Compare commits

...

3 Commits

3 changed files with 44 additions and 42 deletions

View File

@ -1,20 +1,20 @@
GIT GIT
remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec
revision: 6bedc829b7fcec035311d8c6086db5d59414428c revision: aaef842906a5666f0fc0b4f186b4dd3498f5b28c
branch: ssf branch: ssf
specs: specs:
inspec (5.17.9) inspec (5.18.15)
cookstyle cookstyle
faraday_middleware (>= 0.12.2, < 1.1) faraday_middleware (>= 0.12.2, < 1.1)
inspec-core (= 5.17.9) inspec-core (= 5.18.15)
mongo (= 2.13.2) mongo (= 2.13.2)
progress_bar (~> 1.3.3) progress_bar (~> 1.3.3)
rake rake
train (~> 3.0) train (~> 3.10)
train-aws (~> 0.2) train-aws (~> 0.2)
train-habitat (~> 0.1) train-habitat (~> 0.1)
train-winrm (~> 0.2) train-winrm (~> 0.2)
inspec-core (5.17.9) inspec-core (5.18.15)
addressable (~> 2.4) addressable (~> 2.4)
chef-telemetry (~> 1.0, >= 1.0.8) chef-telemetry (~> 1.0, >= 1.0.8)
faraday (>= 0.9.0, < 1.5) faraday (>= 0.9.0, < 1.5)
@ -34,7 +34,7 @@ GIT
sslshake (~> 1.2) sslshake (~> 1.2)
thor (>= 0.20, < 2.0) thor (>= 0.20, < 2.0)
tomlrb (>= 1.2, < 2.1) tomlrb (>= 1.2, < 2.1)
train-core (~> 3.0) train-core (~> 3.10)
tty-prompt (~> 0.17) tty-prompt (~> 0.17)
tty-table (~> 0.10) tty-table (~> 0.10)
@ -49,7 +49,7 @@ GIT
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
activesupport (7.0.3) activesupport (7.0.3.1)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2) i18n (>= 1.6, < 2)
minitest (>= 5.1) minitest (>= 5.1)
@ -58,14 +58,14 @@ GEM
public_suffix (>= 2.0.2, < 5.0) public_suffix (>= 2.0.2, < 5.0)
ast (2.4.2) ast (2.4.2)
aws-eventstream (1.2.0) aws-eventstream (1.2.0)
aws-partitions (1.596.0) aws-partitions (1.607.0)
aws-sdk-alexaforbusiness (1.56.0) aws-sdk-alexaforbusiness (1.56.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-amplify (1.32.0) aws-sdk-amplify (1.32.0)
aws-sdk-core (~> 3, >= 3.120.0) aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-apigateway (1.77.0) aws-sdk-apigateway (1.78.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-apigatewayv2 (1.42.0) aws-sdk-apigatewayv2 (1.42.0)
@ -74,7 +74,7 @@ GEM
aws-sdk-applicationautoscaling (1.51.0) aws-sdk-applicationautoscaling (1.51.0)
aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-athena (1.53.0) aws-sdk-athena (1.55.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-autoscaling (1.63.0) aws-sdk-autoscaling (1.63.0)
@ -83,10 +83,10 @@ GEM
aws-sdk-batch (1.47.0) aws-sdk-batch (1.47.0)
aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-budgets (1.49.0) aws-sdk-budgets (1.50.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-cloudformation (1.69.0) aws-sdk-cloudformation (1.70.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-cloudfront (1.65.0) aws-sdk-cloudfront (1.65.0)
@ -125,10 +125,10 @@ GEM
aws-sdk-cognitoidentityprovider (1.53.0) aws-sdk-cognitoidentityprovider (1.53.0)
aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-configservice (1.77.0) aws-sdk-configservice (1.79.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-core (3.131.1) aws-sdk-core (3.131.2)
aws-eventstream (~> 1, >= 1.0.2) aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0) aws-partitions (~> 1, >= 1.525.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
@ -139,10 +139,10 @@ GEM
aws-sdk-databasemigrationservice (1.53.0) aws-sdk-databasemigrationservice (1.53.0)
aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-dynamodb (1.74.0) aws-sdk-dynamodb (1.75.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-ec2 (1.317.0) aws-sdk-ec2 (1.322.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-ecr (1.56.0) aws-sdk-ecr (1.56.0)
@ -151,7 +151,7 @@ GEM
aws-sdk-ecrpublic (1.12.0) aws-sdk-ecrpublic (1.12.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-ecs (1.99.0) aws-sdk-ecs (1.100.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-efs (1.54.0) aws-sdk-efs (1.54.0)
@ -169,7 +169,7 @@ GEM
aws-sdk-elasticloadbalancing (1.40.0) aws-sdk-elasticloadbalancing (1.40.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-elasticloadbalancingv2 (1.77.0) aws-sdk-elasticloadbalancingv2 (1.78.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-elasticsearchservice (1.65.0) aws-sdk-elasticsearchservice (1.65.0)
@ -187,13 +187,13 @@ GEM
aws-sdk-glue (1.88.0) aws-sdk-glue (1.88.0)
aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-guardduty (1.57.0) aws-sdk-guardduty (1.58.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-iam (1.68.0) aws-sdk-iam (1.69.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-kafka (1.49.0) aws-sdk-kafka (1.50.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-kinesis (1.41.0) aws-sdk-kinesis (1.41.0)
@ -211,7 +211,7 @@ GEM
aws-sdk-networkfirewall (1.17.0) aws-sdk-networkfirewall (1.17.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-networkmanager (1.23.0) aws-sdk-networkmanager (1.24.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-organizations (1.59.0) aws-sdk-organizations (1.59.0)
@ -220,10 +220,10 @@ GEM
aws-sdk-ram (1.26.0) aws-sdk-ram (1.26.0)
aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-rds (1.146.0) aws-sdk-rds (1.148.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-redshift (1.82.0) aws-sdk-redshift (1.84.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-route53 (1.63.0) aws-sdk-route53 (1.63.0)
@ -245,7 +245,7 @@ GEM
aws-sdk-secretsmanager (1.46.0) aws-sdk-secretsmanager (1.46.0)
aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-securityhub (1.65.0) aws-sdk-securityhub (1.67.0)
aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-servicecatalog (1.60.0) aws-sdk-servicecatalog (1.60.0)
@ -375,15 +375,15 @@ GEM
http-cookie (1.0.5) http-cookie (1.0.5)
domain_name (~> 0.5) domain_name (~> 0.5)
httpclient (2.8.3) httpclient (2.8.3)
i18n (1.10.0) i18n (1.12.0)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
inifile (3.0.0) inifile (3.0.0)
jmespath (1.6.1) jmespath (1.6.1)
json (2.6.2) json (2.6.2)
jwt (2.4.0) jwt (2.4.1)
kitchen-inspec (2.6.0) kitchen-inspec (2.6.1)
hashie (>= 3.4, <= 5.0) hashie (>= 3.4, <= 5.0)
inspec (>= 2.2.64, < 6.0) inspec (>= 2.2.64, < 7.0)
test-kitchen (>= 2.7, < 4) test-kitchen (>= 2.7, < 4)
kitchen-salt (0.7.2) kitchen-salt (0.7.2)
hashie (>= 3.5) hashie (>= 3.5)
@ -400,8 +400,8 @@ GEM
memoist (0.16.2) memoist (0.16.2)
method_source (1.0.0) method_source (1.0.0)
mini_mime (1.1.2) mini_mime (1.1.2)
minitest (5.15.0) minitest (5.16.2)
mixlib-config (3.0.9) mixlib-config (3.0.27)
tomlrb tomlrb
mixlib-install (3.12.19) mixlib-install (3.12.19)
mixlib-shellout mixlib-shellout
@ -423,7 +423,7 @@ GEM
faraday-cookie_jar (~> 0.0.6) faraday-cookie_jar (~> 0.0.6)
ms_rest (~> 0.7.6) ms_rest (~> 0.7.6)
multi_json (1.15.0) multi_json (1.15.0)
multipart-post (2.2.0) multipart-post (2.2.3)
net-scp (3.0.0) net-scp (3.0.0)
net-ssh (>= 2.6.5, < 7.0.0) net-ssh (>= 2.6.5, < 7.0.0)
net-ssh (6.1.0) net-ssh (6.1.0)
@ -479,16 +479,16 @@ GEM
rubocop-ast (>= 1.15.1, < 2.0) rubocop-ast (>= 1.15.1, < 2.0)
ruby-progressbar (~> 1.7) ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 3.0) unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.18.0) rubocop-ast (1.19.1)
parser (>= 3.1.1.0) parser (>= 3.1.1.0)
ruby-progressbar (1.11.0) ruby-progressbar (1.11.0)
ruby2_keywords (0.0.5) ruby2_keywords (0.0.5)
rubyntlm (0.6.3) rubyntlm (0.6.3)
rubyzip (2.3.2) rubyzip (2.3.2)
semverse (3.0.2) semverse (3.0.2)
signet (0.16.1) signet (0.17.0)
addressable (~> 2.8) addressable (~> 2.8)
faraday (>= 0.17.5, < 3.0) faraday (>= 0.17.5, < 3.a)
jwt (>= 1.5, < 3.0) jwt (>= 1.5, < 3.0)
multi_json (~> 1.10) multi_json (~> 1.10)
sslshake (1.3.1) sslshake (1.3.1)
@ -497,7 +497,7 @@ GEM
unicode-display_width (>= 1.5, < 3.0) unicode-display_width (>= 1.5, < 3.0)
unicode_utils (~> 1.4) unicode_utils (~> 1.4)
strings-ansi (0.2.0) strings-ansi (0.2.0)
test-kitchen (3.2.2) test-kitchen (3.3.1)
bcrypt_pbkdf (~> 1.0) bcrypt_pbkdf (~> 1.0)
chef-utils (>= 16.4.35) chef-utils (>= 16.4.35)
ed25519 (~> 1.2) ed25519 (~> 1.2)
@ -515,7 +515,7 @@ GEM
timeliness (0.3.10) timeliness (0.3.10)
tomlrb (1.3.0) tomlrb (1.3.0)
trailblazer-option (0.1.2) trailblazer-option (0.1.2)
train (3.9.2) train (3.10.1)
activesupport (>= 6.0.3.1) activesupport (>= 6.0.3.1)
azure_graph_rbac (~> 0.16) azure_graph_rbac (~> 0.16)
azure_mgmt_key_vault (~> 0.17) azure_mgmt_key_vault (~> 0.17)
@ -526,7 +526,7 @@ GEM
google-api-client (>= 0.23.9, <= 0.52.0) google-api-client (>= 0.23.9, <= 0.52.0)
googleauth (>= 0.6.6, <= 0.14.0) googleauth (>= 0.6.6, <= 0.14.0)
inifile (~> 3.0) inifile (~> 3.0)
train-core (= 3.9.2) train-core (= 3.10.1)
train-winrm (~> 0.2) train-winrm (~> 0.2)
train-aws (0.2.24) train-aws (0.2.24)
aws-sdk-alexaforbusiness (~> 1.0) aws-sdk-alexaforbusiness (~> 1.0)
@ -604,7 +604,7 @@ GEM
aws-sdk-synthetics (~> 1.19.0) aws-sdk-synthetics (~> 1.19.0)
aws-sdk-transfer (>= 1.26, < 1.35) aws-sdk-transfer (>= 1.26, < 1.35)
aws-sdk-waf (~> 1.43.0) aws-sdk-waf (~> 1.43.0)
train-core (3.9.2) train-core (3.10.1)
addressable (~> 2.5) addressable (~> 2.5)
ffi (!= 1.13.0) ffi (!= 1.13.0)
json (>= 1.8, < 3.0) json (>= 1.8, < 3.0)
@ -640,7 +640,7 @@ GEM
unf (0.1.4) unf (0.1.4)
unf_ext unf_ext
unf_ext (0.0.8.2) unf_ext (0.0.8.2)
unicode-display_width (2.1.0) unicode-display_width (2.2.0)
unicode_utils (1.4.0) unicode_utils (1.4.0)
winrm (2.3.6) winrm (2.3.6)
builder (>= 2.1.2) builder (>= 2.1.2)

View File

@ -19,8 +19,8 @@ if File.file?(bundle_binstub)
load(bundle_binstub) load(bundle_binstub)
else else
abort( abort(
'Your `bin/bundle` was not generated by Bundler, '\ 'Your `bin/bundle` was not generated by Bundler, ' \
'so this binstub cannot run. Replace `bin/bundle` by running '\ 'so this binstub cannot run. Replace `bin/bundle` by running ' \
'`bundle binstubs bundler --force`, then run this command again.' '`bundle binstubs bundler --force`, then run this command again.'
) )
end end

View File

@ -97,6 +97,8 @@ class SystemResource < Inspec.resource(1)
# rubocop:disable Metrics/MethodLength,Metrics/CyclomaticComplexity # rubocop:disable Metrics/MethodLength,Metrics/CyclomaticComplexity
def build_platform_codename def build_platform_codename
case build_platform_finger case build_platform_finger
when 'ubuntu-22.04'
'jammy'
when 'ubuntu-20.04' when 'ubuntu-20.04'
'focal' 'focal'
when 'ubuntu-18.04' when 'ubuntu-18.04'