From cedda7c1566f9d3cd7640b6a40c24b497c830874 Mon Sep 17 00:00:00 2001 From: Brett Logan Date: Fri, 23 Dec 2022 21:01:24 -0500 Subject: [PATCH] Revert psd1 extension change and ignore PSMissingModuleManifestField Signed-off-by: Brett Logan --- .github/linters/.powershell-psscriptanalyzer.psd1 | 5 +++++ TEMPLATES/.arm-ttk.psd1 | 1 - ...sscriptanalyzer.txt => .powershell-psscriptanalyzer.psd1} | 0 lib/linter.sh | 2 +- test/inspec/super-linter/controls/super_linter.rb | 2 +- 5 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 .github/linters/.powershell-psscriptanalyzer.psd1 rename TEMPLATES/{.powershell-psscriptanalyzer.txt => .powershell-psscriptanalyzer.psd1} (100%) diff --git a/.github/linters/.powershell-psscriptanalyzer.psd1 b/.github/linters/.powershell-psscriptanalyzer.psd1 new file mode 100644 index 00000000..79a672ce --- /dev/null +++ b/.github/linters/.powershell-psscriptanalyzer.psd1 @@ -0,0 +1,5 @@ +@{ + ExcludeRules = @( + 'PSMissingModuleManifestField' + ) +} diff --git a/TEMPLATES/.arm-ttk.psd1 b/TEMPLATES/.arm-ttk.psd1 index 930ff8f8..bcddce85 100644 --- a/TEMPLATES/.arm-ttk.psd1 +++ b/TEMPLATES/.arm-ttk.psd1 @@ -2,7 +2,6 @@ # - Test Parameters: https://docs.microsoft.com/en-us/azure/azure-resource-manager/templates/test-toolkit#test-parameters # - Test Cases: https://docs.microsoft.com/en-us/azure/azure-resource-manager/templates/test-cases @{ - ModuleVersion = '0.0.1' # Test = @( # 'Parameters Property Must Exist', # 'Parameters Must Be Referenced', diff --git a/TEMPLATES/.powershell-psscriptanalyzer.txt b/TEMPLATES/.powershell-psscriptanalyzer.psd1 similarity index 100% rename from TEMPLATES/.powershell-psscriptanalyzer.txt rename to TEMPLATES/.powershell-psscriptanalyzer.psd1 diff --git a/lib/linter.sh b/lib/linter.sh index 15eb7b41..345c594e 100755 --- a/lib/linter.sh +++ b/lib/linter.sh @@ -152,7 +152,7 @@ PHP_PHPSTAN_FILE_NAME="phpstan.neon" # shellcheck disable=SC2034 # Variable is referenced indirectly PHP_PSALM_FILE_NAME="psalm.xml" # shellcheck disable=SC2034 # Variable is referenced indirectly -POWERSHELL_FILE_NAME=".powershell-psscriptanalyzer.txt" +POWERSHELL_FILE_NAME=".powershell-psscriptanalyzer.psd1" # shellcheck disable=SC2034 # Variable is referenced indirectly PROTOBUF_FILE_NAME="${PROTOBUF_CONFIG_FILE:-.protolintrc.yml}" # shellcheck disable=SC2034 # Variable is referenced indirectly diff --git a/test/inspec/super-linter/controls/super_linter.rb b/test/inspec/super-linter/controls/super_linter.rb index 8811a7a5..83bdccd2 100644 --- a/test/inspec/super-linter/controls/super_linter.rb +++ b/test/inspec/super-linter/controls/super_linter.rb @@ -386,7 +386,7 @@ control "super-linter-validate-files" do "/action/lib/.automation/.mypy.ini", "/action/lib/.automation/.openapirc.yml", "/action/lib/.automation/.perlcriticrc", - "/action/lib/.automation/.powershell-psscriptanalyzer.txt", + "/action/lib/.automation/.powershell-psscriptanalyzer.psd1", "/action/lib/.automation/.protolintrc.yml", "/action/lib/.automation/.python-black", "/action/lib/.automation/.python-lint",