From d47c336f86a61ce875316d6b3af6f051742048ef Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 7 Jun 2022 23:29:25 +0100 Subject: [PATCH 1/5] chore(gemfile.lock): update to latest gem versions (2022-W23) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/449 --- Gemfile.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a81c1f2..ce726b2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 2b56b68db2a758041b9df5b2e4bdc3c6700558ea + revision: 6bedc829b7fcec035311d8c6086db5d59414428c branch: ssf specs: - inspec (5.17.4) + inspec (5.17.9) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 5.17.4) + inspec-core (= 5.17.9) mongo (= 2.13.2) progress_bar (~> 1.3.3) rake @@ -14,7 +14,7 @@ GIT train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (5.17.4) + inspec-core (5.17.9) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -58,7 +58,7 @@ GEM public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.594.0) + aws-partitions (1.596.0) aws-sdk-alexaforbusiness (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) @@ -226,7 +226,7 @@ GEM aws-sdk-redshift (1.82.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-route53 (1.62.0) + aws-sdk-route53 (1.63.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-route53domains (1.40.0) @@ -380,8 +380,8 @@ GEM inifile (3.0.0) jmespath (1.6.1) json (2.6.2) - jwt (2.3.0) - kitchen-inspec (2.5.2) + jwt (2.4.0) + kitchen-inspec (2.6.0) hashie (>= 3.4, <= 5.0) inspec (>= 2.2.64, < 6.0) test-kitchen (>= 2.7, < 4) @@ -405,7 +405,7 @@ GEM minitest (5.15.0) mixlib-config (3.0.9) tomlrb - mixlib-install (3.12.16) + mixlib-install (3.12.19) mixlib-shellout mixlib-versioning thor @@ -425,7 +425,7 @@ GEM faraday-cookie_jar (~> 0.0.6) ms_rest (~> 0.7.6) multi_json (1.15.0) - multipart-post (2.1.1) + multipart-post (2.2.0) net-scp (3.0.0) net-ssh (>= 2.6.5, < 7.0.0) net-ssh (6.1.0) From 9f83975053707988494c55389a610cf3c20bcdee Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 9 Jun 2022 00:03:18 +0100 Subject: [PATCH 2/5] ci: update `pre-commit` configuration inc. for pre-commit.ci [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/450 --- .gitlab-ci.yml | 11 ----------- .pre-commit-config.yaml | 14 +++++++++++++- .travis.yml | 11 ----------- kitchen.yml | 42 ----------------------------------------- 4 files changed, 13 insertions(+), 65 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7d5e470..b0632ff 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -172,8 +172,6 @@ default-fedora-36-master-py3: {extends: '.test_instance_failure_permitted'} # fedora-36-master-py3: {extends: '.test_instance_failure_permitted'} default-fedora-35-master-py3: {extends: '.test_instance'} # fedora-35-master-py3: {extends: '.test_instance'} -default-fedora-34-master-py3: {extends: '.test_instance'} -# fedora-34-master-py3: {extends: '.test_instance'} default-opensuse-leap-153-master-py3: {extends: '.test_instance'} # opensuse-leap-153-master-py3: {extends: '.test_instance'} default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'} @@ -207,7 +205,6 @@ rockylinux-8-master-py3: {extends: '.test_instance'} # default-centos-7-3004-1-py3: {extends: '.test_instance'} # default-fedora-36-3004-1-py3: {extends: '.test_instance_failure_permitted'} # default-fedora-35-3004-1-py3: {extends: '.test_instance'} -# default-fedora-34-3004-1-py3: {extends: '.test_instance'} # default-amazonlinux-2-3004-1-py3: {extends: '.test_instance'} # default-oraclelinux-8-3004-1-py3: {extends: '.test_instance'} # default-oraclelinux-7-3004-1-py3: {extends: '.test_instance'} @@ -228,14 +225,6 @@ rockylinux-8-master-py3: {extends: '.test_instance'} # default-oraclelinux-8-3003-4-py3: {extends: '.test_instance'} # default-oraclelinux-7-3003-4-py3: {extends: '.test_instance'} # default-almalinux-8-3003-4-py3: {extends: '.test_instance'} -# default-debian-10-3002-8-py3: {extends: '.test_instance'} -# default-debian-9-3002-8-py3: {extends: '.test_instance'} -# default-ubuntu-2004-3002-8-py3: {extends: '.test_instance'} -# default-ubuntu-1804-3002-8-py3: {extends: '.test_instance'} -# default-centos-7-3002-8-py3: {extends: '.test_instance'} -# default-amazonlinux-2-3002-8-py3: {extends: '.test_instance'} -# default-oraclelinux-8-3002-8-py3: {extends: '.test_instance'} -# default-oraclelinux-7-3002-8-py3: {extends: '.test_instance'} # yamllint enable rule:line-length ############################################################################### diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2cb381e..1299a84 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,6 +3,18 @@ --- # See https://pre-commit.com for more information # See https://pre-commit.com/hooks.html for more hooks +ci: + autofix_commit_msg: | + ci(pre-commit.ci): apply auto fixes from pre-commit.com hooks + + For more information, see https://pre-commit.ci + autofix_prs: true + autoupdate_branch: '' + autoupdate_commit_msg: | + ci(pre-commit.ci): perform `pre-commit` autoupdate + autoupdate_schedule: quarterly + skip: [] + submodules: false default_stages: [commit] repos: - repo: https://github.com/dafyddj/commitlint-pre-commit-hook @@ -18,7 +30,7 @@ repos: additional_dependencies: ['@commitlint/config-conventional@8.3.4'] always_run: true - repo: https://github.com/rubocop-hq/rubocop - rev: v1.25.1 + rev: v1.30.1 hooks: - id: rubocop name: Check Ruby files with rubocop diff --git a/.travis.yml b/.travis.yml index cf2815b..9c16d68 100644 --- a/.travis.yml +++ b/.travis.yml @@ -124,8 +124,6 @@ jobs: # - env: INSTANCE=fedora-36-master-py3 - env: INSTANCE=default-fedora-35-master-py3 # - env: INSTANCE=fedora-35-master-py3 - - env: INSTANCE=default-fedora-34-master-py3 - # - env: INSTANCE=fedora-34-master-py3 - env: INSTANCE=default-opensuse-leap-153-master-py3 # - env: INSTANCE=opensuse-leap-153-master-py3 - env: INSTANCE=default-opensuse-tmbl-latest-master-py3 @@ -159,7 +157,6 @@ jobs: # - env: INSTANCE=default-centos-7-3004-1-py3 # - env: INSTANCE=default-fedora-36-3004-1-py3 # - env: INSTANCE=default-fedora-35-3004-1-py3 - # - env: INSTANCE=default-fedora-34-3004-1-py3 # - env: INSTANCE=default-amazonlinux-2-3004-1-py3 # - env: INSTANCE=default-oraclelinux-8-3004-1-py3 # - env: INSTANCE=default-oraclelinux-7-3004-1-py3 @@ -180,14 +177,6 @@ jobs: # - env: INSTANCE=default-oraclelinux-8-3003-4-py3 # - env: INSTANCE=default-oraclelinux-7-3003-4-py3 # - env: INSTANCE=default-almalinux-8-3003-4-py3 - # - env: INSTANCE=default-debian-10-3002-8-py3 - # - env: INSTANCE=default-debian-9-3002-8-py3 - # - env: INSTANCE=default-ubuntu-2004-3002-8-py3 - # - env: INSTANCE=default-ubuntu-1804-3002-8-py3 - # - env: INSTANCE=default-centos-7-3002-8-py3 - # - env: INSTANCE=default-amazonlinux-2-3002-8-py3 - # - env: INSTANCE=default-oraclelinux-8-3002-8-py3 - # - env: INSTANCE=default-oraclelinux-7-3002-8-py3 ## Define the release stage that runs `semantic-release` - stage: 'release' diff --git a/kitchen.yml b/kitchen.yml index cae3117..b71053b 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -103,9 +103,6 @@ platforms: - name: fedora-35-master-py3 driver: image: saltimages/salt-master-py3:fedora-35 - - name: fedora-34-master-py3 - driver: - image: saltimages/salt-master-py3:fedora-34 - name: opensuse-leap-153-master-py3 driver: image: saltimages/salt-master-py3:opensuse-leap-15.3 @@ -183,9 +180,6 @@ platforms: - name: fedora-35-3004-1-py3 driver: image: saltimages/salt-3004.1-py3:fedora-35 - - name: fedora-34-3004-1-py3 - driver: - image: saltimages/salt-3004.1-py3:fedora-34 - name: amazonlinux-2-3004-1-py3 driver: image: saltimages/salt-3004.1-py3:amazonlinux-2 @@ -264,36 +258,6 @@ platforms: driver: image: saltimages/salt-3003.4-py3:almalinux-8 - ## SALT `3002.8` - - name: debian-10-3002-8-py3 - driver: - image: saltimages/salt-3002.8-py3:debian-10 - run_command: /lib/systemd/systemd - - name: debian-9-3002-8-py3 - driver: - image: saltimages/salt-3002.8-py3:debian-9 - run_command: /lib/systemd/systemd - - name: ubuntu-2004-3002-8-py3 - driver: - image: saltimages/salt-3002.8-py3:ubuntu-20.04 - run_command: /lib/systemd/systemd - - name: ubuntu-1804-3002-8-py3 - driver: - image: saltimages/salt-3002.8-py3:ubuntu-18.04 - run_command: /lib/systemd/systemd - - name: centos-7-3002-8-py3 - driver: - image: saltimages/salt-3002.8-py3:centos-7 - - name: amazonlinux-2-3002-8-py3 - driver: - image: saltimages/salt-3002.8-py3:amazonlinux-2 - - name: oraclelinux-8-3002-8-py3 - driver: - image: saltimages/salt-3002.8-py3:oraclelinux-8 - - name: oraclelinux-7-3002-8-py3 - driver: - image: saltimages/salt-3002.8-py3:oraclelinux-7 - verifier: # https://www.inspec.io/ name: inspec @@ -367,12 +331,6 @@ suites: - centos-7-3003-4-py3 - oraclelinux-8-3003-4-py3 - almalinux-8-3003-4-py3 - - debian-10-3002-8-py3 - - debian-9-3002-8-py3 - - ubuntu-2004-3002-8-py3 - - ubuntu-1804-3002-8-py3 - - centos-7-3002-8-py3 - - oraclelinux-8-3002-8-py3 provisioner: state_top: base: From 28d2f86f7b65946a864f5e4f805a5668d1aff5e7 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 15 Jun 2022 23:04:35 +0100 Subject: [PATCH 3/5] chore(gemfile.lock): update to latest gem versions (2022-W24) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/452 --- Gemfile.lock | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ce726b2..7b4c66e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 6bedc829b7fcec035311d8c6086db5d59414428c + revision: fdc592e2c7b999166f404ae28119866e805c3cd2 branch: ssf specs: - inspec (5.17.9) + inspec (5.18.5) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 5.17.9) + inspec-core (= 5.18.5) mongo (= 2.13.2) progress_bar (~> 1.3.3) rake @@ -14,7 +14,7 @@ GIT train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (5.17.9) + inspec-core (5.18.5) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -58,7 +58,7 @@ GEM public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.596.0) + aws-partitions (1.598.0) aws-sdk-alexaforbusiness (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) @@ -83,7 +83,7 @@ GEM aws-sdk-batch (1.47.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-budgets (1.49.0) + aws-sdk-budgets (1.50.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-cloudformation (1.69.0) @@ -142,7 +142,7 @@ GEM aws-sdk-dynamodb (1.74.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.317.0) + aws-sdk-ec2 (1.318.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.56.0) @@ -190,7 +190,7 @@ GEM aws-sdk-guardduty (1.57.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.68.0) + aws-sdk-iam (1.69.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-kafka (1.49.0) @@ -223,7 +223,7 @@ GEM aws-sdk-rds (1.146.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.82.0) + aws-sdk-redshift (1.83.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-route53 (1.63.0) @@ -380,15 +380,15 @@ GEM inifile (3.0.0) jmespath (1.6.1) json (2.6.2) - jwt (2.4.0) - kitchen-inspec (2.6.0) + jwt (2.4.1) + kitchen-inspec (2.6.1) hashie (>= 3.4, <= 5.0) - inspec (>= 2.2.64, < 6.0) + inspec (>= 2.2.64, < 7.0) test-kitchen (>= 2.7, < 4) kitchen-salt (0.7.2) hashie (>= 3.5) test-kitchen (>= 1.4) - kitchen-vagrant (1.11.0) + kitchen-vagrant (1.12.0) test-kitchen (>= 1.4, < 4) license-acceptance (2.1.13) pastel (~> 0.7) @@ -402,8 +402,8 @@ GEM memoist (0.16.2) method_source (1.0.0) mini_mime (1.1.2) - minitest (5.15.0) - mixlib-config (3.0.9) + minitest (5.16.0) + mixlib-config (3.0.27) tomlrb mixlib-install (3.12.19) mixlib-shellout @@ -425,7 +425,7 @@ GEM faraday-cookie_jar (~> 0.0.6) ms_rest (~> 0.7.6) multi_json (1.15.0) - multipart-post (2.2.0) + multipart-post (2.2.3) net-scp (3.0.0) net-ssh (>= 2.6.5, < 7.0.0) net-ssh (6.1.0) @@ -499,7 +499,7 @@ GEM unicode-display_width (>= 1.5, < 3.0) unicode_utils (~> 1.4) strings-ansi (0.2.0) - test-kitchen (3.2.2) + test-kitchen (3.3.0) bcrypt_pbkdf (~> 1.0) chef-utils (>= 16.4.35) ed25519 (~> 1.2) From b48b17078db73d0fecdaeb9a796fbd8c02042386 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 30 Jun 2022 23:07:26 +0100 Subject: [PATCH 4/5] chore(gemfile.lock): update to latest gem versions (2022-W26) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/453 --- Gemfile.lock | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7b4c66e..15bc27b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: fdc592e2c7b999166f404ae28119866e805c3cd2 + revision: da3b324893676451fbe419cb11dff91372a9bb9e branch: ssf specs: - inspec (5.18.5) + inspec (5.18.9) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 5.18.5) + inspec-core (= 5.18.9) mongo (= 2.13.2) progress_bar (~> 1.3.3) rake @@ -14,7 +14,7 @@ GIT train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (5.18.5) + inspec-core (5.18.9) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -58,14 +58,14 @@ GEM public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.598.0) + aws-partitions (1.602.0) aws-sdk-alexaforbusiness (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-amplify (1.32.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-apigateway (1.77.0) + aws-sdk-apigateway (1.78.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-apigatewayv2 (1.42.0) @@ -74,7 +74,7 @@ GEM aws-sdk-applicationautoscaling (1.51.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-athena (1.53.0) + aws-sdk-athena (1.54.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-autoscaling (1.63.0) @@ -128,7 +128,7 @@ GEM aws-sdk-configservice (1.77.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.131.1) + aws-sdk-core (3.131.2) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) @@ -139,10 +139,10 @@ GEM aws-sdk-databasemigrationservice (1.53.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-dynamodb (1.74.0) + aws-sdk-dynamodb (1.75.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.318.0) + aws-sdk-ec2 (1.320.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.56.0) @@ -151,7 +151,7 @@ GEM aws-sdk-ecrpublic (1.12.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.99.0) + aws-sdk-ecs (1.100.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-efs (1.54.0) @@ -169,7 +169,7 @@ GEM aws-sdk-elasticloadbalancing (1.40.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancingv2 (1.77.0) + aws-sdk-elasticloadbalancingv2 (1.78.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-elasticsearchservice (1.65.0) @@ -187,13 +187,13 @@ GEM aws-sdk-glue (1.88.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-guardduty (1.57.0) + aws-sdk-guardduty (1.58.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.69.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-kafka (1.49.0) + aws-sdk-kafka (1.50.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-kinesis (1.41.0) @@ -245,7 +245,7 @@ GEM aws-sdk-secretsmanager (1.46.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-securityhub (1.65.0) + aws-sdk-securityhub (1.67.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-servicecatalog (1.60.0) @@ -402,7 +402,7 @@ GEM memoist (0.16.2) method_source (1.0.0) mini_mime (1.1.2) - minitest (5.16.0) + minitest (5.16.1) mixlib-config (3.0.27) tomlrb mixlib-install (3.12.19) @@ -488,9 +488,9 @@ GEM rubyntlm (0.6.3) rubyzip (2.3.2) semverse (3.0.2) - signet (0.16.1) + signet (0.17.0) addressable (~> 2.8) - faraday (>= 0.17.5, < 3.0) + faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) sslshake (1.3.1) @@ -517,7 +517,7 @@ GEM timeliness (0.3.10) tomlrb (1.3.0) trailblazer-option (0.1.2) - train (3.9.2) + train (3.10.1) activesupport (>= 6.0.3.1) azure_graph_rbac (~> 0.16) azure_mgmt_key_vault (~> 0.17) @@ -528,7 +528,7 @@ GEM google-api-client (>= 0.23.9, <= 0.52.0) googleauth (>= 0.6.6, <= 0.14.0) inifile (~> 3.0) - train-core (= 3.9.2) + train-core (= 3.10.1) train-winrm (~> 0.2) train-aws (0.2.24) aws-sdk-alexaforbusiness (~> 1.0) @@ -606,7 +606,7 @@ GEM aws-sdk-synthetics (~> 1.19.0) aws-sdk-transfer (>= 1.26, < 1.35) aws-sdk-waf (~> 1.43.0) - train-core (3.9.2) + train-core (3.10.1) addressable (~> 2.5) ffi (!= 1.13.0) json (>= 1.8, < 3.0) @@ -642,7 +642,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.8.2) - unicode-display_width (2.1.0) + unicode-display_width (2.2.0) unicode_utils (1.4.0) winrm (2.3.6) builder (>= 2.1.2) From 982705f1a6b604386bd85021f41d1939f28252b6 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sun, 17 Jul 2022 19:46:09 +0100 Subject: [PATCH 5/5] chore(gemfile.lock): update to latest gem versions (2022-W28) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/454 --- Gemfile.lock | 38 +++++++++++----------- bin/kitchen | 4 +-- test/integration/share/libraries/system.rb | 2 ++ 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 15bc27b..79083eb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,20 +1,20 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: da3b324893676451fbe419cb11dff91372a9bb9e + revision: aaef842906a5666f0fc0b4f186b4dd3498f5b28c branch: ssf specs: - inspec (5.18.9) + inspec (5.18.15) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 5.18.9) + inspec-core (= 5.18.15) mongo (= 2.13.2) progress_bar (~> 1.3.3) rake - train (~> 3.0) + train (~> 3.10) train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (5.18.9) + inspec-core (5.18.15) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -34,7 +34,7 @@ GIT sslshake (~> 1.2) thor (>= 0.20, < 2.0) tomlrb (>= 1.2, < 2.1) - train-core (~> 3.0) + train-core (~> 3.10) tty-prompt (~> 0.17) tty-table (~> 0.10) @@ -49,7 +49,7 @@ GIT GEM remote: https://rubygems.org/ specs: - activesupport (7.0.3) + activesupport (7.0.3.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -58,7 +58,7 @@ GEM public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.602.0) + aws-partitions (1.607.0) aws-sdk-alexaforbusiness (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) @@ -74,7 +74,7 @@ GEM aws-sdk-applicationautoscaling (1.51.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-athena (1.54.0) + aws-sdk-athena (1.55.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-autoscaling (1.63.0) @@ -86,7 +86,7 @@ GEM aws-sdk-budgets (1.50.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudformation (1.69.0) + aws-sdk-cloudformation (1.70.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-cloudfront (1.65.0) @@ -125,7 +125,7 @@ GEM aws-sdk-cognitoidentityprovider (1.53.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-configservice (1.77.0) + aws-sdk-configservice (1.79.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-core (3.131.2) @@ -142,7 +142,7 @@ GEM aws-sdk-dynamodb (1.75.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.320.0) + aws-sdk-ec2 (1.322.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.56.0) @@ -211,7 +211,7 @@ GEM aws-sdk-networkfirewall (1.17.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-networkmanager (1.23.0) + aws-sdk-networkmanager (1.24.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-organizations (1.59.0) @@ -220,10 +220,10 @@ GEM aws-sdk-ram (1.26.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-rds (1.146.0) + aws-sdk-rds (1.148.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.83.0) + aws-sdk-redshift (1.84.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-route53 (1.63.0) @@ -375,7 +375,7 @@ GEM http-cookie (1.0.5) domain_name (~> 0.5) httpclient (2.8.3) - i18n (1.10.0) + i18n (1.12.0) concurrent-ruby (~> 1.0) inifile (3.0.0) jmespath (1.6.1) @@ -402,7 +402,7 @@ GEM memoist (0.16.2) method_source (1.0.0) mini_mime (1.1.2) - minitest (5.16.1) + minitest (5.16.2) mixlib-config (3.0.27) tomlrb mixlib-install (3.12.19) @@ -481,7 +481,7 @@ GEM rubocop-ast (>= 1.15.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.18.0) + rubocop-ast (1.19.1) parser (>= 3.1.1.0) ruby-progressbar (1.11.0) ruby2_keywords (0.0.5) @@ -499,7 +499,7 @@ GEM unicode-display_width (>= 1.5, < 3.0) unicode_utils (~> 1.4) strings-ansi (0.2.0) - test-kitchen (3.3.0) + test-kitchen (3.3.1) bcrypt_pbkdf (~> 1.0) chef-utils (>= 16.4.35) ed25519 (~> 1.2) diff --git a/bin/kitchen b/bin/kitchen index dcfdb4c..5d5663e 100755 --- a/bin/kitchen +++ b/bin/kitchen @@ -19,8 +19,8 @@ if File.file?(bundle_binstub) load(bundle_binstub) else abort( - 'Your `bin/bundle` was not generated by Bundler, '\ - 'so this binstub cannot run. Replace `bin/bundle` by running '\ + 'Your `bin/bundle` was not generated by Bundler, ' \ + 'so this binstub cannot run. Replace `bin/bundle` by running ' \ '`bundle binstubs bundler --force`, then run this command again.' ) end diff --git a/test/integration/share/libraries/system.rb b/test/integration/share/libraries/system.rb index 0db9d0b..64405bb 100644 --- a/test/integration/share/libraries/system.rb +++ b/test/integration/share/libraries/system.rb @@ -97,6 +97,8 @@ class SystemResource < Inspec.resource(1) # rubocop:disable Metrics/MethodLength,Metrics/CyclomaticComplexity def build_platform_codename case build_platform_finger + when 'ubuntu-22.04' + 'jammy' when 'ubuntu-20.04' 'focal' when 'ubuntu-18.04'