From 42981a4a7a6592edbacb58530668c31773e1447c Mon Sep 17 00:00:00 2001 From: Lukas Gravley Date: Thu, 6 Jan 2022 09:28:26 -0600 Subject: [PATCH] Update additional scala extensions (#2296) * Update buildFileList.sh add new extension * fix space * turn this down a hair * update * fix rule * fixed dumb stuff * fix indent * hangry --- .github/dependabot.yml | 2 +- .github/linters/.cfnlintrc.yml | 1 + .github/linters/.eslintrc.yml | 51 +++++++++++++-------------- .github/linters/.golangci.yml | 13 +++---- .github/linters/.protolintrc.yml | 1 + .github/linters/.yaml-lint.yml | 2 +- .github/release-drafter.yml | 2 ++ .github/workflows/deploy-DEV-slim.yml | 2 +- .github/workflows/stack-linter.yml | 4 +-- TEMPLATES/.cfnlintrc.yml | 3 +- TEMPLATES/.eslintrc.yml | 50 +++++++++++++------------- TEMPLATES/.golangci.yml | 6 ++-- TEMPLATES/.protolintrc.yml | 1 + lib/functions/buildFileList.sh | 2 +- 14 files changed, 72 insertions(+), 68 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index ef8e48e0..80fd6233 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,3 +1,4 @@ +--- ################################# # GitHub Dependabot Config info # ################################# @@ -36,4 +37,3 @@ updates: schedule: interval: "weekly" open-pull-requests-limit: 10 - diff --git a/.github/linters/.cfnlintrc.yml b/.github/linters/.cfnlintrc.yml index 16e8c976..19b154e5 100644 --- a/.github/linters/.cfnlintrc.yml +++ b/.github/linters/.cfnlintrc.yml @@ -1,2 +1,3 @@ +--- include_checks: - I diff --git a/.github/linters/.eslintrc.yml b/.github/linters/.eslintrc.yml index 2025cb8e..327f8bd0 100644 --- a/.github/linters/.eslintrc.yml +++ b/.github/linters/.eslintrc.yml @@ -1,5 +1,4 @@ --- - ############################# ############################# ## JavaScript Linter rules ## @@ -38,36 +37,36 @@ plugins: ######### # Rules # ######### -rules: {} +# rules: ############################## # Overrides for JSON parsing # ############################## overrides: -# JSON files -- files: - - "*.json" - extends: - - plugin:jsonc/recommended-with-json - parser: jsonc-eslint-parser - parserOptions: - jsonSyntax: JSON + # JSON files + - files: + - "*.json" + extends: + - plugin:jsonc/recommended-with-json + parser: jsonc-eslint-parser + parserOptions: + jsonSyntax: JSON -# JSONC files -- files: - - "*.jsonc" - extends: - - plugin:jsonc/recommended-with-jsonc - parser: jsonc-eslint-parser - parserOptions: - jsonSyntax: JSONC + # JSONC files + - files: + - "*.jsonc" + extends: + - plugin:jsonc/recommended-with-jsonc + parser: jsonc-eslint-parser + parserOptions: + jsonSyntax: JSONC -# JSON5 files -- files: - - "*.json5" - extends: - - plugin:jsonc/recommended-with-json5 - parser: jsonc-eslint-parser - parserOptions: - jsonSyntax: JSON5 + # JSON5 files + - files: + - "*.json5" + extends: + - plugin:jsonc/recommended-with-json5 + parser: jsonc-eslint-parser + parserOptions: + jsonSyntax: JSON5 diff --git a/.github/linters/.golangci.yml b/.github/linters/.golangci.yml index 44171d6d..a4048436 100644 --- a/.github/linters/.golangci.yml +++ b/.github/linters/.golangci.yml @@ -5,15 +5,15 @@ ######################### ######################### -# configure golangci-lint -# see https://github.com/golangci/golangci-lint/blob/master/.golangci.example.yml +#configure golangci-lint +#See https://github.com/golangci/golangci-lint/blob/master/.golangci.example.yml issues: exclude-rules: - path: _test\.go linters: - - dupl - - gosec - - goconst + - dupl + - gosec + - goconst linters: enable: - gosec @@ -26,7 +26,8 @@ linters: - revive linters-settings: errcheck: - # report about assignment of errors to blank identifier: `num, _ := strconv.Atoi(numStr)`; + # report about assignment of errors to blank + # identifier: `num, _ := strconv.Atoi(numStr)`; # default is false: such cases aren't reported by default. check-blank: true govet: diff --git a/.github/linters/.protolintrc.yml b/.github/linters/.protolintrc.yml index 7bd3e0ce..57513830 100644 --- a/.github/linters/.protolintrc.yml +++ b/.github/linters/.protolintrc.yml @@ -1,3 +1,4 @@ +--- # Lint directives. lint: # Linter rules. diff --git a/.github/linters/.yaml-lint.yml b/.github/linters/.yaml-lint.yml index 2aa49bd1..63423501 100644 --- a/.github/linters/.yaml-lint.yml +++ b/.github/linters/.yaml-lint.yml @@ -50,7 +50,7 @@ rules: key-duplicates: enable line-length: level: warning - max: 80 + max: 600 allow-non-breakable-words: true allow-non-breakable-inline-mappings: true new-line-at-end-of-file: disable diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index b012a4f3..24be3582 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -1,3 +1,5 @@ +--- +# yamllint disable rule:line-length name-template: 'v$RESOLVED_VERSION' tag-template: 'v$RESOLVED_VERSION' template: | diff --git a/.github/workflows/deploy-DEV-slim.yml b/.github/workflows/deploy-DEV-slim.yml index 108657bd..087bbe52 100644 --- a/.github/workflows/deploy-DEV-slim.yml +++ b/.github/workflows/deploy-DEV-slim.yml @@ -31,7 +31,7 @@ jobs: runs-on: ubuntu-latest # Prevent duplicate run from happening when a forked push is committed if: ${{ github.event_name == 'push' || - github.event.pull_request.head.repo.full_name != github.repository }} + github.event.pull_request.head.repo.full_name != github.repository }} timeout-minutes: 60 ################## # Load all steps # diff --git a/.github/workflows/stack-linter.yml b/.github/workflows/stack-linter.yml index 42b5dbbe..e32b9150 100644 --- a/.github/workflows/stack-linter.yml +++ b/.github/workflows/stack-linter.yml @@ -14,10 +14,8 @@ # Start the job on all push # ############################# on: - push: - branches: [main] pull_request: - branches-ignore: [] + ############### # Set the Job # diff --git a/TEMPLATES/.cfnlintrc.yml b/TEMPLATES/.cfnlintrc.yml index 545080a4..19b154e5 100644 --- a/TEMPLATES/.cfnlintrc.yml +++ b/TEMPLATES/.cfnlintrc.yml @@ -1,2 +1,3 @@ +--- include_checks: -- I + - I diff --git a/TEMPLATES/.eslintrc.yml b/TEMPLATES/.eslintrc.yml index 2025cb8e..7a9763dd 100644 --- a/TEMPLATES/.eslintrc.yml +++ b/TEMPLATES/.eslintrc.yml @@ -38,36 +38,36 @@ plugins: ######### # Rules # ######### -rules: {} +# rules: {} ############################## # Overrides for JSON parsing # ############################## overrides: -# JSON files -- files: - - "*.json" - extends: - - plugin:jsonc/recommended-with-json - parser: jsonc-eslint-parser - parserOptions: - jsonSyntax: JSON + # JSON files + - files: + - "*.json" + extends: + - plugin:jsonc/recommended-with-json + parser: jsonc-eslint-parser + parserOptions: + jsonSyntax: JSON -# JSONC files -- files: - - "*.jsonc" - extends: - - plugin:jsonc/recommended-with-jsonc - parser: jsonc-eslint-parser - parserOptions: - jsonSyntax: JSONC + # JSONC files + - files: + - "*.jsonc" + extends: + - plugin:jsonc/recommended-with-jsonc + parser: jsonc-eslint-parser + parserOptions: + jsonSyntax: JSONC -# JSON5 files -- files: - - "*.json5" - extends: - - plugin:jsonc/recommended-with-json5 - parser: jsonc-eslint-parser - parserOptions: - jsonSyntax: JSON5 + # JSON5 files + - files: + - "*.json5" + extends: + - plugin:jsonc/recommended-with-json5 + parser: jsonc-eslint-parser + parserOptions: + jsonSyntax: JSON5 diff --git a/TEMPLATES/.golangci.yml b/TEMPLATES/.golangci.yml index 44171d6d..67ae8b75 100644 --- a/TEMPLATES/.golangci.yml +++ b/TEMPLATES/.golangci.yml @@ -11,9 +11,9 @@ issues: exclude-rules: - path: _test\.go linters: - - dupl - - gosec - - goconst + - dupl + - gosec + - goconst linters: enable: - gosec diff --git a/TEMPLATES/.protolintrc.yml b/TEMPLATES/.protolintrc.yml index 7bd3e0ce..57513830 100644 --- a/TEMPLATES/.protolintrc.yml +++ b/TEMPLATES/.protolintrc.yml @@ -1,3 +1,4 @@ +--- # Lint directives. lint: # Linter rules. diff --git a/lib/functions/buildFileList.sh b/lib/functions/buildFileList.sh index 0550bb7c..fe7628f6 100755 --- a/lib/functions/buildFileList.sh +++ b/lib/functions/buildFileList.sh @@ -698,7 +698,7 @@ function BuildFileList() { ########################### # Get the SCALA files # ########################### - elif [ "${FILE_TYPE}" == "scala" ] || [ "${BASE_FILE}" == "??????" ]; then + elif [ "${FILE_TYPE}" == "scala" ] || [ "${FILE_TYPE}" == "sc" ] || [ "${BASE_FILE}" == "??????" ]; then ################################ # Append the file to the array # ################################