Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SARIF output support #573

Merged
merged 6 commits into from
Oct 25, 2021
Merged

SARIF output support #573

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dfe507e
SARIF output support
arothian Oct 8, 2021
6c9d596
Resolve todo
arothian Oct 11, 2021
d8cb64f
Update location details to use relative paths to srcroot
arothian Oct 12, 2021
d6193cb
Provide a default line number
arothian Oct 12, 2021
e1cb0fc
Migrate to a version.rb file for tracking version internally
arothian Oct 15, 2021
34462fe
Remove ENV version override
arothian Oct 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Remove ENV version override 
Update version spec to reflect the version.rb values
  • Loading branch information
@arothian
arothian committed Oct 25, 2021
commit 34462fe44ea5fa2c888bed303eccf16f2c96eda3
2 changes: 1 addition & 1 deletion cfn-nag.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ require_relative 'lib/cfn-nag/version'
Gem::Specification.new do |s|
s.name = 'cfn-nag'
s.license = 'MIT'
s.version = ENV['GEM_VERSION'] || CfnNagVersion::VERSION
s.version = CfnNagVersion::VERSION
s.bindir = 'bin'
s.executables = %w[cfn_nag cfn_nag_rules cfn_nag_scan spcm_scan]
s.authors = ['Eric Kascic']
Expand Down
4 changes: 2 additions & 2 deletions scripts/deploy_local.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
echo "Installing cfn_nag from local source"
gem uninstall cfn-nag -x
brew gem uninstall cfn-nag
GEM_VERSION=0.0.01 gem build cfn-nag.gemspec
gem install cfn-nag-0.0.01.gem --no-document
gem build cfn-nag.gemspec
gem install cfn-nag-0.0.0.gem --no-document
2 changes: 1 addition & 1 deletion scripts/setup_and_run_end_to_end_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ download_and_scan_templates () {
fi
}

# Build and install gem locally, using version 0.0.01
# Build and install gem locally, using version 0.0.0
/bin/sh scripts/deploy_local.sh

# Install the two gems required to run end-to-end tests
Expand Down
4 changes: 2 additions & 2 deletions spec/end_to_end/cfn_nag/version_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

describe 'cfn_nag --version', end_to_end: true do
context 'when ensuring the local gem is installed' do
it 'equals 0.0.01' do
it 'equals 0.0.0' do
expect { system %( cfn_nag --version ) }
.to output(a_string_matching('0.0.01'))
.to output(a_string_matching('0.0.0'))
.to_stdout_from_any_process
end
end
Expand Down
2 changes: 1 addition & 1 deletion spec/end_to_end/cfn_nag_rules/version_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
context 'when ensuring the local gem is installed' do
it 'equals 0.0.01' do
expect { system %( cfn_nag_rules --version ) }
.to output(a_string_matching('0.0.01'))
.to output(a_string_matching('0.0.0'))
.to_stdout_from_any_process
end
end
Expand Down
2 changes: 1 addition & 1 deletion spec/end_to_end/cfn_nag_scan/version_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
context 'when ensuring the local gem is installed' do
it 'equals 0.0.01' do
expect { system %( cfn_nag_scan --version ) }
.to output(a_string_matching('0.0.01'))
.to output(a_string_matching('0.0.0'))
.to_stdout_from_any_process
end
end
Expand Down