From a4c1c39f66195cc8d5698cd6b6012418e3cdbd19 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 4 Aug 2021 21:37:49 +0100 Subject: [PATCH 01/13] chore(gemfile.lock): update to latest gem versions (2021-W31) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/356 --- Gemfile.lock | 208 +++++++++++++++++++++++++-------------------------- 1 file changed, 104 insertions(+), 104 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 23d2d0d..58c7898 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker - revision: 1f543f654da5c1774cb8737f6f07a01745520bb5 + revision: 428c89fc250b3790abad5ecb0afe0c3d4956084c branch: ssf specs: - kitchen-docker (2.10.0) + kitchen-docker (2.11.0) test-kitchen (>= 1.0.0) GEM @@ -18,18 +18,18 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.1.1) - aws-partitions (1.479.0) - aws-sdk-apigateway (1.62.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-partitions (1.482.0) + aws-sdk-apigateway (1.64.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-apigatewayv2 (1.32.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-apigatewayv2 (1.34.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-applicationautoscaling (1.51.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-athena (1.37.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-athena (1.39.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-autoscaling (1.61.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -37,41 +37,41 @@ GEM aws-sdk-batch (1.47.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-budgets (1.38.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-budgets (1.40.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudformation (1.53.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-cloudformation (1.55.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudfront (1.53.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-cloudfront (1.55.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsm (1.30.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-cloudhsm (1.32.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsmv2 (1.33.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-cloudhsmv2 (1.35.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudtrail (1.35.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-cloudtrail (1.37.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatch (1.51.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-cloudwatch (1.54.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-cloudwatchevents (1.46.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatchlogs (1.41.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-cloudwatchlogs (1.43.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-codecommit (1.42.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-codecommit (1.44.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-codedeploy (1.40.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-codedeploy (1.42.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-codepipeline (1.44.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-codepipeline (1.46.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-cognitoidentity (1.31.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -79,82 +79,82 @@ GEM aws-sdk-cognitoidentityprovider (1.51.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-configservice (1.62.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-configservice (1.64.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.117.0) + aws-sdk-core (3.119.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-costandusagereportservice (1.31.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-costandusagereportservice (1.33.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-databasemigrationservice (1.53.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-dynamodb (1.60.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-dynamodb (1.62.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.251.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-ec2 (1.254.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-ecr (1.42.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-ecr (1.44.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-ecrpublic (1.3.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-ecrpublic (1.5.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.81.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-ecs (1.83.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-efs (1.40.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-efs (1.42.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-eks (1.58.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-eks (1.60.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.57.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-elasticache (1.59.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticbeanstalk (1.42.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-elasticbeanstalk (1.44.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancing (1.31.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-elasticloadbalancing (1.33.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancingv2 (1.64.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-elasticloadbalancingv2 (1.66.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticsearchservice (1.52.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-elasticsearchservice (1.54.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-eventbridge (1.24.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-firehose (1.37.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-firehose (1.39.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-glue (1.87.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-guardduty (1.45.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-guardduty (1.47.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.57.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-iam (1.59.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-kafka (1.36.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-kafka (1.38.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-kinesis (1.32.1) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-kinesis (1.34.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.44.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-kms (1.46.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.64.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-lambda (1.66.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-organizations (1.59.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -162,51 +162,51 @@ GEM aws-sdk-ram (1.25.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-rds (1.122.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-rds (1.124.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.65.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-redshift (1.68.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-route53 (1.49.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-route53 (1.52.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-route53domains (1.30.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-route53domains (1.32.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-route53resolver (1.26.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-route53resolver (1.28.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.96.2) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-s3 (1.98.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) aws-sdk-secretsmanager (1.46.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-securityhub (1.48.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-securityhub (1.50.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-servicecatalog (1.59.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-ses (1.38.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-ses (1.40.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-shield (1.37.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-shield (1.40.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-sms (1.29.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-sms (1.31.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-sns (1.42.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-sns (1.44.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-sqs (1.40.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-sqs (1.42.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.112.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-ssm (1.114.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-states (1.39.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -235,7 +235,7 @@ GEM mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) tomlrb (~> 1.2) - chef-telemetry (1.0.29) + chef-telemetry (1.1.1) chef-config concurrent-ruby (~> 1.0) chef-utils (17.3.48) @@ -442,7 +442,7 @@ GEM timeliness (0.3.10) tomlrb (1.2.9) trailblazer-option (0.1.1) - train (3.7.4) + train (3.8.1) activesupport (>= 6.0.3.1) azure_graph_rbac (~> 0.16) azure_mgmt_key_vault (~> 0.17) @@ -453,7 +453,7 @@ GEM google-api-client (>= 0.23.9, <= 0.52.0) googleauth (>= 0.6.6, <= 0.14.0) inifile (~> 3.0) - train-core (= 3.7.4) + train-core (= 3.8.1) train-winrm (~> 0.2) train-aws (0.2.8) aws-sdk-apigateway (~> 1.0) @@ -520,7 +520,7 @@ GEM aws-sdk-ssm (~> 1.0) aws-sdk-states (>= 1.35, < 1.40) aws-sdk-transfer (>= 1.26, < 1.33) - train-core (3.7.4) + train-core (3.8.1) addressable (~> 2.5) ffi (!= 1.13.0) json (>= 1.8, < 3.0) From a11da83d03fad1c50a93ba06c1c5af21f1c79e7a Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 4 Aug 2021 21:54:57 +0100 Subject: [PATCH 02/13] ci(gemfile+lock): use `ssf` customised `inspec` repo [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/357 --- Gemfile | 15 ++++--- Gemfile.lock | 118 ++++++++++++++++++++++++++++----------------------- 2 files changed, 75 insertions(+), 58 deletions(-) diff --git a/Gemfile b/Gemfile index f4bb330..9e812aa 100644 --- a/Gemfile +++ b/Gemfile @@ -2,14 +2,19 @@ source 'https://rubygems.org' -# Use the latest version of `inspec` prior to `4.23.4`, which introduces a -# regression where the diff isn't displayed when comparing using `eq`. -gem 'inspec', '~> 4.22.22' -# Install the `kitchen-docker` gem using `git` because the latest version -# currently available (`2.10.0`) doesn't include a recent fix for Gentoo. +# Install the `inspec` gem using `git` because versions after `4.22.22` +# suppress diff output; this version fixes this for our uses. +# rubocop:disable Layout/LineLength +gem 'inspec', git: 'https://gitlab.com/saltstack-formulas/infrastructure/inspec', branch: 'ssf' +# rubocop:enable Layout/LineLength + +# Install the `kitchen-docker` gem using `git` in order to gain a performance +# improvement: avoid package installations which are already covered by the +# `salt-image-builder` (i.e. the pre-salted images that we're using) # rubocop:disable Layout/LineLength gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker', branch: 'ssf' # rubocop:enable Layout/LineLength + gem 'kitchen-inspec', '>= 2.5.0' gem 'kitchen-salt', '>= 0.6.3' diff --git a/Gemfile.lock b/Gemfile.lock index 58c7898..30d10a5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,40 @@ +GIT + remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec + revision: 1dfd086de2d2ba87fd755b0c9063b43ab682519d + branch: ssf + specs: + inspec (4.41.0) + faraday_middleware (>= 0.12.2, < 1.1) + inspec-core (= 4.41.0) + mongo + train (~> 3.0) + train-aws (~> 0.1) + train-habitat (~> 0.1) + train-winrm (~> 0.2) + inspec-core (4.41.0) + addressable (~> 2.4) + chef-telemetry (~> 1.0, >= 1.0.8) + faraday (>= 0.9.0, < 1.5) + faraday_middleware (~> 1.0) + hashie (>= 3.4, < 5.0) + license-acceptance (>= 0.2.13, < 3.0) + method_source (>= 0.8, < 2.0) + mixlib-log (~> 3.0) + multipart-post (~> 2.0) + parallel (~> 1.9) + parslet (>= 1.5, < 2.0) + pry (~> 0.13) + rspec (>= 3.9, < 3.11) + rspec-its (~> 1.2) + rubyzip (>= 1.2.2, < 3.0) + semverse (~> 3.0) + sslshake (~> 1.2) + thor (>= 0.20, < 2.0) + tomlrb (>= 1.2, < 2.1) + train-core (~> 3.0) + tty-prompt (~> 0.17) + tty-table (~> 0.10) + GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker revision: 428c89fc250b3790abad5ecb0afe0c3d4956084c @@ -227,6 +264,7 @@ GEM azure_mgmt_storage (0.23.0) ms_rest_azure (~> 0.12.0) bcrypt_pbkdf (1.1.0) + bson (4.12.1) builder (3.2.4) chef-config (17.3.48) addressable @@ -249,18 +287,27 @@ GEM multi_json domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - ecma-re-validator (0.2.1) - regexp_parser (~> 1.2) ed25519 (1.2.4) erubi (1.10.0) excon (0.85.0) - faraday (0.17.4) + faraday (1.4.3) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.1) multipart-post (>= 1.2, < 3) + ruby2_keywords (>= 0.0.4) faraday-cookie_jar (0.0.7) faraday (>= 0.8.0) http-cookie (~> 1.0.0) - faraday_middleware (0.12.2) - faraday (>= 0.7.4, < 1.0) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday_middleware (1.0.0) + faraday (~> 1.0) ffi (1.15.3) fuzzyurl (0.9.0) google-api-client (0.52.0) @@ -283,51 +330,15 @@ GEM ffi (>= 1.0.1) gyoku (1.3.1) builder (>= 2.1.2) - hana (1.3.7) - hashie (3.6.0) + hashie (4.1.0) http-cookie (1.0.4) domain_name (~> 0.5) httpclient (2.8.3) i18n (1.8.10) concurrent-ruby (~> 1.0) inifile (3.0.0) - inspec (4.22.22) - faraday_middleware (~> 0.12.2) - inspec-core (= 4.22.22) - train (~> 3.0) - train-aws (~> 0.1) - train-habitat (~> 0.1) - train-winrm (~> 0.2) - inspec-core (4.22.22) - addressable (~> 2.4) - chef-telemetry (~> 1.0) - faraday (>= 0.9.0) - hashie (~> 3.4) - json_schemer (>= 0.2.1, < 0.2.12) - license-acceptance (>= 0.2.13, < 2.0) - method_source (>= 0.8, < 2.0) - mixlib-log (~> 3.0) - multipart-post (~> 2.0) - parallel (~> 1.9) - parslet (~> 1.5) - pry (~> 0.13) - rspec (~> 3.9) - rspec-its (~> 1.2) - rubyzip (~> 1.2, >= 1.2.2) - semverse (~> 3.0) - sslshake (~> 1.2) - thor (>= 0.20, < 2.0) - tomlrb (~> 1.2.0) - train-core (~> 3.0) - tty-prompt (~> 0.17) - tty-table (~> 0.10) jmespath (1.4.0) json (2.5.1) - json_schemer (0.2.11) - ecma-re-validator (~> 0.2) - hana (~> 1.3) - regexp_parser (~> 1.5) - uri_template (~> 0.7) jwt (2.2.3) kitchen-inspec (2.5.0) hashie (>= 3.4, <= 5.0) @@ -338,11 +349,11 @@ GEM test-kitchen (>= 1.4) kitchen-vagrant (1.9.0) test-kitchen (>= 1.4, < 4) - license-acceptance (1.0.19) + license-acceptance (2.1.13) pastel (~> 0.7) - tomlrb (~> 1.2) - tty-box (~> 0.3) - tty-prompt (~> 0.18) + tomlrb (>= 1.2, < 3.0) + tty-box (~> 0.6) + tty-prompt (~> 0.20) little-plugger (1.1.4) logging (2.3.0) little-plugger (~> 1.1) @@ -361,6 +372,8 @@ GEM mixlib-shellout (3.2.5) chef-utils mixlib-versioning (1.2.12) + mongo (2.15.0) + bson (>= 4.8.2, < 5.0.0) ms_rest (0.7.6) concurrent-ruby (~> 1.0) faraday (>= 0.9, < 2.0.0) @@ -387,7 +400,6 @@ GEM coderay (~> 1.1) method_source (~> 1.0) public_suffix (4.0.6) - regexp_parser (1.8.2) representable (3.1.1) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) @@ -410,8 +422,9 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.2) + ruby2_keywords (0.0.5) rubyntlm (0.6.3) - rubyzip (1.3.0) + rubyzip (2.3.2) semverse (3.0.0) signet (0.15.0) addressable (~> 2.3) @@ -440,7 +453,7 @@ GEM winrm-fs (~> 1.1) thor (1.1.0) timeliness (0.3.10) - tomlrb (1.2.9) + tomlrb (1.3.0) trailblazer-option (0.1.1) train (3.8.1) activesupport (>= 6.0.3.1) @@ -558,7 +571,6 @@ GEM unf_ext (0.0.7.7) unicode-display_width (2.0.0) unicode_utils (1.4.0) - uri_template (0.7.0) winrm (2.3.6) builder (>= 2.1.2) erubi (~> 1.8) @@ -572,10 +584,10 @@ GEM erubi (~> 1.8) winrm (~> 2.0) winrm-fs (~> 1.0) - winrm-fs (1.3.3) + winrm-fs (1.3.5) erubi (~> 1.8) logging (>= 1.6.1, < 3.0) - rubyzip (~> 1.1) + rubyzip (~> 2.0) winrm (~> 2.0) wisper (2.0.1) zeitwerk (2.4.2) @@ -584,7 +596,7 @@ PLATFORMS ruby DEPENDENCIES - inspec (~> 4.22.22) + inspec! kitchen-docker! kitchen-inspec (>= 2.5.0) kitchen-salt (>= 0.6.3) From 1a97990d3de05ed3a55fce97d2eb4ca854ddd54c Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 9 Aug 2021 12:14:04 +0100 Subject: [PATCH 03/13] chore(gemfile.lock): update to latest gem versions (2021-W32) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/358 --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 30d10a5..cb2af9a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -55,7 +55,7 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.1.1) - aws-partitions (1.482.0) + aws-partitions (1.484.0) aws-sdk-apigateway (1.64.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) @@ -65,7 +65,7 @@ GEM aws-sdk-applicationautoscaling (1.51.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-athena (1.39.0) + aws-sdk-athena (1.40.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-autoscaling (1.61.0) @@ -199,7 +199,7 @@ GEM aws-sdk-ram (1.25.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-rds (1.124.0) + aws-sdk-rds (1.125.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-redshift (1.68.0) From 7b654402cf7f916321da11ab71775427654bf0da Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 16 Aug 2021 18:23:58 +0100 Subject: [PATCH 04/13] chore(gemfile.lock): update to latest gem versions (2021-W33) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/359 --- Gemfile.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index cb2af9a..eff70b5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,17 +1,17 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 1dfd086de2d2ba87fd755b0c9063b43ab682519d + revision: eaeef51095a51ba581c59209df9dd048d93b7154 branch: ssf specs: - inspec (4.41.0) + inspec (4.41.2) faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 4.41.0) - mongo + inspec-core (= 4.41.2) + mongo (= 2.13.2) train (~> 3.0) train-aws (~> 0.1) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.41.0) + inspec-core (4.41.2) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -55,11 +55,11 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.1.1) - aws-partitions (1.484.0) - aws-sdk-apigateway (1.64.0) + aws-partitions (1.487.0) + aws-sdk-apigateway (1.65.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-apigatewayv2 (1.34.0) + aws-sdk-apigatewayv2 (1.35.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-applicationautoscaling (1.51.0) @@ -142,7 +142,7 @@ GEM aws-sdk-ecrpublic (1.5.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.83.0) + aws-sdk-ecs (1.84.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-efs (1.42.0) @@ -151,7 +151,7 @@ GEM aws-sdk-eks (1.60.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.59.0) + aws-sdk-elasticache (1.60.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-elasticbeanstalk (1.44.0) @@ -190,7 +190,7 @@ GEM aws-sdk-kms (1.46.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.66.0) + aws-sdk-lambda (1.67.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-organizations (1.59.0) @@ -205,7 +205,7 @@ GEM aws-sdk-redshift (1.68.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-route53 (1.52.0) + aws-sdk-route53 (1.53.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-route53domains (1.32.0) @@ -242,7 +242,7 @@ GEM aws-sdk-sqs (1.42.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.114.0) + aws-sdk-ssm (1.115.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-states (1.39.0) @@ -364,7 +364,7 @@ GEM minitest (5.14.4) mixlib-config (3.0.9) tomlrb - mixlib-install (3.12.11) + mixlib-install (3.12.16) mixlib-shellout mixlib-versioning thor @@ -372,7 +372,7 @@ GEM mixlib-shellout (3.2.5) chef-utils mixlib-versioning (1.2.12) - mongo (2.15.0) + mongo (2.13.2) bson (>= 4.8.2, < 5.0.0) ms_rest (0.7.6) concurrent-ruby (~> 1.0) From 70a1f3135ccfde09f6016a46eee3fc55b2ca9840 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 19 Aug 2021 10:12:57 +0100 Subject: [PATCH 05/13] ci(kitchen+ci): update with latest `3003.2` pre-salted images [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/360 --- .gitlab-ci.yml | 34 ++++++++++-------- .travis.yml | 34 ++++++++++-------- kitchen.yml | 94 +++++++++++++++++++++++++++++--------------------- 3 files changed, 93 insertions(+), 69 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 747a402..0eeec0d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -192,21 +192,25 @@ almalinux-8-master-py3: {extends: '.test_instance'} # default-rockylinux-8-master-py3: {extends: '.test_instance'} # passenger-rockylinux-8-master-py3: {extends: '.test_instance'} rockylinux-8-master-py3: {extends: '.test_instance'} -# default-debian-11-3003-1-py3: {extends: '.test_instance'} -# default-debian-10-3003-1-py3: {extends: '.test_instance'} -# default-debian-9-3003-1-py3: {extends: '.test_instance'} -# default-ubuntu-2004-3003-1-py3: {extends: '.test_instance'} -# default-ubuntu-1804-3003-1-py3: {extends: '.test_instance'} -# default-centos-8-3003-1-py3: {extends: '.test_instance'} -# default-centos-7-3003-1-py3: {extends: '.test_instance'} -# default-fedora-34-3003-1-py3: {extends: '.test_instance'} -# default-fedora-33-3003-1-py3: {extends: '.test_instance'} -# default-opensuse-leap-153-3003-1-py3: {extends: '.test_instance'} -# default-opensuse-leap-152-3003-1-py3: {extends: '.test_instance'} -# default-opensuse-tmbl-latest-3003-1-py3: {extends: '.test_instance'} -# default-amazonlinux-2-3003-1-py3: {extends: '.test_instance'} -# default-oraclelinux-8-3003-1-py3: {extends: '.test_instance'} -# default-oraclelinux-7-3003-1-py3: {extends: '.test_instance'} +# default-debian-11-3003-2-py3: {extends: '.test_instance'} +# default-debian-10-3003-2-py3: {extends: '.test_instance'} +# default-debian-9-3003-2-py3: {extends: '.test_instance'} +# default-ubuntu-2004-3003-2-py3: {extends: '.test_instance'} +# default-ubuntu-1804-3003-2-py3: {extends: '.test_instance'} +# default-centos-8-3003-2-py3: {extends: '.test_instance'} +# default-centos-7-3003-2-py3: {extends: '.test_instance'} +# default-fedora-34-3003-2-py3: {extends: '.test_instance'} +# default-fedora-33-3003-2-py3: {extends: '.test_instance'} +# default-opensuse-leap-153-3003-2-py3: {extends: '.test_instance'} +# default-opensuse-leap-152-3003-2-py3: {extends: '.test_instance'} +# default-opensuse-tmbl-latest-3003-2-py3: {extends: '.test_instance'} +# default-amazonlinux-2-3003-2-py3: {extends: '.test_instance'} +# default-oraclelinux-8-3003-2-py3: {extends: '.test_instance'} +# default-oraclelinux-7-3003-2-py3: {extends: '.test_instance'} +# default-arch-base-latest-3003-2-py3: {extends: '.test_instance'} +# default-gentoo-stage3-latest-3003-2-py3: {extends: '.test_instance'} +# default-gentoo-stage3-systemd-3003-2-py3: {extends: '.test_instance'} +# default-almalinux-8-3003-2-py3: {extends: '.test_instance'} # default-arch-base-latest-3003-1-py3: {extends: '.test_instance'} # default-gentoo-stage3-latest-3003-1-py3: {extends: '.test_instance'} # default-gentoo-stage3-systemd-3003-1-py3: {extends: '.test_instance'} diff --git a/.travis.yml b/.travis.yml index 412facf..f99ec04 100644 --- a/.travis.yml +++ b/.travis.yml @@ -145,21 +145,25 @@ jobs: # - env: INSTANCE=default-rockylinux-8-master-py3 # - env: INSTANCE=passenger-rockylinux-8-master-py3 - env: INSTANCE=rockylinux-8-master-py3 - # - env: INSTANCE=default-debian-11-3003-1-py3 - # - env: INSTANCE=default-debian-10-3003-1-py3 - # - env: INSTANCE=default-debian-9-3003-1-py3 - # - env: INSTANCE=default-ubuntu-2004-3003-1-py3 - # - env: INSTANCE=default-ubuntu-1804-3003-1-py3 - # - env: INSTANCE=default-centos-8-3003-1-py3 - # - env: INSTANCE=default-centos-7-3003-1-py3 - # - env: INSTANCE=default-fedora-34-3003-1-py3 - # - env: INSTANCE=default-fedora-33-3003-1-py3 - # - env: INSTANCE=default-opensuse-leap-153-3003-1-py3 - # - env: INSTANCE=default-opensuse-leap-152-3003-1-py3 - # - env: INSTANCE=default-opensuse-tmbl-latest-3003-1-py3 - # - env: INSTANCE=default-amazonlinux-2-3003-1-py3 - # - env: INSTANCE=default-oraclelinux-8-3003-1-py3 - # - env: INSTANCE=default-oraclelinux-7-3003-1-py3 + # - env: INSTANCE=default-debian-11-3003-2-py3 + # - env: INSTANCE=default-debian-10-3003-2-py3 + # - env: INSTANCE=default-debian-9-3003-2-py3 + # - env: INSTANCE=default-ubuntu-2004-3003-2-py3 + # - env: INSTANCE=default-ubuntu-1804-3003-2-py3 + # - env: INSTANCE=default-centos-8-3003-2-py3 + # - env: INSTANCE=default-centos-7-3003-2-py3 + # - env: INSTANCE=default-fedora-34-3003-2-py3 + # - env: INSTANCE=default-fedora-33-3003-2-py3 + # - env: INSTANCE=default-opensuse-leap-153-3003-2-py3 + # - env: INSTANCE=default-opensuse-leap-152-3003-2-py3 + # - env: INSTANCE=default-opensuse-tmbl-latest-3003-2-py3 + # - env: INSTANCE=default-amazonlinux-2-3003-2-py3 + # - env: INSTANCE=default-oraclelinux-8-3003-2-py3 + # - env: INSTANCE=default-oraclelinux-7-3003-2-py3 + # - env: INSTANCE=default-arch-base-latest-3003-2-py3 + # - env: INSTANCE=default-gentoo-stage3-latest-3003-2-py3 + # - env: INSTANCE=default-gentoo-stage3-systemd-3003-2-py3 + # - env: INSTANCE=default-almalinux-8-3003-2-py3 # - env: INSTANCE=default-arch-base-latest-3003-1-py3 # - env: INSTANCE=default-gentoo-stage3-latest-3003-1-py3 # - env: INSTANCE=default-gentoo-stage3-systemd-3003-1-py3 diff --git a/kitchen.yml b/kitchen.yml index 7c56d88..c5ab662 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -142,69 +142,84 @@ platforms: driver: image: saltimages/salt-master-py3:rockylinux-8 - ## SALT `3003.1` - - name: debian-11-3003-1-py3 + ## SALT `3003.2` + - name: debian-11-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:debian-11 + image: saltimages/salt-3003.2-py3:debian-11 run_command: /lib/systemd/systemd - - name: debian-10-3003-1-py3 + - name: debian-10-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:debian-10 + image: saltimages/salt-3003.2-py3:debian-10 run_command: /lib/systemd/systemd - - name: debian-9-3003-1-py3 + - name: debian-9-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:debian-9 + image: saltimages/salt-3003.2-py3:debian-9 run_command: /lib/systemd/systemd - - name: ubuntu-2004-3003-1-py3 + - name: ubuntu-2004-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:ubuntu-20.04 + image: saltimages/salt-3003.2-py3:ubuntu-20.04 run_command: /lib/systemd/systemd - - name: ubuntu-1804-3003-1-py3 + - name: ubuntu-1804-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:ubuntu-18.04 + image: saltimages/salt-3003.2-py3:ubuntu-18.04 run_command: /lib/systemd/systemd - - name: centos-8-3003-1-py3 + - name: centos-8-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:centos-8 - - name: centos-7-3003-1-py3 + image: saltimages/salt-3003.2-py3:centos-8 + - name: centos-7-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:centos-7 - - name: fedora-34-3003-1-py3 + image: saltimages/salt-3003.2-py3:centos-7 + - name: fedora-34-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:fedora-34 - - name: fedora-33-3003-1-py3 + image: saltimages/salt-3003.2-py3:fedora-34 + - name: fedora-33-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:fedora-33 - - name: opensuse-leap-153-3003-1-py3 + image: saltimages/salt-3003.2-py3:fedora-33 + - name: opensuse-leap-153-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:opensuse-leap-15.3 + image: saltimages/salt-3003.2-py3:opensuse-leap-15.3 # Workaround to avoid intermittent failures on `opensuse-leap-15.3`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: opensuse-leap-152-3003-1-py3 + - name: opensuse-leap-152-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:opensuse-leap-15.2 + image: saltimages/salt-3003.2-py3:opensuse-leap-15.2 # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: opensuse-tmbl-latest-3003-1-py3 + - name: opensuse-tmbl-latest-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:opensuse-tumbleweed-latest + image: saltimages/salt-3003.2-py3:opensuse-tumbleweed-latest # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: amazonlinux-2-3003-1-py3 + - name: amazonlinux-2-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:amazonlinux-2 - - name: oraclelinux-8-3003-1-py3 + image: saltimages/salt-3003.2-py3:amazonlinux-2 + - name: oraclelinux-8-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:oraclelinux-8 - - name: oraclelinux-7-3003-1-py3 + image: saltimages/salt-3003.2-py3:oraclelinux-8 + - name: oraclelinux-7-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:oraclelinux-7 + image: saltimages/salt-3003.2-py3:oraclelinux-7 + - name: arch-base-latest-3003-2-py3 + driver: + image: saltimages/salt-3003.2-py3:arch-base-latest + - name: gentoo-stage3-latest-3003-2-py3 + driver: + image: saltimages/salt-3003.2-py3:gentoo-stage3-latest + run_command: /sbin/init + - name: gentoo-stage3-systemd-3003-2-py3 + driver: + image: saltimages/salt-3003.2-py3:gentoo-stage3-systemd + - name: almalinux-8-3003-2-py3 + driver: + image: saltimages/salt-3003.2-py3:almalinux-8 + + ## SALT `3003.1` - name: arch-base-latest-3003-1-py3 driver: image: saltimages/salt-3003.1-py3:arch-base-latest @@ -471,14 +486,15 @@ suites: - oraclelinux-8-master-py3 - almalinux-8-master-py3 - rockylinux-8-master-py3 - - debian-11-3003-1-py3 - - debian-10-3003-1-py3 - - debian-9-3003-1-py3 - - ubuntu-2004-3003-1-py3 - - ubuntu-1804-3003-1-py3 - - centos-8-3003-1-py3 - - centos-7-3003-1-py3 - - oraclelinux-8-3003-1-py3 + - debian-11-3003-2-py3 + - debian-10-3003-2-py3 + - debian-9-3003-2-py3 + - ubuntu-2004-3003-2-py3 + - ubuntu-1804-3003-2-py3 + - centos-8-3003-2-py3 + - centos-7-3003-2-py3 + - oraclelinux-8-3003-2-py3 + - almalinux-8-3003-2-py3 - debian-11-3002-6-py3 - debian-10-3002-6-py3 - debian-9-3002-6-py3 From 93024f744415dfdb4c56b9cdb9276b9aec0c942f Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 23 Aug 2021 09:24:06 +0100 Subject: [PATCH 06/13] chore(gemfile.lock): update to latest gem versions (2021-W34) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/362 --- Gemfile.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index eff70b5..b53bf1c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,17 +1,17 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: eaeef51095a51ba581c59209df9dd048d93b7154 + revision: 603468f3449c8581d05ea6b7328834115490dfb8 branch: ssf specs: - inspec (4.41.2) + inspec (4.41.7) faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 4.41.2) + inspec-core (= 4.41.7) mongo (= 2.13.2) train (~> 3.0) train-aws (~> 0.1) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.41.2) + inspec-core (4.41.7) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -46,7 +46,7 @@ GIT GEM remote: https://rubygems.org/ specs: - activesupport (6.1.4) + activesupport (6.1.4.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -55,7 +55,7 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.1.1) - aws-partitions (1.487.0) + aws-partitions (1.489.0) aws-sdk-apigateway (1.65.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) @@ -98,7 +98,7 @@ GEM aws-sdk-cloudwatchevents (1.46.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatchlogs (1.43.0) + aws-sdk-cloudwatchlogs (1.44.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-codecommit (1.44.0) @@ -116,10 +116,10 @@ GEM aws-sdk-cognitoidentityprovider (1.51.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-configservice (1.64.0) + aws-sdk-configservice (1.65.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.119.0) + aws-sdk-core (3.119.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) @@ -133,7 +133,7 @@ GEM aws-sdk-dynamodb (1.62.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.254.0) + aws-sdk-ec2 (1.257.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.44.0) @@ -148,7 +148,7 @@ GEM aws-sdk-efs (1.42.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-eks (1.60.0) + aws-sdk-eks (1.61.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-elasticache (1.60.0) @@ -205,16 +205,16 @@ GEM aws-sdk-redshift (1.68.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-route53 (1.53.0) + aws-sdk-route53 (1.54.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-route53domains (1.32.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-route53resolver (1.28.0) + aws-sdk-route53resolver (1.29.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.98.0) + aws-sdk-s3 (1.99.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -360,7 +360,7 @@ GEM multi_json (~> 1.14) memoist (0.16.2) method_source (1.0.0) - mini_mime (1.1.0) + mini_mime (1.1.1) minitest (5.14.4) mixlib-config (3.0.9) tomlrb From 24fa08ada5b02dfeef32980a268bdb890f85223c Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 30 Aug 2021 18:09:51 +0100 Subject: [PATCH 07/13] chore(gemfile.lock): update to latest gem versions (2021-W35) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/364 --- Gemfile.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b53bf1c..47b3ab6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,17 +1,17 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 603468f3449c8581d05ea6b7328834115490dfb8 + revision: 4fa6455347ea3c7123743dfd9796728cb0b77bb9 branch: ssf specs: - inspec (4.41.7) + inspec (4.41.11) faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 4.41.7) + inspec-core (= 4.41.11) mongo (= 2.13.2) train (~> 3.0) train-aws (~> 0.1) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.41.7) + inspec-core (4.41.11) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -55,8 +55,8 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.1.1) - aws-partitions (1.489.0) - aws-sdk-apigateway (1.65.0) + aws-partitions (1.492.0) + aws-sdk-apigateway (1.66.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-apigatewayv2 (1.35.0) @@ -133,7 +133,7 @@ GEM aws-sdk-dynamodb (1.62.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.257.0) + aws-sdk-ec2 (1.260.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.44.0) @@ -214,7 +214,7 @@ GEM aws-sdk-route53resolver (1.29.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.99.0) + aws-sdk-s3 (1.100.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -242,7 +242,7 @@ GEM aws-sdk-sqs (1.42.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.115.0) + aws-sdk-ssm (1.116.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-states (1.39.0) @@ -266,9 +266,9 @@ GEM bcrypt_pbkdf (1.1.0) bson (4.12.1) builder (3.2.4) - chef-config (17.3.48) + chef-config (17.4.38) addressable - chef-utils (= 17.3.48) + chef-utils (= 17.4.38) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -276,7 +276,7 @@ GEM chef-telemetry (1.1.1) chef-config concurrent-ruby (~> 1.0) - chef-utils (17.3.48) + chef-utils (17.4.38) concurrent-ruby coderay (1.1.3) concurrent-ruby (1.1.9) @@ -347,7 +347,7 @@ GEM kitchen-salt (0.6.3) hashie (>= 3.5) test-kitchen (>= 1.4) - kitchen-vagrant (1.9.0) + kitchen-vagrant (1.10.0) test-kitchen (>= 1.4, < 4) license-acceptance (2.1.13) pastel (~> 0.7) From 016786bac22f9786fbfec8bdf2b22c41f5274cb2 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 8 Sep 2021 23:33:44 +0100 Subject: [PATCH 08/13] chore(gemfile.lock): update to latest gem versions (2021-W36) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/367 --- Gemfile.lock | 264 +++++++++++++++++++++++++++------------------------ 1 file changed, 142 insertions(+), 122 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 47b3ab6..06584a8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,17 +1,17 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 4fa6455347ea3c7123743dfd9796728cb0b77bb9 + revision: 2654d96e9567010c80908b15e07b0c63220abda9 branch: ssf specs: - inspec (4.41.11) + inspec (4.41.20) faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 4.41.11) + inspec-core (= 4.41.20) mongo (= 2.13.2) train (~> 3.0) - train-aws (~> 0.1) + train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.41.11) + inspec-core (4.41.20) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -54,204 +54,219 @@ GEM zeitwerk (~> 2.3) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) - aws-eventstream (1.1.1) - aws-partitions (1.492.0) - aws-sdk-apigateway (1.66.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-eventstream (1.2.0) + aws-partitions (1.497.0) + aws-sdk-alexaforbusiness (1.50.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-apigatewayv2 (1.35.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-amplify (1.32.0) + aws-sdk-core (~> 3, >= 3.120.0) + aws-sigv4 (~> 1.1) + aws-sdk-apigateway (1.67.0) + aws-sdk-core (~> 3, >= 3.120.0) + aws-sigv4 (~> 1.1) + aws-sdk-apigatewayv2 (1.36.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-applicationautoscaling (1.51.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-athena (1.40.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-athena (1.41.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-autoscaling (1.61.0) + aws-sdk-autoscaling (1.63.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sdk-batch (1.47.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-budgets (1.40.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-budgets (1.41.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudformation (1.55.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-cloudformation (1.57.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudfront (1.55.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-cloudfront (1.56.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsm (1.32.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-cloudhsm (1.33.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsmv2 (1.35.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-cloudhsmv2 (1.36.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudtrail (1.37.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-cloudtrail (1.38.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatch (1.54.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-cloudwatch (1.55.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-cloudwatchevents (1.46.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatchlogs (1.44.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-cloudwatchlogs (1.45.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-codecommit (1.44.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-codecommit (1.45.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-codedeploy (1.42.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-codedeploy (1.43.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-codepipeline (1.46.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-codepipeline (1.47.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-cognitoidentity (1.31.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-cognitoidentityprovider (1.51.0) + aws-sdk-cognitoidentityprovider (1.53.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-configservice (1.65.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-configservice (1.66.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.119.1) + aws-sdk-core (3.121.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-costandusagereportservice (1.33.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-costandusagereportservice (1.34.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-databasemigrationservice (1.53.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-dynamodb (1.62.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-dynamodb (1.63.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.260.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-ec2 (1.261.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-ecr (1.44.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-ecr (1.45.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-ecrpublic (1.5.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-ecrpublic (1.6.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.84.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-ecs (1.85.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-efs (1.42.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-efs (1.44.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-eks (1.61.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-eks (1.63.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.60.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-elasticache (1.62.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticbeanstalk (1.44.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-elasticbeanstalk (1.45.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancing (1.33.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-elasticloadbalancing (1.34.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancingv2 (1.66.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-elasticloadbalancingv2 (1.67.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticsearchservice (1.54.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-elasticsearchservice (1.55.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-eventbridge (1.24.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-firehose (1.39.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-firehose (1.41.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-glue (1.87.0) + aws-sdk-glue (1.88.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-guardduty (1.47.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-guardduty (1.48.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.59.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-iam (1.60.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-kafka (1.38.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-kafka (1.39.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-kinesis (1.34.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-kinesis (1.35.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.46.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-kms (1.48.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.67.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-lambda (1.68.0) + aws-sdk-core (~> 3, >= 3.120.0) + aws-sigv4 (~> 1.1) + aws-sdk-mq (1.40.0) + aws-sdk-core (~> 3, >= 3.120.0) + aws-sigv4 (~> 1.1) + aws-sdk-networkfirewall (1.7.0) + aws-sdk-core (~> 3, >= 3.120.0) + aws-sigv4 (~> 1.1) + aws-sdk-networkmanager (1.14.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-organizations (1.59.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-ram (1.25.0) + aws-sdk-ram (1.26.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-rds (1.125.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-rds (1.126.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.68.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-redshift (1.69.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-route53 (1.54.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-route53 (1.55.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-route53domains (1.32.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-route53domains (1.33.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-route53resolver (1.29.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-route53resolver (1.30.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.100.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-s3 (1.102.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.1) + aws-sigv4 (~> 1.4) aws-sdk-secretsmanager (1.46.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-securityhub (1.50.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-securityhub (1.52.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-servicecatalog (1.59.0) + aws-sdk-servicecatalog (1.60.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-ses (1.40.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-ses (1.41.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-shield (1.40.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-shield (1.41.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-sms (1.31.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-sms (1.32.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-sns (1.44.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-sns (1.45.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-sqs (1.42.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-sqs (1.44.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.116.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-ssm (1.117.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-states (1.39.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-transfer (1.32.0) + aws-sdk-transfer (1.34.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sigv4 (1.2.4) + aws-sigv4 (1.4.0) aws-eventstream (~> 1, >= 1.0.2) azure_graph_rbac (0.17.2) ms_rest_azure (~> 0.12.0) @@ -308,7 +323,7 @@ GEM faraday-net_http_persistent (1.2.0) faraday_middleware (1.0.0) faraday (~> 1.0) - ffi (1.15.3) + ffi (1.15.4) fuzzyurl (0.9.0) google-api-client (0.52.0) addressable (~> 2.5, >= 2.5.1) @@ -426,8 +441,8 @@ GEM rubyntlm (0.6.3) rubyzip (2.3.2) semverse (3.0.0) - signet (0.15.0) - addressable (~> 2.3) + signet (0.16.0) + addressable (~> 2.8) faraday (>= 0.17.3, < 2.0) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) @@ -468,12 +483,14 @@ GEM inifile (~> 3.0) train-core (= 3.8.1) train-winrm (~> 0.2) - train-aws (0.2.8) + train-aws (0.2.19) + aws-sdk-alexaforbusiness (~> 1.0) + aws-sdk-amplify (~> 1.0) aws-sdk-apigateway (~> 1.0) aws-sdk-apigatewayv2 (~> 1.0) aws-sdk-applicationautoscaling (>= 1.46, < 1.52) aws-sdk-athena (~> 1.0) - aws-sdk-autoscaling (>= 1.22, < 1.62) + aws-sdk-autoscaling (>= 1.22, < 1.64) aws-sdk-batch (>= 1.36, < 1.48) aws-sdk-budgets (~> 1.0) aws-sdk-cloudformation (~> 1.0) @@ -488,7 +505,7 @@ GEM aws-sdk-codedeploy (~> 1.0) aws-sdk-codepipeline (~> 1.0) aws-sdk-cognitoidentity (>= 1.26, < 1.32) - aws-sdk-cognitoidentityprovider (>= 1.46, < 1.52) + aws-sdk-cognitoidentityprovider (>= 1.46, < 1.54) aws-sdk-configservice (~> 1.21) aws-sdk-core (~> 3.0) aws-sdk-costandusagereportservice (~> 1.6) @@ -507,15 +524,18 @@ GEM aws-sdk-elasticsearchservice (~> 1.0) aws-sdk-eventbridge (~> 1.24.0) aws-sdk-firehose (~> 1.0) - aws-sdk-glue (>= 1.71, < 1.88) + aws-sdk-glue (>= 1.71, < 1.89) aws-sdk-guardduty (~> 1.31) aws-sdk-iam (~> 1.13) aws-sdk-kafka (~> 1.0) aws-sdk-kinesis (~> 1.0) aws-sdk-kms (~> 1.13) aws-sdk-lambda (~> 1.0) + aws-sdk-mq (~> 1.0) + aws-sdk-networkfirewall (>= 1.6.0) + aws-sdk-networkmanager (>= 1.13.0) aws-sdk-organizations (>= 1.17, < 1.60) - aws-sdk-ram (>= 1.21, < 1.26) + aws-sdk-ram (>= 1.21, < 1.27) aws-sdk-rds (~> 1.43) aws-sdk-redshift (~> 1.0) aws-sdk-route53 (~> 1.0) @@ -524,7 +544,7 @@ GEM aws-sdk-s3 (~> 1.30) aws-sdk-secretsmanager (>= 1.42, < 1.47) aws-sdk-securityhub (~> 1.0) - aws-sdk-servicecatalog (>= 1.48, < 1.60) + aws-sdk-servicecatalog (>= 1.48, < 1.61) aws-sdk-ses (~> 1.0) aws-sdk-shield (~> 1.30) aws-sdk-sms (~> 1.0) @@ -532,7 +552,7 @@ GEM aws-sdk-sqs (~> 1.10) aws-sdk-ssm (~> 1.0) aws-sdk-states (>= 1.35, < 1.40) - aws-sdk-transfer (>= 1.26, < 1.33) + aws-sdk-transfer (>= 1.26, < 1.35) train-core (3.8.1) addressable (~> 2.5) ffi (!= 1.13.0) From 94317ef7b69757a2367f4a380f15229fe2820e23 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 14 Sep 2021 09:56:57 +0100 Subject: [PATCH 09/13] chore(gemfile.lock): update to latest gem versions (2021-W37) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/368 --- Gemfile.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 06584a8..13b3128 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,17 +1,17 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 2654d96e9567010c80908b15e07b0c63220abda9 + revision: 9a3c06719f3a209f34212151883fda40787a1626 branch: ssf specs: - inspec (4.41.20) + inspec (4.46.4) faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 4.41.20) + inspec-core (= 4.46.4) mongo (= 2.13.2) train (~> 3.0) train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.41.20) + inspec-core (4.46.4) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -55,7 +55,7 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.2.0) - aws-partitions (1.497.0) + aws-partitions (1.501.0) aws-sdk-alexaforbusiness (1.50.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) @@ -83,7 +83,7 @@ GEM aws-sdk-budgets (1.41.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudformation (1.57.0) + aws-sdk-cloudformation (1.58.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-cloudfront (1.56.0) @@ -139,10 +139,10 @@ GEM aws-sdk-dynamodb (1.63.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.261.0) + aws-sdk-ec2 (1.262.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-ecr (1.45.0) + aws-sdk-ecr (1.46.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-ecrpublic (1.6.0) @@ -187,7 +187,7 @@ GEM aws-sdk-iam (1.60.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-kafka (1.39.0) + aws-sdk-kafka (1.40.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-kinesis (1.35.0) @@ -214,7 +214,7 @@ GEM aws-sdk-ram (1.26.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-rds (1.126.0) + aws-sdk-rds (1.127.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-redshift (1.69.0) @@ -407,7 +407,7 @@ GEM net-ssh (>= 4.0.0) nori (2.6.0) os (1.1.1) - parallel (1.20.1) + parallel (1.21.0) parslet (1.8.2) pastel (0.8.0) tty-color (~> 0.5) From 1ad223fb659a4e6a9e3741a3aef5fca6e7c5206b Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 21 Sep 2021 11:58:22 +0100 Subject: [PATCH 10/13] chore(gemfile.lock): update to latest gem versions (2021-W38) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/369 --- Gemfile.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 13b3128..8da7033 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -55,7 +55,7 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.2.0) - aws-partitions (1.501.0) + aws-partitions (1.503.0) aws-sdk-alexaforbusiness (1.50.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) @@ -139,7 +139,7 @@ GEM aws-sdk-dynamodb (1.63.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.262.0) + aws-sdk-ec2 (1.263.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.46.0) @@ -169,7 +169,7 @@ GEM aws-sdk-elasticloadbalancingv2 (1.67.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticsearchservice (1.55.0) + aws-sdk-elasticsearchservice (1.56.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-eventbridge (1.24.0) @@ -229,7 +229,7 @@ GEM aws-sdk-route53resolver (1.30.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.102.0) + aws-sdk-s3 (1.103.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) @@ -588,8 +588,8 @@ GEM uber (0.1.0) unf (0.1.4) unf_ext - unf_ext (0.0.7.7) - unicode-display_width (2.0.0) + unf_ext (0.0.8) + unicode-display_width (2.1.0) unicode_utils (1.4.0) winrm (2.3.6) builder (>= 2.1.2) From 3233185565d36806abc19e240f5ed6ddb3035256 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 30 Sep 2021 07:16:29 +0100 Subject: [PATCH 11/13] chore(gemfile.lock): update to latest gem versions (2021-W39) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/370 --- Gemfile.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8da7033..d0e351d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,17 +1,17 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 9a3c06719f3a209f34212151883fda40787a1626 + revision: 223002687f2cfa303b13457825665de6c5514c52 branch: ssf specs: - inspec (4.46.4) + inspec (4.46.13) faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 4.46.4) + inspec-core (= 4.46.13) mongo (= 2.13.2) train (~> 3.0) train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.46.4) + inspec-core (4.46.13) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -55,7 +55,7 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.2.0) - aws-partitions (1.503.0) + aws-partitions (1.507.0) aws-sdk-alexaforbusiness (1.50.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) @@ -125,7 +125,7 @@ GEM aws-sdk-configservice (1.66.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.121.0) + aws-sdk-core (3.121.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) @@ -139,10 +139,10 @@ GEM aws-sdk-dynamodb (1.63.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.263.0) + aws-sdk-ec2 (1.265.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-ecr (1.46.0) + aws-sdk-ecr (1.47.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-ecrpublic (1.6.0) @@ -166,7 +166,7 @@ GEM aws-sdk-elasticloadbalancing (1.34.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancingv2 (1.67.0) + aws-sdk-elasticloadbalancingv2 (1.68.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-elasticsearchservice (1.56.0) @@ -184,10 +184,10 @@ GEM aws-sdk-guardduty (1.48.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.60.0) + aws-sdk-iam (1.61.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-kafka (1.40.0) + aws-sdk-kafka (1.41.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-kinesis (1.35.0) @@ -257,7 +257,7 @@ GEM aws-sdk-sqs (1.44.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.117.0) + aws-sdk-ssm (1.118.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-states (1.39.0) @@ -281,9 +281,9 @@ GEM bcrypt_pbkdf (1.1.0) bson (4.12.1) builder (3.2.4) - chef-config (17.4.38) + chef-config (17.5.22) addressable - chef-utils (= 17.4.38) + chef-utils (= 17.5.22) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -291,7 +291,7 @@ GEM chef-telemetry (1.1.1) chef-config concurrent-ruby (~> 1.0) - chef-utils (17.4.38) + chef-utils (17.5.22) concurrent-ruby coderay (1.1.3) concurrent-ruby (1.1.9) From e0414181a724076176cb37f6402f013f4e498109 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 5 Oct 2021 11:14:59 +0100 Subject: [PATCH 12/13] ci(kitchen+ci): update with latest CVE pre-salted images [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/374 --- .github/workflows/kitchen.vagrant.yml | 3 - .gitignore | 1 + .gitlab-ci.yml | 125 ++++----- .travis.yml | 125 ++++----- kitchen.vagrant.yml | 6 - kitchen.yml | 362 ++++++++++---------------- 6 files changed, 251 insertions(+), 371 deletions(-) diff --git a/.github/workflows/kitchen.vagrant.yml b/.github/workflows/kitchen.vagrant.yml index 7d090c3..99a948b 100644 --- a/.github/workflows/kitchen.vagrant.yml +++ b/.github/workflows/kitchen.vagrant.yml @@ -18,11 +18,8 @@ jobs: # - freebsd-130-master-py3 - default-freebsd-122-master-py3 # - freebsd-122-master-py3 - - default-freebsd-114-master-py3 - # - freebsd-114-master-py3 # - default-freebsd-130-3003-1-py3 # - default-freebsd-122-3003-1-py3 - # - default-freebsd-114-3003-1-py3 steps: - name: 'Check out code' uses: 'actions/checkout@v2' diff --git a/.gitignore b/.gitignore index 94f77a8..39752a7 100644 --- a/.gitignore +++ b/.gitignore @@ -127,6 +127,7 @@ tmp/ # `salt-formula` -- Vagrant Specific files .vagrant top.sls +!test/salt/pillar/top.sls # `suricata-formula` -- Platform binaries *.rpm diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0eeec0d..64322aa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -192,77 +192,60 @@ almalinux-8-master-py3: {extends: '.test_instance'} # default-rockylinux-8-master-py3: {extends: '.test_instance'} # passenger-rockylinux-8-master-py3: {extends: '.test_instance'} rockylinux-8-master-py3: {extends: '.test_instance'} -# default-debian-11-3003-2-py3: {extends: '.test_instance'} -# default-debian-10-3003-2-py3: {extends: '.test_instance'} -# default-debian-9-3003-2-py3: {extends: '.test_instance'} -# default-ubuntu-2004-3003-2-py3: {extends: '.test_instance'} -# default-ubuntu-1804-3003-2-py3: {extends: '.test_instance'} -# default-centos-8-3003-2-py3: {extends: '.test_instance'} -# default-centos-7-3003-2-py3: {extends: '.test_instance'} -# default-fedora-34-3003-2-py3: {extends: '.test_instance'} -# default-fedora-33-3003-2-py3: {extends: '.test_instance'} -# default-opensuse-leap-153-3003-2-py3: {extends: '.test_instance'} -# default-opensuse-leap-152-3003-2-py3: {extends: '.test_instance'} -# default-opensuse-tmbl-latest-3003-2-py3: {extends: '.test_instance'} -# default-amazonlinux-2-3003-2-py3: {extends: '.test_instance'} -# default-oraclelinux-8-3003-2-py3: {extends: '.test_instance'} -# default-oraclelinux-7-3003-2-py3: {extends: '.test_instance'} -# default-arch-base-latest-3003-2-py3: {extends: '.test_instance'} -# default-gentoo-stage3-latest-3003-2-py3: {extends: '.test_instance'} -# default-gentoo-stage3-systemd-3003-2-py3: {extends: '.test_instance'} -# default-almalinux-8-3003-2-py3: {extends: '.test_instance'} -# default-arch-base-latest-3003-1-py3: {extends: '.test_instance'} -# default-gentoo-stage3-latest-3003-1-py3: {extends: '.test_instance'} -# default-gentoo-stage3-systemd-3003-1-py3: {extends: '.test_instance'} -# default-debian-11-3002-6-py3: {extends: '.test_instance'} -# default-debian-10-3002-6-py3: {extends: '.test_instance'} -# default-debian-9-3002-6-py3: {extends: '.test_instance'} -# default-ubuntu-2004-3002-6-py3: {extends: '.test_instance'} -# default-ubuntu-1804-3002-6-py3: {extends: '.test_instance'} -# default-centos-8-3002-6-py3: {extends: '.test_instance'} -# default-centos-7-3002-6-py3: {extends: '.test_instance'} -# default-fedora-34-3002-6-py3: {extends: '.test_instance'} -# default-fedora-33-3002-6-py3: {extends: '.test_instance'} -# default-amazonlinux-2-3002-6-py3: {extends: '.test_instance'} -# default-oraclelinux-8-3002-6-py3: {extends: '.test_instance'} -# default-oraclelinux-7-3002-6-py3: {extends: '.test_instance'} -# default-arch-base-latest-3002-6-py3: {extends: '.test_instance'} -# default-gentoo-stage3-latest-3002-6-py3: {extends: '.test_instance'} -# default-gentoo-stage3-systemd-3002-6-py3: {extends: '.test_instance'} -# default-opensuse-leap-153-3002-2-py3: {extends: '.test_instance'} -# default-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'} -# default-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'} -# default-debian-10-3001-7-py3: {extends: '.test_instance'} -# default-debian-9-3001-7-py3: {extends: '.test_instance'} -# default-ubuntu-2004-3001-7-py3: {extends: '.test_instance'} -# default-ubuntu-1804-3001-7-py3: {extends: '.test_instance'} -# default-centos-8-3001-7-py3: {extends: '.test_instance'} -# default-centos-7-3001-7-py3: {extends: '.test_instance'} -# default-fedora-34-3001-7-py3: {extends: '.test_instance'} -# default-fedora-33-3001-7-py3: {extends: '.test_instance'} -# default-opensuse-leap-153-3001-7-py3: {extends: '.test_instance'} -# default-opensuse-leap-152-3001-7-py3: {extends: '.test_instance'} -# default-opensuse-tmbl-latest-3001-7-py3: {extends: '.test_instance'} -# default-amazonlinux-2-3001-7-py3: {extends: '.test_instance'} -# default-oraclelinux-8-3001-7-py3: {extends: '.test_instance'} -# default-oraclelinux-7-3001-7-py3: {extends: '.test_instance'} -# default-arch-base-latest-3001-7-py3: {extends: '.test_instance'} -# default-gentoo-stage3-latest-3001-7-py3: {extends: '.test_instance'} -# default-gentoo-stage3-systemd-3001-7-py3: {extends: '.test_instance'} -# default-debian-10-3000-9-py3: {extends: '.test_instance'} -# default-debian-9-3000-9-py3: {extends: '.test_instance'} -# default-ubuntu-1804-3000-9-py3: {extends: '.test_instance'} -# default-centos-8-3000-9-py3: {extends: '.test_instance'} -# default-centos-7-3000-9-py3: {extends: '.test_instance'} -# default-opensuse-leap-153-3000-9-py3: {extends: '.test_instance'} -# default-opensuse-leap-152-3000-9-py3: {extends: '.test_instance'} -# default-amazonlinux-2-3000-9-py3: {extends: '.test_instance'} -# default-oraclelinux-8-3000-9-py3: {extends: '.test_instance'} -# default-oraclelinux-7-3000-9-py3: {extends: '.test_instance'} -# default-gentoo-stage3-latest-3000-9-py3: {extends: '.test_instance'} -# default-gentoo-stage3-systemd-3000-9-py3: {extends: '.test_instance'} -# default-ubuntu-1804-3000-9-py2: {extends: '.test_instance'} -# default-arch-base-latest-3000-9-py2: {extends: '.test_instance'} +# default-debian-11-3003-3-py3: {extends: '.test_instance'} +# default-debian-10-3003-3-py3: {extends: '.test_instance'} +# default-debian-9-3003-3-py3: {extends: '.test_instance'} +# default-ubuntu-2004-3003-3-py3: {extends: '.test_instance'} +# default-ubuntu-1804-3003-3-py3: {extends: '.test_instance'} +# default-centos-8-3003-3-py3: {extends: '.test_instance'} +# default-centos-7-3003-3-py3: {extends: '.test_instance'} +# default-fedora-34-3003-3-py3: {extends: '.test_instance'} +# default-fedora-33-3003-3-py3: {extends: '.test_instance'} +# default-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'} +# default-opensuse-leap-152-3003-3-py3: {extends: '.test_instance'} +# default-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance'} +# default-amazonlinux-2-3003-3-py3: {extends: '.test_instance'} +# default-oraclelinux-8-3003-3-py3: {extends: '.test_instance'} +# default-oraclelinux-7-3003-3-py3: {extends: '.test_instance'} +# default-arch-base-latest-3003-3-py3: {extends: '.test_instance'} +# default-gentoo-stage3-latest-3003-3-py3: {extends: '.test_instance'} +# default-gentoo-stage3-systemd-3003-3-py3: {extends: '.test_instance'} +# default-almalinux-8-3003-3-py3: {extends: '.test_instance'} +# default-debian-11-3002-7-py3: {extends: '.test_instance'} +# default-debian-10-3002-7-py3: {extends: '.test_instance'} +# default-debian-9-3002-7-py3: {extends: '.test_instance'} +# default-ubuntu-2004-3002-7-py3: {extends: '.test_instance'} +# default-ubuntu-1804-3002-7-py3: {extends: '.test_instance'} +# default-centos-8-3002-7-py3: {extends: '.test_instance'} +# default-centos-7-3002-7-py3: {extends: '.test_instance'} +# default-fedora-34-3002-7-py3: {extends: '.test_instance'} +# default-fedora-33-3002-7-py3: {extends: '.test_instance'} +# default-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'} +# default-opensuse-leap-152-3002-7-py3: {extends: '.test_instance'} +# default-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance'} +# default-amazonlinux-2-3002-7-py3: {extends: '.test_instance'} +# default-oraclelinux-8-3002-7-py3: {extends: '.test_instance'} +# default-oraclelinux-7-3002-7-py3: {extends: '.test_instance'} +# default-arch-base-latest-3002-7-py3: {extends: '.test_instance'} +# default-gentoo-stage3-latest-3002-7-py3: {extends: '.test_instance'} +# default-gentoo-stage3-systemd-3002-7-py3: {extends: '.test_instance'} +# default-debian-10-3001-8-py3: {extends: '.test_instance'} +# default-debian-9-3001-8-py3: {extends: '.test_instance'} +# default-ubuntu-2004-3001-8-py3: {extends: '.test_instance'} +# default-ubuntu-1804-3001-8-py3: {extends: '.test_instance'} +# default-centos-8-3001-8-py3: {extends: '.test_instance'} +# default-centos-7-3001-8-py3: {extends: '.test_instance'} +# default-fedora-34-3001-8-py3: {extends: '.test_instance'} +# default-fedora-33-3001-8-py3: {extends: '.test_instance'} +# default-opensuse-leap-153-3001-8-py3: {extends: '.test_instance'} +# default-opensuse-leap-152-3001-8-py3: {extends: '.test_instance'} +# default-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance'} +# default-amazonlinux-2-3001-8-py3: {extends: '.test_instance'} +# default-oraclelinux-8-3001-8-py3: {extends: '.test_instance'} +# default-oraclelinux-7-3001-8-py3: {extends: '.test_instance'} +# default-arch-base-latest-3001-8-py3: {extends: '.test_instance'} +# default-gentoo-stage3-latest-3001-8-py3: {extends: '.test_instance'} +# default-gentoo-stage3-systemd-3001-8-py3: {extends: '.test_instance'} ############################################################################### # `release` stage: `semantic-release` diff --git a/.travis.yml b/.travis.yml index f99ec04..5883022 100644 --- a/.travis.yml +++ b/.travis.yml @@ -145,77 +145,60 @@ jobs: # - env: INSTANCE=default-rockylinux-8-master-py3 # - env: INSTANCE=passenger-rockylinux-8-master-py3 - env: INSTANCE=rockylinux-8-master-py3 - # - env: INSTANCE=default-debian-11-3003-2-py3 - # - env: INSTANCE=default-debian-10-3003-2-py3 - # - env: INSTANCE=default-debian-9-3003-2-py3 - # - env: INSTANCE=default-ubuntu-2004-3003-2-py3 - # - env: INSTANCE=default-ubuntu-1804-3003-2-py3 - # - env: INSTANCE=default-centos-8-3003-2-py3 - # - env: INSTANCE=default-centos-7-3003-2-py3 - # - env: INSTANCE=default-fedora-34-3003-2-py3 - # - env: INSTANCE=default-fedora-33-3003-2-py3 - # - env: INSTANCE=default-opensuse-leap-153-3003-2-py3 - # - env: INSTANCE=default-opensuse-leap-152-3003-2-py3 - # - env: INSTANCE=default-opensuse-tmbl-latest-3003-2-py3 - # - env: INSTANCE=default-amazonlinux-2-3003-2-py3 - # - env: INSTANCE=default-oraclelinux-8-3003-2-py3 - # - env: INSTANCE=default-oraclelinux-7-3003-2-py3 - # - env: INSTANCE=default-arch-base-latest-3003-2-py3 - # - env: INSTANCE=default-gentoo-stage3-latest-3003-2-py3 - # - env: INSTANCE=default-gentoo-stage3-systemd-3003-2-py3 - # - env: INSTANCE=default-almalinux-8-3003-2-py3 - # - env: INSTANCE=default-arch-base-latest-3003-1-py3 - # - env: INSTANCE=default-gentoo-stage3-latest-3003-1-py3 - # - env: INSTANCE=default-gentoo-stage3-systemd-3003-1-py3 - # - env: INSTANCE=default-debian-11-3002-6-py3 - # - env: INSTANCE=default-debian-10-3002-6-py3 - # - env: INSTANCE=default-debian-9-3002-6-py3 - # - env: INSTANCE=default-ubuntu-2004-3002-6-py3 - # - env: INSTANCE=default-ubuntu-1804-3002-6-py3 - # - env: INSTANCE=default-centos-8-3002-6-py3 - # - env: INSTANCE=default-centos-7-3002-6-py3 - # - env: INSTANCE=default-fedora-34-3002-6-py3 - # - env: INSTANCE=default-fedora-33-3002-6-py3 - # - env: INSTANCE=default-amazonlinux-2-3002-6-py3 - # - env: INSTANCE=default-oraclelinux-8-3002-6-py3 - # - env: INSTANCE=default-oraclelinux-7-3002-6-py3 - # - env: INSTANCE=default-arch-base-latest-3002-6-py3 - # - env: INSTANCE=default-gentoo-stage3-latest-3002-6-py3 - # - env: INSTANCE=default-gentoo-stage3-systemd-3002-6-py3 - # - env: INSTANCE=default-opensuse-leap-153-3002-2-py3 - # - env: INSTANCE=default-opensuse-leap-152-3002-2-py3 - # - env: INSTANCE=default-opensuse-tmbl-latest-3002-2-py3 - # - env: INSTANCE=default-debian-10-3001-7-py3 - # - env: INSTANCE=default-debian-9-3001-7-py3 - # - env: INSTANCE=default-ubuntu-2004-3001-7-py3 - # - env: INSTANCE=default-ubuntu-1804-3001-7-py3 - # - env: INSTANCE=default-centos-8-3001-7-py3 - # - env: INSTANCE=default-centos-7-3001-7-py3 - # - env: INSTANCE=default-fedora-34-3001-7-py3 - # - env: INSTANCE=default-fedora-33-3001-7-py3 - # - env: INSTANCE=default-opensuse-leap-153-3001-7-py3 - # - env: INSTANCE=default-opensuse-leap-152-3001-7-py3 - # - env: INSTANCE=default-opensuse-tmbl-latest-3001-7-py3 - # - env: INSTANCE=default-amazonlinux-2-3001-7-py3 - # - env: INSTANCE=default-oraclelinux-8-3001-7-py3 - # - env: INSTANCE=default-oraclelinux-7-3001-7-py3 - # - env: INSTANCE=default-arch-base-latest-3001-7-py3 - # - env: INSTANCE=default-gentoo-stage3-latest-3001-7-py3 - # - env: INSTANCE=default-gentoo-stage3-systemd-3001-7-py3 - # - env: INSTANCE=default-debian-10-3000-9-py3 - # - env: INSTANCE=default-debian-9-3000-9-py3 - # - env: INSTANCE=default-ubuntu-1804-3000-9-py3 - # - env: INSTANCE=default-centos-8-3000-9-py3 - # - env: INSTANCE=default-centos-7-3000-9-py3 - # - env: INSTANCE=default-opensuse-leap-153-3000-9-py3 - # - env: INSTANCE=default-opensuse-leap-152-3000-9-py3 - # - env: INSTANCE=default-amazonlinux-2-3000-9-py3 - # - env: INSTANCE=default-oraclelinux-8-3000-9-py3 - # - env: INSTANCE=default-oraclelinux-7-3000-9-py3 - # - env: INSTANCE=default-gentoo-stage3-latest-3000-9-py3 - # - env: INSTANCE=default-gentoo-stage3-systemd-3000-9-py3 - # - env: INSTANCE=default-ubuntu-1804-3000-9-py2 - # - env: INSTANCE=default-arch-base-latest-3000-9-py2 + # - env: INSTANCE=default-debian-11-3003-3-py3 + # - env: INSTANCE=default-debian-10-3003-3-py3 + # - env: INSTANCE=default-debian-9-3003-3-py3 + # - env: INSTANCE=default-ubuntu-2004-3003-3-py3 + # - env: INSTANCE=default-ubuntu-1804-3003-3-py3 + # - env: INSTANCE=default-centos-8-3003-3-py3 + # - env: INSTANCE=default-centos-7-3003-3-py3 + # - env: INSTANCE=default-fedora-34-3003-3-py3 + # - env: INSTANCE=default-fedora-33-3003-3-py3 + # - env: INSTANCE=default-opensuse-leap-153-3003-3-py3 + # - env: INSTANCE=default-opensuse-leap-152-3003-3-py3 + # - env: INSTANCE=default-opensuse-tmbl-latest-3003-3-py3 + # - env: INSTANCE=default-amazonlinux-2-3003-3-py3 + # - env: INSTANCE=default-oraclelinux-8-3003-3-py3 + # - env: INSTANCE=default-oraclelinux-7-3003-3-py3 + # - env: INSTANCE=default-arch-base-latest-3003-3-py3 + # - env: INSTANCE=default-gentoo-stage3-latest-3003-3-py3 + # - env: INSTANCE=default-gentoo-stage3-systemd-3003-3-py3 + # - env: INSTANCE=default-almalinux-8-3003-3-py3 + # - env: INSTANCE=default-debian-11-3002-7-py3 + # - env: INSTANCE=default-debian-10-3002-7-py3 + # - env: INSTANCE=default-debian-9-3002-7-py3 + # - env: INSTANCE=default-ubuntu-2004-3002-7-py3 + # - env: INSTANCE=default-ubuntu-1804-3002-7-py3 + # - env: INSTANCE=default-centos-8-3002-7-py3 + # - env: INSTANCE=default-centos-7-3002-7-py3 + # - env: INSTANCE=default-fedora-34-3002-7-py3 + # - env: INSTANCE=default-fedora-33-3002-7-py3 + # - env: INSTANCE=default-opensuse-leap-153-3002-7-py3 + # - env: INSTANCE=default-opensuse-leap-152-3002-7-py3 + # - env: INSTANCE=default-opensuse-tmbl-latest-3002-7-py3 + # - env: INSTANCE=default-amazonlinux-2-3002-7-py3 + # - env: INSTANCE=default-oraclelinux-8-3002-7-py3 + # - env: INSTANCE=default-oraclelinux-7-3002-7-py3 + # - env: INSTANCE=default-arch-base-latest-3002-7-py3 + # - env: INSTANCE=default-gentoo-stage3-latest-3002-7-py3 + # - env: INSTANCE=default-gentoo-stage3-systemd-3002-7-py3 + # - env: INSTANCE=default-debian-10-3001-8-py3 + # - env: INSTANCE=default-debian-9-3001-8-py3 + # - env: INSTANCE=default-ubuntu-2004-3001-8-py3 + # - env: INSTANCE=default-ubuntu-1804-3001-8-py3 + # - env: INSTANCE=default-centos-8-3001-8-py3 + # - env: INSTANCE=default-centos-7-3001-8-py3 + # - env: INSTANCE=default-fedora-34-3001-8-py3 + # - env: INSTANCE=default-fedora-33-3001-8-py3 + # - env: INSTANCE=default-opensuse-leap-153-3001-8-py3 + # - env: INSTANCE=default-opensuse-leap-152-3001-8-py3 + # - env: INSTANCE=default-opensuse-tmbl-latest-3001-8-py3 + # - env: INSTANCE=default-amazonlinux-2-3001-8-py3 + # - env: INSTANCE=default-oraclelinux-8-3001-8-py3 + # - env: INSTANCE=default-oraclelinux-7-3001-8-py3 + # - env: INSTANCE=default-arch-base-latest-3001-8-py3 + # - env: INSTANCE=default-gentoo-stage3-latest-3001-8-py3 + # - env: INSTANCE=default-gentoo-stage3-systemd-3001-8-py3 ## Define the release stage that runs `semantic-release` - stage: 'release' diff --git a/kitchen.vagrant.yml b/kitchen.vagrant.yml index 2197d92..eff870a 100644 --- a/kitchen.vagrant.yml +++ b/kitchen.vagrant.yml @@ -25,9 +25,6 @@ platforms: - name: freebsd-122-master-py3 driver: box: myii/freebsd-12.2-master-py3 - - name: freebsd-114-master-py3 - driver: - box: myii/freebsd-11.4-master-py3 - name: freebsd-130-3003-1-py3 driver: box: myii/freebsd-13.0-3003.1-py3 @@ -35,6 +32,3 @@ platforms: - name: freebsd-122-3003-1-py3 driver: box: myii/freebsd-12.2-3003.1-py3 - - name: freebsd-114-3003-1-py3 - driver: - box: myii/freebsd-11.4-3003.1-py3 diff --git a/kitchen.yml b/kitchen.yml index c5ab662..039f66f 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -142,297 +142,226 @@ platforms: driver: image: saltimages/salt-master-py3:rockylinux-8 - ## SALT `3003.2` - - name: debian-11-3003-2-py3 + ## SALT `3003.3` + - name: debian-11-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:debian-11 + image: saltimages/salt-3003.3-py3:debian-11 run_command: /lib/systemd/systemd - - name: debian-10-3003-2-py3 + - name: debian-10-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:debian-10 + image: saltimages/salt-3003.3-py3:debian-10 run_command: /lib/systemd/systemd - - name: debian-9-3003-2-py3 + - name: debian-9-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:debian-9 + image: saltimages/salt-3003.3-py3:debian-9 run_command: /lib/systemd/systemd - - name: ubuntu-2004-3003-2-py3 + - name: ubuntu-2004-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:ubuntu-20.04 + image: saltimages/salt-3003.3-py3:ubuntu-20.04 run_command: /lib/systemd/systemd - - name: ubuntu-1804-3003-2-py3 + - name: ubuntu-1804-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:ubuntu-18.04 + image: saltimages/salt-3003.3-py3:ubuntu-18.04 run_command: /lib/systemd/systemd - - name: centos-8-3003-2-py3 + - name: centos-8-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:centos-8 - - name: centos-7-3003-2-py3 + image: saltimages/salt-3003.3-py3:centos-8 + - name: centos-7-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:centos-7 - - name: fedora-34-3003-2-py3 + image: saltimages/salt-3003.3-py3:centos-7 + - name: fedora-34-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:fedora-34 - - name: fedora-33-3003-2-py3 + image: saltimages/salt-3003.3-py3:fedora-34 + - name: fedora-33-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:fedora-33 - - name: opensuse-leap-153-3003-2-py3 + image: saltimages/salt-3003.3-py3:fedora-33 + - name: opensuse-leap-153-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:opensuse-leap-15.3 + image: saltimages/salt-3003.3-py3:opensuse-leap-15.3 # Workaround to avoid intermittent failures on `opensuse-leap-15.3`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: opensuse-leap-152-3003-2-py3 + - name: opensuse-leap-152-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:opensuse-leap-15.2 + image: saltimages/salt-3003.3-py3:opensuse-leap-15.2 # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: opensuse-tmbl-latest-3003-2-py3 + - name: opensuse-tmbl-latest-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:opensuse-tumbleweed-latest + image: saltimages/salt-3003.3-py3:opensuse-tumbleweed-latest # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: amazonlinux-2-3003-2-py3 + - name: amazonlinux-2-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:amazonlinux-2 - - name: oraclelinux-8-3003-2-py3 + image: saltimages/salt-3003.3-py3:amazonlinux-2 + - name: oraclelinux-8-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:oraclelinux-8 - - name: oraclelinux-7-3003-2-py3 + image: saltimages/salt-3003.3-py3:oraclelinux-8 + - name: oraclelinux-7-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:oraclelinux-7 - - name: arch-base-latest-3003-2-py3 + image: saltimages/salt-3003.3-py3:oraclelinux-7 + - name: arch-base-latest-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:arch-base-latest - - name: gentoo-stage3-latest-3003-2-py3 + image: saltimages/salt-3003.3-py3:arch-base-latest + - name: gentoo-stage3-latest-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:gentoo-stage3-latest + image: saltimages/salt-3003.3-py3:gentoo-stage3-latest run_command: /sbin/init - - name: gentoo-stage3-systemd-3003-2-py3 + - name: gentoo-stage3-systemd-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:gentoo-stage3-systemd - - name: almalinux-8-3003-2-py3 + image: saltimages/salt-3003.3-py3:gentoo-stage3-systemd + - name: almalinux-8-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:almalinux-8 + image: saltimages/salt-3003.3-py3:almalinux-8 - ## SALT `3003.1` - - name: arch-base-latest-3003-1-py3 + ## SALT `3002.7` + - name: debian-11-3002-7-py3 driver: - image: saltimages/salt-3003.1-py3:arch-base-latest - - name: gentoo-stage3-latest-3003-1-py3 - driver: - image: saltimages/salt-3003.1-py3:gentoo-stage3-latest - run_command: /sbin/init - - name: gentoo-stage3-systemd-3003-1-py3 - driver: - image: saltimages/salt-3003.1-py3:gentoo-stage3-systemd - - ## SALT `3002.6` - - name: debian-11-3002-6-py3 - driver: - image: saltimages/salt-3002.6-py3:debian-11 + image: saltimages/salt-3002.7-py3:debian-11 run_command: /lib/systemd/systemd - - name: debian-10-3002-6-py3 + - name: debian-10-3002-7-py3 driver: - image: saltimages/salt-3002.6-py3:debian-10 + image: saltimages/salt-3002.7-py3:debian-10 run_command: /lib/systemd/systemd - - name: debian-9-3002-6-py3 + - name: debian-9-3002-7-py3 driver: - image: saltimages/salt-3002.6-py3:debian-9 + image: saltimages/salt-3002.7-py3:debian-9 run_command: /lib/systemd/systemd - - name: ubuntu-2004-3002-6-py3 + - name: ubuntu-2004-3002-7-py3 driver: - image: saltimages/salt-3002.6-py3:ubuntu-20.04 + image: saltimages/salt-3002.7-py3:ubuntu-20.04 run_command: /lib/systemd/systemd - - name: ubuntu-1804-3002-6-py3 + - name: ubuntu-1804-3002-7-py3 driver: - image: saltimages/salt-3002.6-py3:ubuntu-18.04 + image: saltimages/salt-3002.7-py3:ubuntu-18.04 run_command: /lib/systemd/systemd - - name: centos-8-3002-6-py3 + - name: centos-8-3002-7-py3 driver: - image: saltimages/salt-3002.6-py3:centos-8 - - name: centos-7-3002-6-py3 + image: saltimages/salt-3002.7-py3:centos-8 + - name: centos-7-3002-7-py3 driver: - image: saltimages/salt-3002.6-py3:centos-7 - - name: fedora-34-3002-6-py3 + image: saltimages/salt-3002.7-py3:centos-7 + - name: fedora-34-3002-7-py3 driver: - image: saltimages/salt-3002.6-py3:fedora-34 - - name: fedora-33-3002-6-py3 + image: saltimages/salt-3002.7-py3:fedora-34 + - name: fedora-33-3002-7-py3 driver: - image: saltimages/salt-3002.6-py3:fedora-33 - - name: amazonlinux-2-3002-6-py3 + image: saltimages/salt-3002.7-py3:fedora-33 + - name: opensuse-leap-153-3002-7-py3 driver: - image: saltimages/salt-3002.6-py3:amazonlinux-2 - - name: oraclelinux-8-3002-6-py3 - driver: - image: saltimages/salt-3002.6-py3:oraclelinux-8 - - name: oraclelinux-7-3002-6-py3 - driver: - image: saltimages/salt-3002.6-py3:oraclelinux-7 - - name: arch-base-latest-3002-6-py3 - driver: - image: saltimages/salt-3002.6-py3:arch-base-latest - - name: gentoo-stage3-latest-3002-6-py3 - driver: - image: saltimages/salt-3002.6-py3:gentoo-stage3-latest - run_command: /sbin/init - - name: gentoo-stage3-systemd-3002-6-py3 - driver: - image: saltimages/salt-3002.6-py3:gentoo-stage3-systemd - - ## SALT `3002.2` - - name: opensuse-leap-153-3002-2-py3 - driver: - image: saltimages/salt-3002.2-py3:opensuse-leap-15.3 + image: saltimages/salt-3002.7-py3:opensuse-leap-15.3 # Workaround to avoid intermittent failures on `opensuse-leap-15.3`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: opensuse-leap-152-3002-2-py3 + - name: opensuse-leap-152-3002-7-py3 driver: - image: saltimages/salt-3002.2-py3:opensuse-leap-15.2 + image: saltimages/salt-3002.7-py3:opensuse-leap-15.2 # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: opensuse-tmbl-latest-3002-2-py3 + - name: opensuse-tmbl-latest-3002-7-py3 driver: - image: saltimages/salt-3002.2-py3:opensuse-tumbleweed-latest + image: saltimages/salt-3002.7-py3:opensuse-tumbleweed-latest # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 + - name: amazonlinux-2-3002-7-py3 + driver: + image: saltimages/salt-3002.7-py3:amazonlinux-2 + - name: oraclelinux-8-3002-7-py3 + driver: + image: saltimages/salt-3002.7-py3:oraclelinux-8 + - name: oraclelinux-7-3002-7-py3 + driver: + image: saltimages/salt-3002.7-py3:oraclelinux-7 + - name: arch-base-latest-3002-7-py3 + driver: + image: saltimages/salt-3002.7-py3:arch-base-latest + - name: gentoo-stage3-latest-3002-7-py3 + driver: + image: saltimages/salt-3002.7-py3:gentoo-stage3-latest + run_command: /sbin/init + - name: gentoo-stage3-systemd-3002-7-py3 + driver: + image: saltimages/salt-3002.7-py3:gentoo-stage3-systemd - ## SALT `3001.7` - - name: debian-10-3001-7-py3 + ## SALT `3001.8` + - name: debian-10-3001-8-py3 driver: - image: saltimages/salt-3001.7-py3:debian-10 + image: saltimages/salt-3001.8-py3:debian-10 run_command: /lib/systemd/systemd - - name: debian-9-3001-7-py3 + - name: debian-9-3001-8-py3 driver: - image: saltimages/salt-3001.7-py3:debian-9 + image: saltimages/salt-3001.8-py3:debian-9 run_command: /lib/systemd/systemd - - name: ubuntu-2004-3001-7-py3 + - name: ubuntu-2004-3001-8-py3 driver: - image: saltimages/salt-3001.7-py3:ubuntu-20.04 + image: saltimages/salt-3001.8-py3:ubuntu-20.04 run_command: /lib/systemd/systemd - - name: ubuntu-1804-3001-7-py3 + - name: ubuntu-1804-3001-8-py3 driver: - image: saltimages/salt-3001.7-py3:ubuntu-18.04 + image: saltimages/salt-3001.8-py3:ubuntu-18.04 run_command: /lib/systemd/systemd - - name: centos-8-3001-7-py3 + - name: centos-8-3001-8-py3 driver: - image: saltimages/salt-3001.7-py3:centos-8 - - name: centos-7-3001-7-py3 + image: saltimages/salt-3001.8-py3:centos-8 + - name: centos-7-3001-8-py3 driver: - image: saltimages/salt-3001.7-py3:centos-7 - - name: fedora-34-3001-7-py3 + image: saltimages/salt-3001.8-py3:centos-7 + - name: fedora-34-3001-8-py3 driver: - image: saltimages/salt-3001.7-py3:fedora-34 - - name: fedora-33-3001-7-py3 + image: saltimages/salt-3001.8-py3:fedora-34 + - name: fedora-33-3001-8-py3 driver: - image: saltimages/salt-3001.7-py3:fedora-33 - - name: opensuse-leap-153-3001-7-py3 + image: saltimages/salt-3001.8-py3:fedora-33 + - name: opensuse-leap-153-3001-8-py3 driver: - image: saltimages/salt-3001.7-py3:opensuse-leap-15.3 + image: saltimages/salt-3001.8-py3:opensuse-leap-15.3 # Workaround to avoid intermittent failures on `opensuse-leap-15.3`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: opensuse-leap-152-3001-7-py3 + - name: opensuse-leap-152-3001-8-py3 driver: - image: saltimages/salt-3001.7-py3:opensuse-leap-15.2 + image: saltimages/salt-3001.8-py3:opensuse-leap-15.2 # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: opensuse-tmbl-latest-3001-7-py3 + - name: opensuse-tmbl-latest-3001-8-py3 driver: - image: saltimages/salt-3001.7-py3:opensuse-tumbleweed-latest + image: saltimages/salt-3001.8-py3:opensuse-tumbleweed-latest # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: amazonlinux-2-3001-7-py3 + - name: amazonlinux-2-3001-8-py3 driver: - image: saltimages/salt-3001.7-py3:amazonlinux-2 - - name: oraclelinux-8-3001-7-py3 + image: saltimages/salt-3001.8-py3:amazonlinux-2 + - name: oraclelinux-8-3001-8-py3 driver: - image: saltimages/salt-3001.7-py3:oraclelinux-8 - - name: oraclelinux-7-3001-7-py3 + image: saltimages/salt-3001.8-py3:oraclelinux-8 + - name: oraclelinux-7-3001-8-py3 driver: - image: saltimages/salt-3001.7-py3:oraclelinux-7 - - name: arch-base-latest-3001-7-py3 + image: saltimages/salt-3001.8-py3:oraclelinux-7 + - name: arch-base-latest-3001-8-py3 driver: - image: saltimages/salt-3001.7-py3:arch-base-latest - - name: gentoo-stage3-latest-3001-7-py3 + image: saltimages/salt-3001.8-py3:arch-base-latest + - name: gentoo-stage3-latest-3001-8-py3 driver: - image: saltimages/salt-3001.7-py3:gentoo-stage3-latest + image: saltimages/salt-3001.8-py3:gentoo-stage3-latest run_command: /sbin/init - - name: gentoo-stage3-systemd-3001-7-py3 + - name: gentoo-stage3-systemd-3001-8-py3 driver: - image: saltimages/salt-3001.7-py3:gentoo-stage3-systemd - - ## SALT `3000.9` - - name: debian-10-3000-9-py3 - driver: - image: saltimages/salt-3000.9-py3:debian-10 - run_command: /lib/systemd/systemd - - name: debian-9-3000-9-py3 - driver: - image: saltimages/salt-3000.9-py3:debian-9 - run_command: /lib/systemd/systemd - - name: ubuntu-1804-3000-9-py3 - driver: - image: saltimages/salt-3000.9-py3:ubuntu-18.04 - run_command: /lib/systemd/systemd - - name: centos-8-3000-9-py3 - driver: - image: saltimages/salt-3000.9-py3:centos-8 - - name: centos-7-3000-9-py3 - driver: - image: saltimages/salt-3000.9-py3:centos-7 - - name: opensuse-leap-153-3000-9-py3 - driver: - image: saltimages/salt-3000.9-py3:opensuse-leap-15.3 - # Workaround to avoid intermittent failures on `opensuse-leap-15.3`: - # => SCP did not finish successfully (255): (Net::SCP::Error) - transport: - max_ssh_sessions: 1 - - name: opensuse-leap-152-3000-9-py3 - driver: - image: saltimages/salt-3000.9-py3:opensuse-leap-15.2 - # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: - # => SCP did not finish successfully (255): (Net::SCP::Error) - transport: - max_ssh_sessions: 1 - - name: amazonlinux-2-3000-9-py3 - driver: - image: saltimages/salt-3000.9-py3:amazonlinux-2 - - name: oraclelinux-8-3000-9-py3 - driver: - image: saltimages/salt-3000.9-py3:oraclelinux-8 - - name: oraclelinux-7-3000-9-py3 - driver: - image: saltimages/salt-3000.9-py3:oraclelinux-7 - - name: gentoo-stage3-latest-3000-9-py3 - driver: - image: saltimages/salt-3000.9-py3:gentoo-stage3-latest - run_command: /sbin/init - - name: gentoo-stage3-systemd-3000-9-py3 - driver: - image: saltimages/salt-3000.9-py3:gentoo-stage3-systemd - - name: ubuntu-1804-3000-9-py2 - driver: - image: saltimages/salt-3000.9-py2:ubuntu-18.04 - run_command: /lib/systemd/systemd - - name: arch-base-latest-3000-9-py2 - driver: - image: saltimages/salt-3000.9-py2:arch-base-latest + image: saltimages/salt-3001.8-py3:gentoo-stage3-systemd verifier: # https://www.inspec.io/ @@ -486,37 +415,30 @@ suites: - oraclelinux-8-master-py3 - almalinux-8-master-py3 - rockylinux-8-master-py3 - - debian-11-3003-2-py3 - - debian-10-3003-2-py3 - - debian-9-3003-2-py3 - - ubuntu-2004-3003-2-py3 - - ubuntu-1804-3003-2-py3 - - centos-8-3003-2-py3 - - centos-7-3003-2-py3 - - oraclelinux-8-3003-2-py3 - - almalinux-8-3003-2-py3 - - debian-11-3002-6-py3 - - debian-10-3002-6-py3 - - debian-9-3002-6-py3 - - ubuntu-2004-3002-6-py3 - - ubuntu-1804-3002-6-py3 - - centos-8-3002-6-py3 - - centos-7-3002-6-py3 - - oraclelinux-8-3002-6-py3 - - debian-10-3001-7-py3 - - debian-9-3001-7-py3 - - ubuntu-2004-3001-7-py3 - - ubuntu-1804-3001-7-py3 - - centos-8-3001-7-py3 - - centos-7-3001-7-py3 - - oraclelinux-8-3001-7-py3 - - debian-10-3000-9-py3 - - debian-9-3000-9-py3 - - ubuntu-1804-3000-9-py3 - - centos-8-3000-9-py3 - - centos-7-3000-9-py3 - - oraclelinux-8-3000-9-py3 - - ubuntu-1804-3000-9-py2 + - debian-11-3003-3-py3 + - debian-10-3003-3-py3 + - debian-9-3003-3-py3 + - ubuntu-2004-3003-3-py3 + - ubuntu-1804-3003-3-py3 + - centos-8-3003-3-py3 + - centos-7-3003-3-py3 + - oraclelinux-8-3003-3-py3 + - almalinux-8-3003-3-py3 + - debian-11-3002-7-py3 + - debian-10-3002-7-py3 + - debian-9-3002-7-py3 + - ubuntu-2004-3002-7-py3 + - ubuntu-1804-3002-7-py3 + - centos-8-3002-7-py3 + - centos-7-3002-7-py3 + - oraclelinux-8-3002-7-py3 + - debian-10-3001-8-py3 + - debian-9-3001-8-py3 + - ubuntu-2004-3001-8-py3 + - ubuntu-1804-3001-8-py3 + - centos-8-3001-8-py3 + - centos-7-3001-8-py3 + - oraclelinux-8-3001-8-py3 provisioner: state_top: base: From a73fa023ff6a2a3fb918baf0a7088dd9e878f89b Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 6 Oct 2021 17:04:02 +0100 Subject: [PATCH 13/13] chore(gemfile.lock): update to latest gem versions (2021-W40) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/375 --- Gemfile.lock | 43 ++++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index d0e351d..94478e8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -55,7 +55,7 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.2.0) - aws-partitions (1.507.0) + aws-partitions (1.510.0) aws-sdk-alexaforbusiness (1.50.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) @@ -139,7 +139,7 @@ GEM aws-sdk-dynamodb (1.63.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.265.0) + aws-sdk-ec2 (1.266.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.47.0) @@ -151,7 +151,7 @@ GEM aws-sdk-ecs (1.85.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-efs (1.44.0) + aws-sdk-efs (1.45.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-eks (1.63.0) @@ -193,16 +193,16 @@ GEM aws-sdk-kinesis (1.35.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.48.0) + aws-sdk-kms (1.49.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.68.0) + aws-sdk-lambda (1.69.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-mq (1.40.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-networkfirewall (1.7.0) + aws-sdk-networkfirewall (1.8.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-networkmanager (1.14.0) @@ -248,6 +248,12 @@ GEM aws-sdk-shield (1.41.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) + aws-sdk-signer (1.32.0) + aws-sdk-core (~> 3, >= 3.120.0) + aws-sigv4 (~> 1.1) + aws-sdk-simpledb (1.29.0) + aws-sdk-core (~> 3, >= 3.120.0) + aws-sigv2 (~> 1.0) aws-sdk-sms (1.32.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) @@ -257,7 +263,7 @@ GEM aws-sdk-sqs (1.44.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.118.0) + aws-sdk-ssm (1.119.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-states (1.39.0) @@ -266,6 +272,7 @@ GEM aws-sdk-transfer (1.34.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) + aws-sigv2 (1.1.0) aws-sigv4 (1.4.0) aws-eventstream (~> 1, >= 1.0.2) azure_graph_rbac (0.17.2) @@ -281,9 +288,9 @@ GEM bcrypt_pbkdf (1.1.0) bson (4.12.1) builder (3.2.4) - chef-config (17.5.22) + chef-config (17.6.18) addressable - chef-utils (= 17.5.22) + chef-utils (= 17.6.18) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -291,7 +298,7 @@ GEM chef-telemetry (1.1.1) chef-config concurrent-ruby (~> 1.0) - chef-utils (17.5.22) + chef-utils (17.6.18) concurrent-ruby coderay (1.1.3) concurrent-ruby (1.1.9) @@ -304,7 +311,7 @@ GEM unf (>= 0.0.5, < 1.0.0) ed25519 (1.2.4) erubi (1.10.0) - excon (0.85.0) + excon (0.86.0) faraday (1.4.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -354,7 +361,7 @@ GEM inifile (3.0.0) jmespath (1.4.0) json (2.5.1) - jwt (2.2.3) + jwt (2.3.0) kitchen-inspec (2.5.0) hashie (>= 3.4, <= 5.0) inspec (>= 2.2.64, < 5.0) @@ -452,7 +459,7 @@ GEM unicode-display_width (>= 1.5, < 3.0) unicode_utils (~> 1.4) strings-ansi (0.2.0) - test-kitchen (3.0.0) + test-kitchen (3.1.0) bcrypt_pbkdf (~> 1.0) chef-utils (>= 16.4.35) ed25519 (~> 1.2) @@ -483,9 +490,9 @@ GEM inifile (~> 3.0) train-core (= 3.8.1) train-winrm (~> 0.2) - train-aws (0.2.19) + train-aws (0.2.20) aws-sdk-alexaforbusiness (~> 1.0) - aws-sdk-amplify (~> 1.0) + aws-sdk-amplify (~> 1.32.0) aws-sdk-apigateway (~> 1.0) aws-sdk-apigatewayv2 (~> 1.0) aws-sdk-applicationautoscaling (>= 1.46, < 1.52) @@ -531,7 +538,7 @@ GEM aws-sdk-kinesis (~> 1.0) aws-sdk-kms (~> 1.13) aws-sdk-lambda (~> 1.0) - aws-sdk-mq (~> 1.0) + aws-sdk-mq (~> 1.40.0) aws-sdk-networkfirewall (>= 1.6.0) aws-sdk-networkmanager (>= 1.13.0) aws-sdk-organizations (>= 1.17, < 1.60) @@ -545,8 +552,10 @@ GEM aws-sdk-secretsmanager (>= 1.42, < 1.47) aws-sdk-securityhub (~> 1.0) aws-sdk-servicecatalog (>= 1.48, < 1.61) - aws-sdk-ses (~> 1.0) + aws-sdk-ses (~> 1.41.0) aws-sdk-shield (~> 1.30) + aws-sdk-signer (~> 1.32.0) + aws-sdk-simpledb (~> 1.29.0) aws-sdk-sms (~> 1.0) aws-sdk-sns (~> 1.9) aws-sdk-sqs (~> 1.10)