From 5456b1315ee7d865017aa83bea564ebeac399394 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 20 Oct 2020 10:14:26 +0100 Subject: [PATCH 01/60] chore(gemfile+lock): update to latest gem versions (2020-W43) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/273 --- Gemfile.lock | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5addeb7..f83e4c9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,7 +17,7 @@ GEM addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.1.0) - aws-partitions (1.380.0) + aws-partitions (1.383.0) aws-sdk-apigateway (1.55.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) @@ -30,13 +30,13 @@ GEM aws-sdk-autoscaling (1.22.0) aws-sdk-core (~> 3, >= 3.52.1) aws-sigv4 (~> 1.1) - aws-sdk-budgets (1.35.0) + aws-sdk-budgets (1.36.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) aws-sdk-cloudformation (1.44.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudfront (1.43.0) + aws-sdk-cloudfront (1.44.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) aws-sdk-cloudhsm (1.27.0) @@ -77,7 +77,7 @@ GEM aws-sdk-dynamodb (1.55.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.198.0) + aws-sdk-ec2 (1.200.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.39.0) @@ -89,10 +89,10 @@ GEM aws-sdk-efs (1.36.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-eks (1.44.0) + aws-sdk-eks (1.45.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.43.0) + aws-sdk-elasticache (1.44.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) aws-sdk-elasticbeanstalk (1.38.0) @@ -131,7 +131,7 @@ GEM aws-sdk-organizations (1.17.0) aws-sdk-core (~> 3, >= 3.39.0) aws-sigv4 (~> 1.0) - aws-sdk-rds (1.102.0) + aws-sdk-rds (1.104.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) aws-sdk-redshift (1.50.0) @@ -146,7 +146,7 @@ GEM aws-sdk-route53resolver (1.21.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.83.0) + aws-sdk-s3 (1.83.1) aws-sdk-core (~> 3, >= 3.109.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -159,13 +159,13 @@ GEM aws-sdk-sms (1.27.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-sns (1.32.1) + aws-sdk-sns (1.33.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) aws-sdk-sqs (1.34.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.93.0) + aws-sdk-ssm (1.95.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) aws-sigv4 (1.2.2) @@ -182,9 +182,9 @@ GEM ms_rest_azure (~> 0.12.0) bcrypt_pbkdf (1.0.1) builder (3.2.4) - chef-config (16.5.77) + chef-config (16.6.14) addressable - chef-utils (= 16.5.77) + chef-utils (= 16.6.14) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -193,7 +193,7 @@ GEM chef-config concurrent-ruby (~> 1.0) ffi-yajl (~> 2.2) - chef-utils (16.5.77) + chef-utils (16.6.14) coderay (1.1.3) concurrent-ruby (1.1.7) declarative (0.0.20) @@ -208,7 +208,7 @@ GEM regexp_parser (~> 1.2) ed25519 (1.2.4) erubi (1.9.0) - excon (0.76.0) + excon (0.78.0) faraday (1.0.1) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.7) @@ -342,7 +342,7 @@ GEM coderay (~> 1.1) method_source (~> 1.0) public_suffix (4.0.6) - regexp_parser (1.8.1) + regexp_parser (1.8.2) representable (3.0.4) declarative (< 0.1.0) declarative-option (< 0.2.0) @@ -395,7 +395,7 @@ GEM thread_safe (0.3.6) timeliness (0.3.10) tomlrb (1.2.9) - train (3.3.24) + train (3.3.27) activesupport (>= 5.2.4.3, < 6.0.0) azure_graph_rbac (~> 0.16) azure_mgmt_key_vault (~> 0.17) @@ -406,7 +406,7 @@ GEM google-api-client (>= 0.23.9, < 0.44.1) googleauth (>= 0.6.6, < 0.13.1) inifile (~> 3.0) - train-core (= 3.3.24) + train-core (= 3.3.27) train-winrm (~> 0.2) train-aws (0.1.18) aws-sdk-apigateway (~> 1.0) @@ -458,7 +458,7 @@ GEM aws-sdk-sns (~> 1.9) aws-sdk-sqs (~> 1.10) aws-sdk-ssm (~> 1.0) - train-core (3.3.24) + train-core (3.3.27) addressable (~> 2.5) ffi (!= 1.13.0) json (>= 1.8, < 3.0) @@ -497,7 +497,7 @@ GEM unicode-display_width (1.7.0) unicode_utils (1.4.0) uri_template (0.7.0) - winrm (2.3.4) + winrm (2.3.5) builder (>= 2.1.2) erubi (~> 1.8) gssapi (~> 1.2) From f420d98a414e0b803f9f1061178689c9d1bbe852 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 26 Oct 2020 22:45:59 +0000 Subject: [PATCH 02/60] chore(gemfile+lock): update to latest gem versions (2020-W44) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/274 --- Gemfile | 5 +++++ Gemfile.lock | 39 ++++++++++++++++++++------------------- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/Gemfile b/Gemfile index f18b9e9..82c4a31 100644 --- a/Gemfile +++ b/Gemfile @@ -2,6 +2,11 @@ source 'https://rubygems.org' +# Use the latest version of `inspec` prior to `4.23.4`, which introduces a +# regression where the diff isn't displayed when comparing using `eq`. +gem 'inspec', '~> 4.22.22' +# Install the `kitchen-docker` gem from GitHub because the latest version +# currently available (`2.10.0`) doesn't include a recent fix for Gentoo. gem 'kitchen-docker', github: 'test-kitchen/kitchen-docker', ref: '41e80fe' gem 'kitchen-inspec', '>= 2.2.1' gem 'kitchen-salt', '>= 0.6.3' diff --git a/Gemfile.lock b/Gemfile.lock index f83e4c9..19bf26d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,7 +17,7 @@ GEM addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.1.0) - aws-partitions (1.383.0) + aws-partitions (1.386.0) aws-sdk-apigateway (1.55.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) @@ -36,7 +36,7 @@ GEM aws-sdk-cloudformation (1.44.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudfront (1.44.0) + aws-sdk-cloudfront (1.46.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) aws-sdk-cloudhsm (1.27.0) @@ -77,7 +77,7 @@ GEM aws-sdk-dynamodb (1.55.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.200.0) + aws-sdk-ec2 (1.202.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.39.0) @@ -95,7 +95,7 @@ GEM aws-sdk-elasticache (1.44.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticbeanstalk (1.38.0) + aws-sdk-elasticbeanstalk (1.39.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) aws-sdk-elasticloadbalancing (1.29.0) @@ -159,7 +159,7 @@ GEM aws-sdk-sms (1.27.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-sns (1.33.0) + aws-sdk-sns (1.34.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) aws-sdk-sqs (1.34.0) @@ -209,13 +209,13 @@ GEM ed25519 (1.2.4) erubi (1.9.0) excon (0.78.0) - faraday (1.0.1) + faraday (0.17.3) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.7) faraday (>= 0.8.0) http-cookie (~> 1.0.0) - faraday_middleware (1.0.0) - faraday (~> 1.0) + faraday_middleware (0.12.2) + faraday (>= 0.7.4, < 1.0) ffi (1.13.1) ffi-yajl (2.3.4) libyajl2 (~> 1.2) @@ -247,20 +247,20 @@ GEM i18n (1.8.5) concurrent-ruby (~> 1.0) inifile (3.0.0) - inspec (4.23.11) - faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 4.23.11) + inspec (4.22.22) + faraday_middleware (~> 0.12.2) + inspec-core (= 4.22.22) train (~> 3.0) train-aws (~> 0.1) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.23.11) + inspec-core (4.22.22) addressable (~> 2.4) chef-telemetry (~> 1.0) - faraday (>= 0.9.0, < 1.1) + faraday (>= 0.9.0) hashie (~> 3.4) json_schemer (>= 0.2.1, < 0.2.12) - license-acceptance (>= 0.2.13, < 3.0) + license-acceptance (>= 0.2.13, < 2.0) method_source (>= 0.8, < 2.0) mixlib-log (~> 3.0) multipart-post (~> 2.0) @@ -293,11 +293,11 @@ GEM hashie (>= 3.5) test-kitchen (>= 1.4) libyajl2 (1.2.0) - license-acceptance (2.1.2) + license-acceptance (1.0.19) pastel (~> 0.7) tomlrb (~> 1.2) - tty-box (~> 0.6) - tty-prompt (~> 0.20) + tty-box (~> 0.3) + tty-prompt (~> 0.18) little-plugger (1.1.4) logging (2.3.0) little-plugger (~> 1.1) @@ -354,7 +354,7 @@ GEM rspec-mocks (~> 3.9.0) rspec-core (3.9.3) rspec-support (~> 3.9.3) - rspec-expectations (3.9.2) + rspec-expectations (3.9.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-its (1.3.0) @@ -363,7 +363,7 @@ GEM rspec-mocks (3.9.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) - rspec-support (3.9.3) + rspec-support (3.9.4) rubyntlm (0.6.2) rubyzip (1.3.0) semverse (3.0.0) @@ -521,6 +521,7 @@ PLATFORMS ruby DEPENDENCIES + inspec (~> 4.22.22) kitchen-docker! kitchen-inspec (>= 2.2.1) kitchen-salt (>= 0.6.3) From 0f9b05940899957ac1c1fe4d6594cbab1d422e56 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 16 Dec 2020 06:27:25 +0000 Subject: [PATCH 03/60] ci(gitlab-ci): use GitLab CI as Travis CI replacement * Automated using https://github.com/myii/ssf-formula/pull/275 --- .gitlab-ci.yml | 141 +++++++++++++++++++++++++++++++++ .travis.yml | 15 +++- .yamllint | 1 + CODEOWNERS | 5 +- pre-commit_semantic-release.sh | 2 +- release.config.js | 1 + 6 files changed, 160 insertions(+), 5 deletions(-) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..e930712 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,141 @@ +# -*- coding: utf-8 -*- +# vim: ft=yaml +--- +############################################################################### +# Define all YAML node anchors +############################################################################### +.node_anchors: + # `only` (also used for `except` where applicable) + only_branch_master_parent_repo: &only_branch_master_parent_repo + - 'master@saltstack-formulas/apt-formula' + # `stage` + stage_lint: &stage_lint 'lint' + stage_release: &stage_release 'release' + stage_test: &stage_test 'test' + # `image` + image_commitlint: &image_commitlint 'myii/ssf-commitlint:11' + image_dindruby: &image_dindruby 'myii/ssf-dind-ruby:2.7.1-r3' + image_precommit: &image_precommit + name: 'myii/ssf-pre-commit:2.9.2' + entrypoint: ['/bin/bash', '-c'] + image_semantic-release: &image_semanticrelease 'myii/ssf-semantic-release:15.14' + # `services` + services_docker_dind: &services_docker_dind + - 'docker:dind' + # `variables` + # https://forum.gitlab.com/t/gitlab-com-ci-caching-rubygems/5627/3 + # https://bundler.io/v1.16/bundle_config.html + variables_bundler: &variables_bundler + BUNDLE_CACHE_PATH: '${CI_PROJECT_DIR}/.cache/bundler' + BUNDLE_WITHOUT: 'production' + # `cache` + cache_bundler: &cache_bundler + key: '${CI_JOB_STAGE}' + paths: + - '${BUNDLE_CACHE_PATH}' + +############################################################################### +# Define stages and global variables +############################################################################### +stages: + - *stage_lint + - *stage_test + - *stage_release +variables: + DOCKER_DRIVER: 'overlay2' + +############################################################################### +# `lint` stage: `commitlint` & `pre-commit` +############################################################################### +commitlint: + stage: *stage_lint + image: *image_commitlint + script: + # Add `upstream` remote to get access to `upstream/master` + - 'git remote add upstream ${CI_PROJECT_URL}.git' + - 'git fetch --all' + # Set default commit hashes for `--from` and `--to` + - 'export COMMITLINT_FROM="$(git merge-base upstream/master HEAD)"' + - 'export COMMITLINT_TO="${CI_COMMIT_SHA}"' + # `coqbot` adds a merge commit to test PRs on top of the latest commit in + # the repo; amend this merge commit message to avoid failure + - | + if [ "${GITLAB_USER_LOGIN}" = "coqbot" ] \ + && [ "${CI_COMMIT_BRANCH}" != "master" ]; then + git commit --amend -m \ + 'chore: reword coqbot merge commit message for commitlint' + export COMMITLINT_TO=HEAD + fi + # Run `commitlint` + - 'commitlint --from "${COMMITLINT_FROM}" + --to "${COMMITLINT_TO}" + --verbose' + +pre-commit: + stage: *stage_lint + image: *image_precommit + # https://pre-commit.com/#gitlab-ci-example + variables: + PRE_COMMIT_HOME: '${CI_PROJECT_DIR}/.cache/pre-commit' + cache: + key: '${CI_JOB_NAME}' + paths: + - '${PRE_COMMIT_HOME}' + script: + - 'pre-commit run --all-files --color always --verbose' + +############################################################################### +# Define `test` template +############################################################################### +.test_instance: + stage: *stage_test + image: *image_dindruby + services: *services_docker_dind + variables: *variables_bundler + cache: *cache_bundler + before_script: + # TODO: This should work from the env vars above automatically + - 'bundle config set path "${BUNDLE_CACHE_PATH}"' + - 'bundle config set without "${BUNDLE_WITHOUT}"' + - 'bundle install' + script: + # Alternative value to consider: `${CI_JOB_NAME}` + - 'bin/kitchen verify "${DOCKER_ENV_CI_JOB_NAME}"' + +############################################################################### +# `test` stage: each instance below uses the `test` template above +############################################################################### +## 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` +repositories-debian-10-master-py3: {extends: '.test_instance'} +# preferences-debian-10-master-py3: {extends: '.test_instance'} +# unattended-debian-10-master-py3: {extends: '.test_instance'} +# debian-10-master-py3: {extends: '.test_instance'} +repositories-ubuntu-1804-master-py3: {extends: '.test_instance'} +# preferences-ubuntu-1804-master-py3: {extends: '.test_instance'} +# unattended-ubuntu-1804-master-py3: {extends: '.test_instance'} +# ubuntu-1804-master-py3: {extends: '.test_instance'} +# repositories-debian-9-2019-2-py3: {extends: '.test_instance'} +preferences-debian-9-2019-2-py3: {extends: '.test_instance'} +# unattended-debian-9-2019-2-py3: {extends: '.test_instance'} +# debian-9-2019-2-py3: {extends: '.test_instance'} +# repositories-ubuntu-1804-2019-2-py3: {extends: '.test_instance'} +# preferences-ubuntu-1804-2019-2-py3: {extends: '.test_instance'} +unattended-ubuntu-1804-2019-2-py3: {extends: '.test_instance'} +# ubuntu-1804-2019-2-py3: {extends: '.test_instance'} + +############################################################################### +# `release` stage: `semantic-release` +############################################################################### +semantic-release: + only: *only_branch_master_parent_repo + stage: *stage_release + image: *image_semanticrelease + variables: + MAINTAINER_TOKEN: '${GH_TOKEN}' + script: + # Update `AUTHORS.md` + - '${HOME}/go/bin/maintainer contributor' + # Run `semantic-release` + - 'semantic-release' diff --git a/.travis.yml b/.travis.yml index e6c26e1..d512087 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,15 @@ # -*- coding: utf-8 -*- # vim: ft=yaml --- +################################################################################ +# NOTE: This file is UNMAINTAINED; it is provided for references purposes only. +# No guarantees are tendered that this structure will work after 2020. +################################################################################ +# * https://en.wikipedia.org/wiki/Travis_CI: +# - "... free open-source plans were removed in [sic] the end of 2020" +# - https://blog.travis-ci.com/2020-11-02-travis-ci-new-billing +# - https://ropensci.org/technotes/2020/11/19/moving-away-travis/ +################################################################################ ## Machine config os: 'linux' arch: 'amd64' @@ -22,8 +31,10 @@ script: ## Stages and jobs matrix stages: - test - - name: 'release' - if: 'branch = master AND type != pull_request' + # # As part of the switch away from Travis CI, ensure that the `release` stage + # # is not run inadvertently + # - name: 'release' + # if: 'branch = master AND type != pull_request' jobs: include: ## Define the test stage that runs the linters (and testing matrix, if applicable) diff --git a/.yamllint b/.yamllint index 740beca..73bcbe2 100644 --- a/.yamllint +++ b/.yamllint @@ -9,6 +9,7 @@ extends: default # 2. Any SLS files under directory `test/`, which are actually state files # 3. Any YAML files under directory `.kitchen/`, introduced during local testing ignore: | + .cache/ node_modules/ test/**/states/**/*.sls .kitchen/ diff --git a/CODEOWNERS b/CODEOWNERS index 75f0974..45ca6c6 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -15,12 +15,13 @@ /docs/AUTHORS.rst @saltstack-formulas/ssf /docs/CHANGELOG.rst @saltstack-formulas/ssf /docs/TOFS_pattern.rst @saltstack-formulas/ssf -/apt/libsaltcli.jinja @saltstack-formulas/ssf -/apt/libtofs.jinja @saltstack-formulas/ssf +/*/libsaltcli.jinja @saltstack-formulas/ssf +/*/libtofs.jinja @saltstack-formulas/ssf /test/integration/**/inspec.yml @saltstack-formulas/ssf /test/integration/**/README.md @saltstack-formulas/ssf /.gitignore @saltstack-formulas/ssf /.cirrus.yml @saltstack-formulas/ssf +/.gitlab-ci.yml @saltstack-formulas/ssf /.pre-commit-config.yaml @saltstack-formulas/ssf /.rstcheck.cfg @saltstack-formulas/ssf /.rubocop.yml @saltstack-formulas/ssf diff --git a/pre-commit_semantic-release.sh b/pre-commit_semantic-release.sh index ba80535..458b7b6 100755 --- a/pre-commit_semantic-release.sh +++ b/pre-commit_semantic-release.sh @@ -11,7 +11,7 @@ sed -i -e "s_^\(version:\).*_\1 ${1}_" FORMULA ############################################################################### # Install `m2r` -sudo -H pip install m2r +pip3 install m2r # Copy and then convert the `.md` docs cp ./*.md docs/ diff --git a/release.config.js b/release.config.js index 6af7aa8..15bf012 100644 --- a/release.config.js +++ b/release.config.js @@ -1,5 +1,6 @@ module.exports = { branch: 'master', + repositoryUrl: 'https://github.com/saltstack-formulas/apt-formula', plugins: [ ['@semantic-release/commit-analyzer', { preset: 'angular', From 057b19ec7ad97afec550ca7c2dbbf28acf53d311 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 19 Dec 2020 14:27:59 +0000 Subject: [PATCH 04/60] ci(gitlab-ci): add `rubocop` linter (with `allow_failure`) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/277 --- .gitlab-ci.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e930712..3771112 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,6 +18,7 @@ image_precommit: &image_precommit name: 'myii/ssf-pre-commit:2.9.2' entrypoint: ['/bin/bash', '-c'] + image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest' image_semantic-release: &image_semanticrelease 'myii/ssf-semantic-release:15.14' # `services` services_docker_dind: &services_docker_dind @@ -84,6 +85,19 @@ pre-commit: script: - 'pre-commit run --all-files --color always --verbose' +# Use a separate job for `rubocop` other than the one potentially run by `pre-commit` +# - The `pre-commit` check will only be available for formulas that pass the default +# `rubocop` check -- and must continue to do so +# - This job is allowed to fail, so can be used for all formulas +# - Furthermore, this job uses all of the latest `rubocop` features & cops, +# which will help when upgrading the `rubocop` linter used in `pre-commit` +rubocop: + allow_failure: true + stage: *stage_lint + image: *image_rubocop + script: + - 'rubocop -d -P -S --enable-pending-cops' + ############################################################################### # Define `test` template ############################################################################### From b4cce02adfbd902ee86d175f66c61f5b41b37b15 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sun, 20 Dec 2020 18:42:28 +0000 Subject: [PATCH 05/60] ci(commitlint): ensure `upstream/master` uses main repo URL [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/278 --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3771112..80f613c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -53,7 +53,8 @@ commitlint: image: *image_commitlint script: # Add `upstream` remote to get access to `upstream/master` - - 'git remote add upstream ${CI_PROJECT_URL}.git' + - 'git remote add upstream + https://gitlab.com/saltstack-formulas/apt-formula.git' - 'git fetch --all' # Set default commit hashes for `--from` and `--to` - 'export COMMITLINT_FROM="$(git merge-base upstream/master HEAD)"' From 67c1130d8957a47ddc71a45a438bb6e74b4a10ac Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 2 Feb 2021 00:12:37 +0000 Subject: [PATCH 06/60] ci(pre-commit): update hook for `rubocop` * Automated using https://github.com/myii/ssf-formula/pull/290 --- .pre-commit-config.yaml | 6 +++--- CODEOWNERS | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0efdb51..8cf7f97 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -17,8 +17,8 @@ repos: stages: [manual] additional_dependencies: ['@commitlint/config-conventional@8.3.4'] always_run: true - - repo: https://github.com/adithyabsk/mirrors-rubocop - rev: v0.91.0 + - repo: https://github.com/rubocop-hq/rubocop + rev: v1.9.1 hooks: - id: rubocop name: Check Ruby files with rubocop @@ -33,7 +33,7 @@ repos: files: ^.*\.(sh|bash|ksh)$ types: [] args: [] - - repo: https://github.com/adrienverge/yamllint.git + - repo: https://github.com/adrienverge/yamllint rev: v1.23.0 hooks: - id: yamllint diff --git a/CODEOWNERS b/CODEOWNERS index 45ca6c6..1990816 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -15,8 +15,11 @@ /docs/AUTHORS.rst @saltstack-formulas/ssf /docs/CHANGELOG.rst @saltstack-formulas/ssf /docs/TOFS_pattern.rst @saltstack-formulas/ssf +/*/_mapdata/ @saltstack-formulas/ssf /*/libsaltcli.jinja @saltstack-formulas/ssf /*/libtofs.jinja @saltstack-formulas/ssf +/test/integration/**/_mapdata_spec.rb @saltstack-formulas/ssf +/test/integration/**/libraries/system.rb @saltstack-formulas/ssf /test/integration/**/inspec.yml @saltstack-formulas/ssf /test/integration/**/README.md @saltstack-formulas/ssf /.gitignore @saltstack-formulas/ssf From a520404f0c4f319d77a3341c4fae9b27a9504458 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 11 Feb 2021 11:46:11 +0000 Subject: [PATCH 07/60] chore: standardise structure (`.gitignore` & `_mapdata.rb`) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/292 --- .gitignore | 11 +++++++++++ CODEOWNERS | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 6995110..94f77a8 100644 --- a/.gitignore +++ b/.gitignore @@ -91,6 +91,9 @@ celerybeat-schedule venv/ ENV/ +# visual studio +.vs/ + # Spyder project settings .spyderproject .spyproject @@ -120,3 +123,11 @@ docs/*.md Dockerfile.*_* ignore/ tmp/ + +# `salt-formula` -- Vagrant Specific files +.vagrant +top.sls + +# `suricata-formula` -- Platform binaries +*.rpm +*.deb diff --git a/CODEOWNERS b/CODEOWNERS index 1990816..85c4cb9 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -18,7 +18,7 @@ /*/_mapdata/ @saltstack-formulas/ssf /*/libsaltcli.jinja @saltstack-formulas/ssf /*/libtofs.jinja @saltstack-formulas/ssf -/test/integration/**/_mapdata_spec.rb @saltstack-formulas/ssf +/test/integration/**/_mapdata.rb @saltstack-formulas/ssf /test/integration/**/libraries/system.rb @saltstack-formulas/ssf /test/integration/**/inspec.yml @saltstack-formulas/ssf /test/integration/**/README.md @saltstack-formulas/ssf From d48630589f28fc42d8f0ddb65b6c6d1de3da12b0 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 12 Feb 2021 20:42:17 +0000 Subject: [PATCH 08/60] ci(kitchen+gitlab-ci): use latest pre-salted images [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/293 --- .gitlab-ci.yml | 49 +++++++++++++++++++++-------- .travis.yml | 49 +++++++++++++++++++++-------- kitchen.yml | 84 +++++++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 151 insertions(+), 31 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 80f613c..e2128bd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -123,22 +123,47 @@ 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` -repositories-debian-10-master-py3: {extends: '.test_instance'} +# repositories-debian-10-tiamat-py3: {extends: '.test_instance'} +# repositories-debian-9-tiamat-py3: {extends: '.test_instance'} +# repositories-ubuntu-2004-tiamat-py3: {extends: '.test_instance'} +# repositories-ubuntu-1804-tiamat-py3: {extends: '.test_instance'} +# repositories-ubuntu-1604-tiamat-py3: {extends: '.test_instance'} +# repositories-debian-10-master-py3: {extends: '.test_instance'} # preferences-debian-10-master-py3: {extends: '.test_instance'} # unattended-debian-10-master-py3: {extends: '.test_instance'} -# debian-10-master-py3: {extends: '.test_instance'} -repositories-ubuntu-1804-master-py3: {extends: '.test_instance'} +debian-10-master-py3: {extends: '.test_instance'} +# repositories-debian-9-master-py3: {extends: '.test_instance'} +# preferences-debian-9-master-py3: {extends: '.test_instance'} +# unattended-debian-9-master-py3: {extends: '.test_instance'} +debian-9-master-py3: {extends: '.test_instance'} +# repositories-ubuntu-2004-master-py3: {extends: '.test_instance'} +# preferences-ubuntu-2004-master-py3: {extends: '.test_instance'} +# unattended-ubuntu-2004-master-py3: {extends: '.test_instance'} +ubuntu-2004-master-py3: {extends: '.test_instance'} +# repositories-ubuntu-1804-master-py3: {extends: '.test_instance'} # preferences-ubuntu-1804-master-py3: {extends: '.test_instance'} # unattended-ubuntu-1804-master-py3: {extends: '.test_instance'} -# ubuntu-1804-master-py3: {extends: '.test_instance'} -# repositories-debian-9-2019-2-py3: {extends: '.test_instance'} -preferences-debian-9-2019-2-py3: {extends: '.test_instance'} -# unattended-debian-9-2019-2-py3: {extends: '.test_instance'} -# debian-9-2019-2-py3: {extends: '.test_instance'} -# repositories-ubuntu-1804-2019-2-py3: {extends: '.test_instance'} -# preferences-ubuntu-1804-2019-2-py3: {extends: '.test_instance'} -unattended-ubuntu-1804-2019-2-py3: {extends: '.test_instance'} -# ubuntu-1804-2019-2-py3: {extends: '.test_instance'} +ubuntu-1804-master-py3: {extends: '.test_instance'} +# repositories-ubuntu-1604-master-py3: {extends: '.test_instance'} +# preferences-ubuntu-1604-master-py3: {extends: '.test_instance'} +# unattended-ubuntu-1604-master-py3: {extends: '.test_instance'} +ubuntu-1604-master-py3: {extends: '.test_instance'} +# repositories-debian-10-3002-2-py3: {extends: '.test_instance'} +# repositories-debian-9-3002-2-py3: {extends: '.test_instance'} +# repositories-ubuntu-2004-3002-2-py3: {extends: '.test_instance'} +# repositories-ubuntu-1804-3002-2-py3: {extends: '.test_instance'} +# repositories-ubuntu-1604-3002-2-py3: {extends: '.test_instance'} +# repositories-debian-10-3001-4-py3: {extends: '.test_instance'} +# repositories-debian-9-3001-4-py3: {extends: '.test_instance'} +# repositories-ubuntu-2004-3001-4-py3: {extends: '.test_instance'} +# repositories-ubuntu-1804-3001-4-py3: {extends: '.test_instance'} +# repositories-ubuntu-1604-3001-4-py3: {extends: '.test_instance'} +# repositories-debian-10-3000-6-py3: {extends: '.test_instance'} +# repositories-debian-9-3000-6-py3: {extends: '.test_instance'} +# repositories-ubuntu-1804-3000-6-py3: {extends: '.test_instance'} +# repositories-ubuntu-1604-3000-6-py3: {extends: '.test_instance'} +# repositories-ubuntu-1804-3000-6-py2: {extends: '.test_instance'} +# repositories-ubuntu-1604-3000-6-py2: {extends: '.test_instance'} ############################################################################### # `release` stage: `semantic-release` diff --git a/.travis.yml b/.travis.yml index d512087..2513e66 100644 --- a/.travis.yml +++ b/.travis.yml @@ -83,22 +83,47 @@ jobs: ## 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` - - env: INSTANCE=repositories-debian-10-master-py3 + # - env: INSTANCE=repositories-debian-10-tiamat-py3 + # - env: INSTANCE=repositories-debian-9-tiamat-py3 + # - env: INSTANCE=repositories-ubuntu-2004-tiamat-py3 + # - env: INSTANCE=repositories-ubuntu-1804-tiamat-py3 + # - env: INSTANCE=repositories-ubuntu-1604-tiamat-py3 + # - env: INSTANCE=repositories-debian-10-master-py3 # - env: INSTANCE=preferences-debian-10-master-py3 # - env: INSTANCE=unattended-debian-10-master-py3 - # - env: INSTANCE=debian-10-master-py3 - - env: INSTANCE=repositories-ubuntu-1804-master-py3 + - env: INSTANCE=debian-10-master-py3 + # - env: INSTANCE=repositories-debian-9-master-py3 + # - env: INSTANCE=preferences-debian-9-master-py3 + # - env: INSTANCE=unattended-debian-9-master-py3 + - env: INSTANCE=debian-9-master-py3 + # - env: INSTANCE=repositories-ubuntu-2004-master-py3 + # - env: INSTANCE=preferences-ubuntu-2004-master-py3 + # - env: INSTANCE=unattended-ubuntu-2004-master-py3 + - env: INSTANCE=ubuntu-2004-master-py3 + # - env: INSTANCE=repositories-ubuntu-1804-master-py3 # - env: INSTANCE=preferences-ubuntu-1804-master-py3 # - env: INSTANCE=unattended-ubuntu-1804-master-py3 - # - env: INSTANCE=ubuntu-1804-master-py3 - # - env: INSTANCE=repositories-debian-9-2019-2-py3 - - env: INSTANCE=preferences-debian-9-2019-2-py3 - # - env: INSTANCE=unattended-debian-9-2019-2-py3 - # - env: INSTANCE=debian-9-2019-2-py3 - # - env: INSTANCE=repositories-ubuntu-1804-2019-2-py3 - # - env: INSTANCE=preferences-ubuntu-1804-2019-2-py3 - - env: INSTANCE=unattended-ubuntu-1804-2019-2-py3 - # - env: INSTANCE=ubuntu-1804-2019-2-py3 + - env: INSTANCE=ubuntu-1804-master-py3 + # - env: INSTANCE=repositories-ubuntu-1604-master-py3 + # - env: INSTANCE=preferences-ubuntu-1604-master-py3 + # - env: INSTANCE=unattended-ubuntu-1604-master-py3 + - env: INSTANCE=ubuntu-1604-master-py3 + # - env: INSTANCE=repositories-debian-10-3002-2-py3 + # - env: INSTANCE=repositories-debian-9-3002-2-py3 + # - env: INSTANCE=repositories-ubuntu-2004-3002-2-py3 + # - env: INSTANCE=repositories-ubuntu-1804-3002-2-py3 + # - env: INSTANCE=repositories-ubuntu-1604-3002-2-py3 + # - env: INSTANCE=repositories-debian-10-3001-4-py3 + # - env: INSTANCE=repositories-debian-9-3001-4-py3 + # - env: INSTANCE=repositories-ubuntu-2004-3001-4-py3 + # - env: INSTANCE=repositories-ubuntu-1804-3001-4-py3 + # - env: INSTANCE=repositories-ubuntu-1604-3001-4-py3 + # - env: INSTANCE=repositories-debian-10-3000-6-py3 + # - env: INSTANCE=repositories-debian-9-3000-6-py3 + # - env: INSTANCE=repositories-ubuntu-1804-3000-6-py3 + # - env: INSTANCE=repositories-ubuntu-1604-3000-6-py3 + # - env: INSTANCE=repositories-ubuntu-1804-3000-6-py2 + # - env: INSTANCE=repositories-ubuntu-1604-3000-6-py2 ## Define the release stage that runs `semantic-release` - stage: 'release' diff --git a/kitchen.yml b/kitchen.yml index 6f7357e..5a035c3 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -8,24 +8,94 @@ driver: privileged: true run_command: /lib/systemd/systemd -# Make sure the platforms listed below match up with -# the `env.matrix` instances defined in `.travis.yml` platforms: + ## SALT `tiamat` + - name: debian-10-tiamat-py3 + driver: + image: saltimages/salt-tiamat-py3:debian-10 + - name: debian-9-tiamat-py3 + driver: + image: saltimages/salt-tiamat-py3:debian-9 + - name: ubuntu-2004-tiamat-py3 + driver: + image: saltimages/salt-tiamat-py3:ubuntu-20.04 + - name: ubuntu-1804-tiamat-py3 + driver: + image: saltimages/salt-tiamat-py3:ubuntu-18.04 + - name: ubuntu-1604-tiamat-py3 + driver: + image: saltimages/salt-tiamat-py3:ubuntu-16.04 + ## SALT `master` - name: debian-10-master-py3 driver: image: saltimages/salt-master-py3:debian-10 + - name: debian-9-master-py3 + driver: + image: saltimages/salt-master-py3:debian-9 + - name: ubuntu-2004-master-py3 + driver: + image: saltimages/salt-master-py3:ubuntu-20.04 - name: ubuntu-1804-master-py3 driver: image: saltimages/salt-master-py3:ubuntu-18.04 + - name: ubuntu-1604-master-py3 + driver: + image: saltimages/salt-master-py3:ubuntu-16.04 - ## SALT `2019.2` - - name: debian-9-2019-2-py3 + ## SALT `3002.2` + - name: debian-10-3002-2-py3 + driver: + image: saltimages/salt-3002.2-py3:debian-10 + - name: debian-9-3002-2-py3 + driver: + image: saltimages/salt-3002.2-py3:debian-9 + - name: ubuntu-2004-3002-2-py3 + driver: + image: saltimages/salt-3002.2-py3:ubuntu-20.04 + - name: ubuntu-1804-3002-2-py3 + driver: + image: saltimages/salt-3002.2-py3:ubuntu-18.04 + - name: ubuntu-1604-3002-2-py3 + driver: + image: saltimages/salt-3002.2-py3:ubuntu-16.04 + + ## SALT `3001.4` + - name: debian-10-3001-4-py3 + driver: + image: saltimages/salt-3001.4-py3:debian-10 + - name: debian-9-3001-4-py3 + driver: + image: saltimages/salt-3001.4-py3:debian-9 + - name: ubuntu-2004-3001-4-py3 + driver: + image: saltimages/salt-3001.4-py3:ubuntu-20.04 + - name: ubuntu-1804-3001-4-py3 + driver: + image: saltimages/salt-3001.4-py3:ubuntu-18.04 + - name: ubuntu-1604-3001-4-py3 + driver: + image: saltimages/salt-3001.4-py3:ubuntu-16.04 + + ## SALT `3000.6` + - name: debian-10-3000-6-py3 + driver: + image: saltimages/salt-3000.6-py3:debian-10 + - name: debian-9-3000-6-py3 + driver: + image: saltimages/salt-3000.6-py3:debian-9 + - name: ubuntu-1804-3000-6-py3 + driver: + image: saltimages/salt-3000.6-py3:ubuntu-18.04 + - name: ubuntu-1604-3000-6-py3 + driver: + image: saltimages/salt-3000.6-py3:ubuntu-16.04 + - name: ubuntu-1804-3000-6-py2 driver: - image: saltimages/salt-2019.2-py3:debian-9 - - name: ubuntu-1804-2019-2-py3 + image: saltimages/salt-3000.6-py2:ubuntu-18.04 + - name: ubuntu-1604-3000-6-py2 driver: - image: saltimages/salt-2019.2-py3:ubuntu-18.04 + image: saltimages/salt-3000.6-py2:ubuntu-16.04 provisioner: name: salt_solo From ce4f1a8488ac65a0d3e34d2f28a47007924958fc Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 17 Feb 2021 13:46:30 +0000 Subject: [PATCH 09/60] ci(gemfile+lock): use `ssf` customised `kitchen-docker` repo [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/294 --- Gemfile | 4 +++- Gemfile.lock | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 82c4a31..15a77c3 100644 --- a/Gemfile +++ b/Gemfile @@ -7,6 +7,8 @@ source 'https://rubygems.org' gem 'inspec', '~> 4.22.22' # Install the `kitchen-docker` gem from GitHub because the latest version # currently available (`2.10.0`) doesn't include a recent fix for Gentoo. -gem 'kitchen-docker', github: 'test-kitchen/kitchen-docker', ref: '41e80fe' +# rubocop:disable Layout/LineLength +gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker', branch: 'ssf' +# rubocop:enable Layout/LineLength gem 'kitchen-inspec', '>= 2.2.1' gem 'kitchen-salt', '>= 0.6.3' diff --git a/Gemfile.lock b/Gemfile.lock index 19bf26d..d7cbc3b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GIT - remote: https://github.com/test-kitchen/kitchen-docker.git - revision: 41e80fed3a7cc86323e19c16a5a340cebf7e5848 - ref: 41e80fe + remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker + revision: 042e6921940a28d2502258b6a5ff3be17dd2fd37 + branch: ssf specs: kitchen-docker (2.10.0) test-kitchen (>= 1.0.0) From 1f9a95240caa913d0a50056e668bccc97482c49a Mon Sep 17 00:00:00 2001 From: Dafydd Jones Date: Sun, 21 Feb 2021 08:27:18 +0000 Subject: [PATCH 10/60] chore(shellcheck): switch hook for `shellcheck` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/295 --- .pre-commit-config.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8cf7f97..ea8271b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -25,14 +25,13 @@ repos: args: [--debug] always_run: true pass_filenames: false - - repo: https://github.com/jumanjihouse/pre-commit-hooks - rev: 2.1.3 + - repo: https://github.com/shellcheck-py/shellcheck-py + rev: v0.7.1.1 hooks: - id: shellcheck name: Check shell scripts with shellcheck files: ^.*\.(sh|bash|ksh)$ types: [] - args: [] - repo: https://github.com/adrienverge/yamllint rev: v1.23.0 hooks: From d33674ad0c3bae3f4abb8e60940511d31e7b2d19 Mon Sep 17 00:00:00 2001 From: Daniel Dehennin Date: Tue, 23 Feb 2021 21:44:46 +0000 Subject: [PATCH 11/60] chore(rubocop): allow use of `YAML.load` for `_mapdata.rb` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/296 --- .rubocop.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.rubocop.yml b/.rubocop.yml index 7fd75ac..9367e99 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -12,5 +12,8 @@ Metrics/BlockLength: - describe # Increase from default of `25` Max: 30 +Security/YAMLLoad: + Exclude: + - test/integration/**/_mapdata.rb # Any offenses that should be fixed, e.g. collected via. `rubocop --auto-gen-config` From 3a909b7ea9194ff32bdf0899ecb4f7c95133ba7b Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 5 Mar 2021 18:29:24 +0000 Subject: [PATCH 12/60] chore(yamllint): add `.git/` to ignores [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/297 --- .yamllint | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.yamllint b/.yamllint index 73bcbe2..5a060ef 100644 --- a/.yamllint +++ b/.yamllint @@ -2,14 +2,17 @@ # vim: ft=yaml --- # Extend the `default` configuration provided by `yamllint` -extends: default +extends: 'default' # Files to ignore completely -# 1. All YAML files under directory `node_modules/`, introduced during the Travis run -# 2. Any SLS files under directory `test/`, which are actually state files -# 3. Any YAML files under directory `.kitchen/`, introduced during local testing +# 1. All YAML files under directory `.cache/`, introduced during the GitLab CI run +# 2. All YAML files under directory `.git/` +# 3. All YAML files under directory `node_modules/`, introduced during the Travis run +# 4. Any SLS files under directory `test/`, which are actually state files +# 5. Any YAML files under directory `.kitchen/`, introduced during local testing ignore: | .cache/ + .git/ node_modules/ test/**/states/**/*.sls .kitchen/ From d5c38c1dda806cf874d66292a862cea7b6c21ea1 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sun, 7 Mar 2021 22:16:00 +0000 Subject: [PATCH 13/60] ci(kitchen+ci): use latest pre-salted images (after CVE) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/299 --- .gitlab-ci.yml | 34 ++++++++++++------------ .travis.yml | 32 +++++++++++------------ kitchen.yml | 70 +++++++++++++++++++++++++------------------------- 3 files changed, 68 insertions(+), 68 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e2128bd..482af29 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -46,7 +46,7 @@ variables: DOCKER_DRIVER: 'overlay2' ############################################################################### -# `lint` stage: `commitlint` & `pre-commit` +# `lint` stage: `commitlint`, `pre-commit` & `rubocop` (latest, failure allowed) ############################################################################### commitlint: stage: *stage_lint @@ -148,22 +148,22 @@ ubuntu-1804-master-py3: {extends: '.test_instance'} # preferences-ubuntu-1604-master-py3: {extends: '.test_instance'} # unattended-ubuntu-1604-master-py3: {extends: '.test_instance'} ubuntu-1604-master-py3: {extends: '.test_instance'} -# repositories-debian-10-3002-2-py3: {extends: '.test_instance'} -# repositories-debian-9-3002-2-py3: {extends: '.test_instance'} -# repositories-ubuntu-2004-3002-2-py3: {extends: '.test_instance'} -# repositories-ubuntu-1804-3002-2-py3: {extends: '.test_instance'} -# repositories-ubuntu-1604-3002-2-py3: {extends: '.test_instance'} -# repositories-debian-10-3001-4-py3: {extends: '.test_instance'} -# repositories-debian-9-3001-4-py3: {extends: '.test_instance'} -# repositories-ubuntu-2004-3001-4-py3: {extends: '.test_instance'} -# repositories-ubuntu-1804-3001-4-py3: {extends: '.test_instance'} -# repositories-ubuntu-1604-3001-4-py3: {extends: '.test_instance'} -# repositories-debian-10-3000-6-py3: {extends: '.test_instance'} -# repositories-debian-9-3000-6-py3: {extends: '.test_instance'} -# repositories-ubuntu-1804-3000-6-py3: {extends: '.test_instance'} -# repositories-ubuntu-1604-3000-6-py3: {extends: '.test_instance'} -# repositories-ubuntu-1804-3000-6-py2: {extends: '.test_instance'} -# repositories-ubuntu-1604-3000-6-py2: {extends: '.test_instance'} +# repositories-debian-10-3002-5-py3: {extends: '.test_instance'} +# repositories-debian-9-3002-5-py3: {extends: '.test_instance'} +# repositories-ubuntu-2004-3002-5-py3: {extends: '.test_instance'} +# repositories-ubuntu-1804-3002-5-py3: {extends: '.test_instance'} +# repositories-ubuntu-1604-3002-5-py3: {extends: '.test_instance'} +# repositories-debian-10-3001-6-py3: {extends: '.test_instance'} +# repositories-debian-9-3001-6-py3: {extends: '.test_instance'} +# repositories-ubuntu-2004-3001-6-py3: {extends: '.test_instance'} +# repositories-ubuntu-1804-3001-6-py3: {extends: '.test_instance'} +# repositories-ubuntu-1604-3001-6-py3: {extends: '.test_instance'} +# repositories-debian-10-3000-8-py3: {extends: '.test_instance'} +# repositories-debian-9-3000-8-py3: {extends: '.test_instance'} +# repositories-ubuntu-1804-3000-8-py3: {extends: '.test_instance'} +# repositories-ubuntu-1604-3000-8-py3: {extends: '.test_instance'} +# repositories-ubuntu-1804-3000-8-py2: {extends: '.test_instance'} +# repositories-ubuntu-1604-3000-8-py2: {extends: '.test_instance'} ############################################################################### # `release` stage: `semantic-release` diff --git a/.travis.yml b/.travis.yml index 2513e66..fdf307d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -108,22 +108,22 @@ jobs: # - env: INSTANCE=preferences-ubuntu-1604-master-py3 # - env: INSTANCE=unattended-ubuntu-1604-master-py3 - env: INSTANCE=ubuntu-1604-master-py3 - # - env: INSTANCE=repositories-debian-10-3002-2-py3 - # - env: INSTANCE=repositories-debian-9-3002-2-py3 - # - env: INSTANCE=repositories-ubuntu-2004-3002-2-py3 - # - env: INSTANCE=repositories-ubuntu-1804-3002-2-py3 - # - env: INSTANCE=repositories-ubuntu-1604-3002-2-py3 - # - env: INSTANCE=repositories-debian-10-3001-4-py3 - # - env: INSTANCE=repositories-debian-9-3001-4-py3 - # - env: INSTANCE=repositories-ubuntu-2004-3001-4-py3 - # - env: INSTANCE=repositories-ubuntu-1804-3001-4-py3 - # - env: INSTANCE=repositories-ubuntu-1604-3001-4-py3 - # - env: INSTANCE=repositories-debian-10-3000-6-py3 - # - env: INSTANCE=repositories-debian-9-3000-6-py3 - # - env: INSTANCE=repositories-ubuntu-1804-3000-6-py3 - # - env: INSTANCE=repositories-ubuntu-1604-3000-6-py3 - # - env: INSTANCE=repositories-ubuntu-1804-3000-6-py2 - # - env: INSTANCE=repositories-ubuntu-1604-3000-6-py2 + # - env: INSTANCE=repositories-debian-10-3002-5-py3 + # - env: INSTANCE=repositories-debian-9-3002-5-py3 + # - env: INSTANCE=repositories-ubuntu-2004-3002-5-py3 + # - env: INSTANCE=repositories-ubuntu-1804-3002-5-py3 + # - env: INSTANCE=repositories-ubuntu-1604-3002-5-py3 + # - env: INSTANCE=repositories-debian-10-3001-6-py3 + # - env: INSTANCE=repositories-debian-9-3001-6-py3 + # - env: INSTANCE=repositories-ubuntu-2004-3001-6-py3 + # - env: INSTANCE=repositories-ubuntu-1804-3001-6-py3 + # - env: INSTANCE=repositories-ubuntu-1604-3001-6-py3 + # - env: INSTANCE=repositories-debian-10-3000-8-py3 + # - env: INSTANCE=repositories-debian-9-3000-8-py3 + # - env: INSTANCE=repositories-ubuntu-1804-3000-8-py3 + # - env: INSTANCE=repositories-ubuntu-1604-3000-8-py3 + # - env: INSTANCE=repositories-ubuntu-1804-3000-8-py2 + # - env: INSTANCE=repositories-ubuntu-1604-3000-8-py2 ## Define the release stage that runs `semantic-release` - stage: 'release' diff --git a/kitchen.yml b/kitchen.yml index 5a035c3..2411671 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -43,59 +43,59 @@ platforms: driver: image: saltimages/salt-master-py3:ubuntu-16.04 - ## SALT `3002.2` - - name: debian-10-3002-2-py3 + ## SALT `3002.5` + - name: debian-10-3002-5-py3 driver: - image: saltimages/salt-3002.2-py3:debian-10 - - name: debian-9-3002-2-py3 + image: saltimages/salt-3002.5-py3:debian-10 + - name: debian-9-3002-5-py3 driver: - image: saltimages/salt-3002.2-py3:debian-9 - - name: ubuntu-2004-3002-2-py3 + image: saltimages/salt-3002.5-py3:debian-9 + - name: ubuntu-2004-3002-5-py3 driver: - image: saltimages/salt-3002.2-py3:ubuntu-20.04 - - name: ubuntu-1804-3002-2-py3 + image: saltimages/salt-3002.5-py3:ubuntu-20.04 + - name: ubuntu-1804-3002-5-py3 driver: - image: saltimages/salt-3002.2-py3:ubuntu-18.04 - - name: ubuntu-1604-3002-2-py3 + image: saltimages/salt-3002.5-py3:ubuntu-18.04 + - name: ubuntu-1604-3002-5-py3 driver: - image: saltimages/salt-3002.2-py3:ubuntu-16.04 + image: saltimages/salt-3002.5-py3:ubuntu-16.04 - ## SALT `3001.4` - - name: debian-10-3001-4-py3 + ## SALT `3001.6` + - name: debian-10-3001-6-py3 driver: - image: saltimages/salt-3001.4-py3:debian-10 - - name: debian-9-3001-4-py3 + image: saltimages/salt-3001.6-py3:debian-10 + - name: debian-9-3001-6-py3 driver: - image: saltimages/salt-3001.4-py3:debian-9 - - name: ubuntu-2004-3001-4-py3 + image: saltimages/salt-3001.6-py3:debian-9 + - name: ubuntu-2004-3001-6-py3 driver: - image: saltimages/salt-3001.4-py3:ubuntu-20.04 - - name: ubuntu-1804-3001-4-py3 + image: saltimages/salt-3001.6-py3:ubuntu-20.04 + - name: ubuntu-1804-3001-6-py3 driver: - image: saltimages/salt-3001.4-py3:ubuntu-18.04 - - name: ubuntu-1604-3001-4-py3 + image: saltimages/salt-3001.6-py3:ubuntu-18.04 + - name: ubuntu-1604-3001-6-py3 driver: - image: saltimages/salt-3001.4-py3:ubuntu-16.04 + image: saltimages/salt-3001.6-py3:ubuntu-16.04 - ## SALT `3000.6` - - name: debian-10-3000-6-py3 + ## SALT `3000.8` + - name: debian-10-3000-8-py3 driver: - image: saltimages/salt-3000.6-py3:debian-10 - - name: debian-9-3000-6-py3 + image: saltimages/salt-3000.8-py3:debian-10 + - name: debian-9-3000-8-py3 driver: - image: saltimages/salt-3000.6-py3:debian-9 - - name: ubuntu-1804-3000-6-py3 + image: saltimages/salt-3000.8-py3:debian-9 + - name: ubuntu-1804-3000-8-py3 driver: - image: saltimages/salt-3000.6-py3:ubuntu-18.04 - - name: ubuntu-1604-3000-6-py3 + image: saltimages/salt-3000.8-py3:ubuntu-18.04 + - name: ubuntu-1604-3000-8-py3 driver: - image: saltimages/salt-3000.6-py3:ubuntu-16.04 - - name: ubuntu-1804-3000-6-py2 + image: saltimages/salt-3000.8-py3:ubuntu-16.04 + - name: ubuntu-1804-3000-8-py2 driver: - image: saltimages/salt-3000.6-py2:ubuntu-18.04 - - name: ubuntu-1604-3000-6-py2 + image: saltimages/salt-3000.8-py2:ubuntu-18.04 + - name: ubuntu-1604-3000-8-py2 driver: - image: saltimages/salt-3000.6-py2:ubuntu-16.04 + image: saltimages/salt-3000.8-py2:ubuntu-16.04 provisioner: name: salt_solo From 9f6b2b1250ae4d134d3904cd09df9902bb42f677 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 23 Mar 2021 21:24:52 +0000 Subject: [PATCH 14/60] test: standardise use of `share` suite & `_mapdata` state [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/302 --- .rubocop.yml | 2 +- Gemfile | 2 +- apt/_mapdata/_mapdata.jinja | 13 ++++ apt/_mapdata/init.sls | 22 ++++++ kitchen.yml | 3 + test/integration/preferences/inspec.yml | 3 + test/integration/repositories/inspec.yml | 3 + test/integration/share/README.md | 22 ++++++ test/integration/share/inspec.yml | 22 ++++++ test/integration/share/libraries/system.rb | 90 ++++++++++++++++++++++ test/integration/unattended/inspec.yml | 3 + 11 files changed, 183 insertions(+), 2 deletions(-) create mode 100644 apt/_mapdata/_mapdata.jinja create mode 100644 apt/_mapdata/init.sls create mode 100644 test/integration/share/README.md create mode 100644 test/integration/share/inspec.yml create mode 100644 test/integration/share/libraries/system.rb diff --git a/.rubocop.yml b/.rubocop.yml index 9367e99..2cceb73 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -7,7 +7,7 @@ Layout/LineLength: # Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`) Max: 88 Metrics/BlockLength: - ExcludedMethods: + IgnoredMethods: - control - describe # Increase from default of `25` diff --git a/Gemfile b/Gemfile index 15a77c3..c08ad6c 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ source 'https://rubygems.org' # Use the latest version of `inspec` prior to `4.23.4`, which introduces a # regression where the diff isn't displayed when comparing using `eq`. gem 'inspec', '~> 4.22.22' -# Install the `kitchen-docker` gem from GitHub because the latest version +# Install the `kitchen-docker` gem using `git` because the latest version # currently available (`2.10.0`) doesn't include a recent fix for Gentoo. # rubocop:disable Layout/LineLength gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker', branch: 'ssf' diff --git a/apt/_mapdata/_mapdata.jinja b/apt/_mapdata/_mapdata.jinja new file mode 100644 index 0000000..aa9649c --- /dev/null +++ b/apt/_mapdata/_mapdata.jinja @@ -0,0 +1,13 @@ +# yamllint disable rule:indentation rule:line-length +# {{ grains.get("osfinger", grains.os) }} +--- +{#- use salt.slsutil.serialize to avoid encoding errors on some platforms #} +{{ salt["slsutil.serialize"]( + "yaml", + map, + default_flow_style=False, + allow_unicode=True, + ) + | regex_replace("^\s+'$", "'", multiline=True) + | trim +}} diff --git a/apt/_mapdata/init.sls b/apt/_mapdata/init.sls new file mode 100644 index 0000000..50bae9b --- /dev/null +++ b/apt/_mapdata/init.sls @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# vim: ft=sls +--- +{#- Get the `tplroot` from `tpldir` #} +{%- set tplroot = tpldir.split("/")[0] %} +{%- from tplroot ~ "/map.jinja" import apt with context %} + +{%- set _mapdata = { + "values": apt, + } %} +{%- do salt["log.debug"]("### MAP.JINJA DUMP ###\n" ~ _mapdata | yaml(False)) %} + +{%- set output_dir = "/temp" if grains.os_family == "Windows" else "/tmp" %} +{%- set output_file = output_dir ~ "/salt_mapdata_dump.yaml" %} + +{{ tplroot }}-mapdata-dump: + file.managed: + - name: {{ output_file }} + - source: salt://{{ tplroot }}/_mapdata/_mapdata.jinja + - template: jinja + - context: + map: {{ _mapdata | yaml }} diff --git a/kitchen.yml b/kitchen.yml index 2411671..fb47565 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -121,6 +121,7 @@ suites: state_top: base: '*': + - apt._mapdata - apt.repositories - apt.update pillars: @@ -138,6 +139,7 @@ suites: state_top: base: '*': + - apt._mapdata - apt.preferences pillars: top.sls: @@ -154,6 +156,7 @@ suites: state_top: base: '*': + - apt._mapdata - apt.unattended pillars: top.sls: diff --git a/test/integration/preferences/inspec.yml b/test/integration/preferences/inspec.yml index f4cb7a4..7e8b3eb 100644 --- a/test/integration/preferences/inspec.yml +++ b/test/integration/preferences/inspec.yml @@ -6,6 +6,9 @@ title: apt formula maintainer: SaltStack Formulas license: Apache-2.0 summary: Verify that the apt preferences are configured correctly +depends: + - name: share + path: test/integration/share supports: - platform-name: debian - platform-name: ubuntu diff --git a/test/integration/repositories/inspec.yml b/test/integration/repositories/inspec.yml index 5cda415..dbb5089 100644 --- a/test/integration/repositories/inspec.yml +++ b/test/integration/repositories/inspec.yml @@ -6,6 +6,9 @@ title: apt formula maintainer: SaltStack Formulas license: Apache-2.0 summary: Verify that the apt repositories are configured correctly +depends: + - name: share + path: test/integration/share supports: - platform-name: debian - platform-name: ubuntu diff --git a/test/integration/share/README.md b/test/integration/share/README.md new file mode 100644 index 0000000..5c5785b --- /dev/null +++ b/test/integration/share/README.md @@ -0,0 +1,22 @@ +# InSpec Profile: `share` + +This shows the implementation of the `share` InSpec [profile](https://github.com/inspec/inspec/blob/master/docs/profiles.md). + +Its goal is to share the libraries between all profiles. + +## Libraries + +### `system` + +The `system` library provides easy access to system dependent information: + +- `system.platform`: based on `inspec.platform`, modify to values that are more consistent from a SaltStack perspective + - `system.platform[:family]` provide a family name for Arch and Gentoo + - `system.platform[:name]` append `linux` to both `amazon` and `oracle`; ensure Windows platforms are resolved as simply `windows` + - `system.platform[:release]` tweak Arch, Amazon Linux, Gentoo, openSUSE and Windows: + - `Arch` is always `base-latest` + - `Amazon Linux` release `2018` is resolved as `1` + - `Gentoo` release is trimmed to its major version number and then the init system is appended (i.e. `sysv` or `sysd`) + - `openSUSE` is resolved as `tumbleweed` if the `platform[:release]` is in date format + - `Windows` uses the widely-used release number (e.g. `8.1` or `2019-server`) in place of the actual system release version + - `system.platform[:finger]` is the concatenation of the name and the major release number (except for Ubuntu, which gives `ubuntu-20.04` for example) diff --git a/test/integration/share/inspec.yml b/test/integration/share/inspec.yml new file mode 100644 index 0000000..cf623a1 --- /dev/null +++ b/test/integration/share/inspec.yml @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# vim: ft=yaml +--- +name: share +title: InSpec shared resources +maintainer: SaltStack Formulas +license: Apache-2.0 +summary: shared resources +supports: + - platform-name: debian + - platform-name: ubuntu + - platform-name: centos + - platform-name: fedora + - platform-name: opensuse + - platform-name: suse + - platform-name: freebsd + - platform-name: openbsd + - platform-name: amazon + - platform-name: oracle + - platform-name: arch + - platform-name: gentoo + - platform: windows diff --git a/test/integration/share/libraries/system.rb b/test/integration/share/libraries/system.rb new file mode 100644 index 0000000..461dea4 --- /dev/null +++ b/test/integration/share/libraries/system.rb @@ -0,0 +1,90 @@ +# frozen_string_literal: true + +# system.rb -- InSpec resources for system values +# Author: Daniel Dehennin +# Copyright (C) 2020 Daniel Dehennin + +class SystemResource < Inspec.resource(1) + name 'system' + + attr_reader :platform + + def initialize + super + @platform = build_platform + end + + private + + def build_platform + { + family: build_platform_family, + name: build_platform_name, + release: build_platform_release, + finger: build_platform_finger + } + end + + def build_platform_family + case inspec.platform[:name] + when 'arch', 'gentoo' + inspec.platform[:name] + else + inspec.platform[:family] + end + end + + def build_platform_name + case inspec.platform[:name] + when 'amazon', 'oracle' + "#{inspec.platform[:name]}linux" + when /^windows_/ + inspec.platform[:family] + else + inspec.platform[:name] + end + end + + # rubocop:disable Metrics/MethodLength,Metrics/AbcSize,Metrics/CyclomaticComplexity + def build_platform_release + case inspec.platform[:name] + when 'amazon' + # `2018` relase is named `1` in kitchen.yaml + inspec.platform[:release].gsub(/2018.*/, '1') + when 'arch' + 'base-latest' + when 'gentoo' + "#{inspec.platform[:release].split('.')[0]}-#{derive_gentoo_init_system}" + when 'opensuse' + # rubocop:disable Style/NumericLiterals,Layout/LineLength + inspec.platform[:release].to_i > 20210101 ? 'tumbleweed' : inspec.platform[:release] + # rubocop:enable Style/NumericLiterals,Layout/LineLength + when 'windows_8.1_pro' + '8.1' + when 'windows_server_2019_datacenter' + '2019-server' + when 'windows_server_2016_datacenter' + '2016-server' + else + inspec.platform[:release] + end + end + # rubocop:enable Metrics/MethodLength,Metrics/AbcSize,Metrics/CyclomaticComplexity + + def derive_gentoo_init_system + inspec.command('systemctl').exist? ? 'sysd' : 'sysv' + end + + def build_platform_finger + "#{build_platform_name}-#{build_finger_release}" + end + + def build_finger_release + case inspec.platform[:name] + when 'ubuntu' + build_platform_release.split('.').slice(0, 2).join('.') + else + build_platform_release.split('.')[0] + end + end +end diff --git a/test/integration/unattended/inspec.yml b/test/integration/unattended/inspec.yml index c832c01..294dc86 100644 --- a/test/integration/unattended/inspec.yml +++ b/test/integration/unattended/inspec.yml @@ -6,6 +6,9 @@ title: apt formula maintainer: SaltStack Formulas license: Apache-2.0 summary: Verify that the apt unattended preferences are configured correctly +depends: + - name: share + path: test/integration/share supports: - platform-name: debian - platform-name: ubuntu From 958e36194c591ff33f204333d1443e2f81fb270d Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 5 Apr 2021 18:15:42 +0100 Subject: [PATCH 15/60] chore: update `CODEOWNERS` & `.yamllint` re: `kitchen-vagrant` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/310 --- .yamllint | 2 ++ CODEOWNERS | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.yamllint b/.yamllint index 5a060ef..72dc99f 100644 --- a/.yamllint +++ b/.yamllint @@ -10,12 +10,14 @@ extends: 'default' # 3. All YAML files under directory `node_modules/`, introduced during the Travis run # 4. Any SLS files under directory `test/`, which are actually state files # 5. Any YAML files under directory `.kitchen/`, introduced during local testing +# 6. `kitchen.vagrant.yml`, which contains Embedded Ruby (ERB) template syntax ignore: | .cache/ .git/ node_modules/ test/**/states/**/*.sls .kitchen/ + kitchen.vagrant.yml yaml-files: # Default settings diff --git a/CODEOWNERS b/CODEOWNERS index 85c4cb9..2f7df79 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -39,6 +39,8 @@ /Gemfile @saltstack-formulas/ssf /Gemfile.lock @saltstack-formulas/ssf /kitchen.yml @saltstack-formulas/ssf +/kitchen.vagrant.yml @saltstack-formulas/ssf +/kitchen.windows.yml @saltstack-formulas/ssf /pre-commit_semantic-release.sh @saltstack-formulas/ssf /release-rules.js @saltstack-formulas/ssf /release.config.js @saltstack-formulas/ssf From 6be32dcd4254ef6b0dc7d9033b2b030f5701322a Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 23 Apr 2021 08:43:07 +0100 Subject: [PATCH 16/60] ci(kitchen+gitlab): adjust matrix to add `3003` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/318 --- .gitlab-ci.yml | 36 ++++++++++++---------- kitchen.yml | 84 +++++++++++++++++++++++++++++--------------------- 2 files changed, 69 insertions(+), 51 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 482af29..25cdeed 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -148,22 +148,26 @@ ubuntu-1804-master-py3: {extends: '.test_instance'} # preferences-ubuntu-1604-master-py3: {extends: '.test_instance'} # unattended-ubuntu-1604-master-py3: {extends: '.test_instance'} ubuntu-1604-master-py3: {extends: '.test_instance'} -# repositories-debian-10-3002-5-py3: {extends: '.test_instance'} -# repositories-debian-9-3002-5-py3: {extends: '.test_instance'} -# repositories-ubuntu-2004-3002-5-py3: {extends: '.test_instance'} -# repositories-ubuntu-1804-3002-5-py3: {extends: '.test_instance'} -# repositories-ubuntu-1604-3002-5-py3: {extends: '.test_instance'} -# repositories-debian-10-3001-6-py3: {extends: '.test_instance'} -# repositories-debian-9-3001-6-py3: {extends: '.test_instance'} -# repositories-ubuntu-2004-3001-6-py3: {extends: '.test_instance'} -# repositories-ubuntu-1804-3001-6-py3: {extends: '.test_instance'} -# repositories-ubuntu-1604-3001-6-py3: {extends: '.test_instance'} -# repositories-debian-10-3000-8-py3: {extends: '.test_instance'} -# repositories-debian-9-3000-8-py3: {extends: '.test_instance'} -# repositories-ubuntu-1804-3000-8-py3: {extends: '.test_instance'} -# repositories-ubuntu-1604-3000-8-py3: {extends: '.test_instance'} -# repositories-ubuntu-1804-3000-8-py2: {extends: '.test_instance'} -# repositories-ubuntu-1604-3000-8-py2: {extends: '.test_instance'} +# repositories-debian-10-3003-0-py3: {extends: '.test_instance'} +# repositories-debian-9-3003-0-py3: {extends: '.test_instance'} +# repositories-ubuntu-2004-3003-0-py3: {extends: '.test_instance'} +# repositories-ubuntu-1804-3003-0-py3: {extends: '.test_instance'} +# repositories-debian-10-3002-6-py3: {extends: '.test_instance'} +# repositories-debian-9-3002-6-py3: {extends: '.test_instance'} +# repositories-ubuntu-2004-3002-6-py3: {extends: '.test_instance'} +# repositories-ubuntu-1804-3002-6-py3: {extends: '.test_instance'} +# repositories-ubuntu-1604-3002-6-py3: {extends: '.test_instance'} +# repositories-debian-10-3001-7-py3: {extends: '.test_instance'} +# repositories-debian-9-3001-7-py3: {extends: '.test_instance'} +# repositories-ubuntu-2004-3001-7-py3: {extends: '.test_instance'} +# repositories-ubuntu-1804-3001-7-py3: {extends: '.test_instance'} +# repositories-ubuntu-1604-3001-7-py3: {extends: '.test_instance'} +# repositories-debian-10-3000-9-py3: {extends: '.test_instance'} +# repositories-debian-9-3000-9-py3: {extends: '.test_instance'} +# repositories-ubuntu-1804-3000-9-py3: {extends: '.test_instance'} +# repositories-ubuntu-1604-3000-9-py3: {extends: '.test_instance'} +# repositories-ubuntu-1804-3000-9-py2: {extends: '.test_instance'} +# repositories-ubuntu-1604-3000-9-py2: {extends: '.test_instance'} ############################################################################### # `release` stage: `semantic-release` diff --git a/kitchen.yml b/kitchen.yml index fb47565..75e99c7 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -43,59 +43,73 @@ platforms: driver: image: saltimages/salt-master-py3:ubuntu-16.04 - ## SALT `3002.5` - - name: debian-10-3002-5-py3 + ## SALT `3003.0` + - name: debian-10-3003-0-py3 driver: - image: saltimages/salt-3002.5-py3:debian-10 - - name: debian-9-3002-5-py3 + image: saltimages/salt-3003.0-py3:debian-10 + - name: debian-9-3003-0-py3 driver: - image: saltimages/salt-3002.5-py3:debian-9 - - name: ubuntu-2004-3002-5-py3 + image: saltimages/salt-3003.0-py3:debian-9 + - name: ubuntu-2004-3003-0-py3 driver: - image: saltimages/salt-3002.5-py3:ubuntu-20.04 - - name: ubuntu-1804-3002-5-py3 + image: saltimages/salt-3003.0-py3:ubuntu-20.04 + - name: ubuntu-1804-3003-0-py3 driver: - image: saltimages/salt-3002.5-py3:ubuntu-18.04 - - name: ubuntu-1604-3002-5-py3 + image: saltimages/salt-3003.0-py3:ubuntu-18.04 + + ## SALT `3002.6` + - name: debian-10-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:debian-10 + - name: debian-9-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:debian-9 + - name: ubuntu-2004-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:ubuntu-20.04 + - name: ubuntu-1804-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:ubuntu-18.04 + - name: ubuntu-1604-3002-6-py3 driver: - image: saltimages/salt-3002.5-py3:ubuntu-16.04 + image: saltimages/salt-3002.6-py3:ubuntu-16.04 - ## SALT `3001.6` - - name: debian-10-3001-6-py3 + ## SALT `3001.7` + - name: debian-10-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:debian-10 - - name: debian-9-3001-6-py3 + image: saltimages/salt-3001.7-py3:debian-10 + - name: debian-9-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:debian-9 - - name: ubuntu-2004-3001-6-py3 + image: saltimages/salt-3001.7-py3:debian-9 + - name: ubuntu-2004-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:ubuntu-20.04 - - name: ubuntu-1804-3001-6-py3 + image: saltimages/salt-3001.7-py3:ubuntu-20.04 + - name: ubuntu-1804-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:ubuntu-18.04 - - name: ubuntu-1604-3001-6-py3 + image: saltimages/salt-3001.7-py3:ubuntu-18.04 + - name: ubuntu-1604-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:ubuntu-16.04 + image: saltimages/salt-3001.7-py3:ubuntu-16.04 - ## SALT `3000.8` - - name: debian-10-3000-8-py3 + ## SALT `3000.9` + - name: debian-10-3000-9-py3 driver: - image: saltimages/salt-3000.8-py3:debian-10 - - name: debian-9-3000-8-py3 + image: saltimages/salt-3000.9-py3:debian-10 + - name: debian-9-3000-9-py3 driver: - image: saltimages/salt-3000.8-py3:debian-9 - - name: ubuntu-1804-3000-8-py3 + image: saltimages/salt-3000.9-py3:debian-9 + - name: ubuntu-1804-3000-9-py3 driver: - image: saltimages/salt-3000.8-py3:ubuntu-18.04 - - name: ubuntu-1604-3000-8-py3 + image: saltimages/salt-3000.9-py3:ubuntu-18.04 + - name: ubuntu-1604-3000-9-py3 driver: - image: saltimages/salt-3000.8-py3:ubuntu-16.04 - - name: ubuntu-1804-3000-8-py2 + image: saltimages/salt-3000.9-py3:ubuntu-16.04 + - name: ubuntu-1804-3000-9-py2 driver: - image: saltimages/salt-3000.8-py2:ubuntu-18.04 - - name: ubuntu-1604-3000-8-py2 + image: saltimages/salt-3000.9-py2:ubuntu-18.04 + - name: ubuntu-1604-3000-9-py2 driver: - image: saltimages/salt-3000.8-py2:ubuntu-16.04 + image: saltimages/salt-3000.9-py2:ubuntu-16.04 provisioner: name: salt_solo From 5637e073b698b3970d99901e1a4abd24fa34318b Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sun, 9 May 2021 22:26:08 +0100 Subject: [PATCH 17/60] ci: add `arch-master` to matrix and update `.travis.yml` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/323 --- .travis.yml | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index fdf307d..42c2cbe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -108,22 +108,26 @@ jobs: # - env: INSTANCE=preferences-ubuntu-1604-master-py3 # - env: INSTANCE=unattended-ubuntu-1604-master-py3 - env: INSTANCE=ubuntu-1604-master-py3 - # - env: INSTANCE=repositories-debian-10-3002-5-py3 - # - env: INSTANCE=repositories-debian-9-3002-5-py3 - # - env: INSTANCE=repositories-ubuntu-2004-3002-5-py3 - # - env: INSTANCE=repositories-ubuntu-1804-3002-5-py3 - # - env: INSTANCE=repositories-ubuntu-1604-3002-5-py3 - # - env: INSTANCE=repositories-debian-10-3001-6-py3 - # - env: INSTANCE=repositories-debian-9-3001-6-py3 - # - env: INSTANCE=repositories-ubuntu-2004-3001-6-py3 - # - env: INSTANCE=repositories-ubuntu-1804-3001-6-py3 - # - env: INSTANCE=repositories-ubuntu-1604-3001-6-py3 - # - env: INSTANCE=repositories-debian-10-3000-8-py3 - # - env: INSTANCE=repositories-debian-9-3000-8-py3 - # - env: INSTANCE=repositories-ubuntu-1804-3000-8-py3 - # - env: INSTANCE=repositories-ubuntu-1604-3000-8-py3 - # - env: INSTANCE=repositories-ubuntu-1804-3000-8-py2 - # - env: INSTANCE=repositories-ubuntu-1604-3000-8-py2 + # - env: INSTANCE=repositories-debian-10-3003-0-py3 + # - env: INSTANCE=repositories-debian-9-3003-0-py3 + # - env: INSTANCE=repositories-ubuntu-2004-3003-0-py3 + # - env: INSTANCE=repositories-ubuntu-1804-3003-0-py3 + # - env: INSTANCE=repositories-debian-10-3002-6-py3 + # - env: INSTANCE=repositories-debian-9-3002-6-py3 + # - env: INSTANCE=repositories-ubuntu-2004-3002-6-py3 + # - env: INSTANCE=repositories-ubuntu-1804-3002-6-py3 + # - env: INSTANCE=repositories-ubuntu-1604-3002-6-py3 + # - env: INSTANCE=repositories-debian-10-3001-7-py3 + # - env: INSTANCE=repositories-debian-9-3001-7-py3 + # - env: INSTANCE=repositories-ubuntu-2004-3001-7-py3 + # - env: INSTANCE=repositories-ubuntu-1804-3001-7-py3 + # - env: INSTANCE=repositories-ubuntu-1604-3001-7-py3 + # - env: INSTANCE=repositories-debian-10-3000-9-py3 + # - env: INSTANCE=repositories-debian-9-3000-9-py3 + # - env: INSTANCE=repositories-ubuntu-1804-3000-9-py3 + # - env: INSTANCE=repositories-ubuntu-1604-3000-9-py3 + # - env: INSTANCE=repositories-ubuntu-1804-3000-9-py2 + # - env: INSTANCE=repositories-ubuntu-1604-3000-9-py2 ## Define the release stage that runs `semantic-release` - stage: 'release' From f9bf2f41d67f0ab611393f7c73da1b21813f9efa Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 20 May 2021 14:04:00 +0100 Subject: [PATCH 18/60] chore(pre-commit): use `info` report level for `rstcheck` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/325 --- .pre-commit-config.yaml | 1 - .rstcheck.cfg | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ea8271b..9bc4109 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -52,4 +52,3 @@ repos: - id: rstcheck name: Check reST files using rstcheck exclude: 'docs/CHANGELOG.rst' - args: [--report=warning] diff --git a/.rstcheck.cfg b/.rstcheck.cfg index 05856dc..5383623 100644 --- a/.rstcheck.cfg +++ b/.rstcheck.cfg @@ -1,3 +1,4 @@ [rstcheck] -report=error +report=info ignore_language=rst +ignore_messages=(Duplicate (ex|im)plicit target.*|Hyperlink target ".*" is not referenced\.$) From 8086687001e0e5d38472f65a7b1d2097d818b1b8 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 21 Jun 2021 20:40:41 +0100 Subject: [PATCH 19/60] ci(kitchen+gitlab): remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/331 --- .gitlab-ci.yml | 9 --------- .travis.yml | 9 --------- kitchen.yml | 18 ------------------ 3 files changed, 36 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 25cdeed..da57ae2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -127,7 +127,6 @@ rubocop: # repositories-debian-9-tiamat-py3: {extends: '.test_instance'} # repositories-ubuntu-2004-tiamat-py3: {extends: '.test_instance'} # repositories-ubuntu-1804-tiamat-py3: {extends: '.test_instance'} -# repositories-ubuntu-1604-tiamat-py3: {extends: '.test_instance'} # repositories-debian-10-master-py3: {extends: '.test_instance'} # preferences-debian-10-master-py3: {extends: '.test_instance'} # unattended-debian-10-master-py3: {extends: '.test_instance'} @@ -144,10 +143,6 @@ ubuntu-2004-master-py3: {extends: '.test_instance'} # preferences-ubuntu-1804-master-py3: {extends: '.test_instance'} # unattended-ubuntu-1804-master-py3: {extends: '.test_instance'} ubuntu-1804-master-py3: {extends: '.test_instance'} -# repositories-ubuntu-1604-master-py3: {extends: '.test_instance'} -# preferences-ubuntu-1604-master-py3: {extends: '.test_instance'} -# unattended-ubuntu-1604-master-py3: {extends: '.test_instance'} -ubuntu-1604-master-py3: {extends: '.test_instance'} # repositories-debian-10-3003-0-py3: {extends: '.test_instance'} # repositories-debian-9-3003-0-py3: {extends: '.test_instance'} # repositories-ubuntu-2004-3003-0-py3: {extends: '.test_instance'} @@ -156,18 +151,14 @@ ubuntu-1604-master-py3: {extends: '.test_instance'} # repositories-debian-9-3002-6-py3: {extends: '.test_instance'} # repositories-ubuntu-2004-3002-6-py3: {extends: '.test_instance'} # repositories-ubuntu-1804-3002-6-py3: {extends: '.test_instance'} -# repositories-ubuntu-1604-3002-6-py3: {extends: '.test_instance'} # repositories-debian-10-3001-7-py3: {extends: '.test_instance'} # repositories-debian-9-3001-7-py3: {extends: '.test_instance'} # repositories-ubuntu-2004-3001-7-py3: {extends: '.test_instance'} # repositories-ubuntu-1804-3001-7-py3: {extends: '.test_instance'} -# repositories-ubuntu-1604-3001-7-py3: {extends: '.test_instance'} # repositories-debian-10-3000-9-py3: {extends: '.test_instance'} # repositories-debian-9-3000-9-py3: {extends: '.test_instance'} # repositories-ubuntu-1804-3000-9-py3: {extends: '.test_instance'} -# repositories-ubuntu-1604-3000-9-py3: {extends: '.test_instance'} # repositories-ubuntu-1804-3000-9-py2: {extends: '.test_instance'} -# repositories-ubuntu-1604-3000-9-py2: {extends: '.test_instance'} ############################################################################### # `release` stage: `semantic-release` diff --git a/.travis.yml b/.travis.yml index 42c2cbe..76e6864 100644 --- a/.travis.yml +++ b/.travis.yml @@ -87,7 +87,6 @@ jobs: # - env: INSTANCE=repositories-debian-9-tiamat-py3 # - env: INSTANCE=repositories-ubuntu-2004-tiamat-py3 # - env: INSTANCE=repositories-ubuntu-1804-tiamat-py3 - # - env: INSTANCE=repositories-ubuntu-1604-tiamat-py3 # - env: INSTANCE=repositories-debian-10-master-py3 # - env: INSTANCE=preferences-debian-10-master-py3 # - env: INSTANCE=unattended-debian-10-master-py3 @@ -104,10 +103,6 @@ jobs: # - env: INSTANCE=preferences-ubuntu-1804-master-py3 # - env: INSTANCE=unattended-ubuntu-1804-master-py3 - env: INSTANCE=ubuntu-1804-master-py3 - # - env: INSTANCE=repositories-ubuntu-1604-master-py3 - # - env: INSTANCE=preferences-ubuntu-1604-master-py3 - # - env: INSTANCE=unattended-ubuntu-1604-master-py3 - - env: INSTANCE=ubuntu-1604-master-py3 # - env: INSTANCE=repositories-debian-10-3003-0-py3 # - env: INSTANCE=repositories-debian-9-3003-0-py3 # - env: INSTANCE=repositories-ubuntu-2004-3003-0-py3 @@ -116,18 +111,14 @@ jobs: # - env: INSTANCE=repositories-debian-9-3002-6-py3 # - env: INSTANCE=repositories-ubuntu-2004-3002-6-py3 # - env: INSTANCE=repositories-ubuntu-1804-3002-6-py3 - # - env: INSTANCE=repositories-ubuntu-1604-3002-6-py3 # - env: INSTANCE=repositories-debian-10-3001-7-py3 # - env: INSTANCE=repositories-debian-9-3001-7-py3 # - env: INSTANCE=repositories-ubuntu-2004-3001-7-py3 # - env: INSTANCE=repositories-ubuntu-1804-3001-7-py3 - # - env: INSTANCE=repositories-ubuntu-1604-3001-7-py3 # - env: INSTANCE=repositories-debian-10-3000-9-py3 # - env: INSTANCE=repositories-debian-9-3000-9-py3 # - env: INSTANCE=repositories-ubuntu-1804-3000-9-py3 - # - env: INSTANCE=repositories-ubuntu-1604-3000-9-py3 # - env: INSTANCE=repositories-ubuntu-1804-3000-9-py2 - # - env: INSTANCE=repositories-ubuntu-1604-3000-9-py2 ## Define the release stage that runs `semantic-release` - stage: 'release' diff --git a/kitchen.yml b/kitchen.yml index 75e99c7..784d546 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -22,9 +22,6 @@ platforms: - name: ubuntu-1804-tiamat-py3 driver: image: saltimages/salt-tiamat-py3:ubuntu-18.04 - - name: ubuntu-1604-tiamat-py3 - driver: - image: saltimages/salt-tiamat-py3:ubuntu-16.04 ## SALT `master` - name: debian-10-master-py3 @@ -39,9 +36,6 @@ platforms: - name: ubuntu-1804-master-py3 driver: image: saltimages/salt-master-py3:ubuntu-18.04 - - name: ubuntu-1604-master-py3 - driver: - image: saltimages/salt-master-py3:ubuntu-16.04 ## SALT `3003.0` - name: debian-10-3003-0-py3 @@ -70,9 +64,6 @@ platforms: - name: ubuntu-1804-3002-6-py3 driver: image: saltimages/salt-3002.6-py3:ubuntu-18.04 - - name: ubuntu-1604-3002-6-py3 - driver: - image: saltimages/salt-3002.6-py3:ubuntu-16.04 ## SALT `3001.7` - name: debian-10-3001-7-py3 @@ -87,9 +78,6 @@ platforms: - name: ubuntu-1804-3001-7-py3 driver: image: saltimages/salt-3001.7-py3:ubuntu-18.04 - - name: ubuntu-1604-3001-7-py3 - driver: - image: saltimages/salt-3001.7-py3:ubuntu-16.04 ## SALT `3000.9` - name: debian-10-3000-9-py3 @@ -101,15 +89,9 @@ platforms: - name: ubuntu-1804-3000-9-py3 driver: image: saltimages/salt-3000.9-py3:ubuntu-18.04 - - name: ubuntu-1604-3000-9-py3 - driver: - image: saltimages/salt-3000.9-py3:ubuntu-16.04 - name: ubuntu-1804-3000-9-py2 driver: image: saltimages/salt-3000.9-py2:ubuntu-18.04 - - name: ubuntu-1604-3000-9-py2 - driver: - image: saltimages/salt-3000.9-py2:ubuntu-16.04 provisioner: name: salt_solo From 97b0af695acd8adfd3c3a048de21d03a04560636 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 1 Jul 2021 23:59:00 +0100 Subject: [PATCH 20/60] ci(3003.1): update inc. AlmaLinux, Rocky & `rst-lint` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/335 --- .gitlab-ci.yml | 8 ++++---- .pre-commit-config.yaml | 11 +++++++++++ .travis.yml | 8 ++++---- Gemfile.lock | 2 +- kitchen.yml | 18 +++++++++--------- test/integration/share/inspec.yml | 2 ++ test/integration/share/libraries/system.rb | 2 +- 7 files changed, 32 insertions(+), 19 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index da57ae2..1700b21 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -143,10 +143,10 @@ ubuntu-2004-master-py3: {extends: '.test_instance'} # preferences-ubuntu-1804-master-py3: {extends: '.test_instance'} # unattended-ubuntu-1804-master-py3: {extends: '.test_instance'} ubuntu-1804-master-py3: {extends: '.test_instance'} -# repositories-debian-10-3003-0-py3: {extends: '.test_instance'} -# repositories-debian-9-3003-0-py3: {extends: '.test_instance'} -# repositories-ubuntu-2004-3003-0-py3: {extends: '.test_instance'} -# repositories-ubuntu-1804-3003-0-py3: {extends: '.test_instance'} +# repositories-debian-10-3003-1-py3: {extends: '.test_instance'} +# repositories-debian-9-3003-1-py3: {extends: '.test_instance'} +# repositories-ubuntu-2004-3003-1-py3: {extends: '.test_instance'} +# repositories-ubuntu-1804-3003-1-py3: {extends: '.test_instance'} # repositories-debian-10-3002-6-py3: {extends: '.test_instance'} # repositories-debian-9-3002-6-py3: {extends: '.test_instance'} # repositories-ubuntu-2004-3002-6-py3: {extends: '.test_instance'} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9bc4109..41b5f35 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -52,3 +52,14 @@ repos: - id: rstcheck name: Check reST files using rstcheck exclude: 'docs/CHANGELOG.rst' + - repo: https://github.com/saltstack-formulas/mirrors-rst-lint + rev: v1.3.2 + hooks: + - id: rst-lint + name: Check reST files using rst-lint + exclude: | + (?x)^( + docs/CHANGELOG.rst| + docs/TOFS_pattern.rst| + )$ + additional_dependencies: [pygments==2.9.0] diff --git a/.travis.yml b/.travis.yml index 76e6864..f1f2dff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -103,10 +103,10 @@ jobs: # - env: INSTANCE=preferences-ubuntu-1804-master-py3 # - env: INSTANCE=unattended-ubuntu-1804-master-py3 - env: INSTANCE=ubuntu-1804-master-py3 - # - env: INSTANCE=repositories-debian-10-3003-0-py3 - # - env: INSTANCE=repositories-debian-9-3003-0-py3 - # - env: INSTANCE=repositories-ubuntu-2004-3003-0-py3 - # - env: INSTANCE=repositories-ubuntu-1804-3003-0-py3 + # - env: INSTANCE=repositories-debian-10-3003-1-py3 + # - env: INSTANCE=repositories-debian-9-3003-1-py3 + # - env: INSTANCE=repositories-ubuntu-2004-3003-1-py3 + # - env: INSTANCE=repositories-ubuntu-1804-3003-1-py3 # - env: INSTANCE=repositories-debian-10-3002-6-py3 # - env: INSTANCE=repositories-debian-9-3002-6-py3 # - env: INSTANCE=repositories-ubuntu-2004-3002-6-py3 diff --git a/Gemfile.lock b/Gemfile.lock index d7cbc3b..6ad4ef9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker - revision: 042e6921940a28d2502258b6a5ff3be17dd2fd37 + revision: 1f543f654da5c1774cb8737f6f07a01745520bb5 branch: ssf specs: kitchen-docker (2.10.0) diff --git a/kitchen.yml b/kitchen.yml index 784d546..710de79 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -37,19 +37,19 @@ platforms: driver: image: saltimages/salt-master-py3:ubuntu-18.04 - ## SALT `3003.0` - - name: debian-10-3003-0-py3 + ## SALT `3003.1` + - name: debian-10-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:debian-10 - - name: debian-9-3003-0-py3 + image: saltimages/salt-3003.1-py3:debian-10 + - name: debian-9-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:debian-9 - - name: ubuntu-2004-3003-0-py3 + image: saltimages/salt-3003.1-py3:debian-9 + - name: ubuntu-2004-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:ubuntu-20.04 - - name: ubuntu-1804-3003-0-py3 + image: saltimages/salt-3003.1-py3:ubuntu-20.04 + - name: ubuntu-1804-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:ubuntu-18.04 + image: saltimages/salt-3003.1-py3:ubuntu-18.04 ## SALT `3002.6` - name: debian-10-3002-6-py3 diff --git a/test/integration/share/inspec.yml b/test/integration/share/inspec.yml index cf623a1..ee20080 100644 --- a/test/integration/share/inspec.yml +++ b/test/integration/share/inspec.yml @@ -19,4 +19,6 @@ supports: - platform-name: oracle - platform-name: arch - platform-name: gentoo + - platform-name: almalinux + - platform-name: rocky - platform: windows diff --git a/test/integration/share/libraries/system.rb b/test/integration/share/libraries/system.rb index 461dea4..87daf08 100644 --- a/test/integration/share/libraries/system.rb +++ b/test/integration/share/libraries/system.rb @@ -36,7 +36,7 @@ def build_platform_family def build_platform_name case inspec.platform[:name] - when 'amazon', 'oracle' + when 'amazon', 'oracle', 'rocky' "#{inspec.platform[:name]}linux" when /^windows_/ inspec.platform[:family] From 8818bc61fa06b4d10494dac7154044bbd828a008 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 14 Jul 2021 12:09:05 +0100 Subject: [PATCH 21/60] chore(deps): bump `addressable` from `2.7.0` to `2.8.0` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/340 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6ad4ef9..d0dedb8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -14,7 +14,7 @@ GEM i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.7.0) + addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.1.0) aws-partitions (1.386.0) From 01cd0b04015927a06e723d45e44ef3eb6e239c22 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 17 Jul 2021 20:22:51 +0100 Subject: [PATCH 22/60] chore(gemfile+lock): update to latest gem versions (2021-W28) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/343 --- Gemfile | 2 +- Gemfile.lock | 431 +++++++++++++++++++++++++++++---------------------- kitchen.yml | 2 +- 3 files changed, 248 insertions(+), 187 deletions(-) diff --git a/Gemfile b/Gemfile index c08ad6c..9774aac 100644 --- a/Gemfile +++ b/Gemfile @@ -10,5 +10,5 @@ gem 'inspec', '~> 4.22.22' # rubocop:disable Layout/LineLength gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker', branch: 'ssf' # rubocop:enable Layout/LineLength -gem 'kitchen-inspec', '>= 2.2.1' +gem 'kitchen-inspec', '>= 2.5.0' gem 'kitchen-salt', '>= 0.6.3' diff --git a/Gemfile.lock b/Gemfile.lock index d0dedb8..4e0ccc9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,197 +9,242 @@ GIT GEM remote: https://rubygems.org/ specs: - activesupport (5.2.4.4) + activesupport (6.1.4) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) - aws-eventstream (1.1.0) - aws-partitions (1.386.0) - aws-sdk-apigateway (1.55.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-eventstream (1.1.1) + aws-partitions (1.478.0) + aws-sdk-apigateway (1.62.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-apigatewayv2 (1.29.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-apigatewayv2 (1.32.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-athena (1.33.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-applicationautoscaling (1.51.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-autoscaling (1.22.0) - aws-sdk-core (~> 3, >= 3.52.1) + aws-sdk-athena (1.37.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-budgets (1.36.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-autoscaling (1.61.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudformation (1.44.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-batch (1.47.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudfront (1.46.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-budgets (1.38.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsm (1.27.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-cloudformation (1.53.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsmv2 (1.30.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-cloudfront (1.53.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudtrail (1.29.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-cloudhsm (1.30.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatch (1.45.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-cloudhsmv2 (1.33.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatchlogs (1.38.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-cloudtrail (1.35.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-codecommit (1.40.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-cloudwatch (1.51.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-codedeploy (1.37.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-cloudwatchevents (1.46.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-codepipeline (1.37.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-cloudwatchlogs (1.41.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-configservice (1.53.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-codecommit (1.42.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.109.1) + aws-sdk-codedeploy (1.40.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-codepipeline (1.44.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-cognitoidentity (1.31.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-cognitoidentityprovider (1.51.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-configservice (1.62.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-core (3.117.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-costandusagereportservice (1.28.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-costandusagereportservice (1.31.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-databasemigrationservice (1.53.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-dynamodb (1.60.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-ec2 (1.248.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-ecr (1.42.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-ecrpublic (1.3.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-dynamodb (1.55.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-ecs (1.80.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.202.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-efs (1.40.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-ecr (1.39.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-eks (1.58.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.70.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-elasticache (1.57.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-efs (1.36.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-elasticbeanstalk (1.42.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-eks (1.45.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-elasticloadbalancing (1.31.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.44.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-elasticloadbalancingv2 (1.62.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticbeanstalk (1.39.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-elasticsearchservice (1.52.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancing (1.29.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-eventbridge (1.24.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancingv2 (1.53.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-firehose (1.37.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticsearchservice (1.43.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-glue (1.87.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-firehose (1.35.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-guardduty (1.45.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-guardduty (1.42.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-iam (1.56.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.46.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-kafka (1.36.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-kafka (1.29.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-kinesis (1.32.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-kinesis (1.30.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-kms (1.44.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.39.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-lambda (1.63.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.51.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-organizations (1.59.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-organizations (1.17.0) - aws-sdk-core (~> 3, >= 3.39.0) - aws-sigv4 (~> 1.0) - aws-sdk-rds (1.104.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-ram (1.25.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.50.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-rds (1.121.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-route53 (1.44.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-redshift (1.65.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-route53domains (1.28.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-route53 (1.49.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-route53resolver (1.21.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-route53domains (1.30.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.83.1) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-route53resolver (1.26.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-s3 (1.96.1) + aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) - aws-sdk-securityhub (1.35.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-secretsmanager (1.46.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-securityhub (1.47.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-servicecatalog (1.59.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-ses (1.38.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-shield (1.37.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-ses (1.36.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-sms (1.29.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-sms (1.27.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-sns (1.42.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-sns (1.34.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-sqs (1.40.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-sqs (1.34.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-ssm (1.112.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.95.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-states (1.39.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sigv4 (1.2.2) + aws-sdk-transfer (1.32.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sigv4 (1.2.4) aws-eventstream (~> 1, >= 1.0.2) azure_graph_rbac (0.17.2) ms_rest_azure (~> 0.12.0) - azure_mgmt_key_vault (0.17.6) + azure_mgmt_key_vault (0.17.7) ms_rest_azure (~> 0.12.0) - azure_mgmt_resources (0.18.0) + azure_mgmt_resources (0.18.2) ms_rest_azure (~> 0.12.0) - azure_mgmt_security (0.18.2) + azure_mgmt_security (0.19.0) ms_rest_azure (~> 0.12.0) - azure_mgmt_storage (0.22.0) + azure_mgmt_storage (0.23.0) ms_rest_azure (~> 0.12.0) - bcrypt_pbkdf (1.0.1) + bcrypt_pbkdf (1.1.0) builder (3.2.4) - chef-config (16.6.14) + chef-config (17.2.29) addressable - chef-utils (= 16.6.14) + chef-utils (= 17.2.29) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) tomlrb (~> 1.2) - chef-telemetry (1.0.14) + chef-telemetry (1.0.29) chef-config concurrent-ruby (~> 1.0) - ffi-yajl (~> 2.2) - chef-utils (16.6.14) + chef-utils (17.2.29) + concurrent-ruby coderay (1.1.3) - concurrent-ruby (1.1.7) + concurrent-ruby (1.1.9) declarative (0.0.20) - declarative-option (0.1.0) diff-lcs (1.4.4) - docker-api (2.0.0) + docker-api (2.2.0) excon (>= 0.47.0) multi_json domain_name (0.5.20190701) @@ -207,44 +252,43 @@ GEM ecma-re-validator (0.2.1) regexp_parser (~> 1.2) ed25519 (1.2.4) - erubi (1.9.0) - excon (0.78.0) - faraday (0.17.3) + erubi (1.10.0) + excon (0.84.0) + faraday (0.17.4) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.7) faraday (>= 0.8.0) http-cookie (~> 1.0.0) faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) - ffi (1.13.1) - ffi-yajl (2.3.4) - libyajl2 (~> 1.2) + ffi (1.15.3) fuzzyurl (0.9.0) - google-api-client (0.44.0) + google-api-client (0.52.0) addressable (~> 2.5, >= 2.5.1) googleauth (~> 0.9) httpclient (>= 2.8.1, < 3.0) mini_mime (~> 1.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) + rexml signet (~> 0.12) - googleauth (0.13.0) + googleauth (0.14.0) faraday (>= 0.17.3, < 2.0) jwt (>= 1.4, < 3.0) memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (~> 0.14) - gssapi (1.3.0) + gssapi (1.3.1) ffi (>= 1.0.1) gyoku (1.3.1) builder (>= 2.1.2) - hana (1.3.6) + hana (1.3.7) hashie (3.6.0) - http-cookie (1.0.3) + http-cookie (1.0.4) domain_name (~> 0.5) httpclient (2.8.3) - i18n (1.8.5) + i18n (1.8.10) concurrent-ruby (~> 1.0) inifile (3.0.0) inspec (4.22.22) @@ -278,21 +322,20 @@ GEM tty-prompt (~> 0.17) tty-table (~> 0.10) jmespath (1.4.0) - json (2.3.1) + json (2.5.1) json_schemer (0.2.11) ecma-re-validator (~> 0.2) hana (~> 1.3) regexp_parser (~> 1.5) uri_template (~> 0.7) - jwt (2.2.2) - kitchen-inspec (2.2.1) - hashie (~> 3.4) + jwt (2.2.3) + kitchen-inspec (2.5.0) + hashie (>= 3.4, <= 5.0) inspec (>= 2.2.64, < 5.0) - test-kitchen (>= 2.7, < 3) + test-kitchen (>= 2.7, < 4) kitchen-salt (0.6.3) hashie (>= 3.5) test-kitchen (>= 1.4) - libyajl2 (1.2.0) license-acceptance (1.0.19) pastel (~> 0.7) tomlrb (~> 1.2) @@ -304,16 +347,16 @@ GEM multi_json (~> 1.14) memoist (0.16.2) method_source (1.0.0) - mini_mime (1.0.2) - minitest (5.14.2) + mini_mime (1.1.0) + minitest (5.14.4) mixlib-config (3.0.9) tomlrb - mixlib-install (3.12.3) + mixlib-install (3.12.11) mixlib-shellout mixlib-versioning thor mixlib-log (3.0.9) - mixlib-shellout (3.1.6) + mixlib-shellout (3.2.5) chef-utils mixlib-versioning (1.2.12) ms_rest (0.7.6) @@ -334,52 +377,54 @@ GEM net-ssh (>= 4.0.0) nori (2.6.0) os (1.1.1) - parallel (1.19.2) + parallel (1.20.1) parslet (1.8.2) pastel (0.8.0) tty-color (~> 0.5) - pry (0.13.1) + pry (0.14.1) coderay (~> 1.1) method_source (~> 1.0) public_suffix (4.0.6) regexp_parser (1.8.2) - representable (3.0.4) + representable (3.1.1) declarative (< 0.1.0) - declarative-option (< 0.2.0) + trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rspec (3.9.0) - rspec-core (~> 3.9.0) - rspec-expectations (~> 3.9.0) - rspec-mocks (~> 3.9.0) - rspec-core (3.9.3) - rspec-support (~> 3.9.3) - rspec-expectations (3.9.3) + 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.1) + rspec-support (~> 3.10.0) + rspec-expectations (3.10.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) + rspec-support (~> 3.10.0) rspec-its (1.3.0) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) - rspec-mocks (3.9.1) + rspec-mocks (3.10.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-support (3.9.4) - rubyntlm (0.6.2) + rspec-support (~> 3.10.0) + rspec-support (3.10.2) + rubyntlm (0.6.3) rubyzip (1.3.0) semverse (3.0.0) - signet (0.14.0) + signet (0.15.0) addressable (~> 2.3) faraday (>= 0.17.3, < 2.0) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) sslshake (1.3.1) - strings (0.2.0) + strings (0.2.1) strings-ansi (~> 0.2) - unicode-display_width (~> 1.5) + unicode-display_width (>= 1.5, < 3.0) unicode_utils (~> 1.4) strings-ansi (0.2.0) - test-kitchen (2.7.2) + test-kitchen (3.0.0) bcrypt_pbkdf (~> 1.0) + chef-utils (>= 16.4.35) ed25519 (~> 1.2) license-acceptance (>= 1.0.11, < 3.0) mixlib-install (~> 3.6) @@ -391,28 +436,30 @@ GEM winrm (~> 2.0) winrm-elevated (~> 1.0) winrm-fs (~> 1.1) - thor (1.0.1) - thread_safe (0.3.6) + thor (1.1.0) timeliness (0.3.10) tomlrb (1.2.9) - train (3.3.27) - activesupport (>= 5.2.4.3, < 6.0.0) + trailblazer-option (0.1.1) + train (3.7.4) + activesupport (>= 6.0.3.1) azure_graph_rbac (~> 0.16) azure_mgmt_key_vault (~> 0.17) azure_mgmt_resources (~> 0.15) azure_mgmt_security (~> 0.18) azure_mgmt_storage (~> 0.18) docker-api (>= 1.26, < 3.0) - google-api-client (>= 0.23.9, < 0.44.1) - googleauth (>= 0.6.6, < 0.13.1) + google-api-client (>= 0.23.9, <= 0.52.0) + googleauth (>= 0.6.6, <= 0.14.0) inifile (~> 3.0) - train-core (= 3.3.27) + train-core (= 3.7.4) train-winrm (~> 0.2) - train-aws (0.1.18) + train-aws (0.2.8) aws-sdk-apigateway (~> 1.0) aws-sdk-apigatewayv2 (~> 1.0) + aws-sdk-applicationautoscaling (>= 1.46, < 1.52) aws-sdk-athena (~> 1.0) - aws-sdk-autoscaling (~> 1.22.0) + aws-sdk-autoscaling (>= 1.22, < 1.62) + aws-sdk-batch (>= 1.36, < 1.48) aws-sdk-budgets (~> 1.0) aws-sdk-cloudformation (~> 1.0) aws-sdk-cloudfront (~> 1.0) @@ -420,16 +467,21 @@ GEM aws-sdk-cloudhsmv2 (~> 1.0) aws-sdk-cloudtrail (~> 1.8) aws-sdk-cloudwatch (~> 1.13) + aws-sdk-cloudwatchevents (>= 1.36, < 1.47) aws-sdk-cloudwatchlogs (~> 1.13) aws-sdk-codecommit (~> 1.0) aws-sdk-codedeploy (~> 1.0) aws-sdk-codepipeline (~> 1.0) + aws-sdk-cognitoidentity (>= 1.26, < 1.32) + aws-sdk-cognitoidentityprovider (>= 1.46, < 1.52) aws-sdk-configservice (~> 1.21) aws-sdk-core (~> 3.0) aws-sdk-costandusagereportservice (~> 1.6) + aws-sdk-databasemigrationservice (>= 1.42, < 1.54) aws-sdk-dynamodb (~> 1.31) aws-sdk-ec2 (~> 1.70) aws-sdk-ecr (~> 1.18) + aws-sdk-ecrpublic (~> 1.3) aws-sdk-ecs (~> 1.30) aws-sdk-efs (~> 1.0) aws-sdk-eks (~> 1.9) @@ -438,48 +490,56 @@ GEM aws-sdk-elasticloadbalancing (~> 1.8) aws-sdk-elasticloadbalancingv2 (~> 1.0) aws-sdk-elasticsearchservice (~> 1.0) + aws-sdk-eventbridge (~> 1.24.0) aws-sdk-firehose (~> 1.0) + aws-sdk-glue (>= 1.71, < 1.88) aws-sdk-guardduty (~> 1.31) aws-sdk-iam (~> 1.13) aws-sdk-kafka (~> 1.0) aws-sdk-kinesis (~> 1.0) aws-sdk-kms (~> 1.13) aws-sdk-lambda (~> 1.0) - aws-sdk-organizations (~> 1.17.0) + aws-sdk-organizations (>= 1.17, < 1.60) + aws-sdk-ram (>= 1.21, < 1.26) aws-sdk-rds (~> 1.43) aws-sdk-redshift (~> 1.0) aws-sdk-route53 (~> 1.0) aws-sdk-route53domains (~> 1.0) aws-sdk-route53resolver (~> 1.0) aws-sdk-s3 (~> 1.30) + aws-sdk-secretsmanager (>= 1.42, < 1.47) aws-sdk-securityhub (~> 1.0) + aws-sdk-servicecatalog (>= 1.48, < 1.60) aws-sdk-ses (~> 1.0) + aws-sdk-shield (~> 1.30) aws-sdk-sms (~> 1.0) aws-sdk-sns (~> 1.9) aws-sdk-sqs (~> 1.10) aws-sdk-ssm (~> 1.0) - train-core (3.3.27) + aws-sdk-states (>= 1.35, < 1.40) + aws-sdk-transfer (>= 1.26, < 1.33) + train-core (3.7.4) addressable (~> 2.5) ffi (!= 1.13.0) json (>= 1.8, < 3.0) mixlib-shellout (>= 2.0, < 4.0) net-scp (>= 1.2, < 4.0) net-ssh (>= 2.9, < 7.0) - train-habitat (0.2.13) - train-winrm (0.2.11) - winrm (~> 2.0) + train-habitat (0.2.22) + train-winrm (0.2.12) + winrm (>= 2.3.6, < 3.0) winrm-elevated (~> 1.2.2) winrm-fs (~> 1.0) - tty-box (0.6.0) + tty-box (0.7.0) pastel (~> 0.8) strings (~> 0.2.0) tty-cursor (~> 0.7) - tty-color (0.5.2) + tty-color (0.6.0) tty-cursor (0.7.1) - tty-prompt (0.22.0) + tty-prompt (0.23.1) pastel (~> 0.8) tty-reader (~> 0.8) - tty-reader (0.8.0) + tty-reader (0.9.0) tty-cursor (~> 0.7) tty-screen (~> 0.8) wisper (~> 2.0) @@ -488,16 +548,16 @@ GEM pastel (~> 0.8) strings (~> 0.2.0) tty-screen (~> 0.8) - tzinfo (1.2.7) - thread_safe (~> 0.1) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) uber (0.1.0) unf (0.1.4) unf_ext unf_ext (0.0.7.7) - unicode-display_width (1.7.0) + unicode-display_width (2.0.0) unicode_utils (1.4.0) uri_template (0.7.0) - winrm (2.3.5) + winrm (2.3.6) builder (>= 2.1.2) erubi (~> 1.8) gssapi (~> 1.2) @@ -505,8 +565,8 @@ GEM httpclient (~> 2.2, >= 2.2.0.2) logging (>= 1.6.1, < 3.0) nori (~> 2.0) - rubyntlm (~> 0.6.0, >= 0.6.1) - winrm-elevated (1.2.2) + rubyntlm (~> 0.6.0, >= 0.6.3) + winrm-elevated (1.2.3) erubi (~> 1.8) winrm (~> 2.0) winrm-fs (~> 1.0) @@ -516,6 +576,7 @@ GEM rubyzip (~> 1.1) winrm (~> 2.0) wisper (2.0.1) + zeitwerk (2.4.2) PLATFORMS ruby @@ -523,7 +584,7 @@ PLATFORMS DEPENDENCIES inspec (~> 4.22.22) kitchen-docker! - kitchen-inspec (>= 2.2.1) + kitchen-inspec (>= 2.5.0) kitchen-salt (>= 0.6.3) BUNDLED WITH diff --git a/kitchen.yml b/kitchen.yml index 710de79..a3e95a6 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -107,8 +107,8 @@ verifier: # https://www.inspec.io/ name: inspec sudo: true - # cli, documentation, html, progress, json, json-min, json-rspec, junit reporter: + # cli, documentation, html, progress, json, json-min, json-rspec, junit - cli suites: From d08806c07d7382fb9e6965c0db46b916aad3a386 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 17 Jul 2021 21:05:56 +0100 Subject: [PATCH 23/60] ci(kitchen): move `provisioner` block & update `run_command` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/344 --- kitchen.yml | 46 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/kitchen.yml b/kitchen.yml index a3e95a6..6a207b0 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -6,102 +6,126 @@ driver: name: docker use_sudo: false privileged: true - run_command: /lib/systemd/systemd + run_command: /usr/lib/systemd/systemd + +provisioner: + name: salt_solo + log_level: debug + salt_install: none + require_chef: false + formula: apt + salt_copy_filter: + - .kitchen + - .git platforms: ## SALT `tiamat` - name: debian-10-tiamat-py3 driver: image: saltimages/salt-tiamat-py3:debian-10 + run_command: /lib/systemd/systemd - name: debian-9-tiamat-py3 driver: image: saltimages/salt-tiamat-py3:debian-9 + run_command: /lib/systemd/systemd - name: ubuntu-2004-tiamat-py3 driver: image: saltimages/salt-tiamat-py3:ubuntu-20.04 + run_command: /lib/systemd/systemd - name: ubuntu-1804-tiamat-py3 driver: image: saltimages/salt-tiamat-py3:ubuntu-18.04 + run_command: /lib/systemd/systemd ## SALT `master` - name: debian-10-master-py3 driver: image: saltimages/salt-master-py3:debian-10 + run_command: /lib/systemd/systemd - name: debian-9-master-py3 driver: image: saltimages/salt-master-py3:debian-9 + run_command: /lib/systemd/systemd - name: ubuntu-2004-master-py3 driver: image: saltimages/salt-master-py3:ubuntu-20.04 + run_command: /lib/systemd/systemd - name: ubuntu-1804-master-py3 driver: image: saltimages/salt-master-py3:ubuntu-18.04 + run_command: /lib/systemd/systemd ## SALT `3003.1` - name: debian-10-3003-1-py3 driver: image: saltimages/salt-3003.1-py3:debian-10 + run_command: /lib/systemd/systemd - name: debian-9-3003-1-py3 driver: image: saltimages/salt-3003.1-py3:debian-9 + run_command: /lib/systemd/systemd - name: ubuntu-2004-3003-1-py3 driver: image: saltimages/salt-3003.1-py3:ubuntu-20.04 + run_command: /lib/systemd/systemd - name: ubuntu-1804-3003-1-py3 driver: image: saltimages/salt-3003.1-py3:ubuntu-18.04 + run_command: /lib/systemd/systemd ## SALT `3002.6` - name: debian-10-3002-6-py3 driver: image: saltimages/salt-3002.6-py3:debian-10 + run_command: /lib/systemd/systemd - name: debian-9-3002-6-py3 driver: image: saltimages/salt-3002.6-py3:debian-9 + run_command: /lib/systemd/systemd - name: ubuntu-2004-3002-6-py3 driver: image: saltimages/salt-3002.6-py3:ubuntu-20.04 + run_command: /lib/systemd/systemd - name: ubuntu-1804-3002-6-py3 driver: image: saltimages/salt-3002.6-py3:ubuntu-18.04 + run_command: /lib/systemd/systemd ## SALT `3001.7` - name: debian-10-3001-7-py3 driver: image: saltimages/salt-3001.7-py3:debian-10 + run_command: /lib/systemd/systemd - name: debian-9-3001-7-py3 driver: image: saltimages/salt-3001.7-py3:debian-9 + run_command: /lib/systemd/systemd - name: ubuntu-2004-3001-7-py3 driver: image: saltimages/salt-3001.7-py3:ubuntu-20.04 + run_command: /lib/systemd/systemd - name: ubuntu-1804-3001-7-py3 driver: image: saltimages/salt-3001.7-py3:ubuntu-18.04 + run_command: /lib/systemd/systemd ## SALT `3000.9` - name: debian-10-3000-9-py3 driver: image: saltimages/salt-3000.9-py3:debian-10 + run_command: /lib/systemd/systemd - name: debian-9-3000-9-py3 driver: image: saltimages/salt-3000.9-py3:debian-9 + run_command: /lib/systemd/systemd - name: ubuntu-1804-3000-9-py3 driver: image: saltimages/salt-3000.9-py3:ubuntu-18.04 + run_command: /lib/systemd/systemd - name: ubuntu-1804-3000-9-py2 driver: image: saltimages/salt-3000.9-py2:ubuntu-18.04 - -provisioner: - name: salt_solo - log_level: debug - salt_install: none - require_chef: false - formula: apt - salt_copy_filter: - - .kitchen - - .git + run_command: /lib/systemd/systemd verifier: # https://www.inspec.io/ From 758d646d1e509e1e1a10bfa9b30c3f8261d6bf30 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sun, 18 Jul 2021 18:57:04 +0100 Subject: [PATCH 24/60] ci: add Debian 11 Bullseye & update `yamllint` configuration [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/345 --- .gitlab-ci.yml | 7 +++++++ .travis.yml | 7 +++++++ .yamllint | 14 ++++++++------ kitchen.yml | 16 ++++++++++++++++ 4 files changed, 38 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1700b21..4e19603 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -123,10 +123,15 @@ 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` +# repositories-debian-11-tiamat-py3: {extends: '.test_instance'} # repositories-debian-10-tiamat-py3: {extends: '.test_instance'} # repositories-debian-9-tiamat-py3: {extends: '.test_instance'} # repositories-ubuntu-2004-tiamat-py3: {extends: '.test_instance'} # repositories-ubuntu-1804-tiamat-py3: {extends: '.test_instance'} +# repositories-debian-11-master-py3: {extends: '.test_instance'} +# preferences-debian-11-master-py3: {extends: '.test_instance'} +# unattended-debian-11-master-py3: {extends: '.test_instance'} +debian-11-master-py3: {extends: '.test_instance'} # repositories-debian-10-master-py3: {extends: '.test_instance'} # preferences-debian-10-master-py3: {extends: '.test_instance'} # unattended-debian-10-master-py3: {extends: '.test_instance'} @@ -143,10 +148,12 @@ ubuntu-2004-master-py3: {extends: '.test_instance'} # preferences-ubuntu-1804-master-py3: {extends: '.test_instance'} # unattended-ubuntu-1804-master-py3: {extends: '.test_instance'} ubuntu-1804-master-py3: {extends: '.test_instance'} +# repositories-debian-11-3003-1-py3: {extends: '.test_instance'} # repositories-debian-10-3003-1-py3: {extends: '.test_instance'} # repositories-debian-9-3003-1-py3: {extends: '.test_instance'} # repositories-ubuntu-2004-3003-1-py3: {extends: '.test_instance'} # repositories-ubuntu-1804-3003-1-py3: {extends: '.test_instance'} +# repositories-debian-11-3002-6-py3: {extends: '.test_instance'} # repositories-debian-10-3002-6-py3: {extends: '.test_instance'} # repositories-debian-9-3002-6-py3: {extends: '.test_instance'} # repositories-ubuntu-2004-3002-6-py3: {extends: '.test_instance'} diff --git a/.travis.yml b/.travis.yml index f1f2dff..7c6c8b7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -83,10 +83,15 @@ jobs: ## 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` + # - env: INSTANCE=repositories-debian-11-tiamat-py3 # - env: INSTANCE=repositories-debian-10-tiamat-py3 # - env: INSTANCE=repositories-debian-9-tiamat-py3 # - env: INSTANCE=repositories-ubuntu-2004-tiamat-py3 # - env: INSTANCE=repositories-ubuntu-1804-tiamat-py3 + # - env: INSTANCE=repositories-debian-11-master-py3 + # - env: INSTANCE=preferences-debian-11-master-py3 + # - env: INSTANCE=unattended-debian-11-master-py3 + - env: INSTANCE=debian-11-master-py3 # - env: INSTANCE=repositories-debian-10-master-py3 # - env: INSTANCE=preferences-debian-10-master-py3 # - env: INSTANCE=unattended-debian-10-master-py3 @@ -103,10 +108,12 @@ jobs: # - env: INSTANCE=preferences-ubuntu-1804-master-py3 # - env: INSTANCE=unattended-ubuntu-1804-master-py3 - env: INSTANCE=ubuntu-1804-master-py3 + # - env: INSTANCE=repositories-debian-11-3003-1-py3 # - env: INSTANCE=repositories-debian-10-3003-1-py3 # - env: INSTANCE=repositories-debian-9-3003-1-py3 # - env: INSTANCE=repositories-ubuntu-2004-3003-1-py3 # - env: INSTANCE=repositories-ubuntu-1804-3003-1-py3 + # - env: INSTANCE=repositories-debian-11-3002-6-py3 # - env: INSTANCE=repositories-debian-10-3002-6-py3 # - env: INSTANCE=repositories-debian-9-3002-6-py3 # - env: INSTANCE=repositories-ubuntu-2004-3002-6-py3 diff --git a/.yamllint b/.yamllint index 72dc99f..716baaf 100644 --- a/.yamllint +++ b/.yamllint @@ -5,13 +5,15 @@ extends: 'default' # Files to ignore completely -# 1. All YAML files under directory `.cache/`, introduced during the GitLab CI run -# 2. All YAML files under directory `.git/` -# 3. All YAML files under directory `node_modules/`, introduced during the Travis run -# 4. Any SLS files under directory `test/`, which are actually state files -# 5. Any YAML files under directory `.kitchen/`, introduced during local testing -# 6. `kitchen.vagrant.yml`, which contains Embedded Ruby (ERB) template syntax +# 1. All YAML files under directory `.bundle/`, introduced if gems are installed locally +# 2. All YAML files under directory `.cache/`, introduced during the CI run +# 3. All YAML files under directory `.git/` +# 4. All YAML files under directory `node_modules/`, introduced during the CI run +# 5. Any SLS files under directory `test/`, which are actually state files +# 6. Any YAML files under directory `.kitchen/`, introduced during local testing +# 7. `kitchen.vagrant.yml`, which contains Embedded Ruby (ERB) template syntax ignore: | + .bundle/ .cache/ .git/ node_modules/ diff --git a/kitchen.yml b/kitchen.yml index 6a207b0..073b9ef 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -20,6 +20,10 @@ provisioner: platforms: ## SALT `tiamat` + - name: debian-11-tiamat-py3 + driver: + image: saltimages/salt-tiamat-py3:debian-11 + run_command: /lib/systemd/systemd - name: debian-10-tiamat-py3 driver: image: saltimages/salt-tiamat-py3:debian-10 @@ -38,6 +42,10 @@ platforms: run_command: /lib/systemd/systemd ## SALT `master` + - name: debian-11-master-py3 + driver: + image: saltimages/salt-master-py3:debian-11 + run_command: /lib/systemd/systemd - name: debian-10-master-py3 driver: image: saltimages/salt-master-py3:debian-10 @@ -56,6 +64,10 @@ platforms: run_command: /lib/systemd/systemd ## SALT `3003.1` + - name: debian-11-3003-1-py3 + driver: + image: saltimages/salt-3003.1-py3:debian-11 + run_command: /lib/systemd/systemd - name: debian-10-3003-1-py3 driver: image: saltimages/salt-3003.1-py3:debian-10 @@ -74,6 +86,10 @@ platforms: run_command: /lib/systemd/systemd ## SALT `3002.6` + - name: debian-11-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:debian-11 + run_command: /lib/systemd/systemd - name: debian-10-3002-6-py3 driver: image: saltimages/salt-3002.6-py3:debian-10 From 89e9acb45f8fd2d06cc0e8993fb491ca89c54368 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 21 Jul 2021 18:25:54 +0100 Subject: [PATCH 25/60] chore(gemfile.lock): update to latest gem versions (2021-W29) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/349 --- Gemfile.lock | 12 ++++++------ test/integration/share/libraries/system.rb | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4e0ccc9..7919fa7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -18,7 +18,7 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.1.1) - aws-partitions (1.478.0) + aws-partitions (1.479.0) aws-sdk-apigateway (1.62.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) @@ -96,7 +96,7 @@ GEM aws-sdk-dynamodb (1.60.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.248.0) + aws-sdk-ec2 (1.250.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.42.0) @@ -105,7 +105,7 @@ GEM aws-sdk-ecrpublic (1.3.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.80.0) + aws-sdk-ecs (1.81.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sdk-efs (1.40.0) @@ -147,7 +147,7 @@ GEM aws-sdk-kafka (1.36.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-kinesis (1.32.0) + aws-sdk-kinesis (1.32.1) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sdk-kms (1.44.0) @@ -177,7 +177,7 @@ GEM aws-sdk-route53resolver (1.26.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.96.1) + aws-sdk-s3 (1.96.2) aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -253,7 +253,7 @@ GEM regexp_parser (~> 1.2) ed25519 (1.2.4) erubi (1.10.0) - excon (0.84.0) + excon (0.85.0) faraday (0.17.4) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.7) diff --git a/test/integration/share/libraries/system.rb b/test/integration/share/libraries/system.rb index 87daf08..af65449 100644 --- a/test/integration/share/libraries/system.rb +++ b/test/integration/share/libraries/system.rb @@ -49,7 +49,7 @@ def build_platform_name def build_platform_release case inspec.platform[:name] when 'amazon' - # `2018` relase is named `1` in kitchen.yaml + # `2018` relase is named `1` in `kitchen.yml` inspec.platform[:release].gsub(/2018.*/, '1') when 'arch' 'base-latest' From af09dc347c455f7790b40549ec2a3f3848e02998 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 26 Jul 2021 14:22:30 +0100 Subject: [PATCH 26/60] chore(gemfile.lock): update to latest gem versions (2021-W30) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/353 --- Gemfile.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7919fa7..5c05698 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -96,7 +96,7 @@ GEM aws-sdk-dynamodb (1.60.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.250.0) + aws-sdk-ec2 (1.251.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.42.0) @@ -123,7 +123,7 @@ GEM aws-sdk-elasticloadbalancing (1.31.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancingv2 (1.62.0) + aws-sdk-elasticloadbalancingv2 (1.64.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sdk-elasticsearchservice (1.52.0) @@ -141,7 +141,7 @@ GEM aws-sdk-guardduty (1.45.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.56.0) + aws-sdk-iam (1.57.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sdk-kafka (1.36.0) @@ -153,7 +153,7 @@ GEM aws-sdk-kms (1.44.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.63.0) + aws-sdk-lambda (1.64.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sdk-organizations (1.59.0) @@ -162,7 +162,7 @@ GEM aws-sdk-ram (1.25.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-rds (1.121.0) + aws-sdk-rds (1.122.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sdk-redshift (1.65.0) @@ -184,7 +184,7 @@ GEM aws-sdk-secretsmanager (1.46.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-securityhub (1.47.0) + aws-sdk-securityhub (1.48.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sdk-servicecatalog (1.59.0) @@ -228,9 +228,9 @@ GEM ms_rest_azure (~> 0.12.0) bcrypt_pbkdf (1.1.0) builder (3.2.4) - chef-config (17.2.29) + chef-config (17.3.48) addressable - chef-utils (= 17.2.29) + chef-utils (= 17.3.48) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -238,7 +238,7 @@ GEM chef-telemetry (1.0.29) chef-config concurrent-ruby (~> 1.0) - chef-utils (17.2.29) + chef-utils (17.3.48) concurrent-ruby coderay (1.1.3) concurrent-ruby (1.1.9) From eac7b79cf822466892bcc5d843de40bd2e8aee58 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 4 Aug 2021 21:34:09 +0100 Subject: [PATCH 27/60] chore(gemfile.lock): update to latest gem versions (2021-W31) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/356 --- Gemfile.lock | 208 +++++++++++++++++++++++++-------------------------- 1 file changed, 104 insertions(+), 104 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5c05698..18134ba 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker - revision: 1f543f654da5c1774cb8737f6f07a01745520bb5 + revision: 428c89fc250b3790abad5ecb0afe0c3d4956084c branch: ssf specs: - kitchen-docker (2.10.0) + kitchen-docker (2.11.0) test-kitchen (>= 1.0.0) GEM @@ -18,18 +18,18 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.1.1) - aws-partitions (1.479.0) - aws-sdk-apigateway (1.62.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-partitions (1.482.0) + aws-sdk-apigateway (1.64.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-apigatewayv2 (1.32.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-apigatewayv2 (1.34.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-applicationautoscaling (1.51.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-athena (1.37.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-athena (1.39.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-autoscaling (1.61.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -37,41 +37,41 @@ GEM aws-sdk-batch (1.47.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-budgets (1.38.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-budgets (1.40.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudformation (1.53.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-cloudformation (1.55.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudfront (1.53.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-cloudfront (1.55.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsm (1.30.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-cloudhsm (1.32.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsmv2 (1.33.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-cloudhsmv2 (1.35.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudtrail (1.35.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-cloudtrail (1.37.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatch (1.51.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-cloudwatch (1.54.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-cloudwatchevents (1.46.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatchlogs (1.41.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-cloudwatchlogs (1.43.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-codecommit (1.42.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-codecommit (1.44.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-codedeploy (1.40.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-codedeploy (1.42.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-codepipeline (1.44.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-codepipeline (1.46.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-cognitoidentity (1.31.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -79,82 +79,82 @@ GEM aws-sdk-cognitoidentityprovider (1.51.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-configservice (1.62.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-configservice (1.64.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.117.0) + aws-sdk-core (3.119.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-costandusagereportservice (1.31.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-costandusagereportservice (1.33.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-databasemigrationservice (1.53.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-dynamodb (1.60.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-dynamodb (1.62.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.251.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-ec2 (1.254.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-ecr (1.42.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-ecr (1.44.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-ecrpublic (1.3.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-ecrpublic (1.5.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.81.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-ecs (1.83.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-efs (1.40.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-efs (1.42.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-eks (1.58.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-eks (1.60.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.57.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-elasticache (1.59.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticbeanstalk (1.42.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-elasticbeanstalk (1.44.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancing (1.31.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-elasticloadbalancing (1.33.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancingv2 (1.64.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-elasticloadbalancingv2 (1.66.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticsearchservice (1.52.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-elasticsearchservice (1.54.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-eventbridge (1.24.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-firehose (1.37.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-firehose (1.39.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-glue (1.87.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-guardduty (1.45.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-guardduty (1.47.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.57.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-iam (1.59.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-kafka (1.36.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-kafka (1.38.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-kinesis (1.32.1) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-kinesis (1.34.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.44.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-kms (1.46.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.64.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-lambda (1.66.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-organizations (1.59.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -162,51 +162,51 @@ GEM aws-sdk-ram (1.25.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-rds (1.122.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-rds (1.124.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.65.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-redshift (1.68.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-route53 (1.49.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-route53 (1.52.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-route53domains (1.30.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-route53domains (1.32.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-route53resolver (1.26.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-route53resolver (1.28.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.96.2) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-s3 (1.98.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) aws-sdk-secretsmanager (1.46.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-securityhub (1.48.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-securityhub (1.50.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-servicecatalog (1.59.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-ses (1.38.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-ses (1.40.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-shield (1.37.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-shield (1.40.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-sms (1.29.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-sms (1.31.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-sns (1.42.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-sns (1.44.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-sqs (1.40.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-sqs (1.42.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.112.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-ssm (1.114.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-states (1.39.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -235,7 +235,7 @@ GEM mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) tomlrb (~> 1.2) - chef-telemetry (1.0.29) + chef-telemetry (1.1.1) chef-config concurrent-ruby (~> 1.0) chef-utils (17.3.48) @@ -440,7 +440,7 @@ GEM timeliness (0.3.10) tomlrb (1.2.9) trailblazer-option (0.1.1) - train (3.7.4) + train (3.8.1) activesupport (>= 6.0.3.1) azure_graph_rbac (~> 0.16) azure_mgmt_key_vault (~> 0.17) @@ -451,7 +451,7 @@ GEM google-api-client (>= 0.23.9, <= 0.52.0) googleauth (>= 0.6.6, <= 0.14.0) inifile (~> 3.0) - train-core (= 3.7.4) + train-core (= 3.8.1) train-winrm (~> 0.2) train-aws (0.2.8) aws-sdk-apigateway (~> 1.0) @@ -518,7 +518,7 @@ GEM aws-sdk-ssm (~> 1.0) aws-sdk-states (>= 1.35, < 1.40) aws-sdk-transfer (>= 1.26, < 1.33) - train-core (3.7.4) + train-core (3.8.1) addressable (~> 2.5) ffi (!= 1.13.0) json (>= 1.8, < 3.0) From 1f136cd52c960ffbd43f97c4e4d658e827c34bc3 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 4 Aug 2021 21:51:00 +0100 Subject: [PATCH 28/60] ci(gemfile+lock): use `ssf` customised `inspec` repo [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/357 --- Gemfile | 15 ++++--- Gemfile.lock | 118 ++++++++++++++++++++++++++++----------------------- 2 files changed, 75 insertions(+), 58 deletions(-) diff --git a/Gemfile b/Gemfile index 9774aac..1fc06c5 100644 --- a/Gemfile +++ b/Gemfile @@ -2,13 +2,18 @@ source 'https://rubygems.org' -# Use the latest version of `inspec` prior to `4.23.4`, which introduces a -# regression where the diff isn't displayed when comparing using `eq`. -gem 'inspec', '~> 4.22.22' -# Install the `kitchen-docker` gem using `git` because the latest version -# currently available (`2.10.0`) doesn't include a recent fix for Gentoo. +# Install the `inspec` gem using `git` because versions after `4.22.22` +# suppress diff output; this version fixes this for our uses. +# rubocop:disable Layout/LineLength +gem 'inspec', git: 'https://gitlab.com/saltstack-formulas/infrastructure/inspec', branch: 'ssf' +# rubocop:enable Layout/LineLength + +# Install the `kitchen-docker` gem using `git` in order to gain a performance +# improvement: avoid package installations which are already covered by the +# `salt-image-builder` (i.e. the pre-salted images that we're using) # rubocop:disable Layout/LineLength gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker', branch: 'ssf' # rubocop:enable Layout/LineLength + gem 'kitchen-inspec', '>= 2.5.0' gem 'kitchen-salt', '>= 0.6.3' diff --git a/Gemfile.lock b/Gemfile.lock index 18134ba..d9395ac 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,40 @@ +GIT + remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec + revision: 1dfd086de2d2ba87fd755b0c9063b43ab682519d + branch: ssf + specs: + inspec (4.41.0) + faraday_middleware (>= 0.12.2, < 1.1) + inspec-core (= 4.41.0) + mongo + train (~> 3.0) + train-aws (~> 0.1) + train-habitat (~> 0.1) + train-winrm (~> 0.2) + inspec-core (4.41.0) + addressable (~> 2.4) + chef-telemetry (~> 1.0, >= 1.0.8) + faraday (>= 0.9.0, < 1.5) + faraday_middleware (~> 1.0) + hashie (>= 3.4, < 5.0) + license-acceptance (>= 0.2.13, < 3.0) + method_source (>= 0.8, < 2.0) + mixlib-log (~> 3.0) + multipart-post (~> 2.0) + parallel (~> 1.9) + parslet (>= 1.5, < 2.0) + pry (~> 0.13) + rspec (>= 3.9, < 3.11) + rspec-its (~> 1.2) + rubyzip (>= 1.2.2, < 3.0) + semverse (~> 3.0) + sslshake (~> 1.2) + thor (>= 0.20, < 2.0) + tomlrb (>= 1.2, < 2.1) + train-core (~> 3.0) + tty-prompt (~> 0.17) + tty-table (~> 0.10) + GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker revision: 428c89fc250b3790abad5ecb0afe0c3d4956084c @@ -227,6 +264,7 @@ GEM azure_mgmt_storage (0.23.0) ms_rest_azure (~> 0.12.0) bcrypt_pbkdf (1.1.0) + bson (4.12.1) builder (3.2.4) chef-config (17.3.48) addressable @@ -249,18 +287,27 @@ GEM multi_json domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - ecma-re-validator (0.2.1) - regexp_parser (~> 1.2) ed25519 (1.2.4) erubi (1.10.0) excon (0.85.0) - faraday (0.17.4) + faraday (1.4.3) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.1) multipart-post (>= 1.2, < 3) + ruby2_keywords (>= 0.0.4) faraday-cookie_jar (0.0.7) faraday (>= 0.8.0) http-cookie (~> 1.0.0) - faraday_middleware (0.12.2) - faraday (>= 0.7.4, < 1.0) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday_middleware (1.0.0) + faraday (~> 1.0) ffi (1.15.3) fuzzyurl (0.9.0) google-api-client (0.52.0) @@ -283,51 +330,15 @@ GEM ffi (>= 1.0.1) gyoku (1.3.1) builder (>= 2.1.2) - hana (1.3.7) - hashie (3.6.0) + hashie (4.1.0) http-cookie (1.0.4) domain_name (~> 0.5) httpclient (2.8.3) i18n (1.8.10) concurrent-ruby (~> 1.0) inifile (3.0.0) - inspec (4.22.22) - faraday_middleware (~> 0.12.2) - inspec-core (= 4.22.22) - train (~> 3.0) - train-aws (~> 0.1) - train-habitat (~> 0.1) - train-winrm (~> 0.2) - inspec-core (4.22.22) - addressable (~> 2.4) - chef-telemetry (~> 1.0) - faraday (>= 0.9.0) - hashie (~> 3.4) - json_schemer (>= 0.2.1, < 0.2.12) - license-acceptance (>= 0.2.13, < 2.0) - method_source (>= 0.8, < 2.0) - mixlib-log (~> 3.0) - multipart-post (~> 2.0) - parallel (~> 1.9) - parslet (~> 1.5) - pry (~> 0.13) - rspec (~> 3.9) - rspec-its (~> 1.2) - rubyzip (~> 1.2, >= 1.2.2) - semverse (~> 3.0) - sslshake (~> 1.2) - thor (>= 0.20, < 2.0) - tomlrb (~> 1.2.0) - train-core (~> 3.0) - tty-prompt (~> 0.17) - tty-table (~> 0.10) jmespath (1.4.0) json (2.5.1) - json_schemer (0.2.11) - ecma-re-validator (~> 0.2) - hana (~> 1.3) - regexp_parser (~> 1.5) - uri_template (~> 0.7) jwt (2.2.3) kitchen-inspec (2.5.0) hashie (>= 3.4, <= 5.0) @@ -336,11 +347,11 @@ GEM kitchen-salt (0.6.3) hashie (>= 3.5) test-kitchen (>= 1.4) - license-acceptance (1.0.19) + license-acceptance (2.1.13) pastel (~> 0.7) - tomlrb (~> 1.2) - tty-box (~> 0.3) - tty-prompt (~> 0.18) + tomlrb (>= 1.2, < 3.0) + tty-box (~> 0.6) + tty-prompt (~> 0.20) little-plugger (1.1.4) logging (2.3.0) little-plugger (~> 1.1) @@ -359,6 +370,8 @@ GEM mixlib-shellout (3.2.5) chef-utils mixlib-versioning (1.2.12) + mongo (2.15.0) + bson (>= 4.8.2, < 5.0.0) ms_rest (0.7.6) concurrent-ruby (~> 1.0) faraday (>= 0.9, < 2.0.0) @@ -385,7 +398,6 @@ GEM coderay (~> 1.1) method_source (~> 1.0) public_suffix (4.0.6) - regexp_parser (1.8.2) representable (3.1.1) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) @@ -408,8 +420,9 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.2) + ruby2_keywords (0.0.5) rubyntlm (0.6.3) - rubyzip (1.3.0) + rubyzip (2.3.2) semverse (3.0.0) signet (0.15.0) addressable (~> 2.3) @@ -438,7 +451,7 @@ GEM winrm-fs (~> 1.1) thor (1.1.0) timeliness (0.3.10) - tomlrb (1.2.9) + tomlrb (1.3.0) trailblazer-option (0.1.1) train (3.8.1) activesupport (>= 6.0.3.1) @@ -556,7 +569,6 @@ GEM unf_ext (0.0.7.7) unicode-display_width (2.0.0) unicode_utils (1.4.0) - uri_template (0.7.0) winrm (2.3.6) builder (>= 2.1.2) erubi (~> 1.8) @@ -570,10 +582,10 @@ GEM erubi (~> 1.8) winrm (~> 2.0) winrm-fs (~> 1.0) - winrm-fs (1.3.3) + winrm-fs (1.3.5) erubi (~> 1.8) logging (>= 1.6.1, < 3.0) - rubyzip (~> 1.1) + rubyzip (~> 2.0) winrm (~> 2.0) wisper (2.0.1) zeitwerk (2.4.2) @@ -582,7 +594,7 @@ PLATFORMS ruby DEPENDENCIES - inspec (~> 4.22.22) + inspec! kitchen-docker! kitchen-inspec (>= 2.5.0) kitchen-salt (>= 0.6.3) From 39b7d6d3fb0bda24b48fb2e21345b98095785250 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 9 Aug 2021 12:08:43 +0100 Subject: [PATCH 29/60] chore(gemfile.lock): update to latest gem versions (2021-W32) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/358 --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index d9395ac..6e72407 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -55,7 +55,7 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.1.1) - aws-partitions (1.482.0) + aws-partitions (1.484.0) aws-sdk-apigateway (1.64.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) @@ -65,7 +65,7 @@ GEM aws-sdk-applicationautoscaling (1.51.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-athena (1.39.0) + aws-sdk-athena (1.40.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-autoscaling (1.61.0) @@ -199,7 +199,7 @@ GEM aws-sdk-ram (1.25.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-rds (1.124.0) + aws-sdk-rds (1.125.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-redshift (1.68.0) From 8533d97ab4bc2570cef95bf4d983f24755eebb83 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 16 Aug 2021 18:20:16 +0100 Subject: [PATCH 30/60] chore(gemfile.lock): update to latest gem versions (2021-W33) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/359 --- Gemfile.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6e72407..2999653 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,17 +1,17 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 1dfd086de2d2ba87fd755b0c9063b43ab682519d + revision: eaeef51095a51ba581c59209df9dd048d93b7154 branch: ssf specs: - inspec (4.41.0) + inspec (4.41.2) faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 4.41.0) - mongo + inspec-core (= 4.41.2) + mongo (= 2.13.2) train (~> 3.0) train-aws (~> 0.1) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.41.0) + inspec-core (4.41.2) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -55,11 +55,11 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.1.1) - aws-partitions (1.484.0) - aws-sdk-apigateway (1.64.0) + aws-partitions (1.487.0) + aws-sdk-apigateway (1.65.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-apigatewayv2 (1.34.0) + aws-sdk-apigatewayv2 (1.35.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-applicationautoscaling (1.51.0) @@ -142,7 +142,7 @@ GEM aws-sdk-ecrpublic (1.5.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.83.0) + aws-sdk-ecs (1.84.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-efs (1.42.0) @@ -151,7 +151,7 @@ GEM aws-sdk-eks (1.60.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.59.0) + aws-sdk-elasticache (1.60.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-elasticbeanstalk (1.44.0) @@ -190,7 +190,7 @@ GEM aws-sdk-kms (1.46.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.66.0) + aws-sdk-lambda (1.67.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-organizations (1.59.0) @@ -205,7 +205,7 @@ GEM aws-sdk-redshift (1.68.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-route53 (1.52.0) + aws-sdk-route53 (1.53.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-route53domains (1.32.0) @@ -242,7 +242,7 @@ GEM aws-sdk-sqs (1.42.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.114.0) + aws-sdk-ssm (1.115.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-states (1.39.0) @@ -362,7 +362,7 @@ GEM minitest (5.14.4) mixlib-config (3.0.9) tomlrb - mixlib-install (3.12.11) + mixlib-install (3.12.16) mixlib-shellout mixlib-versioning thor @@ -370,7 +370,7 @@ GEM mixlib-shellout (3.2.5) chef-utils mixlib-versioning (1.2.12) - mongo (2.15.0) + mongo (2.13.2) bson (>= 4.8.2, < 5.0.0) ms_rest (0.7.6) concurrent-ruby (~> 1.0) From efe8592337a698ca3361076e1dec453dca9d69d9 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 19 Aug 2021 10:08:50 +0100 Subject: [PATCH 31/60] ci(kitchen+ci): update with latest `3003.2` pre-salted images [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/360 --- .gitlab-ci.yml | 10 +++++----- .travis.yml | 10 +++++----- kitchen.yml | 22 +++++++++++----------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4e19603..c54ba80 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -148,11 +148,11 @@ ubuntu-2004-master-py3: {extends: '.test_instance'} # preferences-ubuntu-1804-master-py3: {extends: '.test_instance'} # unattended-ubuntu-1804-master-py3: {extends: '.test_instance'} ubuntu-1804-master-py3: {extends: '.test_instance'} -# repositories-debian-11-3003-1-py3: {extends: '.test_instance'} -# repositories-debian-10-3003-1-py3: {extends: '.test_instance'} -# repositories-debian-9-3003-1-py3: {extends: '.test_instance'} -# repositories-ubuntu-2004-3003-1-py3: {extends: '.test_instance'} -# repositories-ubuntu-1804-3003-1-py3: {extends: '.test_instance'} +# repositories-debian-11-3003-2-py3: {extends: '.test_instance'} +# repositories-debian-10-3003-2-py3: {extends: '.test_instance'} +# repositories-debian-9-3003-2-py3: {extends: '.test_instance'} +# repositories-ubuntu-2004-3003-2-py3: {extends: '.test_instance'} +# repositories-ubuntu-1804-3003-2-py3: {extends: '.test_instance'} # repositories-debian-11-3002-6-py3: {extends: '.test_instance'} # repositories-debian-10-3002-6-py3: {extends: '.test_instance'} # repositories-debian-9-3002-6-py3: {extends: '.test_instance'} diff --git a/.travis.yml b/.travis.yml index 7c6c8b7..8501214 100644 --- a/.travis.yml +++ b/.travis.yml @@ -108,11 +108,11 @@ jobs: # - env: INSTANCE=preferences-ubuntu-1804-master-py3 # - env: INSTANCE=unattended-ubuntu-1804-master-py3 - env: INSTANCE=ubuntu-1804-master-py3 - # - env: INSTANCE=repositories-debian-11-3003-1-py3 - # - env: INSTANCE=repositories-debian-10-3003-1-py3 - # - env: INSTANCE=repositories-debian-9-3003-1-py3 - # - env: INSTANCE=repositories-ubuntu-2004-3003-1-py3 - # - env: INSTANCE=repositories-ubuntu-1804-3003-1-py3 + # - env: INSTANCE=repositories-debian-11-3003-2-py3 + # - env: INSTANCE=repositories-debian-10-3003-2-py3 + # - env: INSTANCE=repositories-debian-9-3003-2-py3 + # - env: INSTANCE=repositories-ubuntu-2004-3003-2-py3 + # - env: INSTANCE=repositories-ubuntu-1804-3003-2-py3 # - env: INSTANCE=repositories-debian-11-3002-6-py3 # - env: INSTANCE=repositories-debian-10-3002-6-py3 # - env: INSTANCE=repositories-debian-9-3002-6-py3 diff --git a/kitchen.yml b/kitchen.yml index 073b9ef..d0ab8fe 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -63,26 +63,26 @@ platforms: image: saltimages/salt-master-py3:ubuntu-18.04 run_command: /lib/systemd/systemd - ## SALT `3003.1` - - name: debian-11-3003-1-py3 + ## SALT `3003.2` + - name: debian-11-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:debian-11 + image: saltimages/salt-3003.2-py3:debian-11 run_command: /lib/systemd/systemd - - name: debian-10-3003-1-py3 + - name: debian-10-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:debian-10 + image: saltimages/salt-3003.2-py3:debian-10 run_command: /lib/systemd/systemd - - name: debian-9-3003-1-py3 + - name: debian-9-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:debian-9 + image: saltimages/salt-3003.2-py3:debian-9 run_command: /lib/systemd/systemd - - name: ubuntu-2004-3003-1-py3 + - name: ubuntu-2004-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:ubuntu-20.04 + image: saltimages/salt-3003.2-py3:ubuntu-20.04 run_command: /lib/systemd/systemd - - name: ubuntu-1804-3003-1-py3 + - name: ubuntu-1804-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:ubuntu-18.04 + image: saltimages/salt-3003.2-py3:ubuntu-18.04 run_command: /lib/systemd/systemd ## SALT `3002.6` From 0b4f34f4dc9c05084cd29c6eed8a178460f88248 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 23 Aug 2021 09:20:16 +0100 Subject: [PATCH 32/60] chore(gemfile.lock): update to latest gem versions (2021-W34) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/362 --- Gemfile.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2999653..67bd8da 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,17 +1,17 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: eaeef51095a51ba581c59209df9dd048d93b7154 + revision: 603468f3449c8581d05ea6b7328834115490dfb8 branch: ssf specs: - inspec (4.41.2) + inspec (4.41.7) faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 4.41.2) + inspec-core (= 4.41.7) mongo (= 2.13.2) train (~> 3.0) train-aws (~> 0.1) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.41.2) + inspec-core (4.41.7) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -46,7 +46,7 @@ GIT GEM remote: https://rubygems.org/ specs: - activesupport (6.1.4) + activesupport (6.1.4.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -55,7 +55,7 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.1.1) - aws-partitions (1.487.0) + aws-partitions (1.489.0) aws-sdk-apigateway (1.65.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) @@ -98,7 +98,7 @@ GEM aws-sdk-cloudwatchevents (1.46.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatchlogs (1.43.0) + aws-sdk-cloudwatchlogs (1.44.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-codecommit (1.44.0) @@ -116,10 +116,10 @@ GEM aws-sdk-cognitoidentityprovider (1.51.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-configservice (1.64.0) + aws-sdk-configservice (1.65.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.119.0) + aws-sdk-core (3.119.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) @@ -133,7 +133,7 @@ GEM aws-sdk-dynamodb (1.62.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.254.0) + aws-sdk-ec2 (1.257.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.44.0) @@ -148,7 +148,7 @@ GEM aws-sdk-efs (1.42.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-eks (1.60.0) + aws-sdk-eks (1.61.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-elasticache (1.60.0) @@ -205,16 +205,16 @@ GEM aws-sdk-redshift (1.68.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-route53 (1.53.0) + aws-sdk-route53 (1.54.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-route53domains (1.32.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-route53resolver (1.28.0) + aws-sdk-route53resolver (1.29.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.98.0) + aws-sdk-s3 (1.99.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -358,7 +358,7 @@ GEM multi_json (~> 1.14) memoist (0.16.2) method_source (1.0.0) - mini_mime (1.1.0) + mini_mime (1.1.1) minitest (5.14.4) mixlib-config (3.0.9) tomlrb From 90ac4c5a11d661ef11192d78beefa89f9e50db20 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 30 Aug 2021 18:06:03 +0100 Subject: [PATCH 33/60] chore(gemfile.lock): update to latest gem versions (2021-W35) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/364 --- Gemfile.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 67bd8da..af3a739 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,17 +1,17 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 603468f3449c8581d05ea6b7328834115490dfb8 + revision: 4fa6455347ea3c7123743dfd9796728cb0b77bb9 branch: ssf specs: - inspec (4.41.7) + inspec (4.41.11) faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 4.41.7) + inspec-core (= 4.41.11) mongo (= 2.13.2) train (~> 3.0) train-aws (~> 0.1) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.41.7) + inspec-core (4.41.11) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -55,8 +55,8 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.1.1) - aws-partitions (1.489.0) - aws-sdk-apigateway (1.65.0) + aws-partitions (1.492.0) + aws-sdk-apigateway (1.66.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-apigatewayv2 (1.35.0) @@ -133,7 +133,7 @@ GEM aws-sdk-dynamodb (1.62.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.257.0) + aws-sdk-ec2 (1.260.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.44.0) @@ -214,7 +214,7 @@ GEM aws-sdk-route53resolver (1.29.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.99.0) + aws-sdk-s3 (1.100.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -242,7 +242,7 @@ GEM aws-sdk-sqs (1.42.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.115.0) + aws-sdk-ssm (1.116.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-states (1.39.0) @@ -266,9 +266,9 @@ GEM bcrypt_pbkdf (1.1.0) bson (4.12.1) builder (3.2.4) - chef-config (17.3.48) + chef-config (17.4.38) addressable - chef-utils (= 17.3.48) + chef-utils (= 17.4.38) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -276,7 +276,7 @@ GEM chef-telemetry (1.1.1) chef-config concurrent-ruby (~> 1.0) - chef-utils (17.3.48) + chef-utils (17.4.38) concurrent-ruby coderay (1.1.3) concurrent-ruby (1.1.9) From 2e8cb1b9db186cd7812d6bd82ce9398e35f3548d Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 8 Sep 2021 23:30:04 +0100 Subject: [PATCH 34/60] chore(gemfile.lock): update to latest gem versions (2021-W36) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/367 --- Gemfile.lock | 264 +++++++++++++++++++++++++++------------------------ 1 file changed, 142 insertions(+), 122 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index af3a739..2d09848 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,17 +1,17 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 4fa6455347ea3c7123743dfd9796728cb0b77bb9 + revision: 2654d96e9567010c80908b15e07b0c63220abda9 branch: ssf specs: - inspec (4.41.11) + inspec (4.41.20) faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 4.41.11) + inspec-core (= 4.41.20) mongo (= 2.13.2) train (~> 3.0) - train-aws (~> 0.1) + train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.41.11) + inspec-core (4.41.20) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -54,204 +54,219 @@ GEM zeitwerk (~> 2.3) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) - aws-eventstream (1.1.1) - aws-partitions (1.492.0) - aws-sdk-apigateway (1.66.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-eventstream (1.2.0) + aws-partitions (1.497.0) + aws-sdk-alexaforbusiness (1.50.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-apigatewayv2 (1.35.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-amplify (1.32.0) + aws-sdk-core (~> 3, >= 3.120.0) + aws-sigv4 (~> 1.1) + aws-sdk-apigateway (1.67.0) + aws-sdk-core (~> 3, >= 3.120.0) + aws-sigv4 (~> 1.1) + aws-sdk-apigatewayv2 (1.36.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-applicationautoscaling (1.51.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-athena (1.40.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-athena (1.41.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-autoscaling (1.61.0) + aws-sdk-autoscaling (1.63.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sdk-batch (1.47.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-budgets (1.40.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-budgets (1.41.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudformation (1.55.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-cloudformation (1.57.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudfront (1.55.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-cloudfront (1.56.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsm (1.32.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-cloudhsm (1.33.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsmv2 (1.35.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-cloudhsmv2 (1.36.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudtrail (1.37.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-cloudtrail (1.38.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatch (1.54.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-cloudwatch (1.55.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-cloudwatchevents (1.46.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatchlogs (1.44.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-cloudwatchlogs (1.45.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-codecommit (1.44.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-codecommit (1.45.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-codedeploy (1.42.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-codedeploy (1.43.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-codepipeline (1.46.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-codepipeline (1.47.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-cognitoidentity (1.31.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-cognitoidentityprovider (1.51.0) + aws-sdk-cognitoidentityprovider (1.53.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-configservice (1.65.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-configservice (1.66.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.119.1) + aws-sdk-core (3.121.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-costandusagereportservice (1.33.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-costandusagereportservice (1.34.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-databasemigrationservice (1.53.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-dynamodb (1.62.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-dynamodb (1.63.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.260.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-ec2 (1.261.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-ecr (1.44.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-ecr (1.45.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-ecrpublic (1.5.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-ecrpublic (1.6.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.84.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-ecs (1.85.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-efs (1.42.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-efs (1.44.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-eks (1.61.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-eks (1.63.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.60.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-elasticache (1.62.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticbeanstalk (1.44.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-elasticbeanstalk (1.45.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancing (1.33.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-elasticloadbalancing (1.34.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancingv2 (1.66.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-elasticloadbalancingv2 (1.67.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticsearchservice (1.54.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-elasticsearchservice (1.55.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-eventbridge (1.24.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-firehose (1.39.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-firehose (1.41.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-glue (1.87.0) + aws-sdk-glue (1.88.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-guardduty (1.47.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-guardduty (1.48.0) + aws-sdk-core (~> 3, >= 3.120.0) + aws-sigv4 (~> 1.1) + aws-sdk-iam (1.60.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.59.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-kafka (1.39.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-kafka (1.38.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-kinesis (1.35.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-kinesis (1.34.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-kms (1.48.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.46.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-lambda (1.68.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.67.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-mq (1.40.0) + aws-sdk-core (~> 3, >= 3.120.0) + aws-sigv4 (~> 1.1) + aws-sdk-networkfirewall (1.7.0) + aws-sdk-core (~> 3, >= 3.120.0) + aws-sigv4 (~> 1.1) + aws-sdk-networkmanager (1.14.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-organizations (1.59.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-ram (1.25.0) + aws-sdk-ram (1.26.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-rds (1.125.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-rds (1.126.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.68.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-redshift (1.69.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-route53 (1.54.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-route53 (1.55.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-route53domains (1.32.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-route53domains (1.33.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-route53resolver (1.29.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-route53resolver (1.30.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.100.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-s3 (1.102.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.1) + aws-sigv4 (~> 1.4) aws-sdk-secretsmanager (1.46.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-securityhub (1.50.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-securityhub (1.52.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-servicecatalog (1.59.0) + aws-sdk-servicecatalog (1.60.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-ses (1.40.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-ses (1.41.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-shield (1.40.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-shield (1.41.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-sms (1.31.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-sms (1.32.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-sns (1.44.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-sns (1.45.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-sqs (1.42.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-sqs (1.44.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.116.0) - aws-sdk-core (~> 3, >= 3.119.0) + aws-sdk-ssm (1.117.0) + aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-states (1.39.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-transfer (1.32.0) + aws-sdk-transfer (1.34.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sigv4 (1.2.4) + aws-sigv4 (1.4.0) aws-eventstream (~> 1, >= 1.0.2) azure_graph_rbac (0.17.2) ms_rest_azure (~> 0.12.0) @@ -308,7 +323,7 @@ GEM faraday-net_http_persistent (1.2.0) faraday_middleware (1.0.0) faraday (~> 1.0) - ffi (1.15.3) + ffi (1.15.4) fuzzyurl (0.9.0) google-api-client (0.52.0) addressable (~> 2.5, >= 2.5.1) @@ -424,8 +439,8 @@ GEM rubyntlm (0.6.3) rubyzip (2.3.2) semverse (3.0.0) - signet (0.15.0) - addressable (~> 2.3) + signet (0.16.0) + addressable (~> 2.8) faraday (>= 0.17.3, < 2.0) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) @@ -466,12 +481,14 @@ GEM inifile (~> 3.0) train-core (= 3.8.1) train-winrm (~> 0.2) - train-aws (0.2.8) + train-aws (0.2.19) + aws-sdk-alexaforbusiness (~> 1.0) + aws-sdk-amplify (~> 1.0) aws-sdk-apigateway (~> 1.0) aws-sdk-apigatewayv2 (~> 1.0) aws-sdk-applicationautoscaling (>= 1.46, < 1.52) aws-sdk-athena (~> 1.0) - aws-sdk-autoscaling (>= 1.22, < 1.62) + aws-sdk-autoscaling (>= 1.22, < 1.64) aws-sdk-batch (>= 1.36, < 1.48) aws-sdk-budgets (~> 1.0) aws-sdk-cloudformation (~> 1.0) @@ -486,7 +503,7 @@ GEM aws-sdk-codedeploy (~> 1.0) aws-sdk-codepipeline (~> 1.0) aws-sdk-cognitoidentity (>= 1.26, < 1.32) - aws-sdk-cognitoidentityprovider (>= 1.46, < 1.52) + aws-sdk-cognitoidentityprovider (>= 1.46, < 1.54) aws-sdk-configservice (~> 1.21) aws-sdk-core (~> 3.0) aws-sdk-costandusagereportservice (~> 1.6) @@ -505,15 +522,18 @@ GEM aws-sdk-elasticsearchservice (~> 1.0) aws-sdk-eventbridge (~> 1.24.0) aws-sdk-firehose (~> 1.0) - aws-sdk-glue (>= 1.71, < 1.88) + aws-sdk-glue (>= 1.71, < 1.89) aws-sdk-guardduty (~> 1.31) aws-sdk-iam (~> 1.13) aws-sdk-kafka (~> 1.0) aws-sdk-kinesis (~> 1.0) aws-sdk-kms (~> 1.13) aws-sdk-lambda (~> 1.0) + aws-sdk-mq (~> 1.0) + aws-sdk-networkfirewall (>= 1.6.0) + aws-sdk-networkmanager (>= 1.13.0) aws-sdk-organizations (>= 1.17, < 1.60) - aws-sdk-ram (>= 1.21, < 1.26) + aws-sdk-ram (>= 1.21, < 1.27) aws-sdk-rds (~> 1.43) aws-sdk-redshift (~> 1.0) aws-sdk-route53 (~> 1.0) @@ -522,7 +542,7 @@ GEM aws-sdk-s3 (~> 1.30) aws-sdk-secretsmanager (>= 1.42, < 1.47) aws-sdk-securityhub (~> 1.0) - aws-sdk-servicecatalog (>= 1.48, < 1.60) + aws-sdk-servicecatalog (>= 1.48, < 1.61) aws-sdk-ses (~> 1.0) aws-sdk-shield (~> 1.30) aws-sdk-sms (~> 1.0) @@ -530,7 +550,7 @@ GEM aws-sdk-sqs (~> 1.10) aws-sdk-ssm (~> 1.0) aws-sdk-states (>= 1.35, < 1.40) - aws-sdk-transfer (>= 1.26, < 1.33) + aws-sdk-transfer (>= 1.26, < 1.35) train-core (3.8.1) addressable (~> 2.5) ffi (!= 1.13.0) From d6876bec50ed8d7b946ee3d969c0cdcdba1af1de Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 14 Sep 2021 09:53:14 +0100 Subject: [PATCH 35/60] chore(gemfile.lock): update to latest gem versions (2021-W37) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/368 --- Gemfile.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2d09848..5ae5395 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,17 +1,17 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 2654d96e9567010c80908b15e07b0c63220abda9 + revision: 9a3c06719f3a209f34212151883fda40787a1626 branch: ssf specs: - inspec (4.41.20) + inspec (4.46.4) faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 4.41.20) + inspec-core (= 4.46.4) mongo (= 2.13.2) train (~> 3.0) train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.41.20) + inspec-core (4.46.4) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -55,7 +55,7 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.2.0) - aws-partitions (1.497.0) + aws-partitions (1.501.0) aws-sdk-alexaforbusiness (1.50.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) @@ -83,7 +83,7 @@ GEM aws-sdk-budgets (1.41.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudformation (1.57.0) + aws-sdk-cloudformation (1.58.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-cloudfront (1.56.0) @@ -139,10 +139,10 @@ GEM aws-sdk-dynamodb (1.63.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.261.0) + aws-sdk-ec2 (1.262.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-ecr (1.45.0) + aws-sdk-ecr (1.46.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-ecrpublic (1.6.0) @@ -187,7 +187,7 @@ GEM aws-sdk-iam (1.60.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-kafka (1.39.0) + aws-sdk-kafka (1.40.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-kinesis (1.35.0) @@ -214,7 +214,7 @@ GEM aws-sdk-ram (1.26.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-rds (1.126.0) + aws-sdk-rds (1.127.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-redshift (1.69.0) @@ -405,7 +405,7 @@ GEM net-ssh (>= 4.0.0) nori (2.6.0) os (1.1.1) - parallel (1.20.1) + parallel (1.21.0) parslet (1.8.2) pastel (0.8.0) tty-color (~> 0.5) From 0c32e960225244c934460590ca823bc960f842c0 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 21 Sep 2021 11:54:43 +0100 Subject: [PATCH 36/60] chore(gemfile.lock): update to latest gem versions (2021-W38) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/369 --- Gemfile.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5ae5395..c9fd158 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -55,7 +55,7 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.2.0) - aws-partitions (1.501.0) + aws-partitions (1.503.0) aws-sdk-alexaforbusiness (1.50.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) @@ -139,7 +139,7 @@ GEM aws-sdk-dynamodb (1.63.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.262.0) + aws-sdk-ec2 (1.263.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.46.0) @@ -169,7 +169,7 @@ GEM aws-sdk-elasticloadbalancingv2 (1.67.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticsearchservice (1.55.0) + aws-sdk-elasticsearchservice (1.56.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-eventbridge (1.24.0) @@ -229,7 +229,7 @@ GEM aws-sdk-route53resolver (1.30.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.102.0) + aws-sdk-s3 (1.103.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) @@ -586,8 +586,8 @@ GEM uber (0.1.0) unf (0.1.4) unf_ext - unf_ext (0.0.7.7) - unicode-display_width (2.0.0) + unf_ext (0.0.8) + unicode-display_width (2.1.0) unicode_utils (1.4.0) winrm (2.3.6) builder (>= 2.1.2) From 3ac32271723097e0309b06b4ac8cf96f7687996c Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 30 Sep 2021 07:07:41 +0100 Subject: [PATCH 37/60] chore(gemfile.lock): update to latest gem versions (2021-W39) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/370 --- Gemfile.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c9fd158..6e33618 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,17 +1,17 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 9a3c06719f3a209f34212151883fda40787a1626 + revision: 223002687f2cfa303b13457825665de6c5514c52 branch: ssf specs: - inspec (4.46.4) + inspec (4.46.13) faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 4.46.4) + inspec-core (= 4.46.13) mongo (= 2.13.2) train (~> 3.0) train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.46.4) + inspec-core (4.46.13) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -55,7 +55,7 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.2.0) - aws-partitions (1.503.0) + aws-partitions (1.507.0) aws-sdk-alexaforbusiness (1.50.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) @@ -125,7 +125,7 @@ GEM aws-sdk-configservice (1.66.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.121.0) + aws-sdk-core (3.121.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) @@ -139,10 +139,10 @@ GEM aws-sdk-dynamodb (1.63.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.263.0) + aws-sdk-ec2 (1.265.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-ecr (1.46.0) + aws-sdk-ecr (1.47.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-ecrpublic (1.6.0) @@ -166,7 +166,7 @@ GEM aws-sdk-elasticloadbalancing (1.34.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancingv2 (1.67.0) + aws-sdk-elasticloadbalancingv2 (1.68.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-elasticsearchservice (1.56.0) @@ -184,10 +184,10 @@ GEM aws-sdk-guardduty (1.48.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.60.0) + aws-sdk-iam (1.61.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-kafka (1.40.0) + aws-sdk-kafka (1.41.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-kinesis (1.35.0) @@ -257,7 +257,7 @@ GEM aws-sdk-sqs (1.44.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.117.0) + aws-sdk-ssm (1.118.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-states (1.39.0) @@ -281,9 +281,9 @@ GEM bcrypt_pbkdf (1.1.0) bson (4.12.1) builder (3.2.4) - chef-config (17.4.38) + chef-config (17.5.22) addressable - chef-utils (= 17.4.38) + chef-utils (= 17.5.22) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -291,7 +291,7 @@ GEM chef-telemetry (1.1.1) chef-config concurrent-ruby (~> 1.0) - chef-utils (17.4.38) + chef-utils (17.5.22) concurrent-ruby coderay (1.1.3) concurrent-ruby (1.1.9) From 9762abfb4d3fecd5d4a9028c2e4a6e09667e7ceb Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 5 Oct 2021 11:08:30 +0100 Subject: [PATCH 38/60] ci(kitchen+ci): update with latest CVE pre-salted images [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/374 --- .gitignore | 1 + .gitlab-ci.yml | 32 +++++++++----------- .travis.yml | 32 +++++++++----------- kitchen.yml | 80 +++++++++++++++++++------------------------------- 4 files changed, 60 insertions(+), 85 deletions(-) diff --git a/.gitignore b/.gitignore index 94f77a8..39752a7 100644 --- a/.gitignore +++ b/.gitignore @@ -127,6 +127,7 @@ tmp/ # `salt-formula` -- Vagrant Specific files .vagrant top.sls +!test/salt/pillar/top.sls # `suricata-formula` -- Platform binaries *.rpm diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c54ba80..4d2d2ff 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -148,24 +148,20 @@ ubuntu-2004-master-py3: {extends: '.test_instance'} # preferences-ubuntu-1804-master-py3: {extends: '.test_instance'} # unattended-ubuntu-1804-master-py3: {extends: '.test_instance'} ubuntu-1804-master-py3: {extends: '.test_instance'} -# repositories-debian-11-3003-2-py3: {extends: '.test_instance'} -# repositories-debian-10-3003-2-py3: {extends: '.test_instance'} -# repositories-debian-9-3003-2-py3: {extends: '.test_instance'} -# repositories-ubuntu-2004-3003-2-py3: {extends: '.test_instance'} -# repositories-ubuntu-1804-3003-2-py3: {extends: '.test_instance'} -# repositories-debian-11-3002-6-py3: {extends: '.test_instance'} -# repositories-debian-10-3002-6-py3: {extends: '.test_instance'} -# repositories-debian-9-3002-6-py3: {extends: '.test_instance'} -# repositories-ubuntu-2004-3002-6-py3: {extends: '.test_instance'} -# repositories-ubuntu-1804-3002-6-py3: {extends: '.test_instance'} -# repositories-debian-10-3001-7-py3: {extends: '.test_instance'} -# repositories-debian-9-3001-7-py3: {extends: '.test_instance'} -# repositories-ubuntu-2004-3001-7-py3: {extends: '.test_instance'} -# repositories-ubuntu-1804-3001-7-py3: {extends: '.test_instance'} -# repositories-debian-10-3000-9-py3: {extends: '.test_instance'} -# repositories-debian-9-3000-9-py3: {extends: '.test_instance'} -# repositories-ubuntu-1804-3000-9-py3: {extends: '.test_instance'} -# repositories-ubuntu-1804-3000-9-py2: {extends: '.test_instance'} +# repositories-debian-11-3003-3-py3: {extends: '.test_instance'} +# repositories-debian-10-3003-3-py3: {extends: '.test_instance'} +# repositories-debian-9-3003-3-py3: {extends: '.test_instance'} +# repositories-ubuntu-2004-3003-3-py3: {extends: '.test_instance'} +# repositories-ubuntu-1804-3003-3-py3: {extends: '.test_instance'} +# repositories-debian-11-3002-7-py3: {extends: '.test_instance'} +# repositories-debian-10-3002-7-py3: {extends: '.test_instance'} +# repositories-debian-9-3002-7-py3: {extends: '.test_instance'} +# repositories-ubuntu-2004-3002-7-py3: {extends: '.test_instance'} +# repositories-ubuntu-1804-3002-7-py3: {extends: '.test_instance'} +# repositories-debian-10-3001-8-py3: {extends: '.test_instance'} +# repositories-debian-9-3001-8-py3: {extends: '.test_instance'} +# repositories-ubuntu-2004-3001-8-py3: {extends: '.test_instance'} +# repositories-ubuntu-1804-3001-8-py3: {extends: '.test_instance'} ############################################################################### # `release` stage: `semantic-release` diff --git a/.travis.yml b/.travis.yml index 8501214..c1776b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -108,24 +108,20 @@ jobs: # - env: INSTANCE=preferences-ubuntu-1804-master-py3 # - env: INSTANCE=unattended-ubuntu-1804-master-py3 - env: INSTANCE=ubuntu-1804-master-py3 - # - env: INSTANCE=repositories-debian-11-3003-2-py3 - # - env: INSTANCE=repositories-debian-10-3003-2-py3 - # - env: INSTANCE=repositories-debian-9-3003-2-py3 - # - env: INSTANCE=repositories-ubuntu-2004-3003-2-py3 - # - env: INSTANCE=repositories-ubuntu-1804-3003-2-py3 - # - env: INSTANCE=repositories-debian-11-3002-6-py3 - # - env: INSTANCE=repositories-debian-10-3002-6-py3 - # - env: INSTANCE=repositories-debian-9-3002-6-py3 - # - env: INSTANCE=repositories-ubuntu-2004-3002-6-py3 - # - env: INSTANCE=repositories-ubuntu-1804-3002-6-py3 - # - env: INSTANCE=repositories-debian-10-3001-7-py3 - # - env: INSTANCE=repositories-debian-9-3001-7-py3 - # - env: INSTANCE=repositories-ubuntu-2004-3001-7-py3 - # - env: INSTANCE=repositories-ubuntu-1804-3001-7-py3 - # - env: INSTANCE=repositories-debian-10-3000-9-py3 - # - env: INSTANCE=repositories-debian-9-3000-9-py3 - # - env: INSTANCE=repositories-ubuntu-1804-3000-9-py3 - # - env: INSTANCE=repositories-ubuntu-1804-3000-9-py2 + # - env: INSTANCE=repositories-debian-11-3003-3-py3 + # - env: INSTANCE=repositories-debian-10-3003-3-py3 + # - env: INSTANCE=repositories-debian-9-3003-3-py3 + # - env: INSTANCE=repositories-ubuntu-2004-3003-3-py3 + # - env: INSTANCE=repositories-ubuntu-1804-3003-3-py3 + # - env: INSTANCE=repositories-debian-11-3002-7-py3 + # - env: INSTANCE=repositories-debian-10-3002-7-py3 + # - env: INSTANCE=repositories-debian-9-3002-7-py3 + # - env: INSTANCE=repositories-ubuntu-2004-3002-7-py3 + # - env: INSTANCE=repositories-ubuntu-1804-3002-7-py3 + # - env: INSTANCE=repositories-debian-10-3001-8-py3 + # - env: INSTANCE=repositories-debian-9-3001-8-py3 + # - env: INSTANCE=repositories-ubuntu-2004-3001-8-py3 + # - env: INSTANCE=repositories-ubuntu-1804-3001-8-py3 ## Define the release stage that runs `semantic-release` - stage: 'release' diff --git a/kitchen.yml b/kitchen.yml index d0ab8fe..9e3cab0 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -63,84 +63,66 @@ platforms: image: saltimages/salt-master-py3:ubuntu-18.04 run_command: /lib/systemd/systemd - ## SALT `3003.2` - - name: debian-11-3003-2-py3 + ## SALT `3003.3` + - name: debian-11-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:debian-11 + image: saltimages/salt-3003.3-py3:debian-11 run_command: /lib/systemd/systemd - - name: debian-10-3003-2-py3 + - name: debian-10-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:debian-10 + image: saltimages/salt-3003.3-py3:debian-10 run_command: /lib/systemd/systemd - - name: debian-9-3003-2-py3 + - name: debian-9-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:debian-9 + image: saltimages/salt-3003.3-py3:debian-9 run_command: /lib/systemd/systemd - - name: ubuntu-2004-3003-2-py3 + - name: ubuntu-2004-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:ubuntu-20.04 + image: saltimages/salt-3003.3-py3:ubuntu-20.04 run_command: /lib/systemd/systemd - - name: ubuntu-1804-3003-2-py3 + - name: ubuntu-1804-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:ubuntu-18.04 + image: saltimages/salt-3003.3-py3:ubuntu-18.04 run_command: /lib/systemd/systemd - ## SALT `3002.6` - - name: debian-11-3002-6-py3 + ## SALT `3002.7` + - name: debian-11-3002-7-py3 driver: - image: saltimages/salt-3002.6-py3:debian-11 + image: saltimages/salt-3002.7-py3:debian-11 run_command: /lib/systemd/systemd - - name: debian-10-3002-6-py3 + - name: debian-10-3002-7-py3 driver: - image: saltimages/salt-3002.6-py3:debian-10 + image: saltimages/salt-3002.7-py3:debian-10 run_command: /lib/systemd/systemd - - name: debian-9-3002-6-py3 + - name: debian-9-3002-7-py3 driver: - image: saltimages/salt-3002.6-py3:debian-9 + image: saltimages/salt-3002.7-py3:debian-9 run_command: /lib/systemd/systemd - - name: ubuntu-2004-3002-6-py3 + - name: ubuntu-2004-3002-7-py3 driver: - image: saltimages/salt-3002.6-py3:ubuntu-20.04 + image: saltimages/salt-3002.7-py3:ubuntu-20.04 run_command: /lib/systemd/systemd - - name: ubuntu-1804-3002-6-py3 + - name: ubuntu-1804-3002-7-py3 driver: - image: saltimages/salt-3002.6-py3:ubuntu-18.04 + image: saltimages/salt-3002.7-py3:ubuntu-18.04 run_command: /lib/systemd/systemd - ## SALT `3001.7` - - name: debian-10-3001-7-py3 + ## SALT `3001.8` + - name: debian-10-3001-8-py3 driver: - image: saltimages/salt-3001.7-py3:debian-10 + image: saltimages/salt-3001.8-py3:debian-10 run_command: /lib/systemd/systemd - - name: debian-9-3001-7-py3 + - name: debian-9-3001-8-py3 driver: - image: saltimages/salt-3001.7-py3:debian-9 + image: saltimages/salt-3001.8-py3:debian-9 run_command: /lib/systemd/systemd - - name: ubuntu-2004-3001-7-py3 + - name: ubuntu-2004-3001-8-py3 driver: - image: saltimages/salt-3001.7-py3:ubuntu-20.04 + image: saltimages/salt-3001.8-py3:ubuntu-20.04 run_command: /lib/systemd/systemd - - name: ubuntu-1804-3001-7-py3 + - name: ubuntu-1804-3001-8-py3 driver: - image: saltimages/salt-3001.7-py3:ubuntu-18.04 - run_command: /lib/systemd/systemd - - ## SALT `3000.9` - - name: debian-10-3000-9-py3 - driver: - image: saltimages/salt-3000.9-py3:debian-10 - run_command: /lib/systemd/systemd - - name: debian-9-3000-9-py3 - driver: - image: saltimages/salt-3000.9-py3:debian-9 - run_command: /lib/systemd/systemd - - name: ubuntu-1804-3000-9-py3 - driver: - image: saltimages/salt-3000.9-py3:ubuntu-18.04 - run_command: /lib/systemd/systemd - - name: ubuntu-1804-3000-9-py2 - driver: - image: saltimages/salt-3000.9-py2:ubuntu-18.04 + image: saltimages/salt-3001.8-py3:ubuntu-18.04 run_command: /lib/systemd/systemd verifier: From 0020899f45eb696613b9b61878e12ce48ace4fb3 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 6 Oct 2021 16:59:52 +0100 Subject: [PATCH 39/60] chore(gemfile.lock): update to latest gem versions (2021-W40) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/375 --- Gemfile.lock | 43 ++++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6e33618..2330d07 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -55,7 +55,7 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.2.0) - aws-partitions (1.507.0) + aws-partitions (1.510.0) aws-sdk-alexaforbusiness (1.50.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) @@ -139,7 +139,7 @@ GEM aws-sdk-dynamodb (1.63.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.265.0) + aws-sdk-ec2 (1.266.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.47.0) @@ -151,7 +151,7 @@ GEM aws-sdk-ecs (1.85.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-efs (1.44.0) + aws-sdk-efs (1.45.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-eks (1.63.0) @@ -193,16 +193,16 @@ GEM aws-sdk-kinesis (1.35.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.48.0) + aws-sdk-kms (1.49.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.68.0) + aws-sdk-lambda (1.69.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-mq (1.40.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-networkfirewall (1.7.0) + aws-sdk-networkfirewall (1.8.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-networkmanager (1.14.0) @@ -248,6 +248,12 @@ GEM aws-sdk-shield (1.41.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) + aws-sdk-signer (1.32.0) + aws-sdk-core (~> 3, >= 3.120.0) + aws-sigv4 (~> 1.1) + aws-sdk-simpledb (1.29.0) + aws-sdk-core (~> 3, >= 3.120.0) + aws-sigv2 (~> 1.0) aws-sdk-sms (1.32.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) @@ -257,7 +263,7 @@ GEM aws-sdk-sqs (1.44.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.118.0) + aws-sdk-ssm (1.119.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-states (1.39.0) @@ -266,6 +272,7 @@ GEM aws-sdk-transfer (1.34.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) + aws-sigv2 (1.1.0) aws-sigv4 (1.4.0) aws-eventstream (~> 1, >= 1.0.2) azure_graph_rbac (0.17.2) @@ -281,9 +288,9 @@ GEM bcrypt_pbkdf (1.1.0) bson (4.12.1) builder (3.2.4) - chef-config (17.5.22) + chef-config (17.6.18) addressable - chef-utils (= 17.5.22) + chef-utils (= 17.6.18) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -291,7 +298,7 @@ GEM chef-telemetry (1.1.1) chef-config concurrent-ruby (~> 1.0) - chef-utils (17.5.22) + chef-utils (17.6.18) concurrent-ruby coderay (1.1.3) concurrent-ruby (1.1.9) @@ -304,7 +311,7 @@ GEM unf (>= 0.0.5, < 1.0.0) ed25519 (1.2.4) erubi (1.10.0) - excon (0.85.0) + excon (0.86.0) faraday (1.4.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -354,7 +361,7 @@ GEM inifile (3.0.0) jmespath (1.4.0) json (2.5.1) - jwt (2.2.3) + jwt (2.3.0) kitchen-inspec (2.5.0) hashie (>= 3.4, <= 5.0) inspec (>= 2.2.64, < 5.0) @@ -450,7 +457,7 @@ GEM unicode-display_width (>= 1.5, < 3.0) unicode_utils (~> 1.4) strings-ansi (0.2.0) - test-kitchen (3.0.0) + test-kitchen (3.1.0) bcrypt_pbkdf (~> 1.0) chef-utils (>= 16.4.35) ed25519 (~> 1.2) @@ -481,9 +488,9 @@ GEM inifile (~> 3.0) train-core (= 3.8.1) train-winrm (~> 0.2) - train-aws (0.2.19) + train-aws (0.2.20) aws-sdk-alexaforbusiness (~> 1.0) - aws-sdk-amplify (~> 1.0) + aws-sdk-amplify (~> 1.32.0) aws-sdk-apigateway (~> 1.0) aws-sdk-apigatewayv2 (~> 1.0) aws-sdk-applicationautoscaling (>= 1.46, < 1.52) @@ -529,7 +536,7 @@ GEM aws-sdk-kinesis (~> 1.0) aws-sdk-kms (~> 1.13) aws-sdk-lambda (~> 1.0) - aws-sdk-mq (~> 1.0) + aws-sdk-mq (~> 1.40.0) aws-sdk-networkfirewall (>= 1.6.0) aws-sdk-networkmanager (>= 1.13.0) aws-sdk-organizations (>= 1.17, < 1.60) @@ -543,8 +550,10 @@ GEM aws-sdk-secretsmanager (>= 1.42, < 1.47) aws-sdk-securityhub (~> 1.0) aws-sdk-servicecatalog (>= 1.48, < 1.61) - aws-sdk-ses (~> 1.0) + aws-sdk-ses (~> 1.41.0) aws-sdk-shield (~> 1.30) + aws-sdk-signer (~> 1.32.0) + aws-sdk-simpledb (~> 1.29.0) aws-sdk-sms (~> 1.0) aws-sdk-sns (~> 1.9) aws-sdk-sqs (~> 1.10) From ccdbca4a7b6f196fd3802ce133b871606e9ddf32 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 15 Oct 2021 19:05:56 +0100 Subject: [PATCH 40/60] chore(gemfile.lock): update to latest gem versions (2021-W41) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/378 --- Gemfile.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2330d07..fc69666 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,17 +1,17 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 223002687f2cfa303b13457825665de6c5514c52 + revision: 49969f894d2fa89189ce80401338bcbec66cba93 branch: ssf specs: - inspec (4.46.13) + inspec (4.47.3) faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 4.46.13) + inspec-core (= 4.47.3) mongo (= 2.13.2) train (~> 3.0) train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.46.13) + inspec-core (4.47.3) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -55,7 +55,7 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.2.0) - aws-partitions (1.510.0) + aws-partitions (1.513.0) aws-sdk-alexaforbusiness (1.50.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) @@ -139,7 +139,7 @@ GEM aws-sdk-dynamodb (1.63.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.266.0) + aws-sdk-ec2 (1.267.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.47.0) @@ -175,7 +175,7 @@ GEM aws-sdk-eventbridge (1.24.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-firehose (1.41.0) + aws-sdk-firehose (1.42.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-glue (1.88.0) @@ -236,7 +236,7 @@ GEM aws-sdk-secretsmanager (1.46.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-securityhub (1.52.0) + aws-sdk-securityhub (1.53.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-servicecatalog (1.60.0) @@ -311,7 +311,7 @@ GEM unf (>= 0.0.5, < 1.0.0) ed25519 (1.2.4) erubi (1.10.0) - excon (0.86.0) + excon (0.87.0) faraday (1.4.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -380,7 +380,7 @@ GEM multi_json (~> 1.14) memoist (0.16.2) method_source (1.0.0) - mini_mime (1.1.1) + mini_mime (1.1.2) minitest (5.14.4) mixlib-config (3.0.9) tomlrb From c9c59d9953bdb18c32fb0b37e56e43dfeb79b8ab Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 23 Oct 2021 21:06:12 +0100 Subject: [PATCH 41/60] chore(gemfile.lock): update to latest gem versions (2021-W42) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/380 --- Gemfile.lock | 226 ++++++++++++++++++++++++++------------------------- 1 file changed, 117 insertions(+), 109 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index fc69666..32e3dc8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,17 +1,17 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 49969f894d2fa89189ce80401338bcbec66cba93 + revision: 7a1eab9580b035c949beca635cc148e9740c415a branch: ssf specs: - inspec (4.47.3) + inspec (4.47.8) faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 4.47.3) + inspec-core (= 4.47.8) mongo (= 2.13.2) train (~> 3.0) train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.47.3) + inspec-core (4.47.8) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -55,24 +55,24 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.2.0) - aws-partitions (1.513.0) - aws-sdk-alexaforbusiness (1.50.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-partitions (1.517.0) + aws-sdk-alexaforbusiness (1.51.0) + aws-sdk-core (~> 3, >= 3.121.2) 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.67.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-apigateway (1.68.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-apigatewayv2 (1.36.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-apigatewayv2 (1.37.0) + aws-sdk-core (~> 3, >= 3.121.2) 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.41.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-athena (1.42.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) aws-sdk-autoscaling (1.63.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -80,41 +80,41 @@ GEM aws-sdk-batch (1.47.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-budgets (1.41.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-budgets (1.42.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-cloudformation (1.58.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-cloudformation (1.59.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-cloudfront (1.56.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-cloudfront (1.57.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsm (1.33.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-cloudhsm (1.34.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsmv2 (1.36.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-cloudhsmv2 (1.37.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-cloudtrail (1.38.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-cloudtrail (1.39.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatch (1.55.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-cloudwatch (1.56.0) + aws-sdk-core (~> 3, >= 3.121.2) 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.45.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-cloudwatchlogs (1.46.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-codecommit (1.45.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-codecommit (1.46.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-codedeploy (1.43.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-codedeploy (1.44.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-codepipeline (1.47.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-codepipeline (1.48.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) aws-sdk-cognitoidentity (1.31.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -122,91 +122,94 @@ GEM aws-sdk-cognitoidentityprovider (1.53.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-configservice (1.66.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-configservice (1.68.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-core (3.121.1) + aws-sdk-core (3.121.3) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-costandusagereportservice (1.34.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-costandusagereportservice (1.35.0) + aws-sdk-core (~> 3, >= 3.121.2) 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.63.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-dynamodb (1.64.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.267.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-ec2 (1.271.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-ecr (1.47.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-ecr (1.48.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-ecrpublic (1.6.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-ecrpublic (1.7.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.85.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-ecs (1.87.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-efs (1.45.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-efs (1.47.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-eks (1.63.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-eks (1.64.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.62.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-elasticache (1.63.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-elasticbeanstalk (1.45.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-elasticbeanstalk (1.46.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancing (1.34.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-elasticloadbalancing (1.35.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancingv2 (1.68.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-elasticloadbalancingv2 (1.71.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-elasticsearchservice (1.56.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-elasticsearchservice (1.57.0) + aws-sdk-core (~> 3, >= 3.121.2) + aws-sigv4 (~> 1.1) + aws-sdk-emr (1.53.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) aws-sdk-eventbridge (1.24.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-firehose (1.42.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-firehose (1.43.0) + aws-sdk-core (~> 3, >= 3.121.2) 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.48.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-guardduty (1.49.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.61.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-iam (1.62.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-kafka (1.41.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-kafka (1.42.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-kinesis (1.35.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-kinesis (1.36.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.49.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-kms (1.50.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.69.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-lambda (1.70.0) + aws-sdk-core (~> 3, >= 3.121.2) 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.8.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-networkfirewall (1.9.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-networkmanager (1.14.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-networkmanager (1.15.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) aws-sdk-organizations (1.59.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -214,30 +217,30 @@ GEM aws-sdk-ram (1.26.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-rds (1.127.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-rds (1.128.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.69.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-redshift (1.70.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-route53 (1.55.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-route53 (1.56.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-route53domains (1.33.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-route53domains (1.34.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-route53resolver (1.30.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-route53resolver (1.31.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.103.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-s3 (1.104.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) aws-sdk-secretsmanager (1.46.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-securityhub (1.53.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-securityhub (1.55.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) aws-sdk-servicecatalog (1.60.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -245,8 +248,8 @@ GEM aws-sdk-ses (1.41.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-shield (1.41.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-shield (1.42.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) aws-sdk-signer (1.32.0) aws-sdk-core (~> 3, >= 3.120.0) @@ -254,21 +257,24 @@ GEM aws-sdk-simpledb (1.29.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv2 (~> 1.0) - aws-sdk-sms (1.32.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-sms (1.33.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-sns (1.45.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-sns (1.46.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-sqs (1.44.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-sqs (1.45.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.119.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-ssm (1.120.0) + aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) aws-sdk-states (1.39.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) + aws-sdk-synthetics (1.19.0) + aws-sdk-core (~> 3, >= 3.121.2) + aws-sigv4 (~> 1.1) aws-sdk-transfer (1.34.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) @@ -360,7 +366,7 @@ GEM concurrent-ruby (~> 1.0) inifile (3.0.0) jmespath (1.4.0) - json (2.5.1) + json (2.6.0) jwt (2.3.0) kitchen-inspec (2.5.0) hashie (>= 3.4, <= 5.0) @@ -488,7 +494,7 @@ GEM inifile (~> 3.0) train-core (= 3.8.1) train-winrm (~> 0.2) - train-aws (0.2.20) + train-aws (0.2.22) aws-sdk-alexaforbusiness (~> 1.0) aws-sdk-amplify (~> 1.32.0) aws-sdk-apigateway (~> 1.0) @@ -527,6 +533,7 @@ GEM aws-sdk-elasticloadbalancing (~> 1.8) aws-sdk-elasticloadbalancingv2 (~> 1.0) aws-sdk-elasticsearchservice (~> 1.0) + aws-sdk-emr (~> 1.53.0) aws-sdk-eventbridge (~> 1.24.0) aws-sdk-firehose (~> 1.0) aws-sdk-glue (>= 1.71, < 1.89) @@ -559,6 +566,7 @@ GEM aws-sdk-sqs (~> 1.10) aws-sdk-ssm (~> 1.0) aws-sdk-states (>= 1.35, < 1.40) + aws-sdk-synthetics (~> 1.19.0) aws-sdk-transfer (>= 1.26, < 1.35) train-core (3.8.1) addressable (~> 2.5) @@ -617,7 +625,7 @@ GEM rubyzip (~> 2.0) winrm (~> 2.0) wisper (2.0.1) - zeitwerk (2.4.2) + zeitwerk (2.5.1) PLATFORMS ruby From 5f1c61cb8719094d746b63415c31cc3ee803d967 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 26 Oct 2021 11:10:35 +0100 Subject: [PATCH 42/60] chore(gemfile.lock): update to latest gem versions (2021-W43) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/381 --- Gemfile.lock | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 32e3dc8..906ebe5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,17 +1,18 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 7a1eab9580b035c949beca635cc148e9740c415a + revision: 1cd64079dbbafa1bf19bbc08a2ea977aa1db7ebe branch: ssf specs: - inspec (4.47.8) + inspec (4.49.0) + cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 4.47.8) + inspec-core (= 4.49.0) mongo (= 2.13.2) train (~> 3.0) train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.47.8) + inspec-core (4.49.0) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -54,8 +55,9 @@ GEM zeitwerk (~> 2.3) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) + ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.517.0) + aws-partitions (1.519.0) aws-sdk-alexaforbusiness (1.51.0) aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) @@ -139,7 +141,7 @@ GEM aws-sdk-dynamodb (1.64.0) aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.271.0) + aws-sdk-ec2 (1.272.0) aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.48.0) @@ -217,7 +219,7 @@ GEM aws-sdk-ram (1.26.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-rds (1.128.0) + aws-sdk-rds (1.129.0) aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) aws-sdk-redshift (1.70.0) @@ -229,7 +231,7 @@ GEM aws-sdk-route53domains (1.34.0) aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-route53resolver (1.31.0) + aws-sdk-route53resolver (1.32.0) aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) aws-sdk-s3 (1.104.0) @@ -308,6 +310,8 @@ GEM concurrent-ruby coderay (1.1.3) concurrent-ruby (1.1.9) + cookstyle (7.25.8) + rubocop (= 1.22.2) declarative (0.0.20) diff-lcs (1.4.4) docker-api (2.2.0) @@ -366,7 +370,7 @@ GEM concurrent-ruby (~> 1.0) inifile (3.0.0) jmespath (1.4.0) - json (2.6.0) + json (2.6.1) jwt (2.3.0) kitchen-inspec (2.5.0) hashie (>= 3.4, <= 5.0) @@ -419,6 +423,8 @@ GEM nori (2.6.0) os (1.1.1) parallel (1.21.0) + parser (3.0.2.0) + ast (~> 2.4.1) parslet (1.8.2) pastel (0.8.0) tty-color (~> 0.5) @@ -426,6 +432,8 @@ GEM coderay (~> 1.1) method_source (~> 1.0) public_suffix (4.0.6) + rainbow (3.0.0) + regexp_parser (2.1.1) representable (3.1.1) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) @@ -448,6 +456,18 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.2) + rubocop (1.22.2) + parallel (~> 1.10) + parser (>= 3.0.0.0) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml + rubocop-ast (>= 1.12.0, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.12.0) + parser (>= 3.0.1.1) + ruby-progressbar (1.11.0) ruby2_keywords (0.0.5) rubyntlm (0.6.3) rubyzip (2.3.2) From 380c6894b4c022ca4586693d8e9fd03845aa3b61 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 23 Nov 2021 10:30:18 +0000 Subject: [PATCH 43/60] ci(kitchen+ci): update with `3004` pre-salted images/boxes [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/385 --- .gitlab-ci.yml | 14 +++++++++++++- .travis.yml | 5 +++++ CODEOWNERS | 1 + kitchen.yml | 22 ++++++++++++++++++++++ 4 files changed, 41 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4d2d2ff..efb185e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -102,7 +102,7 @@ rubocop: ############################################################################### # Define `test` template ############################################################################### -.test_instance: +.test_instance: &test_instance stage: *stage_test image: *image_dindruby services: *services_docker_dind @@ -117,6 +117,13 @@ rubocop: # Alternative value to consider: `${CI_JOB_NAME}` - 'bin/kitchen verify "${DOCKER_ENV_CI_JOB_NAME}"' +############################################################################### +# Define `test` template (`allow_failure: true`) +############################################################################### +.test_instance_failure_permitted: + <<: *test_instance + allow_failure: true + ############################################################################### # `test` stage: each instance below uses the `test` template above ############################################################################### @@ -148,6 +155,11 @@ ubuntu-2004-master-py3: {extends: '.test_instance'} # preferences-ubuntu-1804-master-py3: {extends: '.test_instance'} # unattended-ubuntu-1804-master-py3: {extends: '.test_instance'} ubuntu-1804-master-py3: {extends: '.test_instance'} +# repositories-debian-11-3004-0-py3: {extends: '.test_instance'} +# repositories-debian-10-3004-0-py3: {extends: '.test_instance'} +# repositories-debian-9-3004-0-py3: {extends: '.test_instance'} +# repositories-ubuntu-2004-3004-0-py3: {extends: '.test_instance'} +# repositories-ubuntu-1804-3004-0-py3: {extends: '.test_instance'} # repositories-debian-11-3003-3-py3: {extends: '.test_instance'} # repositories-debian-10-3003-3-py3: {extends: '.test_instance'} # repositories-debian-9-3003-3-py3: {extends: '.test_instance'} diff --git a/.travis.yml b/.travis.yml index c1776b9..68db879 100644 --- a/.travis.yml +++ b/.travis.yml @@ -108,6 +108,11 @@ jobs: # - env: INSTANCE=preferences-ubuntu-1804-master-py3 # - env: INSTANCE=unattended-ubuntu-1804-master-py3 - env: INSTANCE=ubuntu-1804-master-py3 + # - env: INSTANCE=repositories-debian-11-3004-0-py3 + # - env: INSTANCE=repositories-debian-10-3004-0-py3 + # - env: INSTANCE=repositories-debian-9-3004-0-py3 + # - env: INSTANCE=repositories-ubuntu-2004-3004-0-py3 + # - env: INSTANCE=repositories-ubuntu-1804-3004-0-py3 # - env: INSTANCE=repositories-debian-11-3003-3-py3 # - env: INSTANCE=repositories-debian-10-3003-3-py3 # - env: INSTANCE=repositories-debian-9-3003-3-py3 diff --git a/CODEOWNERS b/CODEOWNERS index 2f7df79..3615886 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -22,6 +22,7 @@ /test/integration/**/libraries/system.rb @saltstack-formulas/ssf /test/integration/**/inspec.yml @saltstack-formulas/ssf /test/integration/**/README.md @saltstack-formulas/ssf +/test/salt/pillar/top.sls @saltstack-formulas/ssf /.gitignore @saltstack-formulas/ssf /.cirrus.yml @saltstack-formulas/ssf /.gitlab-ci.yml @saltstack-formulas/ssf diff --git a/kitchen.yml b/kitchen.yml index 9e3cab0..140c94c 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -63,6 +63,28 @@ platforms: image: saltimages/salt-master-py3:ubuntu-18.04 run_command: /lib/systemd/systemd + ## SALT `3004.0` + - name: debian-11-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:debian-11 + run_command: /lib/systemd/systemd + - name: debian-10-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:debian-10 + run_command: /lib/systemd/systemd + - name: debian-9-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:debian-9 + run_command: /lib/systemd/systemd + - name: ubuntu-2004-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:ubuntu-20.04 + run_command: /lib/systemd/systemd + - name: ubuntu-1804-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:ubuntu-18.04 + run_command: /lib/systemd/systemd + ## SALT `3003.3` - name: debian-11-3003-3-py3 driver: From d4c01cd0e45db80066231b6d6b7ee06e3673d0be Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 23 Nov 2021 11:39:41 +0000 Subject: [PATCH 44/60] chore(gemfile.lock): update to latest gem versions (2021-W47) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/386 --- Gemfile.lock | 242 ++++++++++++++++++++++++++------------------------- 1 file changed, 122 insertions(+), 120 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 906ebe5..9f3534b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,18 +1,19 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 1cd64079dbbafa1bf19bbc08a2ea977aa1db7ebe + revision: f7235b9e35084cbef0971daf2a223671a4167280 branch: ssf specs: - inspec (4.49.0) + inspec (4.50.8) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 4.49.0) + inspec-core (= 4.50.8) mongo (= 2.13.2) + rake train (~> 3.0) train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.49.0) + inspec-core (4.50.8) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -57,24 +58,24 @@ GEM public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.519.0) - aws-sdk-alexaforbusiness (1.51.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-partitions (1.534.0) + aws-sdk-alexaforbusiness (1.52.0) + aws-sdk-core (~> 3, >= 3.122.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.68.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-apigateway (1.70.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-apigatewayv2 (1.37.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-apigatewayv2 (1.38.0) + aws-sdk-core (~> 3, >= 3.122.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.42.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-athena (1.43.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) aws-sdk-autoscaling (1.63.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -82,41 +83,41 @@ GEM aws-sdk-batch (1.47.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-budgets (1.42.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-budgets (1.43.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudformation (1.59.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-cloudformation (1.62.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudfront (1.57.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-cloudfront (1.59.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsm (1.34.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-cloudhsm (1.35.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsmv2 (1.37.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-cloudhsmv2 (1.38.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudtrail (1.39.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-cloudtrail (1.41.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatch (1.56.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-cloudwatch (1.58.0) + aws-sdk-core (~> 3, >= 3.122.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.46.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-cloudwatchlogs (1.47.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-codecommit (1.46.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-codecommit (1.47.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-codedeploy (1.44.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-codedeploy (1.45.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-codepipeline (1.48.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-codepipeline (1.49.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) aws-sdk-cognitoidentity (1.31.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -124,55 +125,55 @@ GEM aws-sdk-cognitoidentityprovider (1.53.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-configservice (1.68.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-configservice (1.69.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.121.3) + aws-sdk-core (3.122.1) aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.239.0) + aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-costandusagereportservice (1.35.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-costandusagereportservice (1.36.0) + aws-sdk-core (~> 3, >= 3.122.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.64.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-dynamodb (1.66.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.272.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-ec2 (1.281.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-ecr (1.48.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-ecr (1.49.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-ecrpublic (1.7.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-ecrpublic (1.8.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.87.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-ecs (1.90.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-efs (1.47.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-efs (1.48.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-eks (1.64.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-eks (1.68.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.63.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-elasticache (1.64.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticbeanstalk (1.46.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-elasticbeanstalk (1.47.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancing (1.35.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-elasticloadbalancing (1.36.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancingv2 (1.71.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-elasticloadbalancingv2 (1.72.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticsearchservice (1.57.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-elasticsearchservice (1.59.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) aws-sdk-emr (1.53.0) aws-sdk-core (~> 3, >= 3.121.2) @@ -180,38 +181,38 @@ GEM aws-sdk-eventbridge (1.24.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-firehose (1.43.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-firehose (1.44.0) + aws-sdk-core (~> 3, >= 3.122.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.49.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-guardduty (1.50.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.62.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-iam (1.63.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-kafka (1.42.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-kafka (1.44.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-kinesis (1.36.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-kinesis (1.37.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.50.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-kms (1.51.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.70.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-lambda (1.73.0) + aws-sdk-core (~> 3, >= 3.122.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.9.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-networkfirewall (1.10.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-networkmanager (1.15.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-networkmanager (1.17.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) aws-sdk-organizations (1.59.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -219,30 +220,30 @@ GEM aws-sdk-ram (1.26.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-rds (1.129.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-rds (1.131.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.70.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-redshift (1.72.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-route53 (1.56.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-route53 (1.57.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-route53domains (1.34.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-route53domains (1.35.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-route53resolver (1.32.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-route53resolver (1.33.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.104.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-s3 (1.106.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) aws-sdk-secretsmanager (1.46.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-securityhub (1.55.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-securityhub (1.56.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) aws-sdk-servicecatalog (1.60.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -250,8 +251,8 @@ GEM aws-sdk-ses (1.41.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-shield (1.42.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-shield (1.43.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) aws-sdk-signer (1.32.0) aws-sdk-core (~> 3, >= 3.120.0) @@ -259,17 +260,17 @@ GEM aws-sdk-simpledb (1.29.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv2 (~> 1.0) - aws-sdk-sms (1.33.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-sms (1.34.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-sns (1.46.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-sns (1.48.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-sqs (1.45.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-sqs (1.46.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.120.0) - aws-sdk-core (~> 3, >= 3.121.2) + aws-sdk-ssm (1.124.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) aws-sdk-states (1.39.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -296,9 +297,9 @@ GEM bcrypt_pbkdf (1.1.0) bson (4.12.1) builder (3.2.4) - chef-config (17.6.18) + chef-config (17.7.29) addressable - chef-utils (= 17.6.18) + chef-utils (= 17.7.29) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -306,12 +307,12 @@ GEM chef-telemetry (1.1.1) chef-config concurrent-ruby (~> 1.0) - chef-utils (17.6.18) + chef-utils (17.7.29) concurrent-ruby coderay (1.1.3) concurrent-ruby (1.1.9) - cookstyle (7.25.8) - rubocop (= 1.22.2) + cookstyle (7.25.10) + rubocop (= 1.23.0) declarative (0.0.20) diff-lcs (1.4.4) docker-api (2.2.0) @@ -321,7 +322,7 @@ GEM unf (>= 0.0.5, < 1.0.0) ed25519 (1.2.4) erubi (1.10.0) - excon (0.87.0) + excon (0.88.0) faraday (1.4.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -366,7 +367,7 @@ GEM http-cookie (1.0.4) domain_name (~> 0.5) httpclient (2.8.3) - i18n (1.8.10) + i18n (1.8.11) concurrent-ruby (~> 1.0) inifile (3.0.0) jmespath (1.4.0) @@ -421,7 +422,7 @@ GEM net-ssh-gateway (2.0.0) net-ssh (>= 4.0.0) nori (2.6.0) - os (1.1.1) + os (1.1.4) parallel (1.21.0) parser (3.0.2.0) ast (~> 2.4.1) @@ -433,6 +434,7 @@ GEM method_source (~> 1.0) public_suffix (4.0.6) rainbow (3.0.0) + rake (13.0.6) regexp_parser (2.1.1) representable (3.1.1) declarative (< 0.1.0) @@ -455,8 +457,8 @@ GEM rspec-mocks (3.10.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) - rspec-support (3.10.2) - rubocop (1.22.2) + rspec-support (3.10.3) + rubocop (1.23.0) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) @@ -465,7 +467,7 @@ GEM rubocop-ast (>= 1.12.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.12.0) + rubocop-ast (1.13.0) parser (>= 3.0.1.1) ruby-progressbar (1.11.0) ruby2_keywords (0.0.5) @@ -483,7 +485,7 @@ GEM unicode-display_width (>= 1.5, < 3.0) unicode_utils (~> 1.4) strings-ansi (0.2.0) - test-kitchen (3.1.0) + test-kitchen (3.2.0) bcrypt_pbkdf (~> 1.0) chef-utils (>= 16.4.35) ed25519 (~> 1.2) @@ -500,7 +502,7 @@ GEM thor (1.1.0) timeliness (0.3.10) tomlrb (1.3.0) - trailblazer-option (0.1.1) + trailblazer-option (0.1.2) train (3.8.1) activesupport (>= 6.0.3.1) azure_graph_rbac (~> 0.16) From ae773c5e24548e3c7dc08d917b05918d92b4be6b Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 6 Dec 2021 08:17:14 +0000 Subject: [PATCH 45/60] chore(gemfile.lock): update to latest gem versions (2021-W49) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/388 --- Gemfile.lock | 142 +++++++++++++++++++++++++++------------------------ 1 file changed, 75 insertions(+), 67 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9f3534b..b94baf0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,19 +1,19 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: f7235b9e35084cbef0971daf2a223671a4167280 + revision: ba42320942b09a4e26235b578f864c84d05011da branch: ssf specs: - inspec (4.50.8) + inspec (4.51.1) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 4.50.8) + inspec-core (= 4.51.1) mongo (= 2.13.2) rake train (~> 3.0) train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.50.8) + inspec-core (4.51.1) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -58,23 +58,23 @@ GEM public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.534.0) - aws-sdk-alexaforbusiness (1.52.0) + aws-partitions (1.539.0) + aws-sdk-alexaforbusiness (1.53.0) aws-sdk-core (~> 3, >= 3.122.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.70.0) + aws-sdk-apigateway (1.71.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-apigatewayv2 (1.38.0) + aws-sdk-apigatewayv2 (1.39.0) aws-sdk-core (~> 3, >= 3.122.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.43.0) + aws-sdk-athena (1.44.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) aws-sdk-autoscaling (1.63.0) @@ -83,40 +83,40 @@ GEM aws-sdk-batch (1.47.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-budgets (1.43.0) + aws-sdk-budgets (1.44.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudformation (1.62.0) + aws-sdk-cloudformation (1.63.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudfront (1.59.0) + aws-sdk-cloudfront (1.60.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsm (1.35.0) + aws-sdk-cloudhsm (1.36.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsmv2 (1.38.0) + aws-sdk-cloudhsmv2 (1.39.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudtrail (1.41.0) + aws-sdk-cloudtrail (1.42.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatch (1.58.0) + aws-sdk-cloudwatch (1.59.0) aws-sdk-core (~> 3, >= 3.122.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.47.0) + aws-sdk-cloudwatchlogs (1.48.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-codecommit (1.47.0) + aws-sdk-codecommit (1.48.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-codedeploy (1.45.0) + aws-sdk-codedeploy (1.46.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-codepipeline (1.49.0) + aws-sdk-codepipeline (1.50.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) aws-sdk-cognitoidentity (1.31.0) @@ -125,54 +125,54 @@ GEM aws-sdk-cognitoidentityprovider (1.53.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-configservice (1.69.0) + aws-sdk-configservice (1.70.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.122.1) + aws-sdk-core (3.124.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-costandusagereportservice (1.36.0) + aws-sdk-costandusagereportservice (1.37.0) aws-sdk-core (~> 3, >= 3.122.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.66.0) + aws-sdk-dynamodb (1.69.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.281.0) + aws-sdk-ec2 (1.286.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-ecr (1.49.0) + aws-sdk-ecr (1.51.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-ecrpublic (1.8.0) + aws-sdk-ecrpublic (1.9.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.90.0) + aws-sdk-ecs (1.92.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-efs (1.48.0) + aws-sdk-efs (1.49.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-eks (1.68.0) + aws-sdk-eks (1.69.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.64.0) + aws-sdk-elasticache (1.67.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticbeanstalk (1.47.0) + aws-sdk-elasticbeanstalk (1.48.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancing (1.36.0) + aws-sdk-elasticloadbalancing (1.37.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancingv2 (1.72.0) + aws-sdk-elasticloadbalancingv2 (1.74.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticsearchservice (1.59.0) + aws-sdk-elasticsearchservice (1.60.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) aws-sdk-emr (1.53.0) @@ -181,37 +181,37 @@ GEM aws-sdk-eventbridge (1.24.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-firehose (1.44.0) + aws-sdk-firehose (1.45.0) aws-sdk-core (~> 3, >= 3.122.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.50.0) + aws-sdk-guardduty (1.51.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.63.0) + aws-sdk-iam (1.64.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-kafka (1.44.0) + aws-sdk-kafka (1.45.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-kinesis (1.37.0) + aws-sdk-kinesis (1.38.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.51.0) + aws-sdk-kms (1.52.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.73.0) + aws-sdk-lambda (1.76.0) aws-sdk-core (~> 3, >= 3.122.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.10.0) + aws-sdk-networkfirewall (1.11.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-networkmanager (1.17.0) + aws-sdk-networkmanager (1.19.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) aws-sdk-organizations (1.59.0) @@ -220,29 +220,32 @@ GEM aws-sdk-ram (1.26.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-rds (1.131.0) + aws-sdk-rds (1.133.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.72.0) + aws-sdk-redshift (1.74.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-route53 (1.57.0) + aws-sdk-route53 (1.58.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-route53domains (1.35.0) + aws-sdk-route53domains (1.36.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-route53resolver (1.33.0) + aws-sdk-route53resolver (1.34.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.106.0) + aws-sdk-s3 (1.109.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) + aws-sdk-s3control (1.43.0) + aws-sdk-core (~> 3, >= 3.122.0) + aws-sigv4 (~> 1.1) aws-sdk-secretsmanager (1.46.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-securityhub (1.56.0) + aws-sdk-securityhub (1.57.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) aws-sdk-servicecatalog (1.60.0) @@ -251,7 +254,7 @@ GEM aws-sdk-ses (1.41.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-shield (1.43.0) + aws-sdk-shield (1.45.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) aws-sdk-signer (1.32.0) @@ -260,16 +263,16 @@ GEM aws-sdk-simpledb (1.29.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv2 (~> 1.0) - aws-sdk-sms (1.34.0) + aws-sdk-sms (1.35.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-sns (1.48.0) + aws-sdk-sns (1.49.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-sqs (1.46.0) + aws-sdk-sqs (1.48.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.124.0) + aws-sdk-ssm (1.126.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) aws-sdk-states (1.39.0) @@ -281,6 +284,9 @@ GEM aws-sdk-transfer (1.34.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) + aws-sdk-waf (1.43.0) + aws-sdk-core (~> 3, >= 3.122.0) + aws-sigv4 (~> 1.1) aws-sigv2 (1.1.0) aws-sigv4 (1.4.0) aws-eventstream (~> 1, >= 1.0.2) @@ -297,9 +303,9 @@ GEM bcrypt_pbkdf (1.1.0) bson (4.12.1) builder (3.2.4) - chef-config (17.7.29) + chef-config (17.8.25) addressable - chef-utils (= 17.7.29) + chef-utils (= 17.8.25) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -307,7 +313,7 @@ GEM chef-telemetry (1.1.1) chef-config concurrent-ruby (~> 1.0) - chef-utils (17.7.29) + chef-utils (17.8.25) concurrent-ruby coderay (1.1.3) concurrent-ruby (1.1.9) @@ -424,7 +430,7 @@ GEM nori (2.6.0) os (1.1.4) parallel (1.21.0) - parser (3.0.2.0) + parser (3.0.3.1) ast (~> 2.4.1) parslet (1.8.2) pastel (0.8.0) @@ -435,7 +441,7 @@ GEM public_suffix (4.0.6) rainbow (3.0.0) rake (13.0.6) - regexp_parser (2.1.1) + regexp_parser (2.2.0) representable (3.1.1) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) @@ -467,7 +473,7 @@ GEM rubocop-ast (>= 1.12.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.13.0) + rubocop-ast (1.14.0) parser (>= 3.0.1.1) ruby-progressbar (1.11.0) ruby2_keywords (0.0.5) @@ -485,7 +491,7 @@ GEM unicode-display_width (>= 1.5, < 3.0) unicode_utils (~> 1.4) strings-ansi (0.2.0) - test-kitchen (3.2.0) + test-kitchen (3.2.2) bcrypt_pbkdf (~> 1.0) chef-utils (>= 16.4.35) ed25519 (~> 1.2) @@ -503,7 +509,7 @@ GEM timeliness (0.3.10) tomlrb (1.3.0) trailblazer-option (0.1.2) - train (3.8.1) + train (3.8.5) activesupport (>= 6.0.3.1) azure_graph_rbac (~> 0.16) azure_mgmt_key_vault (~> 0.17) @@ -514,9 +520,9 @@ GEM google-api-client (>= 0.23.9, <= 0.52.0) googleauth (>= 0.6.6, <= 0.14.0) inifile (~> 3.0) - train-core (= 3.8.1) + train-core (= 3.8.5) train-winrm (~> 0.2) - train-aws (0.2.22) + train-aws (0.2.24) aws-sdk-alexaforbusiness (~> 1.0) aws-sdk-amplify (~> 1.32.0) aws-sdk-apigateway (~> 1.0) @@ -576,6 +582,7 @@ GEM aws-sdk-route53domains (~> 1.0) aws-sdk-route53resolver (~> 1.0) aws-sdk-s3 (~> 1.30) + aws-sdk-s3control (~> 1.43.0) aws-sdk-secretsmanager (>= 1.42, < 1.47) aws-sdk-securityhub (~> 1.0) aws-sdk-servicecatalog (>= 1.48, < 1.61) @@ -590,7 +597,8 @@ GEM aws-sdk-states (>= 1.35, < 1.40) aws-sdk-synthetics (~> 1.19.0) aws-sdk-transfer (>= 1.26, < 1.35) - train-core (3.8.1) + aws-sdk-waf (~> 1.43.0) + train-core (3.8.5) addressable (~> 2.5) ffi (!= 1.13.0) json (>= 1.8, < 3.0) From 947f032d9d9d53acc3ec0e1912e406eefe6a067c Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 14 Dec 2021 15:17:11 +0000 Subject: [PATCH 46/60] chore(gemfile.lock): update to latest gem versions (2021-W50) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/391 --- Gemfile.lock | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b94baf0..1a029f2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,19 +1,19 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: ba42320942b09a4e26235b578f864c84d05011da + revision: b486a1e6b6593effd97dffbde58f0a56946cf0e1 branch: ssf specs: - inspec (4.51.1) + inspec (4.52.6) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 4.51.1) + inspec-core (= 4.52.6) mongo (= 2.13.2) rake train (~> 3.0) train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.51.1) + inspec-core (4.52.6) 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.539.0) + aws-partitions (1.541.0) aws-sdk-alexaforbusiness (1.53.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) @@ -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.48.0) + aws-sdk-cloudwatchlogs (1.49.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) aws-sdk-codecommit (1.48.0) @@ -142,7 +142,7 @@ GEM aws-sdk-dynamodb (1.69.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.286.0) + aws-sdk-ec2 (1.287.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.51.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.11.0) + aws-sdk-networkfirewall (1.12.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) aws-sdk-networkmanager (1.19.0) @@ -226,10 +226,10 @@ GEM aws-sdk-redshift (1.74.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-route53 (1.58.0) + aws-sdk-route53 (1.59.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-route53domains (1.36.0) + aws-sdk-route53domains (1.37.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) aws-sdk-route53resolver (1.34.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.35.0) + aws-sdk-sms (1.36.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) aws-sdk-sns (1.49.0) @@ -328,7 +328,7 @@ GEM unf (>= 0.0.5, < 1.0.0) ed25519 (1.2.4) erubi (1.10.0) - excon (0.88.0) + excon (0.89.0) faraday (1.4.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -430,7 +430,7 @@ GEM nori (2.6.0) os (1.1.4) parallel (1.21.0) - parser (3.0.3.1) + parser (3.0.3.2) ast (~> 2.4.1) parslet (1.8.2) pastel (0.8.0) @@ -473,7 +473,7 @@ GEM rubocop-ast (>= 1.12.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.14.0) + rubocop-ast (1.15.0) parser (>= 3.0.1.1) ruby-progressbar (1.11.0) ruby2_keywords (0.0.5) From 24e8804f975f0c33fa03842fc82b01760118e169 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 22 Dec 2021 11:52:45 +0000 Subject: [PATCH 47/60] chore(gemfile.lock): update to latest gem versions (2021-W51) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/394 --- Gemfile.lock | 224 ++++++++++----------- test/integration/share/libraries/system.rb | 2 + 2 files changed, 113 insertions(+), 113 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1a029f2..c966f35 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,19 +1,19 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: b486a1e6b6593effd97dffbde58f0a56946cf0e1 + revision: 488720b9bdb0f3cf2d5dc23131d3c66783d1d01d branch: ssf specs: - inspec (4.52.6) + inspec (4.52.9) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 4.52.6) + inspec-core (= 4.52.9) mongo (= 2.13.2) rake train (~> 3.0) train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.52.6) + inspec-core (4.52.9) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -48,34 +48,33 @@ GIT GEM remote: https://rubygems.org/ specs: - activesupport (6.1.4.1) + activesupport (7.0.0) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - zeitwerk (~> 2.3) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.541.0) - aws-sdk-alexaforbusiness (1.53.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-partitions (1.543.0) + aws-sdk-alexaforbusiness (1.54.0) + aws-sdk-core (~> 3, >= 3.125.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.71.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-apigateway (1.73.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-apigatewayv2 (1.39.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-apigatewayv2 (1.40.0) + aws-sdk-core (~> 3, >= 3.125.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.44.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-athena (1.45.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) aws-sdk-autoscaling (1.63.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -83,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.44.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-budgets (1.45.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudformation (1.63.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-cloudformation (1.64.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudfront (1.60.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-cloudfront (1.61.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsm (1.36.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-cloudhsm (1.37.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsmv2 (1.39.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-cloudhsmv2 (1.40.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudtrail (1.42.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-cloudtrail (1.43.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatch (1.59.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-cloudwatch (1.60.0) + aws-sdk-core (~> 3, >= 3.125.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.49.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-cloudwatchlogs (1.50.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-codecommit (1.48.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-codecommit (1.49.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-codedeploy (1.46.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-codedeploy (1.47.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-codepipeline (1.50.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-codepipeline (1.51.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) aws-sdk-cognitoidentity (1.31.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -125,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.70.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-configservice (1.71.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.124.0) + aws-sdk-core (3.125.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-costandusagereportservice (1.37.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-costandusagereportservice (1.38.0) + aws-sdk-core (~> 3, >= 3.125.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.69.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-dynamodb (1.70.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.287.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-ec2 (1.288.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-ecr (1.51.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-ecr (1.52.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-ecrpublic (1.9.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-ecrpublic (1.10.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.92.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-ecs (1.93.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-efs (1.49.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-efs (1.50.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-eks (1.69.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-eks (1.70.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.67.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-elasticache (1.68.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticbeanstalk (1.48.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-elasticbeanstalk (1.49.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancing (1.37.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-elasticloadbalancing (1.38.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancingv2 (1.74.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-elasticloadbalancingv2 (1.75.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticsearchservice (1.60.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-elasticsearchservice (1.61.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) aws-sdk-emr (1.53.0) aws-sdk-core (~> 3, >= 3.121.2) @@ -181,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.45.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-firehose (1.46.0) + aws-sdk-core (~> 3, >= 3.125.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.51.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-guardduty (1.52.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.64.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-iam (1.65.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-kafka (1.45.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-kafka (1.46.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-kinesis (1.38.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-kinesis (1.39.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.52.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-kms (1.53.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.76.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-lambda (1.77.0) + aws-sdk-core (~> 3, >= 3.125.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.12.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-networkfirewall (1.13.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-networkmanager (1.19.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-networkmanager (1.20.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) aws-sdk-organizations (1.59.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -220,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.133.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-rds (1.134.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.74.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-redshift (1.76.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-route53 (1.59.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-route53 (1.60.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-route53domains (1.37.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-route53domains (1.38.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-route53resolver (1.34.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-route53resolver (1.35.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.109.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-s3 (1.110.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) aws-sdk-s3control (1.43.0) @@ -245,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.57.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-securityhub (1.59.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) aws-sdk-servicecatalog (1.60.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -254,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.45.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-shield (1.46.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) aws-sdk-signer (1.32.0) aws-sdk-core (~> 3, >= 3.120.0) @@ -263,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.36.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-sms (1.37.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-sns (1.49.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-sns (1.50.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-sqs (1.48.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-sqs (1.49.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.126.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-sdk-ssm (1.127.0) + aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) aws-sdk-states (1.39.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -398,7 +397,7 @@ GEM memoist (0.16.2) method_source (1.0.0) mini_mime (1.1.2) - minitest (5.14.4) + minitest (5.15.0) mixlib-config (3.0.9) tomlrb mixlib-install (3.12.16) @@ -509,7 +508,7 @@ GEM timeliness (0.3.10) tomlrb (1.3.0) trailblazer-option (0.1.2) - train (3.8.5) + train (3.8.6) activesupport (>= 6.0.3.1) azure_graph_rbac (~> 0.16) azure_mgmt_key_vault (~> 0.17) @@ -520,7 +519,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.5) + train-core (= 3.8.6) train-winrm (~> 0.2) train-aws (0.2.24) aws-sdk-alexaforbusiness (~> 1.0) @@ -598,7 +597,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.5) + train-core (3.8.6) addressable (~> 2.5) ffi (!= 1.13.0) json (>= 1.8, < 3.0) @@ -655,7 +654,6 @@ GEM rubyzip (~> 2.0) winrm (~> 2.0) wisper (2.0.1) - zeitwerk (2.5.1) PLATFORMS ruby diff --git a/test/integration/share/libraries/system.rb b/test/integration/share/libraries/system.rb index af65449..7471ddc 100644 --- a/test/integration/share/libraries/system.rb +++ b/test/integration/share/libraries/system.rb @@ -61,6 +61,8 @@ def build_platform_release # rubocop:enable Style/NumericLiterals,Layout/LineLength when 'windows_8.1_pro' '8.1' + when 'windows_server_2022_datacenter' + '2022-server' when 'windows_server_2019_datacenter' '2019-server' when 'windows_server_2016_datacenter' From 3cf3d0ae875f9fb225b7399b9cdafc41d08ab85c Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 28 Dec 2021 21:01:15 +0000 Subject: [PATCH 48/60] chore(gemfile.lock): update to latest gem versions (2021-W52) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/396 --- Gemfile.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c966f35..2fe621b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -39,10 +39,10 @@ GIT GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker - revision: 428c89fc250b3790abad5ecb0afe0c3d4956084c + revision: 4e03ca42d98624323c1c2d91ceb39c09a29bbfc8 branch: ssf specs: - kitchen-docker (2.11.0) + kitchen-docker (2.12.0) test-kitchen (>= 1.0.0) GEM @@ -300,11 +300,11 @@ GEM azure_mgmt_storage (0.23.0) ms_rest_azure (~> 0.12.0) bcrypt_pbkdf (1.1.0) - bson (4.12.1) + bson (4.13.0) builder (3.2.4) - chef-config (17.8.25) + chef-config (17.9.18) addressable - chef-utils (= 17.8.25) + chef-utils (= 17.9.18) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -312,14 +312,14 @@ GEM chef-telemetry (1.1.1) chef-config concurrent-ruby (~> 1.0) - chef-utils (17.8.25) + chef-utils (17.9.18) concurrent-ruby coderay (1.1.3) concurrent-ruby (1.1.9) cookstyle (7.25.10) rubocop (= 1.23.0) declarative (0.0.20) - diff-lcs (1.4.4) + diff-lcs (1.5.0) docker-api (2.2.0) excon (>= 0.47.0) multi_json @@ -472,7 +472,7 @@ GEM rubocop-ast (>= 1.12.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.15.0) + rubocop-ast (1.15.1) parser (>= 3.0.1.1) ruby-progressbar (1.11.0) ruby2_keywords (0.0.5) From fe82051e7a32ac753d97120dd84f1c79c904dcc5 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 6 Jan 2022 08:02:39 +0000 Subject: [PATCH 49/60] chore(gemfile.lock): update to latest gem versions (2022-W01) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/397 --- Gemfile.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2fe621b..f6d7552 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,19 +1,19 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 488720b9bdb0f3cf2d5dc23131d3c66783d1d01d + revision: 50b07563d32b20b968307f86dd7c1cae0328f657 branch: ssf specs: - inspec (4.52.9) + inspec (4.52.10) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 4.52.9) + inspec-core (= 4.52.10) mongo (= 2.13.2) rake train (~> 3.0) train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.52.9) + inspec-core (4.52.10) 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.543.0) + aws-partitions (1.544.0) aws-sdk-alexaforbusiness (1.54.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) @@ -219,7 +219,7 @@ GEM aws-sdk-ram (1.26.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-rds (1.134.0) + aws-sdk-rds (1.135.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) aws-sdk-redshift (1.76.0) @@ -429,7 +429,7 @@ GEM nori (2.6.0) os (1.1.4) parallel (1.21.0) - parser (3.0.3.2) + parser (3.1.0.0) ast (~> 2.4.1) parslet (1.8.2) pastel (0.8.0) From 1096ffa31f912fb8be4d906991c14b3b93df519e Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 11 Jan 2022 09:32:51 +0000 Subject: [PATCH 50/60] chore(gemfile.lock): update to latest gem versions (2022-W02) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/398 --- Gemfile.lock | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index f6d7552..58936ee 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,19 +1,19 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 50b07563d32b20b968307f86dd7c1cae0328f657 + revision: 347388b00a7a2ec565bdf174f6a2b784880442af branch: ssf specs: - inspec (4.52.10) + inspec (4.52.16) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 4.52.10) + inspec-core (= 4.52.16) mongo (= 2.13.2) rake train (~> 3.0) train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.52.10) + inspec-core (4.52.16) 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.0) + activesupport (7.0.1) 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.544.0) + aws-partitions (1.547.0) aws-sdk-alexaforbusiness (1.54.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) @@ -97,7 +97,7 @@ GEM aws-sdk-cloudhsmv2 (1.40.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudtrail (1.43.0) + aws-sdk-cloudtrail (1.44.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) aws-sdk-cloudwatch (1.60.0) @@ -127,7 +127,7 @@ GEM aws-sdk-configservice (1.71.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.125.0) + aws-sdk-core (3.125.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.70.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.288.0) + aws-sdk-ec2 (1.291.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.52.0) @@ -150,13 +150,13 @@ GEM aws-sdk-ecrpublic (1.10.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.93.0) + aws-sdk-ecs (1.94.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) aws-sdk-efs (1.50.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-eks (1.70.0) + aws-sdk-eks (1.71.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) aws-sdk-elasticache (1.68.0) @@ -171,7 +171,7 @@ GEM aws-sdk-elasticloadbalancingv2 (1.75.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticsearchservice (1.61.0) + aws-sdk-elasticsearchservice (1.62.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) aws-sdk-emr (1.53.0) @@ -234,7 +234,7 @@ GEM aws-sdk-route53resolver (1.35.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.110.0) + aws-sdk-s3 (1.111.1) aws-sdk-core (~> 3, >= 3.125.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) @@ -302,9 +302,9 @@ GEM bcrypt_pbkdf (1.1.0) bson (4.13.0) builder (3.2.4) - chef-config (17.9.18) + chef-config (17.9.26) addressable - chef-utils (= 17.9.18) + chef-utils (= 17.9.26) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -312,12 +312,12 @@ GEM chef-telemetry (1.1.1) chef-config concurrent-ruby (~> 1.0) - chef-utils (17.9.18) + chef-utils (17.9.26) concurrent-ruby coderay (1.1.3) concurrent-ruby (1.1.9) - cookstyle (7.25.10) - rubocop (= 1.23.0) + cookstyle (7.26.1) + rubocop (= 1.24.1) declarative (0.0.20) diff-lcs (1.5.0) docker-api (2.2.0) @@ -346,7 +346,7 @@ GEM faraday-net_http_persistent (1.2.0) faraday_middleware (1.0.0) faraday (~> 1.0) - ffi (1.15.4) + ffi (1.15.5) fuzzyurl (0.9.0) google-api-client (0.52.0) addressable (~> 2.5, >= 2.5.1) @@ -375,14 +375,14 @@ GEM i18n (1.8.11) concurrent-ruby (~> 1.0) inifile (3.0.0) - jmespath (1.4.0) + jmespath (1.5.0) json (2.6.1) jwt (2.3.0) kitchen-inspec (2.5.0) hashie (>= 3.4, <= 5.0) inspec (>= 2.2.64, < 5.0) test-kitchen (>= 2.7, < 4) - kitchen-salt (0.6.3) + kitchen-salt (0.7.1) hashie (>= 3.5) test-kitchen (>= 1.4) license-acceptance (2.1.13) @@ -438,7 +438,7 @@ GEM coderay (~> 1.1) method_source (~> 1.0) public_suffix (4.0.6) - rainbow (3.0.0) + rainbow (3.1.1) rake (13.0.6) regexp_parser (2.2.0) representable (3.1.1) @@ -463,13 +463,13 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.3) - rubocop (1.23.0) + rubocop (1.24.1) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml - rubocop-ast (>= 1.12.0, < 2.0) + rubocop-ast (>= 1.15.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.15.1) @@ -504,7 +504,7 @@ GEM winrm (~> 2.0) winrm-elevated (~> 1.0) winrm-fs (~> 1.1) - thor (1.1.0) + thor (1.2.1) timeliness (0.3.10) tomlrb (1.3.0) trailblazer-option (0.1.2) From 3ac1aded5416c302d1f26dfc393391dba658d077 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 17 Jan 2022 08:11:09 +0000 Subject: [PATCH 51/60] chore(semantic-release): replace broken `m2r` with `m2r2` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/404 --- pre-commit_semantic-release.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pre-commit_semantic-release.sh b/pre-commit_semantic-release.sh index 458b7b6..80f46e2 100755 --- a/pre-commit_semantic-release.sh +++ b/pre-commit_semantic-release.sh @@ -7,16 +7,16 @@ sed -i -e "s_^\(version:\).*_\1 ${1}_" FORMULA ############################################################################### -# (B) Use `m2r` to convert automatically produced `.md` docs to `.rst` +# (B) Use `m2r2` to convert automatically produced `.md` docs to `.rst` ############################################################################### -# Install `m2r` -pip3 install m2r +# Install `m2r2` +pip3 install m2r2 # Copy and then convert the `.md` docs cp ./*.md docs/ cd docs/ || exit -m2r --overwrite ./*.md +m2r2 --overwrite ./*.md # Change excess `H1` headings to `H2` in converted `CHANGELOG.rst` sed -i -e '/^=.*$/s/=/-/g' CHANGELOG.rst From f6b0f890387722e0dd4b74d8ce0cfec24ff99158 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 17 Jan 2022 19:44:55 +0000 Subject: [PATCH 52/60] chore(gemfile.lock): update to latest gem versions (2022-W03) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/405 --- Gemfile.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 58936ee..0aeb7d4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -57,7 +57,7 @@ GEM public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.547.0) + aws-partitions (1.549.0) aws-sdk-alexaforbusiness (1.54.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) @@ -124,10 +124,10 @@ GEM aws-sdk-cognitoidentityprovider (1.53.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-configservice (1.71.0) + aws-sdk-configservice (1.72.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.125.2) + aws-sdk-core (3.125.3) 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.70.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.291.0) + aws-sdk-ec2 (1.293.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.52.0) @@ -159,7 +159,7 @@ GEM aws-sdk-eks (1.71.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.68.0) + aws-sdk-elasticache (1.70.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) aws-sdk-elasticbeanstalk (1.49.0) @@ -219,7 +219,7 @@ GEM aws-sdk-ram (1.26.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-rds (1.135.0) + aws-sdk-rds (1.136.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) aws-sdk-redshift (1.76.0) @@ -271,7 +271,7 @@ GEM aws-sdk-sqs (1.49.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.127.0) + aws-sdk-ssm (1.128.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) aws-sdk-states (1.39.0) @@ -300,7 +300,7 @@ GEM azure_mgmt_storage (0.23.0) ms_rest_azure (~> 0.12.0) bcrypt_pbkdf (1.1.0) - bson (4.13.0) + bson (4.14.0) builder (3.2.4) chef-config (17.9.26) addressable @@ -316,7 +316,7 @@ GEM concurrent-ruby coderay (1.1.3) concurrent-ruby (1.1.9) - cookstyle (7.26.1) + cookstyle (7.28.2) rubocop (= 1.24.1) declarative (0.0.20) diff-lcs (1.5.0) @@ -325,9 +325,9 @@ GEM multi_json domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - ed25519 (1.2.4) + ed25519 (1.3.0) erubi (1.10.0) - excon (0.89.0) + excon (0.90.0) faraday (1.4.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -382,7 +382,7 @@ GEM hashie (>= 3.4, <= 5.0) inspec (>= 2.2.64, < 5.0) test-kitchen (>= 2.7, < 4) - kitchen-salt (0.7.1) + kitchen-salt (0.7.2) hashie (>= 3.5) test-kitchen (>= 1.4) license-acceptance (2.1.13) @@ -453,7 +453,7 @@ GEM rspec-mocks (~> 3.10.0) rspec-core (3.10.1) rspec-support (~> 3.10.0) - rspec-expectations (3.10.1) + rspec-expectations (3.10.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-its (1.3.0) From ade4e7825993b5dd6dc887b0762761ecd3ee48be Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 25 Jan 2022 14:08:45 +0000 Subject: [PATCH 53/60] chore(gemfile.lock): update to latest gem versions (2022-W04) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/407 --- Gemfile.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0aeb7d4..818ffa9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,19 +1,19 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 347388b00a7a2ec565bdf174f6a2b784880442af + revision: f70a1105c67988e97c1a90f3f612e48d2fe2fec9 branch: ssf specs: - inspec (4.52.16) + inspec (4.55.6) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 4.52.16) + inspec-core (= 4.55.6) mongo (= 2.13.2) rake train (~> 3.0) train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.52.16) + inspec-core (4.55.6) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -97,7 +97,7 @@ GEM aws-sdk-cloudhsmv2 (1.40.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudtrail (1.44.0) + aws-sdk-cloudtrail (1.45.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) aws-sdk-cloudwatch (1.60.0) @@ -127,7 +127,7 @@ GEM aws-sdk-configservice (1.72.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.125.3) + aws-sdk-core (3.125.5) 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.70.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.293.0) + aws-sdk-ec2 (1.295.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.52.0) @@ -186,7 +186,7 @@ GEM aws-sdk-glue (1.88.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-guardduty (1.52.0) + aws-sdk-guardduty (1.53.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.65.0) @@ -234,7 +234,7 @@ GEM aws-sdk-route53resolver (1.35.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.111.1) + aws-sdk-s3 (1.111.3) aws-sdk-core (~> 3, >= 3.125.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) @@ -316,8 +316,8 @@ GEM concurrent-ruby coderay (1.1.3) concurrent-ruby (1.1.9) - cookstyle (7.28.2) - rubocop (= 1.24.1) + cookstyle (7.30.4) + rubocop (= 1.25.0) declarative (0.0.20) diff-lcs (1.5.0) docker-api (2.2.0) @@ -463,9 +463,9 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.3) - rubocop (1.24.1) + rubocop (1.25.0) parallel (~> 1.10) - parser (>= 3.0.0.0) + parser (>= 3.1.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml From a8d9d347717e17afc0f149f9f23852bf3b26cde9 Mon Sep 17 00:00:00 2001 From: noelmcloughlin Date: Wed, 26 Jan 2022 08:37:56 +0000 Subject: [PATCH 54/60] ci(gemfile): allow rubygems proxy to be provided as an env var [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/408 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 1fc06c5..098a9fd 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ # frozen_string_literal: true -source 'https://rubygems.org' +source ENV['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. From b1ac0924b6ca2a6a69e5fd60312fcef0f46608e7 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 1 Feb 2022 23:36:12 +0000 Subject: [PATCH 55/60] chore(gemfile.lock): update to latest gem versions (2022-W05) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/409 --- Gemfile | 2 +- Gemfile.lock | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Gemfile b/Gemfile index 098a9fd..5991260 100644 --- a/Gemfile +++ b/Gemfile @@ -16,4 +16,4 @@ gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure # rubocop:enable Layout/LineLength gem 'kitchen-inspec', '>= 2.5.0' -gem 'kitchen-salt', '>= 0.6.3' +gem 'kitchen-salt', '>= 0.7.2' diff --git a/Gemfile.lock b/Gemfile.lock index 818ffa9..983d316 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -57,7 +57,7 @@ GEM public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.549.0) + aws-partitions (1.551.0) aws-sdk-alexaforbusiness (1.54.0) aws-sdk-core (~> 3, >= 3.125.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.45.0) + aws-sdk-athena (1.46.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) aws-sdk-autoscaling (1.63.0) @@ -141,7 +141,7 @@ GEM aws-sdk-dynamodb (1.70.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.295.0) + aws-sdk-ec2 (1.296.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.52.0) @@ -153,7 +153,7 @@ GEM aws-sdk-ecs (1.94.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-efs (1.50.0) + aws-sdk-efs (1.51.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) aws-sdk-eks (1.71.0) @@ -186,13 +186,13 @@ GEM aws-sdk-glue (1.88.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-guardduty (1.53.0) + aws-sdk-guardduty (1.54.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.65.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-kafka (1.46.0) + aws-sdk-kafka (1.47.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) aws-sdk-kinesis (1.39.0) @@ -244,7 +244,7 @@ GEM aws-sdk-secretsmanager (1.46.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-securityhub (1.59.0) + aws-sdk-securityhub (1.60.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) aws-sdk-servicecatalog (1.60.0) @@ -302,9 +302,9 @@ GEM bcrypt_pbkdf (1.1.0) bson (4.14.0) builder (3.2.4) - chef-config (17.9.26) + chef-config (17.9.42) addressable - chef-utils (= 17.9.26) + chef-utils (= 17.9.42) 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.26) + chef-utils (17.9.42) concurrent-ruby coderay (1.1.3) concurrent-ruby (1.1.9) - cookstyle (7.30.4) + cookstyle (7.31.1) rubocop (= 1.25.0) declarative (0.0.20) diff-lcs (1.5.0) @@ -372,7 +372,7 @@ GEM http-cookie (1.0.4) domain_name (~> 0.5) httpclient (2.8.3) - i18n (1.8.11) + i18n (1.9.1) concurrent-ruby (~> 1.0) inifile (3.0.0) jmespath (1.5.0) @@ -451,7 +451,7 @@ GEM rspec-core (~> 3.10.0) rspec-expectations (~> 3.10.0) rspec-mocks (~> 3.10.0) - rspec-core (3.10.1) + rspec-core (3.10.2) rspec-support (~> 3.10.0) rspec-expectations (3.10.2) diff-lcs (>= 1.2.0, < 2.0) @@ -459,7 +459,7 @@ GEM rspec-its (1.3.0) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) - rspec-mocks (3.10.2) + rspec-mocks (3.10.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.3) From 091870b18c7b1c47536c7df012a553f29a78648c Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 2 Feb 2022 22:58:29 +0000 Subject: [PATCH 56/60] ci(kitchen+gitlab): update for new pre-salted images [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/410 --- .gitlab-ci.yml | 6 ------ .travis.yml | 6 ------ kitchen.yml | 26 -------------------------- 3 files changed, 38 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index efb185e..5316b7d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -160,20 +160,14 @@ ubuntu-1804-master-py3: {extends: '.test_instance'} # repositories-debian-9-3004-0-py3: {extends: '.test_instance'} # repositories-ubuntu-2004-3004-0-py3: {extends: '.test_instance'} # repositories-ubuntu-1804-3004-0-py3: {extends: '.test_instance'} -# repositories-debian-11-3003-3-py3: {extends: '.test_instance'} # repositories-debian-10-3003-3-py3: {extends: '.test_instance'} # repositories-debian-9-3003-3-py3: {extends: '.test_instance'} # repositories-ubuntu-2004-3003-3-py3: {extends: '.test_instance'} # repositories-ubuntu-1804-3003-3-py3: {extends: '.test_instance'} -# repositories-debian-11-3002-7-py3: {extends: '.test_instance'} # repositories-debian-10-3002-7-py3: {extends: '.test_instance'} # repositories-debian-9-3002-7-py3: {extends: '.test_instance'} # repositories-ubuntu-2004-3002-7-py3: {extends: '.test_instance'} # repositories-ubuntu-1804-3002-7-py3: {extends: '.test_instance'} -# repositories-debian-10-3001-8-py3: {extends: '.test_instance'} -# repositories-debian-9-3001-8-py3: {extends: '.test_instance'} -# repositories-ubuntu-2004-3001-8-py3: {extends: '.test_instance'} -# repositories-ubuntu-1804-3001-8-py3: {extends: '.test_instance'} ############################################################################### # `release` stage: `semantic-release` diff --git a/.travis.yml b/.travis.yml index 68db879..3d66280 100644 --- a/.travis.yml +++ b/.travis.yml @@ -113,20 +113,14 @@ jobs: # - env: INSTANCE=repositories-debian-9-3004-0-py3 # - env: INSTANCE=repositories-ubuntu-2004-3004-0-py3 # - env: INSTANCE=repositories-ubuntu-1804-3004-0-py3 - # - env: INSTANCE=repositories-debian-11-3003-3-py3 # - env: INSTANCE=repositories-debian-10-3003-3-py3 # - env: INSTANCE=repositories-debian-9-3003-3-py3 # - env: INSTANCE=repositories-ubuntu-2004-3003-3-py3 # - env: INSTANCE=repositories-ubuntu-1804-3003-3-py3 - # - env: INSTANCE=repositories-debian-11-3002-7-py3 # - env: INSTANCE=repositories-debian-10-3002-7-py3 # - env: INSTANCE=repositories-debian-9-3002-7-py3 # - env: INSTANCE=repositories-ubuntu-2004-3002-7-py3 # - env: INSTANCE=repositories-ubuntu-1804-3002-7-py3 - # - env: INSTANCE=repositories-debian-10-3001-8-py3 - # - env: INSTANCE=repositories-debian-9-3001-8-py3 - # - env: INSTANCE=repositories-ubuntu-2004-3001-8-py3 - # - env: INSTANCE=repositories-ubuntu-1804-3001-8-py3 ## Define the release stage that runs `semantic-release` - stage: 'release' diff --git a/kitchen.yml b/kitchen.yml index 140c94c..f6501c4 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -86,10 +86,6 @@ platforms: run_command: /lib/systemd/systemd ## SALT `3003.3` - - name: debian-11-3003-3-py3 - driver: - image: saltimages/salt-3003.3-py3:debian-11 - run_command: /lib/systemd/systemd - name: debian-10-3003-3-py3 driver: image: saltimages/salt-3003.3-py3:debian-10 @@ -108,10 +104,6 @@ platforms: run_command: /lib/systemd/systemd ## SALT `3002.7` - - name: debian-11-3002-7-py3 - driver: - image: saltimages/salt-3002.7-py3:debian-11 - run_command: /lib/systemd/systemd - name: debian-10-3002-7-py3 driver: image: saltimages/salt-3002.7-py3:debian-10 @@ -129,24 +121,6 @@ platforms: image: saltimages/salt-3002.7-py3:ubuntu-18.04 run_command: /lib/systemd/systemd - ## SALT `3001.8` - - name: debian-10-3001-8-py3 - driver: - image: saltimages/salt-3001.8-py3:debian-10 - run_command: /lib/systemd/systemd - - name: debian-9-3001-8-py3 - driver: - image: saltimages/salt-3001.8-py3:debian-9 - run_command: /lib/systemd/systemd - - name: ubuntu-2004-3001-8-py3 - driver: - image: saltimages/salt-3001.8-py3:ubuntu-20.04 - run_command: /lib/systemd/systemd - - name: ubuntu-1804-3001-8-py3 - driver: - image: saltimages/salt-3001.8-py3:ubuntu-18.04 - run_command: /lib/systemd/systemd - verifier: # https://www.inspec.io/ name: inspec From 8e7ef3c1786719ece41364152ec78cee30765418 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 7 Feb 2022 17:25:15 +0000 Subject: [PATCH 57/60] chore(gemfile.lock): update to latest gem versions (2022-W06) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/412 --- Gemfile.lock | 230 +++++++++++++++++++++++++-------------------------- 1 file changed, 115 insertions(+), 115 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 983d316..0975c26 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,19 +1,19 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: f70a1105c67988e97c1a90f3f612e48d2fe2fec9 + revision: 76ec461092da3f08b0e8976df10db6ae687895ab branch: ssf specs: - inspec (4.55.6) + inspec (4.55.9) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 4.55.6) + inspec-core (= 4.55.9) mongo (= 2.13.2) rake train (~> 3.0) train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.55.6) + inspec-core (4.55.9) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -57,24 +57,24 @@ GEM public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.551.0) - aws-sdk-alexaforbusiness (1.54.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-partitions (1.553.0) + aws-sdk-alexaforbusiness (1.55.0) + aws-sdk-core (~> 3, >= 3.126.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.73.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-apigateway (1.74.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-apigatewayv2 (1.40.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-apigatewayv2 (1.41.0) + aws-sdk-core (~> 3, >= 3.126.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.46.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-athena (1.48.0) + aws-sdk-core (~> 3, >= 3.126.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.45.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-budgets (1.46.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudformation (1.64.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-cloudformation (1.65.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudfront (1.61.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-cloudfront (1.62.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsm (1.37.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-cloudhsm (1.38.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsmv2 (1.40.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-cloudhsmv2 (1.41.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudtrail (1.45.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-cloudtrail (1.46.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatch (1.60.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-cloudwatch (1.61.0) + aws-sdk-core (~> 3, >= 3.126.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.50.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-cloudwatchlogs (1.51.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-codecommit (1.49.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-codecommit (1.50.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-codedeploy (1.47.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-codedeploy (1.48.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-codepipeline (1.51.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-codepipeline (1.52.0) + aws-sdk-core (~> 3, >= 3.126.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.72.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-configservice (1.73.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.125.5) + aws-sdk-core (3.126.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-costandusagereportservice (1.38.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-costandusagereportservice (1.39.0) + aws-sdk-core (~> 3, >= 3.126.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.70.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-dynamodb (1.72.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.296.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-ec2 (1.298.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-ecr (1.52.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-ecr (1.53.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-ecrpublic (1.10.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-ecrpublic (1.11.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.94.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-ecs (1.95.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-efs (1.51.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-efs (1.52.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-eks (1.71.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-eks (1.72.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.70.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-elasticache (1.72.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticbeanstalk (1.49.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-elasticbeanstalk (1.50.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancing (1.38.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-elasticloadbalancing (1.39.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancingv2 (1.75.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-elasticloadbalancingv2 (1.76.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticsearchservice (1.62.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-elasticsearchservice (1.64.0) + aws-sdk-core (~> 3, >= 3.126.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.46.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-firehose (1.47.0) + aws-sdk-core (~> 3, >= 3.126.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.54.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-guardduty (1.55.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.65.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-iam (1.66.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-kafka (1.47.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-kafka (1.48.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-kinesis (1.39.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-kinesis (1.40.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.53.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-kms (1.54.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.77.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-lambda (1.78.0) + aws-sdk-core (~> 3, >= 3.126.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.13.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-networkfirewall (1.14.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-networkmanager (1.20.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-networkmanager (1.21.0) + aws-sdk-core (~> 3, >= 3.126.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.136.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-rds (1.138.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.76.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-redshift (1.77.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-route53 (1.60.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-route53 (1.61.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-route53domains (1.38.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-route53domains (1.39.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-route53resolver (1.35.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-route53resolver (1.36.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.111.3) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-s3 (1.112.0) + aws-sdk-core (~> 3, >= 3.126.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.60.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-securityhub (1.61.0) + aws-sdk-core (~> 3, >= 3.126.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.46.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-shield (1.47.0) + aws-sdk-core (~> 3, >= 3.126.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.37.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-sms (1.38.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-sns (1.50.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-sns (1.51.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-sqs (1.49.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-sqs (1.50.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.128.0) - aws-sdk-core (~> 3, >= 3.125.0) + aws-sdk-ssm (1.129.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) aws-sdk-states (1.39.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -300,7 +300,7 @@ GEM azure_mgmt_storage (0.23.0) ms_rest_azure (~> 0.12.0) bcrypt_pbkdf (1.1.0) - bson (4.14.0) + bson (4.14.1) builder (3.2.4) chef-config (17.9.42) addressable @@ -316,8 +316,8 @@ GEM concurrent-ruby coderay (1.1.3) concurrent-ruby (1.1.9) - cookstyle (7.31.1) - rubocop (= 1.25.0) + cookstyle (7.31.3) + rubocop (= 1.25.1) declarative (0.0.20) diff-lcs (1.5.0) docker-api (2.2.0) @@ -327,7 +327,7 @@ GEM unf (>= 0.0.5, < 1.0.0) ed25519 (1.3.0) erubi (1.10.0) - excon (0.90.0) + excon (0.91.0) faraday (1.4.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -463,7 +463,7 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.3) - rubocop (1.25.0) + rubocop (1.25.1) parallel (~> 1.10) parser (>= 3.1.0.0) rainbow (>= 2.2.2, < 4.0) @@ -508,7 +508,7 @@ GEM timeliness (0.3.10) tomlrb (1.3.0) trailblazer-option (0.1.2) - train (3.8.6) + train (3.8.7) activesupport (>= 6.0.3.1) azure_graph_rbac (~> 0.16) azure_mgmt_key_vault (~> 0.17) @@ -519,7 +519,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.6) + train-core (= 3.8.7) train-winrm (~> 0.2) train-aws (0.2.24) aws-sdk-alexaforbusiness (~> 1.0) @@ -597,7 +597,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.6) + train-core (3.8.7) addressable (~> 2.5) ffi (!= 1.13.0) json (>= 1.8, < 3.0) @@ -662,7 +662,7 @@ DEPENDENCIES inspec! kitchen-docker! kitchen-inspec (>= 2.5.0) - kitchen-salt (>= 0.6.3) + kitchen-salt (>= 0.7.2) BUNDLED WITH 2.1.2 From 37ca1fa0574550758947bd0a2b26e5944121d222 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 12 Feb 2022 23:18:33 +0000 Subject: [PATCH 58/60] 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 41b5f35..2cb381e 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 2cceb73..bf4d107 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 7cc688cf1554ebff114321f1be09ea59f83d9c66 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 11 Feb 2022 21:24:24 +0000 Subject: [PATCH 59/60] refactor(salt-lint): fix violations ``` [213] SaltStack recommends using cmd.run together with onchanges, rather than cmd.wait apt/dist_upgrade.sls:2 cmd.wait: [213] SaltStack recommends using cmd.run together with onchanges, rather than cmd.wait apt/update.sls:2 cmd.wait: [213] SaltStack recommends using cmd.run together with onchanges, rather than cmd.wait apt/upgrade.sls:2 cmd.wait: [214] SLS file with a period in the name (besides the suffix period) can not be referenced test/salt/pillar/preferences.pillar.sls:1 [214] SLS file with a period in the name (besides the suffix period) can not be referenced test/salt/pillar/repositories.pillar.sls:1 [214] SLS file with a period in the name (besides the suffix period) can not be referenced test/salt/pillar/unattended.pillar.sls:1 ``` --- apt/dist_upgrade.sls | 4 ++-- apt/update.sls | 4 ++-- apt/upgrade.sls | 4 ++-- kitchen.yml | 6 +++--- .../salt/pillar/{preferences.pillar.sls => preferences.sls} | 0 .../pillar/{repositories.pillar.sls => repositories.sls} | 0 test/salt/pillar/{unattended.pillar.sls => unattended.sls} | 0 7 files changed, 9 insertions(+), 9 deletions(-) rename test/salt/pillar/{preferences.pillar.sls => preferences.sls} (100%) rename test/salt/pillar/{repositories.pillar.sls => repositories.sls} (100%) rename test/salt/pillar/{unattended.pillar.sls => unattended.sls} (100%) diff --git a/apt/dist_upgrade.sls b/apt/dist_upgrade.sls index 2da6fa5..74b751d 100644 --- a/apt/dist_upgrade.sls +++ b/apt/dist_upgrade.sls @@ -1,5 +1,5 @@ apt-get -y dist-upgrade: - cmd.wait: - - watch: + cmd.run: + - onchanges: - file: /etc/apt/sources.list - file: /etc/apt/sources.list.d diff --git a/apt/update.sls b/apt/update.sls index e83a114..6bd27bb 100644 --- a/apt/update.sls +++ b/apt/update.sls @@ -1,5 +1,5 @@ apt-get -y update: - cmd.wait: - - watch: + cmd.run: + - onchanges: - file: /etc/apt/sources.list - file: /etc/apt/sources.list.d diff --git a/apt/upgrade.sls b/apt/upgrade.sls index 7171769..483bd09 100644 --- a/apt/upgrade.sls +++ b/apt/upgrade.sls @@ -1,5 +1,5 @@ apt-get -y upgrade: - cmd.wait: - - watch: + cmd.run: + - onchanges: - file: /etc/apt/sources.list - file: /etc/apt/sources.list.d diff --git a/kitchen.yml b/kitchen.yml index f6501c4..50f1ef7 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -144,7 +144,7 @@ suites: '*': - apt pillars_from_files: - apt.sls: test/salt/pillar/repositories.pillar.sls + apt.sls: test/salt/pillar/repositories.sls verifier: inspec_tests: - path: test/integration/repositories @@ -161,7 +161,7 @@ suites: '*': - apt pillars_from_files: - apt.sls: test/salt/pillar/preferences.pillar.sls + apt.sls: test/salt/pillar/preferences.sls verifier: inspec_tests: - path: test/integration/preferences @@ -178,7 +178,7 @@ suites: '*': - apt pillars_from_files: - apt.sls: test/salt/pillar/unattended.pillar.sls + apt.sls: test/salt/pillar/unattended.sls verifier: inspec_tests: - path: test/integration/unattended diff --git a/test/salt/pillar/preferences.pillar.sls b/test/salt/pillar/preferences.sls similarity index 100% rename from test/salt/pillar/preferences.pillar.sls rename to test/salt/pillar/preferences.sls diff --git a/test/salt/pillar/repositories.pillar.sls b/test/salt/pillar/repositories.sls similarity index 100% rename from test/salt/pillar/repositories.pillar.sls rename to test/salt/pillar/repositories.sls diff --git a/test/salt/pillar/unattended.pillar.sls b/test/salt/pillar/unattended.sls similarity index 100% rename from test/salt/pillar/unattended.pillar.sls rename to test/salt/pillar/unattended.sls From 4ca3b252353ec916ce358eaef343ff349f8fcf87 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Sat, 12 Feb 2022 23:40:04 +0000 Subject: [PATCH 60/60] chore(release): 0.10.4 [skip ci] ## [0.10.4](https://github.com/saltstack-formulas/apt-formula/compare/v0.10.3...v0.10.4) (2022-02-12) ### Code Refactoring * **salt-lint:** fix violations ([7cc688c](https://github.com/saltstack-formulas/apt-formula/commit/7cc688cf1554ebff114321f1be09ea59f83d9c66)) ### Continuous Integration * update linters to latest versions [skip ci] ([37ca1fa](https://github.com/saltstack-formulas/apt-formula/commit/37ca1fa0574550758947bd0a2b26e5944121d222)) * **3003.1:** update inc. AlmaLinux, Rocky & `rst-lint` [skip ci] ([97b0af6](https://github.com/saltstack-formulas/apt-formula/commit/97b0af695acd8adfd3c3a048de21d03a04560636)) * **commitlint:** ensure `upstream/master` uses main repo URL [skip ci] ([b4cce02](https://github.com/saltstack-formulas/apt-formula/commit/b4cce02adfbd902ee86d175f66c61f5b41b37b15)) * **gemfile:** allow rubygems proxy to be provided as an env var [skip ci] ([a8d9d34](https://github.com/saltstack-formulas/apt-formula/commit/a8d9d347717e17afc0f149f9f23852bf3b26cde9)) * **gemfile+lock:** use `ssf` customised `inspec` repo [skip ci] ([1f136cd](https://github.com/saltstack-formulas/apt-formula/commit/1f136cd52c960ffbd43f97c4e4d658e827c34bc3)) * **gemfile+lock:** use `ssf` customised `kitchen-docker` repo [skip ci] ([ce4f1a8](https://github.com/saltstack-formulas/apt-formula/commit/ce4f1a8488ac65a0d3e34d2f28a47007924958fc)) * **gitlab-ci:** add `rubocop` linter (with `allow_failure`) [skip ci] ([057b19e](https://github.com/saltstack-formulas/apt-formula/commit/057b19ec7ad97afec550ca7c2dbbf28acf53d311)) * **gitlab-ci:** use GitLab CI as Travis CI replacement ([0f9b059](https://github.com/saltstack-formulas/apt-formula/commit/0f9b05940899957ac1c1fe4d6594cbab1d422e56)) * **kitchen:** move `provisioner` block & update `run_command` [skip ci] ([d08806c](https://github.com/saltstack-formulas/apt-formula/commit/d08806c07d7382fb9e6965c0db46b916aad3a386)) * **kitchen+ci:** update with `3004` pre-salted images/boxes [skip ci] ([380c689](https://github.com/saltstack-formulas/apt-formula/commit/380c6894b4c022ca4586693d8e9fd03845aa3b61)) * **kitchen+ci:** update with latest `3003.2` pre-salted images [skip ci] ([efe8592](https://github.com/saltstack-formulas/apt-formula/commit/efe8592337a698ca3361076e1dec453dca9d69d9)) * **kitchen+ci:** update with latest CVE pre-salted images [skip ci] ([9762abf](https://github.com/saltstack-formulas/apt-formula/commit/9762abfb4d3fecd5d4a9028c2e4a6e09667e7ceb)) * **kitchen+ci:** use latest pre-salted images (after CVE) [skip ci] ([d5c38c1](https://github.com/saltstack-formulas/apt-formula/commit/d5c38c1dda806cf874d66292a862cea7b6c21ea1)) * **kitchen+gitlab:** adjust matrix to add `3003` [skip ci] ([6be32dc](https://github.com/saltstack-formulas/apt-formula/commit/6be32dcd4254ef6b0dc7d9033b2b030f5701322a)) * **kitchen+gitlab:** remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci] ([8086687](https://github.com/saltstack-formulas/apt-formula/commit/8086687001e0e5d38472f65a7b1d2097d818b1b8)) * **kitchen+gitlab:** update for new pre-salted images [skip ci] ([091870b](https://github.com/saltstack-formulas/apt-formula/commit/091870b18c7b1c47536c7df012a553f29a78648c)) * add `arch-master` to matrix and update `.travis.yml` [skip ci] ([5637e07](https://github.com/saltstack-formulas/apt-formula/commit/5637e073b698b3970d99901e1a4abd24fa34318b)) * add Debian 11 Bullseye & update `yamllint` configuration [skip ci] ([758d646](https://github.com/saltstack-formulas/apt-formula/commit/758d646d1e509e1e1a10bfa9b30c3f8261d6bf30)) * **kitchen+gitlab-ci:** use latest pre-salted images [skip ci] ([d486305](https://github.com/saltstack-formulas/apt-formula/commit/d48630589f28fc42d8f0ddb65b6c6d1de3da12b0)) * **pre-commit:** update hook for `rubocop` ([67c1130](https://github.com/saltstack-formulas/apt-formula/commit/67c1130d8957a47ddc71a45a438bb6e74b4a10ac)) ### Tests * standardise use of `share` suite & `_mapdata` state [skip ci] ([9f6b2b1](https://github.com/saltstack-formulas/apt-formula/commit/9f6b2b1250ae4d134d3904cd09df9902bb42f677)) --- AUTHORS.md | 45 ++++++++++++++++++------------------ CHANGELOG.md | 36 +++++++++++++++++++++++++++++ FORMULA | 2 +- docs/AUTHORS.rst | 57 ++++++++++++++++++++++++---------------------- docs/CHANGELOG.rst | 40 ++++++++++++++++++++++++++++++++ 5 files changed, 130 insertions(+), 50 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index dd0d1b8..6c9de1d 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -4,28 +4,29 @@ This list is sorted by the number of commits per contributor in _descending_ ord Avatar|Contributor|Contributions :-:|---|:-: -@myii|[@myii](https://github.com/myii)|61 -@javierbertoli|[@javierbertoli](https://github.com/javierbertoli)|29 -@gravyboat|[@gravyboat](https://github.com/gravyboat)|12 -@bmcclure|[@bmcclure](https://github.com/bmcclure)|8 -@aboe76|[@aboe76](https://github.com/aboe76)|8 -@arthurlogilab|[@arthurlogilab](https://github.com/arthurlogilab)|7 -@nmadhok|[@nmadhok](https://github.com/nmadhok)|7 -@boltronics|[@boltronics](https://github.com/boltronics)|5 -@jdkelleher|[@jdkelleher](https://github.com/jdkelleher)|5 -@dafyddj|[@dafyddj](https://github.com/dafyddj)|4 -@westurner|[@westurner](https://github.com/westurner)|4 -@daschatten|[@daschatten](https://github.com/daschatten)|4 -@techhat|[@techhat](https://github.com/techhat)|3 -@whiteinge|[@whiteinge](https://github.com/whiteinge)|3 -@devster31|[@devster31](https://github.com/devster31)|3 -@fzipi|[@fzipi](https://github.com/fzipi)|1 -@jerrykan|[@jerrykan](https://github.com/jerrykan)|1 -@rpatterson|[@rpatterson](https://github.com/rpatterson)|1 -@simonclausen|[@simonclausen](https://github.com/simonclausen)|1 -@babilen5|[@babilen5](https://github.com/babilen5)|1 -@daks|[@daks](https://github.com/daks)|1 +@myii|[@myii](https://github.com/myii)|117 +@javierbertoli|[@javierbertoli](https://github.com/javierbertoli)|29 +@gravyboat|[@gravyboat](https://github.com/gravyboat)|12 +@bmcclure|[@bmcclure](https://github.com/bmcclure)|8 +@aboe76|[@aboe76](https://github.com/aboe76)|8 +@arthurlogilab|[@arthurlogilab](https://github.com/arthurlogilab)|7 +@nmadhok|[@nmadhok](https://github.com/nmadhok)|7 +@boltronics|[@boltronics](https://github.com/boltronics)|5 +@dafyddj|[@dafyddj](https://github.com/dafyddj)|5 +@jdkelleher|[@jdkelleher](https://github.com/jdkelleher)|5 +@westurner|[@westurner](https://github.com/westurner)|4 +@daschatten|[@daschatten](https://github.com/daschatten)|4 +@techhat|[@techhat](https://github.com/techhat)|3 +@whiteinge|[@whiteinge](https://github.com/whiteinge)|3 +@devster31|[@devster31](https://github.com/devster31)|3 +@baby-gnu|[@baby-gnu](https://github.com/baby-gnu)|1 +@jerrykan|[@jerrykan](https://github.com/jerrykan)|1 +@rpatterson|[@rpatterson](https://github.com/rpatterson)|1 +@simonclausen|[@simonclausen](https://github.com/simonclausen)|1 +@babilen|[@babilen](https://github.com/babilen)|1 +@noelmcloughlin|[@noelmcloughlin](https://github.com/noelmcloughlin)|1 +@daks|[@daks](https://github.com/daks)|1 --- -Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2020-10-19. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2022-02-12. diff --git a/CHANGELOG.md b/CHANGELOG.md index 342df45..9e393d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,41 @@ # Changelog +## [0.10.4](https://github.com/saltstack-formulas/apt-formula/compare/v0.10.3...v0.10.4) (2022-02-12) + + +### Code Refactoring + +* **salt-lint:** fix violations ([7cc688c](https://github.com/saltstack-formulas/apt-formula/commit/7cc688cf1554ebff114321f1be09ea59f83d9c66)) + + +### Continuous Integration + +* update linters to latest versions [skip ci] ([37ca1fa](https://github.com/saltstack-formulas/apt-formula/commit/37ca1fa0574550758947bd0a2b26e5944121d222)) +* **3003.1:** update inc. AlmaLinux, Rocky & `rst-lint` [skip ci] ([97b0af6](https://github.com/saltstack-formulas/apt-formula/commit/97b0af695acd8adfd3c3a048de21d03a04560636)) +* **commitlint:** ensure `upstream/master` uses main repo URL [skip ci] ([b4cce02](https://github.com/saltstack-formulas/apt-formula/commit/b4cce02adfbd902ee86d175f66c61f5b41b37b15)) +* **gemfile:** allow rubygems proxy to be provided as an env var [skip ci] ([a8d9d34](https://github.com/saltstack-formulas/apt-formula/commit/a8d9d347717e17afc0f149f9f23852bf3b26cde9)) +* **gemfile+lock:** use `ssf` customised `inspec` repo [skip ci] ([1f136cd](https://github.com/saltstack-formulas/apt-formula/commit/1f136cd52c960ffbd43f97c4e4d658e827c34bc3)) +* **gemfile+lock:** use `ssf` customised `kitchen-docker` repo [skip ci] ([ce4f1a8](https://github.com/saltstack-formulas/apt-formula/commit/ce4f1a8488ac65a0d3e34d2f28a47007924958fc)) +* **gitlab-ci:** add `rubocop` linter (with `allow_failure`) [skip ci] ([057b19e](https://github.com/saltstack-formulas/apt-formula/commit/057b19ec7ad97afec550ca7c2dbbf28acf53d311)) +* **gitlab-ci:** use GitLab CI as Travis CI replacement ([0f9b059](https://github.com/saltstack-formulas/apt-formula/commit/0f9b05940899957ac1c1fe4d6594cbab1d422e56)) +* **kitchen:** move `provisioner` block & update `run_command` [skip ci] ([d08806c](https://github.com/saltstack-formulas/apt-formula/commit/d08806c07d7382fb9e6965c0db46b916aad3a386)) +* **kitchen+ci:** update with `3004` pre-salted images/boxes [skip ci] ([380c689](https://github.com/saltstack-formulas/apt-formula/commit/380c6894b4c022ca4586693d8e9fd03845aa3b61)) +* **kitchen+ci:** update with latest `3003.2` pre-salted images [skip ci] ([efe8592](https://github.com/saltstack-formulas/apt-formula/commit/efe8592337a698ca3361076e1dec453dca9d69d9)) +* **kitchen+ci:** update with latest CVE pre-salted images [skip ci] ([9762abf](https://github.com/saltstack-formulas/apt-formula/commit/9762abfb4d3fecd5d4a9028c2e4a6e09667e7ceb)) +* **kitchen+ci:** use latest pre-salted images (after CVE) [skip ci] ([d5c38c1](https://github.com/saltstack-formulas/apt-formula/commit/d5c38c1dda806cf874d66292a862cea7b6c21ea1)) +* **kitchen+gitlab:** adjust matrix to add `3003` [skip ci] ([6be32dc](https://github.com/saltstack-formulas/apt-formula/commit/6be32dcd4254ef6b0dc7d9033b2b030f5701322a)) +* **kitchen+gitlab:** remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci] ([8086687](https://github.com/saltstack-formulas/apt-formula/commit/8086687001e0e5d38472f65a7b1d2097d818b1b8)) +* **kitchen+gitlab:** update for new pre-salted images [skip ci] ([091870b](https://github.com/saltstack-formulas/apt-formula/commit/091870b18c7b1c47536c7df012a553f29a78648c)) +* add `arch-master` to matrix and update `.travis.yml` [skip ci] ([5637e07](https://github.com/saltstack-formulas/apt-formula/commit/5637e073b698b3970d99901e1a4abd24fa34318b)) +* add Debian 11 Bullseye & update `yamllint` configuration [skip ci] ([758d646](https://github.com/saltstack-formulas/apt-formula/commit/758d646d1e509e1e1a10bfa9b30c3f8261d6bf30)) +* **kitchen+gitlab-ci:** use latest pre-salted images [skip ci] ([d486305](https://github.com/saltstack-formulas/apt-formula/commit/d48630589f28fc42d8f0ddb65b6c6d1de3da12b0)) +* **pre-commit:** update hook for `rubocop` ([67c1130](https://github.com/saltstack-formulas/apt-formula/commit/67c1130d8957a47ddc71a45a438bb6e74b4a10ac)) + + +### Tests + +* standardise use of `share` suite & `_mapdata` state [skip ci] ([9f6b2b1](https://github.com/saltstack-formulas/apt-formula/commit/9f6b2b1250ae4d134d3904cd09df9902bb42f677)) + ## [0.10.3](https://github.com/saltstack-formulas/apt-formula/compare/v0.10.2...v0.10.3) (2020-10-19) diff --git a/FORMULA b/FORMULA index d28d98c..98b238f 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: apt os: Debian, Ubuntu, Raspbian os_family: Debian -version: 0.10.3 +version: 0.10.4 release: 1 minimum_version: 2017.7 summary: Apt formula diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 3469cc0..2faf91e 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -13,71 +13,74 @@ This list is sorted by the number of commits per contributor in *descending* ord * - Avatar - Contributor - Contributions - * - :raw-html-m2r:`@myii` + * - :raw-html-m2r:`@myii` - `@myii `_ - - 61 - * - :raw-html-m2r:`@javierbertoli` + - 117 + * - :raw-html-m2r:`@javierbertoli` - `@javierbertoli `_ - 29 - * - :raw-html-m2r:`@gravyboat` + * - :raw-html-m2r:`@gravyboat` - `@gravyboat `_ - 12 - * - :raw-html-m2r:`@bmcclure` + * - :raw-html-m2r:`@bmcclure` - `@bmcclure `_ - 8 - * - :raw-html-m2r:`@aboe76` + * - :raw-html-m2r:`@aboe76` - `@aboe76 `_ - 8 - * - :raw-html-m2r:`@arthurlogilab` + * - :raw-html-m2r:`@arthurlogilab` - `@arthurlogilab `_ - 7 - * - :raw-html-m2r:`@nmadhok` + * - :raw-html-m2r:`@nmadhok` - `@nmadhok `_ - 7 - * - :raw-html-m2r:`@boltronics` + * - :raw-html-m2r:`@boltronics` - `@boltronics `_ - 5 - * - :raw-html-m2r:`@jdkelleher` + * - :raw-html-m2r:`@dafyddj` + - `@dafyddj `_ + - 5 + * - :raw-html-m2r:`@jdkelleher` - `@jdkelleher `_ - 5 - * - :raw-html-m2r:`@dafyddj` - - `@dafyddj `_ - - 4 - * - :raw-html-m2r:`@westurner` + * - :raw-html-m2r:`@westurner` - `@westurner `_ - 4 - * - :raw-html-m2r:`@daschatten` + * - :raw-html-m2r:`@daschatten` - `@daschatten `_ - 4 - * - :raw-html-m2r:`@techhat` + * - :raw-html-m2r:`@techhat` - `@techhat `_ - 3 - * - :raw-html-m2r:`@whiteinge` + * - :raw-html-m2r:`@whiteinge` - `@whiteinge `_ - 3 - * - :raw-html-m2r:`@devster31` + * - :raw-html-m2r:`@devster31` - `@devster31 `_ - 3 - * - :raw-html-m2r:`@fzipi` - - `@fzipi `_ + * - :raw-html-m2r:`@baby-gnu` + - `@baby-gnu `_ - 1 - * - :raw-html-m2r:`@jerrykan` + * - :raw-html-m2r:`@jerrykan` - `@jerrykan `_ - 1 - * - :raw-html-m2r:`@rpatterson` + * - :raw-html-m2r:`@rpatterson` - `@rpatterson `_ - 1 - * - :raw-html-m2r:`@simonclausen` + * - :raw-html-m2r:`@simonclausen` - `@simonclausen `_ - 1 - * - :raw-html-m2r:`@babilen5` - - `@babilen5 `_ + * - :raw-html-m2r:`@babilen` + - `@babilen `_ + - 1 + * - :raw-html-m2r:`@noelmcloughlin` + - `@noelmcloughlin `_ - 1 - * - :raw-html-m2r:`@daks` + * - :raw-html-m2r:`@daks` - `@daks `_ - 1 ---- -Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2020-10-19. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2022-02-12. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index ae5da62..50b72e2 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,46 @@ Changelog ========= +`0.10.4 `_ (2022-02-12) +-------------------------------------------------------------------------------------------------------- + +Code Refactoring +^^^^^^^^^^^^^^^^ + + +* **salt-lint:** fix violations (\ `7cc688c `_\ ) + +Continuous Integration +^^^^^^^^^^^^^^^^^^^^^^ + + +* update linters to latest versions [skip ci] (\ `37ca1fa `_\ ) +* **3003.1:** update inc. AlmaLinux, Rocky & ``rst-lint`` [skip ci] (\ `97b0af6 `_\ ) +* **commitlint:** ensure ``upstream/master`` uses main repo URL [skip ci] (\ `b4cce02 `_\ ) +* **gemfile:** allow rubygems proxy to be provided as an env var [skip ci] (\ `a8d9d34 `_\ ) +* **gemfile+lock:** use ``ssf`` customised ``inspec`` repo [skip ci] (\ `1f136cd `_\ ) +* **gemfile+lock:** use ``ssf`` customised ``kitchen-docker`` repo [skip ci] (\ `ce4f1a8 `_\ ) +* **gitlab-ci:** add ``rubocop`` linter (with ``allow_failure``\ ) [skip ci] (\ `057b19e `_\ ) +* **gitlab-ci:** use GitLab CI as Travis CI replacement (\ `0f9b059 `_\ ) +* **kitchen:** move ``provisioner`` block & update ``run_command`` [skip ci] (\ `d08806c `_\ ) +* **kitchen+ci:** update with ``3004`` pre-salted images/boxes [skip ci] (\ `380c689 `_\ ) +* **kitchen+ci:** update with latest ``3003.2`` pre-salted images [skip ci] (\ `efe8592 `_\ ) +* **kitchen+ci:** update with latest CVE pre-salted images [skip ci] (\ `9762abf `_\ ) +* **kitchen+ci:** use latest pre-salted images (after CVE) [skip ci] (\ `d5c38c1 `_\ ) +* **kitchen+gitlab:** adjust matrix to add ``3003`` [skip ci] (\ `6be32dc `_\ ) +* **kitchen+gitlab:** remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci] (\ `8086687 `_\ ) +* **kitchen+gitlab:** update for new pre-salted images [skip ci] (\ `091870b `_\ ) +* add ``arch-master`` to matrix and update ``.travis.yml`` [skip ci] (\ `5637e07 `_\ ) +* add Debian 11 Bullseye & update ``yamllint`` configuration [skip ci] (\ `758d646 `_\ ) +* **kitchen+gitlab-ci:** use latest pre-salted images [skip ci] (\ `d486305 `_\ ) +* **pre-commit:** update hook for ``rubocop`` (\ `67c1130 `_\ ) + +Tests +^^^^^ + + +* standardise use of ``share`` suite & ``_mapdata`` state [skip ci] (\ `9f6b2b1 `_\ ) + `0.10.3 `_ (2020-10-19) --------------------------------------------------------------------------------------------------------