From 7d1ded14cfbafd24f20b0cfc2e89cf5e3fb34920 Mon Sep 17 00:00:00 2001 From: azu Date: Fri, 20 Aug 2021 10:14:05 +0900 Subject: [PATCH] chore: rename variables for readable --- app/scripts/dev_tools.ts | 4 ++-- app/scripts/secretlint/lint.ts | 4 ++-- app/scripts/secretlint/rule.allows.ts | 2 +- app/scripts/secretlint/rule.patterns.ts | 2 +- app/scripts/settings/App.tsx | 8 ++++---- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/scripts/dev_tools.ts b/app/scripts/dev_tools.ts index 0333ad7..31fd939 100644 --- a/app/scripts/dev_tools.ts +++ b/app/scripts/dev_tools.ts @@ -5,7 +5,7 @@ import { sendMessage } from "webext-bridge"; import { SecretLintMessage } from "./types"; import { SettingSchema } from "./settings/SettingSchema"; import { SCHEMA } from "./settings/SettingSchema.validator"; -import { ALLOWS } from "./secretlint/rule.allows"; +import { RULES_DEFAULT_ALLOWS } from "./secretlint/rule.allows"; const headersToEnv = (headers: Request["headers"]): string => { return headers @@ -53,7 +53,7 @@ const lintContentAndSend = async ({ sliceBefore: SCHEMA.definitions.SettingSchema.properties.sliceBefore.default, sliceAfter: SCHEMA.definitions.SettingSchema.properties.sliceAfter.default, enableConsoleIntegration: SCHEMA.definitions.SettingSchema.properties.enableConsoleIntegration.default, - allows: storage["rule.allows"] ?? ALLOWS, + allows: storage["rule.allows"] ?? RULES_DEFAULT_ALLOWS, ...storage?.settings } as SettingSchema & { allows: string[]; diff --git a/app/scripts/secretlint/lint.ts b/app/scripts/secretlint/lint.ts index c11d1a5..fb15e7d 100644 --- a/app/scripts/secretlint/lint.ts +++ b/app/scripts/secretlint/lint.ts @@ -2,7 +2,7 @@ import { lintSource } from "@secretlint/core"; // @ts-ignore import { rules } from "@secretlint/secretlint-rule-preset-recommend"; import pattern from "@secretlint/secretlint-rule-pattern"; -import { PATTERNS } from "./rule.patterns"; +import { RULE_DEFAULT_PATTERNS } from "./rule.patterns"; /** * HeaderName=HeaderValue @@ -34,7 +34,7 @@ export const lintContent = ({ content, url, allows }: { content: string; url: st rule: pattern, options: { // based on https://github.com/l4yton/RegHex - patterns: PATTERNS, + patterns: RULE_DEFAULT_PATTERNS, allows } } diff --git a/app/scripts/secretlint/rule.allows.ts b/app/scripts/secretlint/rule.allows.ts index e27e122..122ab93 100644 --- a/app/scripts/secretlint/rule.allows.ts +++ b/app/scripts/secretlint/rule.allows.ts @@ -1,4 +1,4 @@ -export const ALLOWS = [ +export const RULES_DEFAULT_ALLOWS = [ // local ip "0.0.0.0", "1.1.1.1", diff --git a/app/scripts/secretlint/rule.patterns.ts b/app/scripts/secretlint/rule.patterns.ts index e919f10..3cbc500 100644 --- a/app/scripts/secretlint/rule.patterns.ts +++ b/app/scripts/secretlint/rule.patterns.ts @@ -7,7 +7,7 @@ * pattern: string or regexp-like string(/pattern/) * */ -export const PATTERNS = [ +export const RULE_DEFAULT_PATTERNS = [ { name: "Artifactory API Token", pattern: '/(?:\\s|=|:|"|^)AKC[a-zA-Z0-9]{10,}/' diff --git a/app/scripts/settings/App.tsx b/app/scripts/settings/App.tsx index 655a6f2..8a87118 100644 --- a/app/scripts/settings/App.tsx +++ b/app/scripts/settings/App.tsx @@ -3,9 +3,9 @@ import React, { useCallback, useEffect, useState } from "react"; import { SCHEMA } from "./SettingSchema.validator"; import { browser } from "webextension-polyfill-ts"; import { SettingSchema } from "./SettingSchema"; -import { PATTERNS } from "../secretlint/rule.patterns"; +import { RULE_DEFAULT_PATTERNS } from "../secretlint/rule.patterns"; import { CodeEditor } from "./CodeEditor"; -import { ALLOWS } from "../secretlint/rule.allows"; +import { RULES_DEFAULT_ALLOWS } from "../secretlint/rule.allows"; const useStorageLocal = (name: string, initialValue?: V) => { const [state, setState] = useState(initialValue); @@ -36,8 +36,8 @@ type Pattern = { name: string; pattern: string }; type Patterns = Pattern[]; export const useApp = () => { const [settings, setSettings] = useStorageLocal>("settings"); - const [patterns, setPatterns] = useStorageLocal("rule.patterns", PATTERNS); - const [allows, setAllows] = useStorageLocal("rule.allows", ALLOWS); + const [patterns, setPatterns] = useStorageLocal("rule.patterns", RULE_DEFAULT_PATTERNS); + const [allows, setAllows] = useStorageLocal("rule.allows", RULES_DEFAULT_ALLOWS); const [patternValue, setPatternValue] = useState(JSON.stringify(patterns, null, 2)); const [allowsValue, setAllowsValue] = useState(JSON.stringify(allows, null, 2)); useEffect(() => {