diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 13c53653..357256e6 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -25,7 +25,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/gempush.yml b/.github/workflows/gempush.yml index a3388afd..27579e29 100644 --- a/.github/workflows/gempush.yml +++ b/.github/workflows/gempush.yml @@ -16,7 +16,7 @@ jobs: needs: [tests-linting] steps: # is this the same commit hash we saw in commit? - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - run: | git fetch --depth=1 origin +refs/tags/*:refs/tags/* git fetch --prune --unshallow diff --git a/.github/workflows/tests-linting.yml b/.github/workflows/tests-linting.yml index 1ca2396b..d4e34ec7 100644 --- a/.github/workflows/tests-linting.yml +++ b/.github/workflows/tests-linting.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false # Allows both ruby versions to run before failing matrix: - ruby: ['2.5', '3.0'] + ruby: ['2.5', '3.2'] steps: - uses: actions/checkout@master @@ -42,7 +42,7 @@ jobs: strategy: fail-fast: false # Allows both ruby versions to run before failing matrix: - ruby: ['2.5', '3.0'] + ruby: ['2.5', '3.2'] steps: # is this the same commit hash we saw in commit? diff --git a/Gemfile.lock b/Gemfile.lock index 49116057..33918ac8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -33,7 +33,7 @@ GEM cfn-model (0.6.6) kwalify (= 0.7.2) psych (~> 3) - diff-lcs (1.4.4) + diff-lcs (1.5.0) docile (1.3.5) jmespath (1.6.1) kwalify (0.7.2) @@ -53,19 +53,19 @@ GEM rake (13.0.1) regexp_parser (2.1.1) rexml (3.2.5) - rspec (3.10.0) - rspec-core (~> 3.10.0) - rspec-expectations (~> 3.10.0) - rspec-mocks (~> 3.10.0) - rspec-core (3.10.1) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.1) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.1) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-mocks (3.10.2) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-support (3.10.2) + rspec-support (~> 3.12.0) + rspec-support (3.12.0) rubocop (1.22.0) parallel (~> 1.10) parser (>= 3.0.0.0) diff --git a/lib/cfn-nag/cfn_nag_executor.rb b/lib/cfn-nag/cfn_nag_executor.rb index 58a3420c..0a253588 100644 --- a/lib/cfn-nag/cfn_nag_executor.rb +++ b/lib/cfn-nag/cfn_nag_executor.rb @@ -128,8 +128,8 @@ def cfn_nag_config(opts) print_suppression: opts[:print_suppression], isolate_custom_rule_exceptions: opts[:isolate_custom_rule_exceptions], fail_on_warnings: opts[:fail_on_warnings], - rule_repository_definitions: @rule_repository_definitions, ignore_fatal: opts[:ignore_fatal], + rule_repository_definitions: @rule_repository_definitions, rule_arguments: merge_rule_arguments(opts), rule_directory_recursive: opts[:rule_directory_recursive] )