From f45dc9c04d0a56b8705f94d0916bcaf43fdce231 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 12 Feb 2022 23:23:35 +0000 Subject: [PATCH 01/28] ci: update linters to latest versions [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/414 --- .pre-commit-config.yaml | 8 ++++---- .rubocop.yml | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 41b5f35d..2cb381ed 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -18,7 +18,7 @@ repos: additional_dependencies: ['@commitlint/config-conventional@8.3.4'] always_run: true - repo: https://github.com/rubocop-hq/rubocop - rev: v1.9.1 + rev: v1.25.1 hooks: - id: rubocop name: Check Ruby files with rubocop @@ -26,14 +26,14 @@ repos: always_run: true pass_filenames: false - repo: https://github.com/shellcheck-py/shellcheck-py - rev: v0.7.1.1 + rev: v0.8.0.4 hooks: - id: shellcheck name: Check shell scripts with shellcheck files: ^.*\.(sh|bash|ksh)$ types: [] - repo: https://github.com/adrienverge/yamllint - rev: v1.23.0 + rev: v1.26.3 hooks: - id: yamllint name: Check YAML syntax with yamllint @@ -41,7 +41,7 @@ repos: always_run: true pass_filenames: false - repo: https://github.com/warpnet/salt-lint - rev: v0.3.0 + rev: v0.8.0 hooks: - id: salt-lint name: Check Salt files using salt-lint diff --git a/.rubocop.yml b/.rubocop.yml index 2cceb739..bf4d107f 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -16,4 +16,8 @@ Security/YAMLLoad: Exclude: - test/integration/**/_mapdata.rb +# General settings across all cops in this formula +AllCops: + NewCops: enable + # Any offenses that should be fixed, e.g. collected via. `rubocop --auto-gen-config` From 1270d0c962a6560bfeb9de44ac0e3762bf19d642 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 14 Feb 2022 08:08:08 +0000 Subject: [PATCH 02/28] test(system): add `build_platform_codename` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/415 --- test/integration/share/libraries/system.rb | 44 +++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/test/integration/share/libraries/system.rb b/test/integration/share/libraries/system.rb index 7471ddcf..64fe7ea7 100644 --- a/test/integration/share/libraries/system.rb +++ b/test/integration/share/libraries/system.rb @@ -4,6 +4,7 @@ # Author: Daniel Dehennin # Copyright (C) 2020 Daniel Dehennin +# rubocop:disable Metrics/ClassLength class SystemResource < Inspec.resource(1) name 'system' @@ -21,7 +22,8 @@ def build_platform family: build_platform_family, name: build_platform_name, release: build_platform_release, - finger: build_platform_finger + finger: build_platform_finger, + codename: build_platform_codename } end @@ -89,4 +91,44 @@ def build_finger_release build_platform_release.split('.')[0] end end + + # rubocop:disable Metrics/MethodLength,Metrics/CyclomaticComplexity + def build_platform_codename + case build_platform_finger + when 'ubuntu-20.04' + 'focal' + when 'ubuntu-18.04' + 'bionic' + when 'debian-11' + 'bullseye' + when 'debian-10' + 'buster' + when 'debian-9' + 'stretch' + when 'almalinux-8' + "AlmaLinux #{build_platform_release} (Arctic Sphynx)" + when 'amazonlinux-2' + 'Amazon Linux 2' + when 'arch-base-latest' + 'Arch Linux' + when 'centos-7' + 'CentOS Linux 7 (Core)' + when 'centos-8' + 'CentOS Stream 8' + when 'opensuse-tumbleweed' + 'openSUSE Tumbleweed' + when 'opensuse-15' + "openSUSE Leap #{build_platform_release}" + when 'oraclelinux-8', 'oraclelinux-7' + "Oracle Linux Server #{build_platform_release}" + when 'gentoo-2-sysd', 'gentoo-2-sysv' + 'Gentoo/Linux' + when 'rockylinux-8' + "Rocky Linux #{build_platform_release} (Green Obsidian)" + else + '' + end + end + # rubocop:enable Metrics/MethodLength,Metrics/CyclomaticComplexity end +# rubocop:enable Metrics/ClassLength From 1c70c9c01c68b7edf629744fe82b9aa6544e7e46 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 14 Feb 2022 08:21:52 +0000 Subject: [PATCH 03/28] test(repository): use `system.platform[:codename]` [skip ci] Tested: * https://gitlab.com/myii/postgres-formula/-/pipelines/470237956 --- test/integration/repo/controls/repository.rb | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/test/integration/repo/controls/repository.rb b/test/integration/repo/controls/repository.rb index 4469261d..b0e9dbc6 100644 --- a/test/integration/repo/controls/repository.rb +++ b/test/integration/repo/controls/repository.rb @@ -18,21 +18,11 @@ repo_file = os_name_repo_file[platform.name] when 'debian' - # Inspec does not provide a `codename` matcher, so we add ours - finger_codename = { - 'ubuntu-18.04' => 'bionic', - 'ubuntu-20.04' => 'focal', - 'debian-9' => 'stretch', - 'debian-10' => 'buster', - 'debian-11' => 'bullseye' - } - codename = finger_codename[system.platform[:finger]] - repo_keyring = '/usr/share/postgresql-common/pgdg/apt.postgresql.org.gpg' repo_file = '/etc/apt/sources.list.d/pgdg.list' - # rubocop:disable Metrics/LineLength - repo_url = "deb [signed-by=#{repo_keyring}] http://apt.postgresql.org/pub/repos/apt #{codename}-pgdg main" - # rubocop:enable Metrics/LineLength + # rubocop:disable Layout/LineLength + repo_url = "deb [signed-by=#{repo_keyring}] http://apt.postgresql.org/pub/repos/apt #{system.platform[:codename]}-pgdg main" + # rubocop:enable Layout/LineLength end control 'Postgresql repository keyring' do From 5517d019ef8e11de7dd6622deb1465f57ab80fb4 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 15 Feb 2022 09:02:37 +0000 Subject: [PATCH 04/28] chore(gemfile.lock): update to latest gem versions (2022-W07) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/416 --- Gemfile.lock | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index efd33490..fe93cfd5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,19 +1,19 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 76ec461092da3f08b0e8976df10db6ae687895ab + revision: 8f9d68f8c3ba20abf366af8e735287bf83fb93b1 branch: ssf specs: - inspec (4.55.9) + inspec (4.56.4) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 4.55.9) + inspec-core (= 4.56.4) mongo (= 2.13.2) rake train (~> 3.0) train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.55.9) + inspec-core (4.56.4) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -48,7 +48,7 @@ GIT GEM remote: https://rubygems.org/ specs: - activesupport (7.0.1) + activesupport (7.0.2.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -57,7 +57,7 @@ GEM public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.553.0) + aws-partitions (1.554.0) aws-sdk-alexaforbusiness (1.55.0) aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) @@ -85,7 +85,7 @@ GEM aws-sdk-budgets (1.46.0) aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudformation (1.65.0) + aws-sdk-cloudformation (1.67.0) aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) aws-sdk-cloudfront (1.62.0) @@ -265,13 +265,13 @@ GEM aws-sdk-sms (1.38.0) aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-sns (1.51.0) + aws-sdk-sns (1.52.0) aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) aws-sdk-sqs (1.50.0) aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.129.0) + aws-sdk-ssm (1.130.0) aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) aws-sdk-states (1.39.0) @@ -302,9 +302,9 @@ GEM bcrypt_pbkdf (1.1.0) bson (4.14.1) builder (3.2.4) - chef-config (17.9.42) + chef-config (17.9.46) addressable - chef-utils (= 17.9.42) + chef-utils (= 17.9.46) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -312,7 +312,7 @@ GEM chef-telemetry (1.1.1) chef-config concurrent-ruby (~> 1.0) - chef-utils (17.9.42) + chef-utils (17.9.46) concurrent-ruby coderay (1.1.3) concurrent-ruby (1.1.9) @@ -442,7 +442,7 @@ GEM public_suffix (4.0.6) rainbow (3.1.1) rake (13.0.6) - regexp_parser (2.2.0) + regexp_parser (2.2.1) representable (3.1.1) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) @@ -474,7 +474,7 @@ GEM rubocop-ast (>= 1.15.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.15.1) + rubocop-ast (1.15.2) parser (>= 3.0.1.1) ruby-progressbar (1.11.0) ruby2_keywords (0.0.5) From 4ca8097b6213109f5dfbba097527253478c83770 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 21 Feb 2022 19:10:44 +0000 Subject: [PATCH 05/28] chore(gemfile.lock): update to latest gem versions (2022-W08) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/419 --- .gitlab-ci.yml | 2 ++ Gemfile.lock | 42 +++++++++++++++++++++--------------------- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d0cd9779..771bb965 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -130,6 +130,7 @@ rubocop: ## Define the rest of the matrix based on Kitchen testing # Make sure the instances listed below match up with # the `platforms` defined in `kitchen.yml` +# yamllint disable rule:line-length # default-debian-11-tiamat-py3: {extends: '.test_instance'} # default-debian-10-tiamat-py3: {extends: '.test_instance'} # default-debian-9-tiamat-py3: {extends: '.test_instance'} @@ -240,6 +241,7 @@ rockylinux-8-master-py3: {extends: '.test_instance'} # default-oraclelinux-7-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'} +# yamllint enable rule:line-length ############################################################################### # `release` stage: `semantic-release` diff --git a/Gemfile.lock b/Gemfile.lock index fe93cfd5..df0426cb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,19 +1,19 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 8f9d68f8c3ba20abf366af8e735287bf83fb93b1 + revision: 1dd91ba6544d9e26c266b055f7648defc89ca9ce branch: ssf specs: - inspec (4.56.4) + inspec (5.0.4) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 4.56.4) + inspec-core (= 5.0.4) mongo (= 2.13.2) rake train (~> 3.0) train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.56.4) + inspec-core (5.0.4) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -57,7 +57,7 @@ GEM public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.554.0) + aws-partitions (1.555.0) aws-sdk-alexaforbusiness (1.55.0) aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) @@ -73,7 +73,7 @@ GEM aws-sdk-applicationautoscaling (1.51.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-athena (1.48.0) + aws-sdk-athena (1.49.0) aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) aws-sdk-autoscaling (1.63.0) @@ -82,7 +82,7 @@ GEM aws-sdk-batch (1.47.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-budgets (1.46.0) + aws-sdk-budgets (1.48.0) aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) aws-sdk-cloudformation (1.67.0) @@ -127,7 +127,7 @@ GEM aws-sdk-configservice (1.73.0) aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.126.0) + aws-sdk-core (3.126.2) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) @@ -141,7 +141,7 @@ GEM aws-sdk-dynamodb (1.72.0) aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.298.0) + aws-sdk-ec2 (1.299.0) aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.53.0) @@ -189,7 +189,7 @@ GEM aws-sdk-guardduty (1.55.0) aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.66.0) + aws-sdk-iam (1.67.0) aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) aws-sdk-kafka (1.48.0) @@ -219,10 +219,10 @@ GEM aws-sdk-ram (1.26.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-rds (1.138.0) + aws-sdk-rds (1.139.0) aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.77.0) + aws-sdk-redshift (1.78.0) aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) aws-sdk-route53 (1.61.0) @@ -271,7 +271,7 @@ GEM aws-sdk-sqs (1.50.0) aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.130.0) + aws-sdk-ssm (1.131.0) aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) aws-sdk-states (1.39.0) @@ -302,9 +302,9 @@ GEM bcrypt_pbkdf (1.1.0) bson (4.14.1) builder (3.2.4) - chef-config (17.9.46) + chef-config (17.9.52) addressable - chef-utils (= 17.9.46) + chef-utils (= 17.9.52) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -312,11 +312,11 @@ GEM chef-telemetry (1.1.1) chef-config concurrent-ruby (~> 1.0) - chef-utils (17.9.46) + chef-utils (17.9.52) concurrent-ruby coderay (1.1.3) concurrent-ruby (1.1.9) - cookstyle (7.31.3) + cookstyle (7.31.7) rubocop (= 1.25.1) declarative (0.0.20) diff-lcs (1.5.0) @@ -372,15 +372,15 @@ GEM http-cookie (1.0.4) domain_name (~> 0.5) httpclient (2.8.3) - i18n (1.9.1) + i18n (1.10.0) concurrent-ruby (~> 1.0) inifile (3.0.0) - jmespath (1.5.0) + jmespath (1.6.0) json (2.6.1) jwt (2.3.0) - kitchen-inspec (2.5.0) + kitchen-inspec (2.5.2) hashie (>= 3.4, <= 5.0) - inspec (>= 2.2.64, < 5.0) + inspec (>= 2.2.64, < 6.0) test-kitchen (>= 2.7, < 4) kitchen-salt (0.7.2) hashie (>= 3.5) From 08d35cb8558ffd9dcb574d00eb26dd595ab90fda Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 4 Mar 2022 15:33:04 +0000 Subject: [PATCH 06/28] chore(gemfile.lock): update to latest gem versions (2022-W09) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/421 --- Gemfile.lock | 250 +++++++++++++++++++++++++-------------------------- 1 file changed, 125 insertions(+), 125 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index df0426cb..48a31ed8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,19 +1,19 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 1dd91ba6544d9e26c266b055f7648defc89ca9ce + revision: 29c9f7b3a2d3197a368ced0b12bceddf9ff9185a branch: ssf specs: - inspec (5.0.4) + inspec (5.4.1) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 5.0.4) + inspec-core (= 5.4.1) mongo (= 2.13.2) rake train (~> 3.0) train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (5.0.4) + inspec-core (5.4.1) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -26,7 +26,7 @@ GIT parallel (~> 1.9) parslet (>= 1.5, < 2.0) pry (~> 0.13) - rspec (>= 3.9, < 3.11) + rspec (>= 3.9, <= 3.11) rspec-its (~> 1.2) rubyzip (>= 1.2.2, < 3.0) semverse (~> 3.0) @@ -57,24 +57,24 @@ GEM public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.555.0) - aws-sdk-alexaforbusiness (1.55.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-partitions (1.563.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.74.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-apigateway (1.75.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-apigatewayv2 (1.41.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-apigatewayv2 (1.42.0) + aws-sdk-core (~> 3, >= 3.127.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.49.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-athena (1.52.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-autoscaling (1.63.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -82,41 +82,41 @@ GEM aws-sdk-batch (1.47.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-budgets (1.48.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-budgets (1.49.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudformation (1.67.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-cloudformation (1.68.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudfront (1.62.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-cloudfront (1.63.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsm (1.38.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-cloudhsm (1.39.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsmv2 (1.41.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-cloudhsmv2 (1.42.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudtrail (1.46.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-cloudtrail (1.48.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatch (1.61.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-cloudwatch (1.62.0) + aws-sdk-core (~> 3, >= 3.127.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.51.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-cloudwatchlogs (1.52.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-codecommit (1.50.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-codecommit (1.51.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-codedeploy (1.48.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-codedeploy (1.49.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-codepipeline (1.52.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-codepipeline (1.53.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-cognitoidentity (1.31.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -124,55 +124,55 @@ GEM aws-sdk-cognitoidentityprovider (1.53.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-configservice (1.73.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-configservice (1.74.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.126.2) + aws-sdk-core (3.127.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-costandusagereportservice (1.39.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-costandusagereportservice (1.40.0) + aws-sdk-core (~> 3, >= 3.127.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.72.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-dynamodb (1.74.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.299.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-ec2 (1.301.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ecr (1.53.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-ecr (1.55.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ecrpublic (1.11.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-ecrpublic (1.12.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.95.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-ecs (1.96.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-efs (1.52.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-efs (1.53.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-eks (1.72.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-eks (1.73.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.72.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-elasticache (1.74.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticbeanstalk (1.50.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-elasticbeanstalk (1.51.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancing (1.39.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-elasticloadbalancing (1.40.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancingv2 (1.76.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-elasticloadbalancingv2 (1.77.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticsearchservice (1.64.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-elasticsearchservice (1.65.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-emr (1.53.0) aws-sdk-core (~> 3, >= 3.121.2) @@ -180,38 +180,38 @@ GEM aws-sdk-eventbridge (1.24.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-firehose (1.47.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-firehose (1.48.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-glue (1.88.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-guardduty (1.55.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-guardduty (1.56.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.67.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-iam (1.68.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-kafka (1.48.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-kafka (1.49.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-kinesis (1.40.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-kinesis (1.41.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.54.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-kms (1.55.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.78.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-lambda (1.80.0) + aws-sdk-core (~> 3, >= 3.127.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.14.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-networkfirewall (1.15.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-networkmanager (1.21.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-networkmanager (1.22.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-organizations (1.59.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -219,23 +219,23 @@ GEM aws-sdk-ram (1.26.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-rds (1.139.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-rds (1.141.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.78.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-redshift (1.79.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-route53 (1.61.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-route53 (1.62.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-route53domains (1.39.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-route53domains (1.40.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-route53resolver (1.36.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-route53resolver (1.37.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.112.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-s3 (1.113.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) aws-sdk-s3control (1.43.0) @@ -244,8 +244,8 @@ GEM aws-sdk-secretsmanager (1.46.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-securityhub (1.61.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-securityhub (1.62.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-servicecatalog (1.60.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -253,8 +253,8 @@ GEM aws-sdk-ses (1.41.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-shield (1.47.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-shield (1.48.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-signer (1.32.0) aws-sdk-core (~> 3, >= 3.120.0) @@ -262,17 +262,17 @@ GEM aws-sdk-simpledb (1.29.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv2 (~> 1.0) - aws-sdk-sms (1.38.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-sms (1.39.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-sns (1.52.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-sns (1.53.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-sqs (1.50.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-sqs (1.51.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.131.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-ssm (1.132.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-states (1.39.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -316,7 +316,7 @@ GEM concurrent-ruby coderay (1.1.3) concurrent-ruby (1.1.9) - cookstyle (7.31.7) + cookstyle (7.32.0) rubocop (= 1.25.1) declarative (0.0.20) diff-lcs (1.5.0) @@ -431,7 +431,7 @@ GEM nori (2.6.0) os (1.1.4) parallel (1.21.0) - parser (3.1.0.0) + parser (3.1.1.0) ast (~> 2.4.1) parslet (1.8.2) pastel (0.8.0) @@ -449,22 +449,22 @@ GEM uber (< 0.2.0) retriable (3.1.2) rexml (3.2.5) - rspec (3.10.0) - rspec-core (~> 3.10.0) - rspec-expectations (~> 3.10.0) - rspec-mocks (~> 3.10.0) - rspec-core (3.10.2) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.2) + rspec (3.11.0) + rspec-core (~> 3.11.0) + rspec-expectations (~> 3.11.0) + rspec-mocks (~> 3.11.0) + rspec-core (3.11.0) + rspec-support (~> 3.11.0) + rspec-expectations (3.11.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) + rspec-support (~> 3.11.0) rspec-its (1.3.0) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) - rspec-mocks (3.10.3) + rspec-mocks (3.11.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-support (3.10.3) + rspec-support (~> 3.11.0) + rspec-support (3.11.0) rubocop (1.25.1) parallel (~> 1.10) parser (>= 3.1.0.0) @@ -474,16 +474,16 @@ GEM rubocop-ast (>= 1.15.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.15.2) - parser (>= 3.0.1.1) + rubocop-ast (1.16.0) + parser (>= 3.1.1.0) ruby-progressbar (1.11.0) ruby2_keywords (0.0.5) rubyntlm (0.6.3) rubyzip (2.3.2) semverse (3.0.0) - signet (0.16.0) + signet (0.16.1) addressable (~> 2.8) - faraday (>= 0.17.3, < 2.0) + faraday (>= 0.17.5, < 3.0) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) sslshake (1.3.1) @@ -607,7 +607,7 @@ GEM net-scp (>= 1.2, < 4.0) net-ssh (>= 2.9, < 7.0) train-habitat (0.2.22) - train-winrm (0.2.12) + train-winrm (0.2.13) winrm (>= 2.3.6, < 3.0) winrm-elevated (~> 1.2.2) winrm-fs (~> 1.0) From 2dcab20332bd3db5d64f968e3695c2f1280aab45 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 12 Mar 2022 10:05:59 +0000 Subject: [PATCH 07/28] chore(gemfile.lock): update to latest gem versions (2022-W10) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/422 --- Gemfile.lock | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 48a31ed8..155593de 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,19 +1,20 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 29c9f7b3a2d3197a368ced0b12bceddf9ff9185a + revision: 2c075651c0de1eac9e6bdbf820c03529ad2f59e1 branch: ssf specs: - inspec (5.4.1) + inspec (5.7.6) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 5.4.1) + inspec-core (= 5.7.6) mongo (= 2.13.2) + progress_bar (~> 1.3.3) rake train (~> 3.0) train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (5.4.1) + inspec-core (5.7.6) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -48,7 +49,7 @@ GIT GEM remote: https://rubygems.org/ specs: - activesupport (7.0.2.2) + activesupport (7.0.2.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -57,7 +58,7 @@ GEM public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.563.0) + aws-partitions (1.566.0) aws-sdk-alexaforbusiness (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) @@ -127,7 +128,7 @@ GEM aws-sdk-configservice (1.74.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.127.0) + aws-sdk-core (3.129.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) @@ -141,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.301.0) + aws-sdk-ec2 (1.302.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.55.0) @@ -150,13 +151,13 @@ GEM aws-sdk-ecrpublic (1.12.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.96.0) + aws-sdk-ecs (1.97.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-efs (1.53.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-eks (1.73.0) + aws-sdk-eks (1.74.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-elasticache (1.74.0) @@ -316,7 +317,7 @@ GEM concurrent-ruby coderay (1.1.3) concurrent-ruby (1.1.9) - cookstyle (7.32.0) + cookstyle (7.32.1) rubocop (= 1.25.1) declarative (0.0.20) diff-lcs (1.5.0) @@ -369,13 +370,14 @@ GEM gyoku (1.3.1) builder (>= 2.1.2) hashie (4.1.0) + highline (2.0.3) http-cookie (1.0.4) domain_name (~> 0.5) httpclient (2.8.3) i18n (1.10.0) concurrent-ruby (~> 1.0) inifile (3.0.0) - jmespath (1.6.0) + jmespath (1.6.1) json (2.6.1) jwt (2.3.0) kitchen-inspec (2.5.2) @@ -429,6 +431,7 @@ GEM net-ssh-gateway (2.0.0) net-ssh (>= 4.0.0) nori (2.6.0) + options (2.3.2) os (1.1.4) parallel (1.21.0) parser (3.1.1.0) @@ -436,6 +439,9 @@ GEM parslet (1.8.2) pastel (0.8.0) tty-color (~> 0.5) + progress_bar (1.3.3) + highline (>= 1.6, < 3) + options (~> 2.3.0) pry (0.14.1) coderay (~> 1.1) method_source (~> 1.0) @@ -510,7 +516,7 @@ GEM timeliness (0.3.10) tomlrb (1.3.0) trailblazer-option (0.1.2) - train (3.8.7) + train (3.8.9) activesupport (>= 6.0.3.1) azure_graph_rbac (~> 0.16) azure_mgmt_key_vault (~> 0.17) @@ -521,7 +527,7 @@ GEM google-api-client (>= 0.23.9, <= 0.52.0) googleauth (>= 0.6.6, <= 0.14.0) inifile (~> 3.0) - train-core (= 3.8.7) + train-core (= 3.8.9) train-winrm (~> 0.2) train-aws (0.2.24) aws-sdk-alexaforbusiness (~> 1.0) @@ -599,7 +605,7 @@ GEM aws-sdk-synthetics (~> 1.19.0) aws-sdk-transfer (>= 1.26, < 1.35) aws-sdk-waf (~> 1.43.0) - train-core (3.8.7) + train-core (3.8.9) addressable (~> 2.5) ffi (!= 1.13.0) json (>= 1.8, < 3.0) From cecb65890ef9c1ee32917846871d6a91067dd041 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 17 Mar 2022 23:40:46 +0000 Subject: [PATCH 08/28] chore(gemfile.lock): update to latest gem versions (2022-W11) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/423 --- Gemfile.lock | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 155593de..10d97c32 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 2c075651c0de1eac9e6bdbf820c03529ad2f59e1 + revision: 3dab2e31799c850afcd377e331e150e97cc48e85 branch: ssf specs: - inspec (5.7.6) + inspec (5.7.10) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 5.7.6) + inspec-core (= 5.7.10) 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.7.6) + inspec-core (5.7.10) 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.566.0) + aws-partitions (1.568.0) aws-sdk-alexaforbusiness (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) @@ -125,10 +125,10 @@ GEM aws-sdk-cognitoidentityprovider (1.53.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-configservice (1.74.0) + aws-sdk-configservice (1.75.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.129.1) + aws-sdk-core (3.130.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) @@ -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.302.0) + aws-sdk-ec2 (1.303.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.55.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.97.0) + aws-sdk-ecs (1.98.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-efs (1.53.0) @@ -160,7 +160,7 @@ GEM aws-sdk-eks (1.74.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.74.0) + aws-sdk-elasticache (1.75.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-elasticbeanstalk (1.51.0) @@ -202,7 +202,7 @@ GEM aws-sdk-kms (1.55.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.80.0) + aws-sdk-lambda (1.81.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-mq (1.40.0) @@ -220,7 +220,7 @@ GEM aws-sdk-ram (1.26.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-rds (1.141.0) + aws-sdk-rds (1.142.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-redshift (1.79.0) @@ -328,7 +328,7 @@ GEM unf (>= 0.0.5, < 1.0.0) ed25519 (1.3.0) erubi (1.10.0) - excon (0.91.0) + excon (0.92.0) faraday (1.4.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -640,7 +640,7 @@ GEM uber (0.1.0) unf (0.1.4) unf_ext - unf_ext (0.0.8) + unf_ext (0.0.8.1) unicode-display_width (2.1.0) unicode_utils (1.4.0) winrm (2.3.6) From 7d64b9f448c9d2528a8514bf3ec7fa1cca0e51a1 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 22 Mar 2022 12:01:54 +0000 Subject: [PATCH 09/28] chore(gemfile.lock): update to latest gem versions (2022-W12) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/424 --- Gemfile.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 10d97c32..f3791c35 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 3dab2e31799c850afcd377e331e150e97cc48e85 + revision: 8b29ba7ad69faeb103c345c560417c5374db8df3 branch: ssf specs: - inspec (5.7.10) + inspec (5.8.0) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 5.7.10) + inspec-core (= 5.8.0) 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.7.10) + inspec-core (5.8.0) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -145,7 +145,7 @@ GEM aws-sdk-ec2 (1.303.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ecr (1.55.0) + aws-sdk-ecr (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-ecrpublic (1.12.0) @@ -303,9 +303,9 @@ GEM bcrypt_pbkdf (1.1.0) bson (4.14.1) builder (3.2.4) - chef-config (17.9.52) + chef-config (17.10.0) addressable - chef-utils (= 17.9.52) + chef-utils (= 17.10.0) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -313,10 +313,10 @@ GEM chef-telemetry (1.1.1) chef-config concurrent-ruby (~> 1.0) - chef-utils (17.9.52) + chef-utils (17.10.0) concurrent-ruby coderay (1.1.3) - concurrent-ruby (1.1.9) + concurrent-ruby (1.1.10) cookstyle (7.32.1) rubocop (= 1.25.1) declarative (0.0.20) @@ -328,7 +328,7 @@ GEM unf (>= 0.0.5, < 1.0.0) ed25519 (1.3.0) erubi (1.10.0) - excon (0.92.0) + excon (0.92.1) faraday (1.4.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -433,7 +433,7 @@ GEM nori (2.6.0) options (2.3.2) os (1.1.4) - parallel (1.21.0) + parallel (1.22.0) parser (3.1.1.0) ast (~> 2.4.1) parslet (1.8.2) From c7812c5906561644d5e7a1adf3bd140382fabd67 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 1 Apr 2022 15:36:11 +0100 Subject: [PATCH 10/28] chore(gemfile.lock): update to latest gem versions (2022-W13) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/425 --- .gitlab-ci.yml | 8 ++++++-- .travis.yml | 4 ++++ Gemfile.lock | 26 +++++++++++++------------- kitchen.yml | 8 ++++++++ 4 files changed, 31 insertions(+), 15 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 771bb965..54715451 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -164,6 +164,9 @@ centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'} # default-centos-7-master-py3: {extends: '.test_instance'} # repo-centos-7-master-py3: {extends: '.test_instance'} centos-7-master-py3: {extends: '.test_instance'} +# default-fedora-35-master-py3: {extends: '.test_instance'} +# repo-fedora-35-master-py3: {extends: '.test_instance'} +fedora-35-master-py3: {extends: '.test_instance'} # default-fedora-34-master-py3: {extends: '.test_instance'} # repo-fedora-34-master-py3: {extends: '.test_instance'} fedora-34-master-py3: {extends: '.test_instance'} @@ -200,6 +203,7 @@ rockylinux-8-master-py3: {extends: '.test_instance'} # default-ubuntu-1804-3004-0-py3: {extends: '.test_instance'} # default-centos-stream8-3004-0-py3: {extends: '.test_instance_failure_permitted'} # default-centos-7-3004-0-py3: {extends: '.test_instance'} +# default-fedora-35-3004-0-py3: {extends: '.test_instance'} # default-fedora-34-3004-0-py3: {extends: '.test_instance'} # default-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'} # default-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'} @@ -217,7 +221,7 @@ rockylinux-8-master-py3: {extends: '.test_instance'} # default-ubuntu-1804-3003-3-py3: {extends: '.test_instance'} # default-centos-stream8-3003-3-py3: {extends: '.test_instance_failure_permitted'} # default-centos-7-3003-3-py3: {extends: '.test_instance'} -# default-fedora-35-3003-3-py3: {extends: '.test_instance_failure_permitted'} +# default-fedora-35-3003-3-py3: {extends: '.test_instance'} # default-fedora-34-3003-3-py3: {extends: '.test_instance'} # default-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'} # default-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance_failure_permitted'} @@ -232,7 +236,7 @@ rockylinux-8-master-py3: {extends: '.test_instance'} # default-ubuntu-2004-3002-7-py3: {extends: '.test_instance'} # default-ubuntu-1804-3002-7-py3: {extends: '.test_instance'} # default-centos-7-3002-7-py3: {extends: '.test_instance'} -# default-fedora-35-3002-7-py3: {extends: '.test_instance_failure_permitted'} +# default-fedora-35-3002-7-py3: {extends: '.test_instance'} # default-fedora-34-3002-7-py3: {extends: '.test_instance'} # default-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'} # default-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance_failure_permitted'} diff --git a/.travis.yml b/.travis.yml index 94c8b53a..11988b71 100644 --- a/.travis.yml +++ b/.travis.yml @@ -116,6 +116,9 @@ jobs: # - env: INSTANCE=default-centos-7-master-py3 # - env: INSTANCE=repo-centos-7-master-py3 - env: INSTANCE=centos-7-master-py3 + # - env: INSTANCE=default-fedora-35-master-py3 + # - env: INSTANCE=repo-fedora-35-master-py3 + - env: INSTANCE=fedora-35-master-py3 # - env: INSTANCE=default-fedora-34-master-py3 # - env: INSTANCE=repo-fedora-34-master-py3 - env: INSTANCE=fedora-34-master-py3 @@ -152,6 +155,7 @@ jobs: # - env: INSTANCE=default-ubuntu-1804-3004-0-py3 # - env: INSTANCE=default-centos-stream8-3004-0-py3 # - env: INSTANCE=default-centos-7-3004-0-py3 + # - env: INSTANCE=default-fedora-35-3004-0-py3 # - env: INSTANCE=default-fedora-34-3004-0-py3 # - env: INSTANCE=default-opensuse-leap-153-3004-0-py3 # - env: INSTANCE=default-opensuse-tmbl-latest-3004-0-py3 diff --git a/Gemfile.lock b/Gemfile.lock index f3791c35..d85bdc6e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 8b29ba7ad69faeb103c345c560417c5374db8df3 + revision: 36118e817641fbc1d4bd9753a77c383e7b20caff branch: ssf specs: - inspec (5.8.0) + inspec (5.10.7) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 5.8.0) + inspec-core (= 5.10.7) 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.8.0) + inspec-core (5.10.7) 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.568.0) + aws-partitions (1.571.0) aws-sdk-alexaforbusiness (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) @@ -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.75.0) + aws-sdk-configservice (1.76.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-core (3.130.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.303.0) + aws-sdk-ec2 (1.304.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.98.0) + aws-sdk-ecs (1.99.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-efs (1.53.0) @@ -160,7 +160,7 @@ GEM aws-sdk-eks (1.74.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.75.0) + aws-sdk-elasticache (1.76.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-elasticbeanstalk (1.51.0) @@ -202,7 +202,7 @@ GEM aws-sdk-kms (1.55.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.81.0) + aws-sdk-lambda (1.82.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-mq (1.40.0) @@ -223,7 +223,7 @@ GEM aws-sdk-rds (1.142.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.79.0) + aws-sdk-redshift (1.80.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-route53 (1.62.0) @@ -272,7 +272,7 @@ GEM aws-sdk-sqs (1.51.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.132.0) + aws-sdk-ssm (1.134.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-states (1.39.0) @@ -433,7 +433,7 @@ GEM nori (2.6.0) options (2.3.2) os (1.1.4) - parallel (1.22.0) + parallel (1.22.1) parser (3.1.1.0) ast (~> 2.4.1) parslet (1.8.2) diff --git a/kitchen.yml b/kitchen.yml index 1b2061bd..319d33c8 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -89,6 +89,9 @@ platforms: - name: centos-7-master-py3 driver: image: saltimages/salt-master-py3:centos-7 + - 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 @@ -159,6 +162,9 @@ platforms: - name: centos-7-3004-0-py3 driver: image: saltimages/salt-3004.0-py3:centos-7 + - name: fedora-35-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:fedora-35 - name: fedora-34-3004-0-py3 driver: image: saltimages/salt-3004.0-py3:fedora-34 @@ -369,6 +375,7 @@ suites: - ubuntu-1804-master-py3 - centos-stream8-master-py3 - centos-7-master-py3 + - fedora-35-master-py3 - fedora-34-master-py3 - opensuse-leap-153-master-py3 - amazonlinux-2-master-py3 @@ -383,6 +390,7 @@ suites: - ubuntu-1804-3004-0-py3 - centos-stream8-3004-0-py3 - centos-7-3004-0-py3 + - fedora-35-3004-0-py3 - fedora-34-3004-0-py3 - opensuse-leap-153-3004-0-py3 - amazonlinux-2-3004-0-py3 From 03fd3faed988962088f847a09d65d36f910617cc Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sun, 3 Apr 2022 15:07:56 +0100 Subject: [PATCH 11/28] ci(kitchen+gitlab): update for new pre-salted images [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/426 --- .gitlab-ci.yml | 82 ++++++-------- .travis.yml | 82 ++++++-------- kitchen.yml | 290 ++++++++++++++++++++----------------------------- 3 files changed, 186 insertions(+), 268 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 54715451..464319fd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -196,55 +196,43 @@ almalinux-8-master-py3: {extends: '.test_instance'} # default-rockylinux-8-master-py3: {extends: '.test_instance'} # repo-rockylinux-8-master-py3: {extends: '.test_instance'} rockylinux-8-master-py3: {extends: '.test_instance'} -# default-debian-11-3004-0-py3: {extends: '.test_instance'} -# default-debian-10-3004-0-py3: {extends: '.test_instance'} -# default-debian-9-3004-0-py3: {extends: '.test_instance'} -# default-ubuntu-2004-3004-0-py3: {extends: '.test_instance'} -# default-ubuntu-1804-3004-0-py3: {extends: '.test_instance'} -# default-centos-stream8-3004-0-py3: {extends: '.test_instance_failure_permitted'} -# default-centos-7-3004-0-py3: {extends: '.test_instance'} -# default-fedora-35-3004-0-py3: {extends: '.test_instance'} -# default-fedora-34-3004-0-py3: {extends: '.test_instance'} +# default-debian-11-3004-1-py3: {extends: '.test_instance'} +# default-debian-10-3004-1-py3: {extends: '.test_instance'} +# default-debian-9-3004-1-py3: {extends: '.test_instance'} +# default-ubuntu-2004-3004-1-py3: {extends: '.test_instance'} +# default-ubuntu-1804-3004-1-py3: {extends: '.test_instance'} +# default-centos-stream8-3004-1-py3: {extends: '.test_instance_failure_permitted'} +# default-centos-7-3004-1-py3: {extends: '.test_instance'} +# 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'} +# default-arch-base-latest-3004-1-py3: {extends: '.test_instance'} +# default-gentoo-stage3-latest-3004-1-py3: {extends: '.test_instance'} +# default-gentoo-stage3-systemd-3004-1-py3: {extends: '.test_instance'} +# default-almalinux-8-3004-1-py3: {extends: '.test_instance'} +# default-rockylinux-8-3004-1-py3: {extends: '.test_instance'} # default-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'} # default-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'} -# default-amazonlinux-2-3004-0-py3: {extends: '.test_instance'} -# default-oraclelinux-8-3004-0-py3: {extends: '.test_instance'} -# default-oraclelinux-7-3004-0-py3: {extends: '.test_instance'} -# default-arch-base-latest-3004-0-py3: {extends: '.test_instance'} -# default-gentoo-stage3-latest-3004-0-py3: {extends: '.test_instance'} -# default-gentoo-stage3-systemd-3004-0-py3: {extends: '.test_instance'} -# default-almalinux-8-3004-0-py3: {extends: '.test_instance'} -# default-rockylinux-8-3004-0-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-stream8-3003-3-py3: {extends: '.test_instance_failure_permitted'} -# default-centos-7-3003-3-py3: {extends: '.test_instance'} -# default-fedora-35-3003-3-py3: {extends: '.test_instance'} -# default-fedora-34-3003-3-py3: {extends: '.test_instance'} -# default-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'} -# default-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance_failure_permitted'} -# 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-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-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-7-3002-7-py3: {extends: '.test_instance'} -# default-fedora-35-3002-7-py3: {extends: '.test_instance'} -# default-fedora-34-3002-7-py3: {extends: '.test_instance'} -# default-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'} -# default-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance_failure_permitted'} -# 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-gentoo-stage3-latest-3002-7-py3: {extends: '.test_instance'} -# default-gentoo-stage3-systemd-3002-7-py3: {extends: '.test_instance'} +# default-debian-10-3003-4-py3: {extends: '.test_instance'} +# default-debian-9-3003-4-py3: {extends: '.test_instance'} +# default-ubuntu-2004-3003-4-py3: {extends: '.test_instance'} +# default-ubuntu-1804-3003-4-py3: {extends: '.test_instance'} +# default-centos-stream8-3003-4-py3: {extends: '.test_instance_failure_permitted'} +# default-centos-7-3003-4-py3: {extends: '.test_instance'} +# default-amazonlinux-2-3003-4-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/.travis.yml b/.travis.yml index 11988b71..766e818c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -148,55 +148,43 @@ jobs: # - env: INSTANCE=default-rockylinux-8-master-py3 # - env: INSTANCE=repo-rockylinux-8-master-py3 - env: INSTANCE=rockylinux-8-master-py3 - # - env: INSTANCE=default-debian-11-3004-0-py3 - # - env: INSTANCE=default-debian-10-3004-0-py3 - # - env: INSTANCE=default-debian-9-3004-0-py3 - # - env: INSTANCE=default-ubuntu-2004-3004-0-py3 - # - env: INSTANCE=default-ubuntu-1804-3004-0-py3 - # - env: INSTANCE=default-centos-stream8-3004-0-py3 - # - env: INSTANCE=default-centos-7-3004-0-py3 - # - env: INSTANCE=default-fedora-35-3004-0-py3 - # - env: INSTANCE=default-fedora-34-3004-0-py3 + # - env: INSTANCE=default-debian-11-3004-1-py3 + # - env: INSTANCE=default-debian-10-3004-1-py3 + # - env: INSTANCE=default-debian-9-3004-1-py3 + # - env: INSTANCE=default-ubuntu-2004-3004-1-py3 + # - env: INSTANCE=default-ubuntu-1804-3004-1-py3 + # - env: INSTANCE=default-centos-stream8-3004-1-py3 + # - env: INSTANCE=default-centos-7-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 + # - env: INSTANCE=default-arch-base-latest-3004-1-py3 + # - env: INSTANCE=default-gentoo-stage3-latest-3004-1-py3 + # - env: INSTANCE=default-gentoo-stage3-systemd-3004-1-py3 + # - env: INSTANCE=default-almalinux-8-3004-1-py3 + # - env: INSTANCE=default-rockylinux-8-3004-1-py3 # - env: INSTANCE=default-opensuse-leap-153-3004-0-py3 # - env: INSTANCE=default-opensuse-tmbl-latest-3004-0-py3 - # - env: INSTANCE=default-amazonlinux-2-3004-0-py3 - # - env: INSTANCE=default-oraclelinux-8-3004-0-py3 - # - env: INSTANCE=default-oraclelinux-7-3004-0-py3 - # - env: INSTANCE=default-arch-base-latest-3004-0-py3 - # - env: INSTANCE=default-gentoo-stage3-latest-3004-0-py3 - # - env: INSTANCE=default-gentoo-stage3-systemd-3004-0-py3 - # - env: INSTANCE=default-almalinux-8-3004-0-py3 - # - env: INSTANCE=default-rockylinux-8-3004-0-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-stream8-3003-3-py3 - # - env: INSTANCE=default-centos-7-3003-3-py3 - # - env: INSTANCE=default-fedora-35-3003-3-py3 - # - env: INSTANCE=default-fedora-34-3003-3-py3 - # - env: INSTANCE=default-opensuse-leap-153-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-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-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-7-3002-7-py3 - # - env: INSTANCE=default-fedora-35-3002-7-py3 - # - env: INSTANCE=default-fedora-34-3002-7-py3 - # - env: INSTANCE=default-opensuse-leap-153-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-gentoo-stage3-latest-3002-7-py3 - # - env: INSTANCE=default-gentoo-stage3-systemd-3002-7-py3 + # - env: INSTANCE=default-debian-10-3003-4-py3 + # - env: INSTANCE=default-debian-9-3003-4-py3 + # - env: INSTANCE=default-ubuntu-2004-3003-4-py3 + # - env: INSTANCE=default-ubuntu-1804-3003-4-py3 + # - env: INSTANCE=default-centos-stream8-3003-4-py3 + # - env: INSTANCE=default-centos-7-3003-4-py3 + # - env: INSTANCE=default-amazonlinux-2-3003-4-py3 + # - 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 319d33c8..aa7ac72d 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -135,39 +135,66 @@ platforms: driver: image: saltimages/salt-master-py3:rockylinux-8 - ## SALT `3004.0` - - name: debian-11-3004-0-py3 + ## SALT `3004.1` + - name: debian-11-3004-1-py3 driver: - image: saltimages/salt-3004.0-py3:debian-11 + image: saltimages/salt-3004.1-py3:debian-11 run_command: /lib/systemd/systemd - - name: debian-10-3004-0-py3 + - name: debian-10-3004-1-py3 driver: - image: saltimages/salt-3004.0-py3:debian-10 + image: saltimages/salt-3004.1-py3:debian-10 run_command: /lib/systemd/systemd - - name: debian-9-3004-0-py3 + - name: debian-9-3004-1-py3 driver: - image: saltimages/salt-3004.0-py3:debian-9 + image: saltimages/salt-3004.1-py3:debian-9 run_command: /lib/systemd/systemd - - name: ubuntu-2004-3004-0-py3 + - name: ubuntu-2004-3004-1-py3 driver: - image: saltimages/salt-3004.0-py3:ubuntu-20.04 + image: saltimages/salt-3004.1-py3:ubuntu-20.04 run_command: /lib/systemd/systemd - - name: ubuntu-1804-3004-0-py3 + - name: ubuntu-1804-3004-1-py3 driver: - image: saltimages/salt-3004.0-py3:ubuntu-18.04 + image: saltimages/salt-3004.1-py3:ubuntu-18.04 run_command: /lib/systemd/systemd - - name: centos-stream8-3004-0-py3 + - name: centos-stream8-3004-1-py3 + driver: + image: saltimages/salt-3004.1-py3:centos-stream8 + - name: centos-7-3004-1-py3 + driver: + image: saltimages/salt-3004.1-py3:centos-7 + - 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.0-py3:centos-stream8 - - name: centos-7-3004-0-py3 + image: saltimages/salt-3004.1-py3:fedora-34 + - name: amazonlinux-2-3004-1-py3 driver: - image: saltimages/salt-3004.0-py3:centos-7 - - name: fedora-35-3004-0-py3 + image: saltimages/salt-3004.1-py3:amazonlinux-2 + - name: oraclelinux-8-3004-1-py3 driver: - image: saltimages/salt-3004.0-py3:fedora-35 - - name: fedora-34-3004-0-py3 + image: saltimages/salt-3004.1-py3:oraclelinux-8 + - name: oraclelinux-7-3004-1-py3 driver: - image: saltimages/salt-3004.0-py3:fedora-34 + image: saltimages/salt-3004.1-py3:oraclelinux-7 + - name: arch-base-latest-3004-1-py3 + driver: + image: saltimages/salt-3004.1-py3:arch-base-latest + - name: gentoo-stage3-latest-3004-1-py3 + driver: + image: saltimages/salt-3004.1-py3:gentoo-stage3-latest + run_command: /sbin/init + - name: gentoo-stage3-systemd-3004-1-py3 + driver: + image: saltimages/salt-3004.1-py3:gentoo-stage3-systemd + - name: almalinux-8-3004-1-py3 + driver: + image: saltimages/salt-3004.1-py3:almalinux-8 + - name: rockylinux-8-3004-1-py3 + driver: + image: saltimages/salt-3004.1-py3:rockylinux-8 + + ## SALT `3004.0` - name: opensuse-leap-153-3004-0-py3 driver: image: saltimages/salt-3004.0-py3:opensuse-leap-15.3 @@ -182,151 +209,72 @@ platforms: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: amazonlinux-2-3004-0-py3 - driver: - image: saltimages/salt-3004.0-py3:amazonlinux-2 - - name: oraclelinux-8-3004-0-py3 - driver: - image: saltimages/salt-3004.0-py3:oraclelinux-8 - - name: oraclelinux-7-3004-0-py3 - driver: - image: saltimages/salt-3004.0-py3:oraclelinux-7 - - name: arch-base-latest-3004-0-py3 - driver: - image: saltimages/salt-3004.0-py3:arch-base-latest - - name: gentoo-stage3-latest-3004-0-py3 - driver: - image: saltimages/salt-3004.0-py3:gentoo-stage3-latest - run_command: /sbin/init - - name: gentoo-stage3-systemd-3004-0-py3 - driver: - image: saltimages/salt-3004.0-py3:gentoo-stage3-systemd - - name: almalinux-8-3004-0-py3 - driver: - image: saltimages/salt-3004.0-py3:almalinux-8 - - name: rockylinux-8-3004-0-py3 - driver: - image: saltimages/salt-3004.0-py3:rockylinux-8 - ## SALT `3003.3` - - name: debian-10-3003-3-py3 + ## SALT `3003.4` + - name: debian-10-3003-4-py3 driver: - image: saltimages/salt-3003.3-py3:debian-10 + image: saltimages/salt-3003.4-py3:debian-10 run_command: /lib/systemd/systemd - - name: debian-9-3003-3-py3 + - name: debian-9-3003-4-py3 driver: - image: saltimages/salt-3003.3-py3:debian-9 + image: saltimages/salt-3003.4-py3:debian-9 run_command: /lib/systemd/systemd - - name: ubuntu-2004-3003-3-py3 + - name: ubuntu-2004-3003-4-py3 driver: - image: saltimages/salt-3003.3-py3:ubuntu-20.04 + image: saltimages/salt-3003.4-py3:ubuntu-20.04 run_command: /lib/systemd/systemd - - name: ubuntu-1804-3003-3-py3 + - name: ubuntu-1804-3003-4-py3 driver: - image: saltimages/salt-3003.3-py3:ubuntu-18.04 + image: saltimages/salt-3003.4-py3:ubuntu-18.04 run_command: /lib/systemd/systemd - - name: centos-stream8-3003-3-py3 + - name: centos-stream8-3003-4-py3 driver: - image: saltimages/salt-3003.3-py3:centos-stream8 - - name: centos-7-3003-3-py3 + image: saltimages/salt-3003.4-py3:centos-stream8 + - name: centos-7-3003-4-py3 driver: - image: saltimages/salt-3003.3-py3:centos-7 - - name: fedora-35-3003-3-py3 + image: saltimages/salt-3003.4-py3:centos-7 + - name: amazonlinux-2-3003-4-py3 driver: - image: saltimages/salt-3003.3-py3:fedora-35 - - name: fedora-34-3003-3-py3 + image: saltimages/salt-3003.4-py3:amazonlinux-2 + - name: oraclelinux-8-3003-4-py3 driver: - image: saltimages/salt-3003.3-py3:fedora-34 - - name: opensuse-leap-153-3003-3-py3 + image: saltimages/salt-3003.4-py3:oraclelinux-8 + - name: oraclelinux-7-3003-4-py3 driver: - 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-tmbl-latest-3003-3-py3 + image: saltimages/salt-3003.4-py3:oraclelinux-7 + - name: almalinux-8-3003-4-py3 driver: - 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-3-py3 - driver: - image: saltimages/salt-3003.3-py3:amazonlinux-2 - - name: oraclelinux-8-3003-3-py3 - driver: - image: saltimages/salt-3003.3-py3:oraclelinux-8 - - name: oraclelinux-7-3003-3-py3 - driver: - image: saltimages/salt-3003.3-py3:oraclelinux-7 - - name: gentoo-stage3-latest-3003-3-py3 - driver: - image: saltimages/salt-3003.3-py3:gentoo-stage3-latest - run_command: /sbin/init - - name: gentoo-stage3-systemd-3003-3-py3 - driver: - image: saltimages/salt-3003.3-py3:gentoo-stage3-systemd - - name: almalinux-8-3003-3-py3 - driver: - image: saltimages/salt-3003.3-py3:almalinux-8 + image: saltimages/salt-3003.4-py3:almalinux-8 - ## SALT `3002.7` - - name: debian-10-3002-7-py3 + ## SALT `3002.8` + - name: debian-10-3002-8-py3 driver: - image: saltimages/salt-3002.7-py3:debian-10 + image: saltimages/salt-3002.8-py3:debian-10 run_command: /lib/systemd/systemd - - name: debian-9-3002-7-py3 + - name: debian-9-3002-8-py3 driver: - image: saltimages/salt-3002.7-py3:debian-9 + image: saltimages/salt-3002.8-py3:debian-9 run_command: /lib/systemd/systemd - - name: ubuntu-2004-3002-7-py3 + - name: ubuntu-2004-3002-8-py3 driver: - image: saltimages/salt-3002.7-py3:ubuntu-20.04 + image: saltimages/salt-3002.8-py3:ubuntu-20.04 run_command: /lib/systemd/systemd - - name: ubuntu-1804-3002-7-py3 + - name: ubuntu-1804-3002-8-py3 driver: - image: saltimages/salt-3002.7-py3:ubuntu-18.04 + image: saltimages/salt-3002.8-py3:ubuntu-18.04 run_command: /lib/systemd/systemd - - name: centos-7-3002-7-py3 + - name: centos-7-3002-8-py3 driver: - image: saltimages/salt-3002.7-py3:centos-7 - - name: fedora-35-3002-7-py3 + image: saltimages/salt-3002.8-py3:centos-7 + - name: amazonlinux-2-3002-8-py3 driver: - image: saltimages/salt-3002.7-py3:fedora-35 - - name: fedora-34-3002-7-py3 + image: saltimages/salt-3002.8-py3:amazonlinux-2 + - name: oraclelinux-8-3002-8-py3 driver: - image: saltimages/salt-3002.7-py3:fedora-34 - - name: opensuse-leap-153-3002-7-py3 - driver: - 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-tmbl-latest-3002-7-py3 - driver: - 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: 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 + image: saltimages/salt-3002.8-py3:oraclelinux-8 + - name: oraclelinux-7-3002-8-py3 driver: - image: saltimages/salt-3002.7-py3:gentoo-stage3-systemd + image: saltimages/salt-3002.8-py3:oraclelinux-7 verifier: # https://www.inspec.io/ @@ -383,45 +331,39 @@ suites: - oraclelinux-7-master-py3 - almalinux-8-master-py3 - rockylinux-8-master-py3 - - debian-11-3004-0-py3 - - debian-10-3004-0-py3 - - debian-9-3004-0-py3 - - ubuntu-2004-3004-0-py3 - - ubuntu-1804-3004-0-py3 - - centos-stream8-3004-0-py3 - - centos-7-3004-0-py3 - - fedora-35-3004-0-py3 - - fedora-34-3004-0-py3 + - debian-11-3004-1-py3 + - debian-10-3004-1-py3 + - debian-9-3004-1-py3 + - ubuntu-2004-3004-1-py3 + - ubuntu-1804-3004-1-py3 + - centos-stream8-3004-1-py3 + - centos-7-3004-1-py3 + - fedora-35-3004-1-py3 + - fedora-34-3004-1-py3 + - amazonlinux-2-3004-1-py3 + - oraclelinux-8-3004-1-py3 + - oraclelinux-7-3004-1-py3 + - almalinux-8-3004-1-py3 + - rockylinux-8-3004-1-py3 - opensuse-leap-153-3004-0-py3 - - amazonlinux-2-3004-0-py3 - - oraclelinux-8-3004-0-py3 - - oraclelinux-7-3004-0-py3 - - almalinux-8-3004-0-py3 - - rockylinux-8-3004-0-py3 - - debian-10-3003-3-py3 - - debian-9-3003-3-py3 - - ubuntu-2004-3003-3-py3 - - ubuntu-1804-3003-3-py3 - - centos-stream8-3003-3-py3 - - centos-7-3003-3-py3 - - fedora-35-3003-3-py3 - - fedora-34-3003-3-py3 - - opensuse-leap-153-3003-3-py3 - - amazonlinux-2-3003-3-py3 - - oraclelinux-8-3003-3-py3 - - oraclelinux-7-3003-3-py3 - - almalinux-8-3003-3-py3 - - debian-10-3002-7-py3 - - debian-9-3002-7-py3 - - ubuntu-2004-3002-7-py3 - - ubuntu-1804-3002-7-py3 - - centos-7-3002-7-py3 - - fedora-35-3002-7-py3 - - fedora-34-3002-7-py3 - - opensuse-leap-153-3002-7-py3 - - amazonlinux-2-3002-7-py3 - - oraclelinux-8-3002-7-py3 - - oraclelinux-7-3002-7-py3 + - debian-10-3003-4-py3 + - debian-9-3003-4-py3 + - ubuntu-2004-3003-4-py3 + - ubuntu-1804-3003-4-py3 + - centos-stream8-3003-4-py3 + - centos-7-3003-4-py3 + - amazonlinux-2-3003-4-py3 + - oraclelinux-8-3003-4-py3 + - oraclelinux-7-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 + - amazonlinux-2-3002-8-py3 + - oraclelinux-8-3002-8-py3 + - oraclelinux-7-3002-8-py3 provisioner: state_top: base: From f09ddb671702731f89346bb4e65052787bec8f64 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 4 Apr 2022 09:23:29 +0100 Subject: [PATCH 12/28] chore(gemfile.lock): update to latest gem versions (2022-W14) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/427 --- Gemfile.lock | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index d85bdc6e..c6c7170a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 36118e817641fbc1d4bd9753a77c383e7b20caff + revision: 31b5b09a827ed9fcbc0b2d550ae4056013dcc92e branch: ssf specs: - inspec (5.10.7) + inspec (5.10.11) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 5.10.7) + inspec-core (= 5.10.11) 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.10.7) + inspec-core (5.10.11) 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.571.0) + aws-partitions (1.573.0) aws-sdk-alexaforbusiness (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) @@ -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.304.0) + aws-sdk-ec2 (1.305.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.56.0) @@ -328,7 +328,7 @@ GEM unf (>= 0.0.5, < 1.0.0) ed25519 (1.3.0) erubi (1.10.0) - excon (0.92.1) + excon (0.92.2) faraday (1.4.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -367,8 +367,9 @@ GEM signet (~> 0.14) gssapi (1.3.1) ffi (>= 1.0.1) - gyoku (1.3.1) + gyoku (1.4.0) builder (>= 2.1.2) + rexml (~> 3.0) hashie (4.1.0) highline (2.0.3) http-cookie (1.0.4) @@ -409,7 +410,7 @@ GEM mixlib-versioning thor mixlib-log (3.0.9) - mixlib-shellout (3.2.5) + mixlib-shellout (3.2.6) chef-utils mixlib-versioning (1.2.12) mongo (2.13.2) @@ -467,7 +468,7 @@ GEM rspec-its (1.3.0) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) - rspec-mocks (3.11.0) + rspec-mocks (3.11.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.11.0) rspec-support (3.11.0) From 450300628f413e53c2405f333d10e6aee2b182fa Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 11 Apr 2022 19:22:26 +0100 Subject: [PATCH 13/28] chore(gemfile.lock): update to latest gem versions (2022-W15) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/428 --- .gitlab-ci.yml | 4 ++++ .travis.yml | 4 ++++ Gemfile.lock | 34 +++++++++++++++++----------------- kitchen.yml | 8 ++++++++ 4 files changed, 33 insertions(+), 17 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 464319fd..fada93c0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -164,6 +164,9 @@ centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'} # default-centos-7-master-py3: {extends: '.test_instance'} # repo-centos-7-master-py3: {extends: '.test_instance'} centos-7-master-py3: {extends: '.test_instance'} +# default-fedora-36-master-py3: {extends: '.test_instance_failure_permitted'} +# repo-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'} # repo-fedora-35-master-py3: {extends: '.test_instance'} fedora-35-master-py3: {extends: '.test_instance'} @@ -203,6 +206,7 @@ rockylinux-8-master-py3: {extends: '.test_instance'} # default-ubuntu-1804-3004-1-py3: {extends: '.test_instance'} # default-centos-stream8-3004-1-py3: {extends: '.test_instance_failure_permitted'} # 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'} diff --git a/.travis.yml b/.travis.yml index 766e818c..7e7fe15c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -116,6 +116,9 @@ jobs: # - env: INSTANCE=default-centos-7-master-py3 # - env: INSTANCE=repo-centos-7-master-py3 - env: INSTANCE=centos-7-master-py3 + # - env: INSTANCE=default-fedora-36-master-py3 + # - env: INSTANCE=repo-fedora-36-master-py3 + - env: INSTANCE=fedora-36-master-py3 # - env: INSTANCE=default-fedora-35-master-py3 # - env: INSTANCE=repo-fedora-35-master-py3 - env: INSTANCE=fedora-35-master-py3 @@ -155,6 +158,7 @@ jobs: # - env: INSTANCE=default-ubuntu-1804-3004-1-py3 # - env: INSTANCE=default-centos-stream8-3004-1-py3 # - 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 diff --git a/Gemfile.lock b/Gemfile.lock index c6c7170a..f8126ba3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 31b5b09a827ed9fcbc0b2d550ae4056013dcc92e + revision: 1821d2dfd3365e8f05b8439845c58fa4d069806b branch: ssf specs: - inspec (5.10.11) + inspec (5.12.2) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 5.10.11) + inspec-core (= 5.12.2) 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.10.11) + inspec-core (5.12.2) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -40,7 +40,7 @@ GIT GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker - revision: 4e03ca42d98624323c1c2d91ceb39c09a29bbfc8 + revision: 9a09bc1e571e25f3ccabf4725ca2048d970fff82 branch: ssf specs: kitchen-docker (2.12.0) @@ -58,14 +58,14 @@ GEM public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.573.0) + aws-partitions (1.574.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.75.0) + aws-sdk-apigateway (1.76.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-apigatewayv2 (1.42.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.76.0) + aws-sdk-configservice (1.77.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-core (3.130.0) @@ -202,7 +202,7 @@ GEM aws-sdk-kms (1.55.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.82.0) + aws-sdk-lambda (1.83.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-mq (1.40.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.62.0) + aws-sdk-securityhub (1.63.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-servicecatalog (1.60.0) @@ -263,7 +263,7 @@ GEM aws-sdk-simpledb (1.29.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv2 (~> 1.0) - aws-sdk-sms (1.39.0) + aws-sdk-sms (1.40.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-sns (1.53.0) @@ -410,7 +410,7 @@ GEM mixlib-versioning thor mixlib-log (3.0.9) - mixlib-shellout (3.2.6) + mixlib-shellout (3.2.7) chef-utils mixlib-versioning (1.2.12) mongo (2.13.2) @@ -449,7 +449,7 @@ GEM public_suffix (4.0.6) rainbow (3.1.1) rake (13.0.6) - regexp_parser (2.2.1) + regexp_parser (2.3.0) representable (3.1.1) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) @@ -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.16.0) + rubocop-ast (1.17.0) parser (>= 3.1.1.0) ruby-progressbar (1.11.0) ruby2_keywords (0.0.5) @@ -517,7 +517,7 @@ GEM timeliness (0.3.10) tomlrb (1.3.0) trailblazer-option (0.1.2) - train (3.8.9) + train (3.9.2) 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.8.9) + train-core (= 3.9.2) 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.8.9) + train-core (3.9.2) addressable (~> 2.5) ffi (!= 1.13.0) json (>= 1.8, < 3.0) diff --git a/kitchen.yml b/kitchen.yml index aa7ac72d..a88c022c 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -89,6 +89,9 @@ platforms: - name: centos-7-master-py3 driver: image: saltimages/salt-master-py3:centos-7 + - name: fedora-36-master-py3 + driver: + image: saltimages/salt-master-py3:fedora-36 - name: fedora-35-master-py3 driver: image: saltimages/salt-master-py3:fedora-35 @@ -162,6 +165,9 @@ platforms: - name: centos-7-3004-1-py3 driver: image: saltimages/salt-3004.1-py3:centos-7 + - name: fedora-36-3004-1-py3 + driver: + image: saltimages/salt-3004.1-py3:fedora-36 - name: fedora-35-3004-1-py3 driver: image: saltimages/salt-3004.1-py3:fedora-35 @@ -323,6 +329,7 @@ suites: - ubuntu-1804-master-py3 - centos-stream8-master-py3 - centos-7-master-py3 + - fedora-36-master-py3 - fedora-35-master-py3 - fedora-34-master-py3 - opensuse-leap-153-master-py3 @@ -338,6 +345,7 @@ suites: - ubuntu-1804-3004-1-py3 - centos-stream8-3004-1-py3 - centos-7-3004-1-py3 + - fedora-36-3004-1-py3 - fedora-35-3004-1-py3 - fedora-34-3004-1-py3 - amazonlinux-2-3004-1-py3 From cdd1b03f9fa3ab40a8d313f83ab1b5a5e264c409 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 18 Apr 2022 23:37:14 +0100 Subject: [PATCH 14/28] chore(gemfile.lock): update to latest gem versions (2022-W16) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/431 --- Gemfile.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index f8126ba3..b6702420 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -58,7 +58,7 @@ GEM public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.574.0) + aws-partitions (1.577.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.52.0) + aws-sdk-athena (1.53.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-autoscaling (1.63.0) @@ -101,7 +101,7 @@ GEM aws-sdk-cloudtrail (1.48.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatch (1.62.0) + aws-sdk-cloudwatch (1.64.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-cloudwatchevents (1.46.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.130.0) + aws-sdk-core (3.130.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) @@ -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.305.0) + aws-sdk-ec2 (1.307.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.56.0) @@ -154,7 +154,7 @@ GEM aws-sdk-ecs (1.99.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-efs (1.53.0) + aws-sdk-efs (1.54.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-eks (1.74.0) @@ -220,7 +220,7 @@ GEM aws-sdk-ram (1.26.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-rds (1.142.0) + aws-sdk-rds (1.143.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-redshift (1.80.0) @@ -435,7 +435,7 @@ GEM options (2.3.2) os (1.1.4) parallel (1.22.1) - parser (3.1.1.0) + parser (3.1.2.0) ast (~> 2.4.1) parslet (1.8.2) pastel (0.8.0) @@ -446,7 +446,7 @@ GEM pry (0.14.1) coderay (~> 1.1) method_source (~> 1.0) - public_suffix (4.0.6) + public_suffix (4.0.7) rainbow (3.1.1) rake (13.0.6) regexp_parser (2.3.0) From c8fee606fcd98b01c1eeca0eb9efb297adbfaf1d Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 25 Apr 2022 09:11:02 +0100 Subject: [PATCH 15/28] chore(gemfile.lock): update to latest gem versions (2022-W17) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/433 --- Gemfile.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b6702420..3718f0f1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 1821d2dfd3365e8f05b8439845c58fa4d069806b + revision: 90eafd68e8ca3d7444c4a83c5c2e38e32285410c branch: ssf specs: - inspec (5.12.2) + inspec (5.14.0) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 5.12.2) + inspec-core (= 5.14.0) 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.12.2) + inspec-core (5.14.0) 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.577.0) + aws-partitions (1.579.0) aws-sdk-alexaforbusiness (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) @@ -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.130.1) + aws-sdk-core (3.130.2) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) @@ -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.307.0) + aws-sdk-ec2 (1.308.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.56.0) @@ -160,7 +160,7 @@ GEM aws-sdk-eks (1.74.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.76.0) + aws-sdk-elasticache (1.77.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-elasticbeanstalk (1.51.0) @@ -199,7 +199,7 @@ GEM aws-sdk-kinesis (1.41.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.55.0) + aws-sdk-kms (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-lambda (1.83.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.143.0) + aws-sdk-rds (1.144.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.80.0) + aws-sdk-redshift (1.81.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-route53 (1.62.0) @@ -272,7 +272,7 @@ GEM aws-sdk-sqs (1.51.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.134.0) + aws-sdk-ssm (1.135.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-states (1.39.0) @@ -288,7 +288,7 @@ GEM aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) aws-sigv2 (1.1.0) - aws-sigv4 (1.4.0) + aws-sigv4 (1.5.0) aws-eventstream (~> 1, >= 1.0.2) azure_graph_rbac (0.17.2) ms_rest_azure (~> 0.12.0) @@ -301,7 +301,7 @@ GEM azure_mgmt_storage (0.23.0) ms_rest_azure (~> 0.12.0) bcrypt_pbkdf (1.1.0) - bson (4.14.1) + bson (4.15.0) builder (3.2.4) chef-config (17.10.0) addressable @@ -449,7 +449,7 @@ GEM public_suffix (4.0.7) rainbow (3.1.1) rake (13.0.6) - regexp_parser (2.3.0) + regexp_parser (2.3.1) representable (3.1.1) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) From a553ee0b098c287ab14a0494795d602a4d7d8b14 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 6 May 2022 23:17:43 +0100 Subject: [PATCH 16/28] chore(gemfile.lock): update to latest gem versions (2022-W18) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/437 --- .gitlab-ci.yml | 5 +++++ .travis.yml | 5 +++++ Gemfile.lock | 34 +++++++++++++++++----------------- kitchen.yml | 15 +++++++++++++++ 4 files changed, 42 insertions(+), 17 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fada93c0..fd7cd987 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -134,6 +134,7 @@ rubocop: # default-debian-11-tiamat-py3: {extends: '.test_instance'} # default-debian-10-tiamat-py3: {extends: '.test_instance'} # default-debian-9-tiamat-py3: {extends: '.test_instance'} +# default-ubuntu-2204-tiamat-py3: {extends: '.test_instance_failure_permitted'} # default-ubuntu-2004-tiamat-py3: {extends: '.test_instance'} # default-ubuntu-1804-tiamat-py3: {extends: '.test_instance'} # default-centos-stream8-tiamat-py3: {extends: '.test_instance_failure_permitted'} @@ -152,6 +153,9 @@ debian-10-master-py3: {extends: '.test_instance'} # default-debian-9-master-py3: {extends: '.test_instance'} # repo-debian-9-master-py3: {extends: '.test_instance'} debian-9-master-py3: {extends: '.test_instance'} +# default-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'} +# repo-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'} +ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'} # default-ubuntu-2004-master-py3: {extends: '.test_instance'} # repo-ubuntu-2004-master-py3: {extends: '.test_instance'} ubuntu-2004-master-py3: {extends: '.test_instance'} @@ -202,6 +206,7 @@ rockylinux-8-master-py3: {extends: '.test_instance'} # default-debian-11-3004-1-py3: {extends: '.test_instance'} # default-debian-10-3004-1-py3: {extends: '.test_instance'} # default-debian-9-3004-1-py3: {extends: '.test_instance'} +# default-ubuntu-2204-3004-1-py3: {extends: '.test_instance_failure_permitted'} # default-ubuntu-2004-3004-1-py3: {extends: '.test_instance'} # default-ubuntu-1804-3004-1-py3: {extends: '.test_instance'} # default-centos-stream8-3004-1-py3: {extends: '.test_instance_failure_permitted'} diff --git a/.travis.yml b/.travis.yml index 7e7fe15c..c8a609d9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -86,6 +86,7 @@ jobs: # - env: INSTANCE=default-debian-11-tiamat-py3 # - env: INSTANCE=default-debian-10-tiamat-py3 # - env: INSTANCE=default-debian-9-tiamat-py3 + # - env: INSTANCE=default-ubuntu-2204-tiamat-py3 # - env: INSTANCE=default-ubuntu-2004-tiamat-py3 # - env: INSTANCE=default-ubuntu-1804-tiamat-py3 # - env: INSTANCE=default-centos-stream8-tiamat-py3 @@ -104,6 +105,9 @@ jobs: # - env: INSTANCE=default-debian-9-master-py3 # - env: INSTANCE=repo-debian-9-master-py3 - env: INSTANCE=debian-9-master-py3 + # - env: INSTANCE=default-ubuntu-2204-master-py3 + # - env: INSTANCE=repo-ubuntu-2204-master-py3 + - env: INSTANCE=ubuntu-2204-master-py3 # - env: INSTANCE=default-ubuntu-2004-master-py3 # - env: INSTANCE=repo-ubuntu-2004-master-py3 - env: INSTANCE=ubuntu-2004-master-py3 @@ -154,6 +158,7 @@ jobs: # - env: INSTANCE=default-debian-11-3004-1-py3 # - env: INSTANCE=default-debian-10-3004-1-py3 # - env: INSTANCE=default-debian-9-3004-1-py3 + # - env: INSTANCE=default-ubuntu-2204-3004-1-py3 # - env: INSTANCE=default-ubuntu-2004-3004-1-py3 # - env: INSTANCE=default-ubuntu-1804-3004-1-py3 # - env: INSTANCE=default-centos-stream8-3004-1-py3 diff --git a/Gemfile.lock b/Gemfile.lock index 3718f0f1..229881d7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 90eafd68e8ca3d7444c4a83c5c2e38e32285410c + revision: bb1df209366a8054faff1d85bd2566b5f97b339e branch: ssf specs: - inspec (5.14.0) + inspec (5.14.5) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 5.14.0) + inspec-core (= 5.14.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.14.0) + inspec-core (5.14.5) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -49,7 +49,7 @@ GIT GEM remote: https://rubygems.org/ specs: - activesupport (7.0.2.3) + activesupport (7.0.2.4) 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.579.0) + aws-partitions (1.584.0) aws-sdk-alexaforbusiness (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) @@ -89,7 +89,7 @@ GEM aws-sdk-cloudformation (1.68.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudfront (1.63.0) + aws-sdk-cloudfront (1.64.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-cloudhsm (1.39.0) @@ -98,7 +98,7 @@ GEM aws-sdk-cloudhsmv2 (1.42.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudtrail (1.48.0) + aws-sdk-cloudtrail (1.49.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-cloudwatch (1.64.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.308.0) + aws-sdk-ec2 (1.310.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.56.0) @@ -187,7 +187,7 @@ GEM aws-sdk-glue (1.88.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-guardduty (1.56.0) + aws-sdk-guardduty (1.57.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.68.0) @@ -208,7 +208,7 @@ GEM aws-sdk-mq (1.40.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-networkfirewall (1.15.0) + aws-sdk-networkfirewall (1.17.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-networkmanager (1.22.0) @@ -220,7 +220,7 @@ GEM aws-sdk-ram (1.26.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-rds (1.144.0) + aws-sdk-rds (1.145.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-redshift (1.81.0) @@ -235,7 +235,7 @@ GEM aws-sdk-route53resolver (1.37.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.113.0) + aws-sdk-s3 (1.114.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) @@ -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.63.0) + aws-sdk-securityhub (1.64.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-servicecatalog (1.60.0) @@ -269,10 +269,10 @@ GEM aws-sdk-sns (1.53.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-sqs (1.51.0) + aws-sdk-sqs (1.51.1) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.135.0) + aws-sdk-ssm (1.137.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-states (1.39.0) @@ -328,7 +328,7 @@ GEM unf (>= 0.0.5, < 1.0.0) ed25519 (1.3.0) erubi (1.10.0) - excon (0.92.2) + excon (0.92.3) faraday (1.4.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) diff --git a/kitchen.yml b/kitchen.yml index a88c022c..b98b29be 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -32,6 +32,10 @@ platforms: driver: image: saltimages/salt-tiamat-py3:debian-9 run_command: /lib/systemd/systemd + - name: ubuntu-2204-tiamat-py3 + driver: + image: saltimages/salt-tiamat-py3:ubuntu-22.04 + run_command: /lib/systemd/systemd - name: ubuntu-2004-tiamat-py3 driver: image: saltimages/salt-tiamat-py3:ubuntu-20.04 @@ -75,6 +79,10 @@ platforms: driver: image: saltimages/salt-master-py3:debian-9 run_command: /lib/systemd/systemd + - name: ubuntu-2204-master-py3 + driver: + image: saltimages/salt-master-py3:ubuntu-22.04 + run_command: /lib/systemd/systemd - name: ubuntu-2004-master-py3 driver: image: saltimages/salt-master-py3:ubuntu-20.04 @@ -151,6 +159,10 @@ platforms: driver: image: saltimages/salt-3004.1-py3:debian-9 run_command: /lib/systemd/systemd + - name: ubuntu-2204-3004-1-py3 + driver: + image: saltimages/salt-3004.1-py3:ubuntu-22.04 + run_command: /lib/systemd/systemd - name: ubuntu-2004-3004-1-py3 driver: image: saltimages/salt-3004.1-py3:ubuntu-20.04 @@ -313,6 +325,7 @@ suites: - debian-11-tiamat-py3 - debian-10-tiamat-py3 - debian-9-tiamat-py3 + - ubuntu-2204-tiamat-py3 - ubuntu-2004-tiamat-py3 - ubuntu-1804-tiamat-py3 - centos-stream8-tiamat-py3 @@ -325,6 +338,7 @@ suites: - debian-11-master-py3 - debian-10-master-py3 - debian-9-master-py3 + - ubuntu-2204-master-py3 - ubuntu-2004-master-py3 - ubuntu-1804-master-py3 - centos-stream8-master-py3 @@ -341,6 +355,7 @@ suites: - debian-11-3004-1-py3 - debian-10-3004-1-py3 - debian-9-3004-1-py3 + - ubuntu-2204-3004-1-py3 - ubuntu-2004-3004-1-py3 - ubuntu-1804-3004-1-py3 - centos-stream8-3004-1-py3 From e2ff349238c9bffbdba424e0dedeeeb353933552 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 10 May 2022 07:33:14 +0100 Subject: [PATCH 17/28] chore(gemfile.lock): update to latest gem versions (2022-W19) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/439 --- Gemfile.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 229881d7..93d667a2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: bb1df209366a8054faff1d85bd2566b5f97b339e + revision: ece601f5dd4bacf5d0dca49cd5c13896a7120255 branch: ssf specs: - inspec (5.14.5) + inspec (5.15.0) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 5.14.5) + inspec-core (= 5.15.0) 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.14.5) + inspec-core (5.15.0) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -49,7 +49,7 @@ GIT GEM remote: https://rubygems.org/ specs: - activesupport (7.0.2.4) + activesupport (7.0.3) 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.584.0) + aws-partitions (1.587.0) aws-sdk-alexaforbusiness (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) @@ -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.310.0) + aws-sdk-ec2 (1.312.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.56.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.145.0) + aws-sdk-rds (1.146.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.81.0) + aws-sdk-redshift (1.82.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-route53 (1.62.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.64.0) + aws-sdk-securityhub (1.65.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-servicecatalog (1.60.0) @@ -449,7 +449,7 @@ GEM public_suffix (4.0.7) rainbow (3.1.1) rake (13.0.6) - regexp_parser (2.3.1) + regexp_parser (2.4.0) representable (3.1.1) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) From ad865fc6025296d39ed8e231d42b0e7773ec6f8a Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 14 May 2022 20:11:36 +0100 Subject: [PATCH 18/28] ci(vagrant): use `linked_clone` at all times (inc. CI) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/441 --- kitchen.vagrant.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kitchen.vagrant.yml b/kitchen.vagrant.yml index f9661b3e..347706dc 100644 --- a/kitchen.vagrant.yml +++ b/kitchen.vagrant.yml @@ -9,8 +9,8 @@ driver: gui: false ssh: shell: /bin/sh - <% unless ENV['CI'] %> linked_clone: true + <% unless ENV['CI'] %> synced_folders: - - '.kitchen/kitchen-vagrant/%{instance_name}/vagrant' - '/vagrant' From 76de88bc7b61e3e5708fd8dae1f7dbc5a9cad4c2 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 17 May 2022 08:51:05 +0100 Subject: [PATCH 19/28] test(system.rb): add support for `mac_os_x` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/442 --- test/integration/share/inspec.yml | 1 + test/integration/share/libraries/system.rb | 2 ++ 2 files changed, 3 insertions(+) diff --git a/test/integration/share/inspec.yml b/test/integration/share/inspec.yml index ee200809..28a97b94 100644 --- a/test/integration/share/inspec.yml +++ b/test/integration/share/inspec.yml @@ -21,4 +21,5 @@ supports: - platform-name: gentoo - platform-name: almalinux - platform-name: rocky + - platform-name: mac_os_x - platform: windows diff --git a/test/integration/share/libraries/system.rb b/test/integration/share/libraries/system.rb index 64fe7ea7..0db9d0b1 100644 --- a/test/integration/share/libraries/system.rb +++ b/test/integration/share/libraries/system.rb @@ -57,6 +57,8 @@ def build_platform_release 'base-latest' when 'gentoo' "#{inspec.platform[:release].split('.')[0]}-#{derive_gentoo_init_system}" + when 'mac_os_x' + inspec.command('sw_vers -productVersion').stdout.to_s when 'opensuse' # rubocop:disable Style/NumericLiterals,Layout/LineLength inspec.platform[:release].to_i > 20210101 ? 'tumbleweed' : inspec.platform[:release] From 2301eddbeffe696459efb3991a226c04d757f91b Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 17 May 2022 13:21:11 +0100 Subject: [PATCH 20/28] chore(gemfile.lock): update to latest gem versions (2022-W20) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/444 --- Gemfile.lock | 24 ++++++++++++------------ test/integration/default/inspec.yml | 1 + test/integration/repo/inspec.yml | 1 + 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 93d667a2..da134ace 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: ece601f5dd4bacf5d0dca49cd5c13896a7120255 + revision: 7efb86a1b5a2b79390bc1e9e364ee219f92a0057 branch: ssf specs: - inspec (5.15.0) + inspec (5.16.2) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 5.15.0) + inspec-core (= 5.16.2) 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.15.0) + inspec-core (5.16.2) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -89,7 +89,7 @@ GEM aws-sdk-cloudformation (1.68.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudfront (1.64.0) + aws-sdk-cloudfront (1.65.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-cloudhsm (1.39.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.130.2) + aws-sdk-core (3.131.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) @@ -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.312.0) + aws-sdk-ec2 (1.315.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.56.0) @@ -157,7 +157,7 @@ GEM aws-sdk-efs (1.54.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-eks (1.74.0) + aws-sdk-eks (1.75.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-elasticache (1.77.0) @@ -202,7 +202,7 @@ GEM aws-sdk-kms (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.83.0) + aws-sdk-lambda (1.84.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-mq (1.40.0) @@ -379,7 +379,7 @@ GEM concurrent-ruby (~> 1.0) inifile (3.0.0) jmespath (1.6.1) - json (2.6.1) + json (2.6.2) jwt (2.3.0) kitchen-inspec (2.5.2) hashie (>= 3.4, <= 5.0) @@ -450,7 +450,7 @@ GEM rainbow (3.1.1) rake (13.0.6) regexp_parser (2.4.0) - representable (3.1.1) + representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) @@ -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.17.0) + rubocop-ast (1.18.0) parser (>= 3.1.1.0) ruby-progressbar (1.11.0) ruby2_keywords (0.0.5) diff --git a/test/integration/default/inspec.yml b/test/integration/default/inspec.yml index 194af4a9..fe5b005c 100644 --- a/test/integration/default/inspec.yml +++ b/test/integration/default/inspec.yml @@ -24,4 +24,5 @@ supports: - platform-name: gentoo - platform-name: almalinux - platform-name: rocky + - platform-name: mac_os_x - platform: windows diff --git a/test/integration/repo/inspec.yml b/test/integration/repo/inspec.yml index 635d0f0d..880c3670 100644 --- a/test/integration/repo/inspec.yml +++ b/test/integration/repo/inspec.yml @@ -25,4 +25,5 @@ supports: - platform-name: gentoo - platform-name: almalinux - platform-name: rocky + - platform-name: mac_os_x - platform: windows From 6eecf7f0688744d8cfbdf4b76d938c0a81efdca2 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 30 May 2022 17:28:17 +0100 Subject: [PATCH 21/28] chore(gemfile.lock): update to latest gem versions (2022-W22) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/447 --- Gemfile | 2 +- Gemfile.lock | 38 +++++++++++++++++++------------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Gemfile b/Gemfile index 8020f666..f4192913 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ # frozen_string_literal: true -source ENV['PROXY_RUBYGEMSORG'] || 'https://rubygems.org' +source ENV.fetch('PROXY_RUBYGEMSORG', 'https://rubygems.org') # Install the `inspec` gem using `git` because versions after `4.22.22` # suppress diff output; this version fixes this for our uses. diff --git a/Gemfile.lock b/Gemfile.lock index da134ace..a81c1f20 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 7efb86a1b5a2b79390bc1e9e364ee219f92a0057 + revision: 2b56b68db2a758041b9df5b2e4bdc3c6700558ea branch: ssf specs: - inspec (5.16.2) + inspec (5.17.4) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 5.16.2) + inspec-core (= 5.17.4) 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.16.2) + inspec-core (5.17.4) 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.587.0) + aws-partitions (1.594.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.76.0) + aws-sdk-apigateway (1.77.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-apigatewayv2 (1.42.0) @@ -86,7 +86,7 @@ GEM aws-sdk-budgets (1.49.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudformation (1.68.0) + aws-sdk-cloudformation (1.69.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-cloudfront (1.65.0) @@ -107,7 +107,7 @@ GEM aws-sdk-cloudwatchevents (1.46.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatchlogs (1.52.0) + aws-sdk-cloudwatchlogs (1.53.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-codecommit (1.51.0) @@ -128,11 +128,11 @@ GEM aws-sdk-configservice (1.77.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.131.0) + aws-sdk-core (3.131.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) - jmespath (~> 1.0) + jmespath (~> 1, >= 1.6.1) aws-sdk-costandusagereportservice (1.40.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) @@ -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.315.0) + aws-sdk-ec2 (1.317.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.56.0) @@ -160,7 +160,7 @@ GEM aws-sdk-eks (1.75.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.77.0) + aws-sdk-elasticache (1.78.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-elasticbeanstalk (1.51.0) @@ -199,7 +199,7 @@ GEM aws-sdk-kinesis (1.41.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.56.0) + aws-sdk-kms (1.57.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-lambda (1.84.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.22.0) + aws-sdk-networkmanager (1.23.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-organizations (1.59.0) @@ -372,7 +372,7 @@ GEM rexml (~> 3.0) hashie (4.1.0) highline (2.0.3) - http-cookie (1.0.4) + http-cookie (1.0.5) domain_name (~> 0.5) httpclient (2.8.3) i18n (1.10.0) @@ -396,7 +396,7 @@ GEM tty-box (~> 0.6) tty-prompt (~> 0.20) little-plugger (1.1.4) - logging (2.3.0) + logging (2.3.1) little-plugger (~> 1.1) multi_json (~> 1.14) memoist (0.16.2) @@ -449,7 +449,7 @@ GEM public_suffix (4.0.7) rainbow (3.1.1) rake (13.0.6) - regexp_parser (2.4.0) + regexp_parser (2.5.0) representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) @@ -487,7 +487,7 @@ GEM ruby2_keywords (0.0.5) rubyntlm (0.6.3) rubyzip (2.3.2) - semverse (3.0.0) + semverse (3.0.2) signet (0.16.1) addressable (~> 2.8) faraday (>= 0.17.5, < 3.0) @@ -641,7 +641,7 @@ GEM uber (0.1.0) unf (0.1.4) unf_ext - unf_ext (0.0.8.1) + unf_ext (0.0.8.2) unicode-display_width (2.1.0) unicode_utils (1.4.0) winrm (2.3.6) From 01214cc6af2efb57168e725e982ed32542261fb3 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 7 Jun 2022 23:30:24 +0100 Subject: [PATCH 22/28] 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 a81c1f20..ce726b22 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 2fefadf9020cdaaae2225bb93a67cf3759114167 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 9 Jun 2022 00:04:35 +0100 Subject: [PATCH 23/28] 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 | 12 ----------- .pre-commit-config.yaml | 14 ++++++++++++- .travis.yml | 12 ----------- kitchen.yml | 46 ----------------------------------------- 4 files changed, 13 insertions(+), 71 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fd7cd987..9eca7daa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -174,9 +174,6 @@ fedora-36-master-py3: {extends: '.test_instance_failure_permitted'} # default-fedora-35-master-py3: {extends: '.test_instance'} # repo-fedora-35-master-py3: {extends: '.test_instance'} fedora-35-master-py3: {extends: '.test_instance'} -# default-fedora-34-master-py3: {extends: '.test_instance'} -# repo-fedora-34-master-py3: {extends: '.test_instance'} -fedora-34-master-py3: {extends: '.test_instance'} # default-opensuse-leap-153-master-py3: {extends: '.test_instance'} # repo-opensuse-leap-153-master-py3: {extends: '.test_instance'} opensuse-leap-153-master-py3: {extends: '.test_instance'} @@ -213,7 +210,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'} @@ -234,14 +230,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 2cb381ed..1299a84d 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 c8a609d9..ee5708fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -126,9 +126,6 @@ jobs: # - env: INSTANCE=default-fedora-35-master-py3 # - env: INSTANCE=repo-fedora-35-master-py3 - env: INSTANCE=fedora-35-master-py3 - # - env: INSTANCE=default-fedora-34-master-py3 - # - env: INSTANCE=repo-fedora-34-master-py3 - - env: INSTANCE=fedora-34-master-py3 # - env: INSTANCE=default-opensuse-leap-153-master-py3 # - env: INSTANCE=repo-opensuse-leap-153-master-py3 - env: INSTANCE=opensuse-leap-153-master-py3 @@ -165,7 +162,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 @@ -186,14 +182,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 b98b29be..27df7a9d 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 @@ -345,7 +309,6 @@ suites: - centos-7-master-py3 - fedora-36-master-py3 - fedora-35-master-py3 - - fedora-34-master-py3 - opensuse-leap-153-master-py3 - amazonlinux-2-master-py3 - oraclelinux-8-master-py3 @@ -362,7 +325,6 @@ suites: - centos-7-3004-1-py3 - fedora-36-3004-1-py3 - fedora-35-3004-1-py3 - - fedora-34-3004-1-py3 - amazonlinux-2-3004-1-py3 - oraclelinux-8-3004-1-py3 - oraclelinux-7-3004-1-py3 @@ -379,14 +341,6 @@ suites: - oraclelinux-8-3003-4-py3 - oraclelinux-7-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 - - amazonlinux-2-3002-8-py3 - - oraclelinux-8-3002-8-py3 - - oraclelinux-7-3002-8-py3 provisioner: state_top: base: From 0a2418452b9f61d794fedbc30997afa7ca7d516f Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 15 Jun 2022 23:05:35 +0100 Subject: [PATCH 24/28] 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 ce726b22..7b4c66e6 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 ef4af027ca0769b012b14cdbf859559eb72d4466 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 30 Jun 2022 23:08:28 +0100 Subject: [PATCH 25/28] 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 7b4c66e6..15bc27b0 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 4acf60677601c5d06cd960cb19bc985139c4cdb6 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sun, 17 Jul 2022 19:47:12 +0100 Subject: [PATCH 26/28] 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 15bc27b0..79083eba 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 dcfdb4ca..5d5663e2 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 0db9d0b1..64405bbc 100644 --- a/test/integration/share/libraries/system.rb +++ b/test/integration/share/libraries/system.rb @@ -97,6 +97,8 @@ def build_finger_release # 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' From fdf5f36c2d0f8c4d114d3626960c093c695f3d99 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 5 Jul 2022 18:19:54 +0100 Subject: [PATCH 27/28] feat(codenamemap): add support for Ubuntu 22.04 --- postgres/codenamemap.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/postgres/codenamemap.yaml b/postgres/codenamemap.yaml index 43596f5e..32496985 100644 --- a/postgres/codenamemap.yaml +++ b/postgres/codenamemap.yaml @@ -76,6 +76,7 @@ {{ debian_codename('bionic', '10') }} {{ debian_codename('eoan', '11') }} {{ debian_codename('focal', '12') }} +{{ debian_codename('jammy', '14') }} ## Fedora # https://download.postgresql.org/pub/repos/yum/13/fedora/ From adf7c415b899e55e0ddcb7f1844184e9e6cf67b0 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Mon, 18 Jul 2022 06:25:06 +0000 Subject: [PATCH 28/28] chore(release): 0.45.0 [skip ci] # [0.45.0](https://github.com/saltstack-formulas/postgres-formula/compare/v0.44.0...v0.45.0) (2022-07-18) ### Continuous Integration * update `pre-commit` configuration inc. for pre-commit.ci [skip ci] ([2fefadf](https://github.com/saltstack-formulas/postgres-formula/commit/2fefadf9020cdaaae2225bb93a67cf3759114167)) * **kitchen+gitlab:** update for new pre-salted images [skip ci] ([03fd3fa](https://github.com/saltstack-formulas/postgres-formula/commit/03fd3faed988962088f847a09d65d36f910617cc)) * **vagrant:** use `linked_clone` at all times (inc. CI) [skip ci] ([ad865fc](https://github.com/saltstack-formulas/postgres-formula/commit/ad865fc6025296d39ed8e231d42b0e7773ec6f8a)) * update linters to latest versions [skip ci] ([f45dc9c](https://github.com/saltstack-formulas/postgres-formula/commit/f45dc9c04d0a56b8705f94d0916bcaf43fdce231)) ### Features * **codenamemap:** add support for Ubuntu 22.04 ([fdf5f36](https://github.com/saltstack-formulas/postgres-formula/commit/fdf5f36c2d0f8c4d114d3626960c093c695f3d99)) ### Tests * **repository:** use `system.platform[:codename]` [skip ci] ([1c70c9c](https://github.com/saltstack-formulas/postgres-formula/commit/1c70c9c01c68b7edf629744fe82b9aa6544e7e46)) * **system:** add `build_platform_codename` [skip ci] ([1270d0c](https://github.com/saltstack-formulas/postgres-formula/commit/1270d0c962a6560bfeb9de44ac0e3762bf19d642)) * **system.rb:** add support for `mac_os_x` [skip ci] ([76de88b](https://github.com/saltstack-formulas/postgres-formula/commit/76de88bc7b61e3e5708fd8dae1f7dbc5a9cad4c2)) --- AUTHORS.md | 6 +++--- CHANGELOG.md | 22 ++++++++++++++++++++++ FORMULA | 2 +- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index 1c3f6856..9514f9c8 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -4,7 +4,7 @@ This list is sorted by the number of commits per contributor in _descending_ ord Avatar|Contributor|Contributions :-:|---|:-: -@myii|[@myii](https://github.com/myii)|201 +@myii|[@myii](https://github.com/myii)|229 @noelmcloughlin|[@noelmcloughlin](https://github.com/noelmcloughlin)|79 @aboe76|[@aboe76](https://github.com/aboe76)|54 @gravyboat|[@gravyboat](https://github.com/gravyboat)|41 @@ -17,7 +17,7 @@ Avatar|Contributor|Contributions @johnkeates|[@johnkeates](https://github.com/johnkeates)|8 @litnialex|[@litnialex](https://github.com/litnialex)|8 @whiteinge|[@whiteinge](https://github.com/whiteinge)|8 -@babilen|[@babilen](https://github.com/babilen)|8 +@wolodjawentland|[@wolodjawentland](https://github.com/wolodjawentland)|8 @iggy|[@iggy](https://github.com/iggy)|7 @dynjnelson|[@dynjnelson](https://github.com/dynjnelson)|7 @rominf|[@rominf](https://github.com/rominf)|7 @@ -71,4 +71,4 @@ Avatar|Contributor|Contributions --- -Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2022-02-07. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2022-07-18. diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d39e4f4..a1c80bc1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,27 @@ # Changelog +# [0.45.0](https://github.com/saltstack-formulas/postgres-formula/compare/v0.44.0...v0.45.0) (2022-07-18) + + +### Continuous Integration + +* update `pre-commit` configuration inc. for pre-commit.ci [skip ci] ([2fefadf](https://github.com/saltstack-formulas/postgres-formula/commit/2fefadf9020cdaaae2225bb93a67cf3759114167)) +* **kitchen+gitlab:** update for new pre-salted images [skip ci] ([03fd3fa](https://github.com/saltstack-formulas/postgres-formula/commit/03fd3faed988962088f847a09d65d36f910617cc)) +* **vagrant:** use `linked_clone` at all times (inc. CI) [skip ci] ([ad865fc](https://github.com/saltstack-formulas/postgres-formula/commit/ad865fc6025296d39ed8e231d42b0e7773ec6f8a)) +* update linters to latest versions [skip ci] ([f45dc9c](https://github.com/saltstack-formulas/postgres-formula/commit/f45dc9c04d0a56b8705f94d0916bcaf43fdce231)) + + +### Features + +* **codenamemap:** add support for Ubuntu 22.04 ([fdf5f36](https://github.com/saltstack-formulas/postgres-formula/commit/fdf5f36c2d0f8c4d114d3626960c093c695f3d99)) + + +### Tests + +* **repository:** use `system.platform[:codename]` [skip ci] ([1c70c9c](https://github.com/saltstack-formulas/postgres-formula/commit/1c70c9c01c68b7edf629744fe82b9aa6544e7e46)) +* **system:** add `build_platform_codename` [skip ci] ([1270d0c](https://github.com/saltstack-formulas/postgres-formula/commit/1270d0c962a6560bfeb9de44ac0e3762bf19d642)) +* **system.rb:** add support for `mac_os_x` [skip ci] ([76de88b](https://github.com/saltstack-formulas/postgres-formula/commit/76de88bc7b61e3e5708fd8dae1f7dbc5a9cad4c2)) + # [0.44.0](https://github.com/saltstack-formulas/postgres-formula/compare/v0.43.0...v0.44.0) (2022-02-07) diff --git a/FORMULA b/FORMULA index c9086bed..f0e0b5ff 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: postgres os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Suse, openSUSE, Gentoo, Funtoo, Arch, Manjaro, Alpine, FreeBSD, OpenBSD, Solaris, SmartOS, Windows, MacOS os_family: Debian, RedHat, Suse, Gentoo, Arch, Alpine, FreeBSD, OpenBSD, Solaris, Windows, MacOS -version: 0.44.0 +version: 0.45.0 release: 1 minimum_version: 2016.11 summary: Postgres formula