From d15f3decb3fb1d8d1d04934c8d909913380d53f1 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 21 Jun 2021 20:46:09 +0100 Subject: [PATCH 01/42] 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 | 12 ------------ .travis.yml | 12 ------------ kitchen.yml | 30 ------------------------------ 3 files changed, 54 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f014be55..14ac9ebb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -127,7 +127,6 @@ rubocop: # default-debian-9-tiamat-py3: {extends: '.test_instance'} # default-ubuntu-2004-tiamat-py3: {extends: '.test_instance'} # default-ubuntu-1804-tiamat-py3: {extends: '.test_instance'} -# default-ubuntu-1604-tiamat-py3: {extends: '.test_instance'} # default-centos-8-tiamat-py3: {extends: '.test_instance'} # default-centos-7-tiamat-py3: {extends: '.test_instance'} # default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'} @@ -145,8 +144,6 @@ ubuntu-2004-master-py3: {extends: '.test_instance'} # default-ubuntu-1804-master-py3: {extends: '.test_instance'} # passenger-ubuntu-1804-master-py3: {extends: '.test_instance'} ubuntu-1804-master-py3: {extends: '.test_instance'} -default-ubuntu-1604-master-py3: {extends: '.test_instance'} -# ubuntu-1604-master-py3: {extends: '.test_instance'} # default-centos-8-master-py3: {extends: '.test_instance'} # passenger-centos-8-master-py3: {extends: '.test_instance'} centos-8-master-py3: {extends: '.test_instance'} @@ -157,8 +154,6 @@ default-fedora-34-master-py3: {extends: '.test_instance'} # fedora-34-master-py3: {extends: '.test_instance'} default-fedora-33-master-py3: {extends: '.test_instance'} # fedora-33-master-py3: {extends: '.test_instance'} -default-fedora-32-master-py3: {extends: '.test_instance'} -# fedora-32-master-py3: {extends: '.test_instance'} default-opensuse-leap-152-master-py3: {extends: '.test_instance'} # opensuse-leap-152-master-py3: {extends: '.test_instance'} default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'} @@ -184,7 +179,6 @@ default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'} # default-centos-7-3003-0-py3: {extends: '.test_instance'} # default-fedora-34-3003-0-py3: {extends: '.test_instance'} # default-fedora-33-3003-0-py3: {extends: '.test_instance'} -# default-fedora-32-3003-0-py3: {extends: '.test_instance'} # default-amazonlinux-2-3003-0-py3: {extends: '.test_instance'} # default-oraclelinux-8-3003-0-py3: {extends: '.test_instance'} # default-oraclelinux-7-3003-0-py3: {extends: '.test_instance'} @@ -195,12 +189,10 @@ default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'} # default-debian-9-3002-6-py3: {extends: '.test_instance'} # default-ubuntu-2004-3002-6-py3: {extends: '.test_instance'} # default-ubuntu-1804-3002-6-py3: {extends: '.test_instance'} -# default-ubuntu-1604-3002-6-py3: {extends: '.test_instance'} # default-centos-8-3002-6-py3: {extends: '.test_instance'} # default-centos-7-3002-6-py3: {extends: '.test_instance'} # default-fedora-34-3002-6-py3: {extends: '.test_instance'} # default-fedora-33-3002-6-py3: {extends: '.test_instance'} -# default-fedora-32-3002-6-py3: {extends: '.test_instance'} # default-amazonlinux-2-3002-6-py3: {extends: '.test_instance'} # default-oraclelinux-8-3002-6-py3: {extends: '.test_instance'} # default-oraclelinux-7-3002-6-py3: {extends: '.test_instance'} @@ -213,12 +205,10 @@ default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'} # default-debian-9-3001-7-py3: {extends: '.test_instance'} # default-ubuntu-2004-3001-7-py3: {extends: '.test_instance'} # default-ubuntu-1804-3001-7-py3: {extends: '.test_instance'} -# default-ubuntu-1604-3001-7-py3: {extends: '.test_instance'} # default-centos-8-3001-7-py3: {extends: '.test_instance'} # default-centos-7-3001-7-py3: {extends: '.test_instance'} # default-fedora-34-3001-7-py3: {extends: '.test_instance'} # default-fedora-33-3001-7-py3: {extends: '.test_instance'} -# default-fedora-32-3001-7-py3: {extends: '.test_instance'} # default-opensuse-leap-152-3001-7-py3: {extends: '.test_instance'} # default-opensuse-tmbl-latest-3001-7-py3: {extends: '.test_instance'} # default-amazonlinux-2-3001-7-py3: {extends: '.test_instance'} @@ -230,7 +220,6 @@ default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'} # default-debian-10-3000-9-py3: {extends: '.test_instance'} # default-debian-9-3000-9-py3: {extends: '.test_instance'} # default-ubuntu-1804-3000-9-py3: {extends: '.test_instance'} -# default-ubuntu-1604-3000-9-py3: {extends: '.test_instance'} # default-centos-8-3000-9-py3: {extends: '.test_instance'} # default-centos-7-3000-9-py3: {extends: '.test_instance'} # default-opensuse-leap-152-3000-9-py3: {extends: '.test_instance'} @@ -238,7 +227,6 @@ default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'} # default-oraclelinux-8-3000-9-py3: {extends: '.test_instance'} # default-oraclelinux-7-3000-9-py3: {extends: '.test_instance'} # default-ubuntu-1804-3000-9-py2: {extends: '.test_instance'} -# default-ubuntu-1604-3000-9-py2: {extends: '.test_instance'} # default-arch-base-latest-3000-9-py2: {extends: '.test_instance'} # default-gentoo-stage3-latest-3000-8-py3: {extends: '.test_instance'} # default-gentoo-stage3-systemd-3000-8-py3: {extends: '.test_instance'} diff --git a/.travis.yml b/.travis.yml index f31e9347..74b0bf31 100644 --- a/.travis.yml +++ b/.travis.yml @@ -87,7 +87,6 @@ jobs: # - env: INSTANCE=default-debian-9-tiamat-py3 # - env: INSTANCE=default-ubuntu-2004-tiamat-py3 # - env: INSTANCE=default-ubuntu-1804-tiamat-py3 - # - env: INSTANCE=default-ubuntu-1604-tiamat-py3 # - env: INSTANCE=default-centos-8-tiamat-py3 # - env: INSTANCE=default-centos-7-tiamat-py3 # - env: INSTANCE=default-amazonlinux-2-tiamat-py3 @@ -105,8 +104,6 @@ jobs: # - env: INSTANCE=default-ubuntu-1804-master-py3 # - env: INSTANCE=passenger-ubuntu-1804-master-py3 - env: INSTANCE=ubuntu-1804-master-py3 - - env: INSTANCE=default-ubuntu-1604-master-py3 - # - env: INSTANCE=ubuntu-1604-master-py3 # - env: INSTANCE=default-centos-8-master-py3 # - env: INSTANCE=passenger-centos-8-master-py3 - env: INSTANCE=centos-8-master-py3 @@ -117,8 +114,6 @@ jobs: # - env: INSTANCE=fedora-34-master-py3 - env: INSTANCE=default-fedora-33-master-py3 # - env: INSTANCE=fedora-33-master-py3 - - env: INSTANCE=default-fedora-32-master-py3 - # - env: INSTANCE=fedora-32-master-py3 - env: INSTANCE=default-opensuse-leap-152-master-py3 # - env: INSTANCE=opensuse-leap-152-master-py3 - env: INSTANCE=default-opensuse-tmbl-latest-master-py3 @@ -144,7 +139,6 @@ jobs: # - env: INSTANCE=default-centos-7-3003-0-py3 # - env: INSTANCE=default-fedora-34-3003-0-py3 # - env: INSTANCE=default-fedora-33-3003-0-py3 - # - env: INSTANCE=default-fedora-32-3003-0-py3 # - env: INSTANCE=default-amazonlinux-2-3003-0-py3 # - env: INSTANCE=default-oraclelinux-8-3003-0-py3 # - env: INSTANCE=default-oraclelinux-7-3003-0-py3 @@ -155,12 +149,10 @@ jobs: # - env: INSTANCE=default-debian-9-3002-6-py3 # - env: INSTANCE=default-ubuntu-2004-3002-6-py3 # - env: INSTANCE=default-ubuntu-1804-3002-6-py3 - # - env: INSTANCE=default-ubuntu-1604-3002-6-py3 # - env: INSTANCE=default-centos-8-3002-6-py3 # - env: INSTANCE=default-centos-7-3002-6-py3 # - env: INSTANCE=default-fedora-34-3002-6-py3 # - env: INSTANCE=default-fedora-33-3002-6-py3 - # - env: INSTANCE=default-fedora-32-3002-6-py3 # - env: INSTANCE=default-amazonlinux-2-3002-6-py3 # - env: INSTANCE=default-oraclelinux-8-3002-6-py3 # - env: INSTANCE=default-oraclelinux-7-3002-6-py3 @@ -173,12 +165,10 @@ jobs: # - env: INSTANCE=default-debian-9-3001-7-py3 # - env: INSTANCE=default-ubuntu-2004-3001-7-py3 # - env: INSTANCE=default-ubuntu-1804-3001-7-py3 - # - env: INSTANCE=default-ubuntu-1604-3001-7-py3 # - env: INSTANCE=default-centos-8-3001-7-py3 # - env: INSTANCE=default-centos-7-3001-7-py3 # - env: INSTANCE=default-fedora-34-3001-7-py3 # - env: INSTANCE=default-fedora-33-3001-7-py3 - # - env: INSTANCE=default-fedora-32-3001-7-py3 # - env: INSTANCE=default-opensuse-leap-152-3001-7-py3 # - env: INSTANCE=default-opensuse-tmbl-latest-3001-7-py3 # - env: INSTANCE=default-amazonlinux-2-3001-7-py3 @@ -190,7 +180,6 @@ jobs: # - env: INSTANCE=default-debian-10-3000-9-py3 # - env: INSTANCE=default-debian-9-3000-9-py3 # - env: INSTANCE=default-ubuntu-1804-3000-9-py3 - # - env: INSTANCE=default-ubuntu-1604-3000-9-py3 # - env: INSTANCE=default-centos-8-3000-9-py3 # - env: INSTANCE=default-centos-7-3000-9-py3 # - env: INSTANCE=default-opensuse-leap-152-3000-9-py3 @@ -198,7 +187,6 @@ jobs: # - env: INSTANCE=default-oraclelinux-8-3000-9-py3 # - env: INSTANCE=default-oraclelinux-7-3000-9-py3 # - env: INSTANCE=default-ubuntu-1804-3000-9-py2 - # - env: INSTANCE=default-ubuntu-1604-3000-9-py2 # - env: INSTANCE=default-arch-base-latest-3000-9-py2 # - env: INSTANCE=default-gentoo-stage3-latest-3000-8-py3 # - env: INSTANCE=default-gentoo-stage3-systemd-3000-8-py3 diff --git a/kitchen.yml b/kitchen.yml index a6fef669..176324f3 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 - name: centos-8-tiamat-py3 driver: image: saltimages/salt-tiamat-py3:centos-8 @@ -54,9 +51,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 - name: centos-8-master-py3 driver: image: saltimages/salt-master-py3:centos-8 @@ -69,9 +63,6 @@ platforms: - name: fedora-33-master-py3 driver: image: saltimages/salt-master-py3:fedora-33 - - name: fedora-32-master-py3 - driver: - image: saltimages/salt-master-py3:fedora-32 - name: opensuse-leap-152-master-py3 driver: image: saltimages/salt-master-py3:opensuse-leap-15.2 @@ -134,9 +125,6 @@ platforms: - name: fedora-33-3003-0-py3 driver: image: saltimages/salt-3003.0-py3:fedora-33 - - name: fedora-32-3003-0-py3 - driver: - image: saltimages/salt-3003.0-py3:fedora-32 - name: amazonlinux-2-3003-0-py3 driver: image: saltimages/salt-3003.0-py3:amazonlinux-2 @@ -171,9 +159,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 - name: centos-8-3002-6-py3 driver: image: saltimages/salt-3002.6-py3:centos-8 @@ -186,9 +171,6 @@ platforms: - name: fedora-33-3002-6-py3 driver: image: saltimages/salt-3002.6-py3:fedora-33 - - name: fedora-32-3002-6-py3 - driver: - image: saltimages/salt-3002.6-py3:fedora-32 - name: amazonlinux-2-3002-6-py3 driver: image: saltimages/salt-3002.6-py3:amazonlinux-2 @@ -243,9 +225,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 - name: centos-8-3001-7-py3 driver: image: saltimages/salt-3001.7-py3:centos-8 @@ -258,9 +237,6 @@ platforms: - name: fedora-33-3001-7-py3 driver: image: saltimages/salt-3001.7-py3:fedora-33 - - name: fedora-32-3001-7-py3 - driver: - image: saltimages/salt-3001.7-py3:fedora-32 - name: opensuse-leap-152-3001-7-py3 driver: image: saltimages/salt-3001.7-py3:opensuse-leap-15.2 @@ -310,9 +286,6 @@ 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: centos-8-3000-9-py3 driver: image: saltimages/salt-3000.9-py3:centos-8 @@ -339,9 +312,6 @@ platforms: - 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 - name: arch-base-latest-3000-9-py2 driver: image: saltimages/salt-3000.9-py2:arch-base-latest From 6a42a9bdf84e764cb4b3313ad2b6d95688517dec Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 2 Jul 2021 00:04:51 +0100 Subject: [PATCH 02/42] ci(3003.1): update inc. AlmaLinux, Rocky & `rst-lint` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/335 --- .gitlab-ci.yml | 60 ++++--- .pre-commit-config.yaml | 11 ++ .travis.yml | 60 ++++--- Gemfile.lock | 2 +- kitchen.yml | 180 ++++++++++++++------- test/integration/default/inspec.yml | 2 + test/integration/passenger/inspec.yml | 2 + test/integration/share/inspec.yml | 2 + test/integration/share/libraries/system.rb | 2 +- 9 files changed, 218 insertions(+), 103 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 14ac9ebb..2776168e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -132,6 +132,8 @@ rubocop: # default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'} # default-oraclelinux-8-tiamat-py3: {extends: '.test_instance'} # default-oraclelinux-7-tiamat-py3: {extends: '.test_instance'} +# default-almalinux-8-tiamat-py3: {extends: '.test_instance'} +# default-rockylinux-8-tiamat-py3: {extends: '.test_instance'} # default-debian-10-master-py3: {extends: '.test_instance'} # passenger-debian-10-master-py3: {extends: '.test_instance'} debian-10-master-py3: {extends: '.test_instance'} @@ -147,13 +149,15 @@ ubuntu-1804-master-py3: {extends: '.test_instance'} # default-centos-8-master-py3: {extends: '.test_instance'} # passenger-centos-8-master-py3: {extends: '.test_instance'} centos-8-master-py3: {extends: '.test_instance'} -# default-centos-7-master-py3: {extends: '.test_instance'} +default-centos-7-master-py3: {extends: '.test_instance'} # passenger-centos-7-master-py3: {extends: '.test_instance'} -centos-7-master-py3: {extends: '.test_instance'} +# centos-7-master-py3: {extends: '.test_instance'} default-fedora-34-master-py3: {extends: '.test_instance'} # fedora-34-master-py3: {extends: '.test_instance'} default-fedora-33-master-py3: {extends: '.test_instance'} # fedora-33-master-py3: {extends: '.test_instance'} +default-opensuse-leap-153-master-py3: {extends: '.test_instance'} +# opensuse-leap-153-master-py3: {extends: '.test_instance'} default-opensuse-leap-152-master-py3: {extends: '.test_instance'} # opensuse-leap-152-master-py3: {extends: '.test_instance'} default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'} @@ -171,20 +175,29 @@ default-arch-base-latest-master-py3: {extends: '.test_instance'} # gentoo-stage3-latest-master-py3: {extends: '.test_instance'} default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'} # gentoo-stage3-systemd-master-py3: {extends: '.test_instance'} -# default-debian-10-3003-0-py3: {extends: '.test_instance'} -# default-debian-9-3003-0-py3: {extends: '.test_instance'} -# default-ubuntu-2004-3003-0-py3: {extends: '.test_instance'} -# default-ubuntu-1804-3003-0-py3: {extends: '.test_instance'} -# default-centos-8-3003-0-py3: {extends: '.test_instance'} -# default-centos-7-3003-0-py3: {extends: '.test_instance'} -# default-fedora-34-3003-0-py3: {extends: '.test_instance'} -# default-fedora-33-3003-0-py3: {extends: '.test_instance'} -# default-amazonlinux-2-3003-0-py3: {extends: '.test_instance'} -# default-oraclelinux-8-3003-0-py3: {extends: '.test_instance'} -# default-oraclelinux-7-3003-0-py3: {extends: '.test_instance'} -# default-arch-base-latest-3003-0-py3: {extends: '.test_instance'} -# default-gentoo-stage3-latest-3003-0-py3: {extends: '.test_instance'} -# default-gentoo-stage3-systemd-3003-0-py3: {extends: '.test_instance'} +# default-almalinux-8-master-py3: {extends: '.test_instance'} +# passenger-almalinux-8-master-py3: {extends: '.test_instance'} +almalinux-8-master-py3: {extends: '.test_instance'} +# default-rockylinux-8-master-py3: {extends: '.test_instance'} +# passenger-rockylinux-8-master-py3: {extends: '.test_instance'} +rockylinux-8-master-py3: {extends: '.test_instance'} +# default-debian-10-3003-1-py3: {extends: '.test_instance'} +# default-debian-9-3003-1-py3: {extends: '.test_instance'} +# default-ubuntu-2004-3003-1-py3: {extends: '.test_instance'} +# default-ubuntu-1804-3003-1-py3: {extends: '.test_instance'} +# default-centos-8-3003-1-py3: {extends: '.test_instance'} +# default-centos-7-3003-1-py3: {extends: '.test_instance'} +# default-fedora-34-3003-1-py3: {extends: '.test_instance'} +# default-fedora-33-3003-1-py3: {extends: '.test_instance'} +# default-opensuse-leap-153-3003-1-py3: {extends: '.test_instance'} +# default-opensuse-leap-152-3003-1-py3: {extends: '.test_instance'} +# default-opensuse-tmbl-latest-3003-1-py3: {extends: '.test_instance'} +# default-amazonlinux-2-3003-1-py3: {extends: '.test_instance'} +# default-oraclelinux-8-3003-1-py3: {extends: '.test_instance'} +# default-oraclelinux-7-3003-1-py3: {extends: '.test_instance'} +# default-arch-base-latest-3003-1-py3: {extends: '.test_instance'} +# default-gentoo-stage3-latest-3003-1-py3: {extends: '.test_instance'} +# default-gentoo-stage3-systemd-3003-1-py3: {extends: '.test_instance'} # default-debian-10-3002-6-py3: {extends: '.test_instance'} # default-debian-9-3002-6-py3: {extends: '.test_instance'} # default-ubuntu-2004-3002-6-py3: {extends: '.test_instance'} @@ -197,8 +210,9 @@ default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'} # default-oraclelinux-8-3002-6-py3: {extends: '.test_instance'} # default-oraclelinux-7-3002-6-py3: {extends: '.test_instance'} # default-arch-base-latest-3002-6-py3: {extends: '.test_instance'} -# default-gentoo-stage3-latest-3002-5-py3: {extends: '.test_instance'} -# default-gentoo-stage3-systemd-3002-5-py3: {extends: '.test_instance'} +# default-gentoo-stage3-latest-3002-6-py3: {extends: '.test_instance'} +# default-gentoo-stage3-systemd-3002-6-py3: {extends: '.test_instance'} +# default-opensuse-leap-153-3002-2-py3: {extends: '.test_instance'} # default-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'} # default-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'} # default-debian-10-3001-7-py3: {extends: '.test_instance'} @@ -209,27 +223,29 @@ default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'} # default-centos-7-3001-7-py3: {extends: '.test_instance'} # default-fedora-34-3001-7-py3: {extends: '.test_instance'} # default-fedora-33-3001-7-py3: {extends: '.test_instance'} +# default-opensuse-leap-153-3001-7-py3: {extends: '.test_instance'} # default-opensuse-leap-152-3001-7-py3: {extends: '.test_instance'} # default-opensuse-tmbl-latest-3001-7-py3: {extends: '.test_instance'} # default-amazonlinux-2-3001-7-py3: {extends: '.test_instance'} # default-oraclelinux-8-3001-7-py3: {extends: '.test_instance'} # default-oraclelinux-7-3001-7-py3: {extends: '.test_instance'} # default-arch-base-latest-3001-7-py3: {extends: '.test_instance'} -# default-gentoo-stage3-latest-3001-6-py3: {extends: '.test_instance'} -# default-gentoo-stage3-systemd-3001-6-py3: {extends: '.test_instance'} +# default-gentoo-stage3-latest-3001-7-py3: {extends: '.test_instance'} +# default-gentoo-stage3-systemd-3001-7-py3: {extends: '.test_instance'} # default-debian-10-3000-9-py3: {extends: '.test_instance'} # default-debian-9-3000-9-py3: {extends: '.test_instance'} # default-ubuntu-1804-3000-9-py3: {extends: '.test_instance'} # default-centos-8-3000-9-py3: {extends: '.test_instance'} # default-centos-7-3000-9-py3: {extends: '.test_instance'} +# default-opensuse-leap-153-3000-9-py3: {extends: '.test_instance'} # default-opensuse-leap-152-3000-9-py3: {extends: '.test_instance'} # default-amazonlinux-2-3000-9-py3: {extends: '.test_instance'} # default-oraclelinux-8-3000-9-py3: {extends: '.test_instance'} # default-oraclelinux-7-3000-9-py3: {extends: '.test_instance'} +# default-gentoo-stage3-latest-3000-9-py3: {extends: '.test_instance'} +# default-gentoo-stage3-systemd-3000-9-py3: {extends: '.test_instance'} # default-ubuntu-1804-3000-9-py2: {extends: '.test_instance'} # default-arch-base-latest-3000-9-py2: {extends: '.test_instance'} -# default-gentoo-stage3-latest-3000-8-py3: {extends: '.test_instance'} -# default-gentoo-stage3-systemd-3000-8-py3: {extends: '.test_instance'} ############################################################################### # `release` stage: `semantic-release` diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9bc41097..41b5f35d 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 74b0bf31..2b7acd3e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -92,6 +92,8 @@ jobs: # - env: INSTANCE=default-amazonlinux-2-tiamat-py3 # - env: INSTANCE=default-oraclelinux-8-tiamat-py3 # - env: INSTANCE=default-oraclelinux-7-tiamat-py3 + # - env: INSTANCE=default-almalinux-8-tiamat-py3 + # - env: INSTANCE=default-rockylinux-8-tiamat-py3 # - env: INSTANCE=default-debian-10-master-py3 # - env: INSTANCE=passenger-debian-10-master-py3 - env: INSTANCE=debian-10-master-py3 @@ -107,13 +109,15 @@ jobs: # - env: INSTANCE=default-centos-8-master-py3 # - env: INSTANCE=passenger-centos-8-master-py3 - env: INSTANCE=centos-8-master-py3 - # - env: INSTANCE=default-centos-7-master-py3 + - env: INSTANCE=default-centos-7-master-py3 # - env: INSTANCE=passenger-centos-7-master-py3 - - env: INSTANCE=centos-7-master-py3 + # - env: INSTANCE=centos-7-master-py3 - env: INSTANCE=default-fedora-34-master-py3 # - env: INSTANCE=fedora-34-master-py3 - env: INSTANCE=default-fedora-33-master-py3 # - env: INSTANCE=fedora-33-master-py3 + - env: INSTANCE=default-opensuse-leap-153-master-py3 + # - env: INSTANCE=opensuse-leap-153-master-py3 - env: INSTANCE=default-opensuse-leap-152-master-py3 # - env: INSTANCE=opensuse-leap-152-master-py3 - env: INSTANCE=default-opensuse-tmbl-latest-master-py3 @@ -131,20 +135,29 @@ jobs: # - env: INSTANCE=gentoo-stage3-latest-master-py3 - env: INSTANCE=default-gentoo-stage3-systemd-master-py3 # - env: INSTANCE=gentoo-stage3-systemd-master-py3 - # - env: INSTANCE=default-debian-10-3003-0-py3 - # - env: INSTANCE=default-debian-9-3003-0-py3 - # - env: INSTANCE=default-ubuntu-2004-3003-0-py3 - # - env: INSTANCE=default-ubuntu-1804-3003-0-py3 - # - env: INSTANCE=default-centos-8-3003-0-py3 - # - env: INSTANCE=default-centos-7-3003-0-py3 - # - env: INSTANCE=default-fedora-34-3003-0-py3 - # - env: INSTANCE=default-fedora-33-3003-0-py3 - # - env: INSTANCE=default-amazonlinux-2-3003-0-py3 - # - env: INSTANCE=default-oraclelinux-8-3003-0-py3 - # - env: INSTANCE=default-oraclelinux-7-3003-0-py3 - # - env: INSTANCE=default-arch-base-latest-3003-0-py3 - # - env: INSTANCE=default-gentoo-stage3-latest-3003-0-py3 - # - env: INSTANCE=default-gentoo-stage3-systemd-3003-0-py3 + # - env: INSTANCE=default-almalinux-8-master-py3 + # - env: INSTANCE=passenger-almalinux-8-master-py3 + - env: INSTANCE=almalinux-8-master-py3 + # - env: INSTANCE=default-rockylinux-8-master-py3 + # - env: INSTANCE=passenger-rockylinux-8-master-py3 + - env: INSTANCE=rockylinux-8-master-py3 + # - env: INSTANCE=default-debian-10-3003-1-py3 + # - env: INSTANCE=default-debian-9-3003-1-py3 + # - env: INSTANCE=default-ubuntu-2004-3003-1-py3 + # - env: INSTANCE=default-ubuntu-1804-3003-1-py3 + # - env: INSTANCE=default-centos-8-3003-1-py3 + # - env: INSTANCE=default-centos-7-3003-1-py3 + # - env: INSTANCE=default-fedora-34-3003-1-py3 + # - env: INSTANCE=default-fedora-33-3003-1-py3 + # - env: INSTANCE=default-opensuse-leap-153-3003-1-py3 + # - env: INSTANCE=default-opensuse-leap-152-3003-1-py3 + # - env: INSTANCE=default-opensuse-tmbl-latest-3003-1-py3 + # - env: INSTANCE=default-amazonlinux-2-3003-1-py3 + # - env: INSTANCE=default-oraclelinux-8-3003-1-py3 + # - env: INSTANCE=default-oraclelinux-7-3003-1-py3 + # - env: INSTANCE=default-arch-base-latest-3003-1-py3 + # - env: INSTANCE=default-gentoo-stage3-latest-3003-1-py3 + # - env: INSTANCE=default-gentoo-stage3-systemd-3003-1-py3 # - env: INSTANCE=default-debian-10-3002-6-py3 # - env: INSTANCE=default-debian-9-3002-6-py3 # - env: INSTANCE=default-ubuntu-2004-3002-6-py3 @@ -157,8 +170,9 @@ jobs: # - env: INSTANCE=default-oraclelinux-8-3002-6-py3 # - env: INSTANCE=default-oraclelinux-7-3002-6-py3 # - env: INSTANCE=default-arch-base-latest-3002-6-py3 - # - env: INSTANCE=default-gentoo-stage3-latest-3002-5-py3 - # - env: INSTANCE=default-gentoo-stage3-systemd-3002-5-py3 + # - env: INSTANCE=default-gentoo-stage3-latest-3002-6-py3 + # - env: INSTANCE=default-gentoo-stage3-systemd-3002-6-py3 + # - env: INSTANCE=default-opensuse-leap-153-3002-2-py3 # - env: INSTANCE=default-opensuse-leap-152-3002-2-py3 # - env: INSTANCE=default-opensuse-tmbl-latest-3002-2-py3 # - env: INSTANCE=default-debian-10-3001-7-py3 @@ -169,27 +183,29 @@ jobs: # - env: INSTANCE=default-centos-7-3001-7-py3 # - env: INSTANCE=default-fedora-34-3001-7-py3 # - env: INSTANCE=default-fedora-33-3001-7-py3 + # - env: INSTANCE=default-opensuse-leap-153-3001-7-py3 # - env: INSTANCE=default-opensuse-leap-152-3001-7-py3 # - env: INSTANCE=default-opensuse-tmbl-latest-3001-7-py3 # - env: INSTANCE=default-amazonlinux-2-3001-7-py3 # - env: INSTANCE=default-oraclelinux-8-3001-7-py3 # - env: INSTANCE=default-oraclelinux-7-3001-7-py3 # - env: INSTANCE=default-arch-base-latest-3001-7-py3 - # - env: INSTANCE=default-gentoo-stage3-latest-3001-6-py3 - # - env: INSTANCE=default-gentoo-stage3-systemd-3001-6-py3 + # - env: INSTANCE=default-gentoo-stage3-latest-3001-7-py3 + # - env: INSTANCE=default-gentoo-stage3-systemd-3001-7-py3 # - env: INSTANCE=default-debian-10-3000-9-py3 # - env: INSTANCE=default-debian-9-3000-9-py3 # - env: INSTANCE=default-ubuntu-1804-3000-9-py3 # - env: INSTANCE=default-centos-8-3000-9-py3 # - env: INSTANCE=default-centos-7-3000-9-py3 + # - env: INSTANCE=default-opensuse-leap-153-3000-9-py3 # - env: INSTANCE=default-opensuse-leap-152-3000-9-py3 # - env: INSTANCE=default-amazonlinux-2-3000-9-py3 # - env: INSTANCE=default-oraclelinux-8-3000-9-py3 # - env: INSTANCE=default-oraclelinux-7-3000-9-py3 + # - env: INSTANCE=default-gentoo-stage3-latest-3000-9-py3 + # - env: INSTANCE=default-gentoo-stage3-systemd-3000-9-py3 # - env: INSTANCE=default-ubuntu-1804-3000-9-py2 # - env: INSTANCE=default-arch-base-latest-3000-9-py2 - # - env: INSTANCE=default-gentoo-stage3-latest-3000-8-py3 - # - env: INSTANCE=default-gentoo-stage3-systemd-3000-8-py3 ## Define the release stage that runs `semantic-release` - stage: 'release' diff --git a/Gemfile.lock b/Gemfile.lock index ef26d96b..e2f62f3a 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 176324f3..6a382585 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -37,6 +37,12 @@ platforms: - name: oraclelinux-7-tiamat-py3 driver: image: saltimages/salt-tiamat-py3:oraclelinux-7 + - name: almalinux-8-tiamat-py3 + driver: + image: saltimages/salt-tiamat-py3:almalinux-8 + - name: rockylinux-8-tiamat-py3 + driver: + image: saltimages/salt-tiamat-py3:rockylinux-8 ## SALT `master` - name: debian-10-master-py3 @@ -63,6 +69,14 @@ platforms: - name: fedora-33-master-py3 driver: image: saltimages/salt-master-py3:fedora-33 + - name: opensuse-leap-153-master-py3 + driver: + image: saltimages/salt-master-py3:opensuse-leap-15.3 + run_command: /usr/lib/systemd/systemd + # Workaround to avoid intermittent failures on `opensuse-leap-15.3`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 - name: opensuse-leap-152-master-py3 driver: image: saltimages/salt-master-py3:opensuse-leap-15.2 @@ -99,52 +113,82 @@ platforms: - name: gentoo-stage3-systemd-master-py3 driver: image: saltimages/salt-master-py3:gentoo-stage3-systemd + - name: almalinux-8-master-py3 + driver: + image: saltimages/salt-master-py3:almalinux-8 + - name: rockylinux-8-master-py3 + driver: + image: saltimages/salt-master-py3:rockylinux-8 - ## SALT `3003.0` - - name: debian-10-3003-0-py3 + ## SALT `3003.1` + - name: debian-10-3003-1-py3 + driver: + image: saltimages/salt-3003.1-py3:debian-10 + - name: debian-9-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-9 + - name: ubuntu-2004-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:debian-9 - - name: ubuntu-2004-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-20.04 - - name: ubuntu-1804-3003-0-py3 + image: saltimages/salt-3003.1-py3:ubuntu-18.04 + - name: centos-8-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:ubuntu-18.04 - - name: centos-8-3003-0-py3 + image: saltimages/salt-3003.1-py3:centos-8 + - name: centos-7-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:centos-8 - - name: centos-7-3003-0-py3 + image: saltimages/salt-3003.1-py3:centos-7 + - name: fedora-34-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:centos-7 - - name: fedora-34-3003-0-py3 + image: saltimages/salt-3003.1-py3:fedora-34 + - name: fedora-33-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:fedora-34 - - name: fedora-33-3003-0-py3 + image: saltimages/salt-3003.1-py3:fedora-33 + - name: opensuse-leap-153-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:fedora-33 - - name: amazonlinux-2-3003-0-py3 + image: saltimages/salt-3003.1-py3:opensuse-leap-15.3 + run_command: /usr/lib/systemd/systemd + # Workaround to avoid intermittent failures on `opensuse-leap-15.3`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 + - name: opensuse-leap-152-3003-1-py3 + driver: + image: saltimages/salt-3003.1-py3:opensuse-leap-15.2 + run_command: /usr/lib/systemd/systemd + # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 + - name: opensuse-tmbl-latest-3003-1-py3 + driver: + image: saltimages/salt-3003.1-py3:opensuse-tumbleweed-latest + run_command: /usr/lib/systemd/systemd + # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 + - name: amazonlinux-2-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:amazonlinux-2 - - name: oraclelinux-8-3003-0-py3 + image: saltimages/salt-3003.1-py3:amazonlinux-2 + - name: oraclelinux-8-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:oraclelinux-8 - - name: oraclelinux-7-3003-0-py3 + image: saltimages/salt-3003.1-py3:oraclelinux-8 + - name: oraclelinux-7-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:oraclelinux-7 - - name: arch-base-latest-3003-0-py3 + image: saltimages/salt-3003.1-py3:oraclelinux-7 + - name: arch-base-latest-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:arch-base-latest + image: saltimages/salt-3003.1-py3:arch-base-latest run_command: /usr/lib/systemd/systemd - - name: gentoo-stage3-latest-3003-0-py3 + - name: gentoo-stage3-latest-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:gentoo-stage3-latest + image: saltimages/salt-3003.1-py3:gentoo-stage3-latest run_command: /sbin/init - - name: gentoo-stage3-systemd-3003-0-py3 + - name: gentoo-stage3-systemd-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:gentoo-stage3-systemd + image: saltimages/salt-3003.1-py3:gentoo-stage3-systemd ## SALT `3002.6` - name: debian-10-3002-6-py3 @@ -184,17 +228,23 @@ platforms: driver: image: saltimages/salt-3002.6-py3:arch-base-latest run_command: /usr/lib/systemd/systemd - - ## SALT `3002.5` - - name: gentoo-stage3-latest-3002-5-py3 + - name: gentoo-stage3-latest-3002-6-py3 driver: - image: saltimages/salt-3002.5-py3:gentoo-stage3-latest + image: saltimages/salt-3002.6-py3:gentoo-stage3-latest run_command: /sbin/init - - name: gentoo-stage3-systemd-3002-5-py3 + - name: gentoo-stage3-systemd-3002-6-py3 driver: - image: saltimages/salt-3002.5-py3:gentoo-stage3-systemd + image: saltimages/salt-3002.6-py3:gentoo-stage3-systemd ## SALT `3002.2` + - name: opensuse-leap-153-3002-2-py3 + driver: + image: saltimages/salt-3002.2-py3:opensuse-leap-15.3 + run_command: /usr/lib/systemd/systemd + # Workaround to avoid intermittent failures on `opensuse-leap-15.3`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 - name: opensuse-leap-152-3002-2-py3 driver: image: saltimages/salt-3002.2-py3:opensuse-leap-15.2 @@ -237,6 +287,14 @@ platforms: - name: fedora-33-3001-7-py3 driver: image: saltimages/salt-3001.7-py3:fedora-33 + - name: opensuse-leap-153-3001-7-py3 + driver: + image: saltimages/salt-3001.7-py3:opensuse-leap-15.3 + run_command: /usr/lib/systemd/systemd + # Workaround to avoid intermittent failures on `opensuse-leap-15.3`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 - name: opensuse-leap-152-3001-7-py3 driver: image: saltimages/salt-3001.7-py3:opensuse-leap-15.2 @@ -266,15 +324,13 @@ platforms: driver: image: saltimages/salt-3001.7-py3:arch-base-latest run_command: /usr/lib/systemd/systemd - - ## SALT `3001.6` - - name: gentoo-stage3-latest-3001-6-py3 + - name: gentoo-stage3-latest-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:gentoo-stage3-latest + image: saltimages/salt-3001.7-py3:gentoo-stage3-latest run_command: /sbin/init - - name: gentoo-stage3-systemd-3001-6-py3 + - name: gentoo-stage3-systemd-3001-7-py3 driver: - image: saltimages/salt-3001.6-py3:gentoo-stage3-systemd + image: saltimages/salt-3001.7-py3:gentoo-stage3-systemd ## SALT `3000.9` - name: debian-10-3000-9-py3 @@ -292,6 +348,14 @@ platforms: - name: centos-7-3000-9-py3 driver: image: saltimages/salt-3000.9-py3:centos-7 + - name: opensuse-leap-153-3000-9-py3 + driver: + image: saltimages/salt-3000.9-py3:opensuse-leap-15.3 + run_command: /usr/lib/systemd/systemd + # Workaround to avoid intermittent failures on `opensuse-leap-15.3`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 - name: opensuse-leap-152-3000-9-py3 driver: image: saltimages/salt-3000.9-py3:opensuse-leap-15.2 @@ -309,6 +373,13 @@ platforms: - name: oraclelinux-7-3000-9-py3 driver: image: saltimages/salt-3000.9-py3:oraclelinux-7 + - name: gentoo-stage3-latest-3000-9-py3 + driver: + image: saltimages/salt-3000.9-py3:gentoo-stage3-latest + run_command: /sbin/init + - name: gentoo-stage3-systemd-3000-9-py3 + driver: + image: saltimages/salt-3000.9-py3:gentoo-stage3-systemd - name: ubuntu-1804-3000-9-py2 driver: image: saltimages/salt-3000.9-py2:ubuntu-18.04 @@ -317,15 +388,6 @@ platforms: image: saltimages/salt-3000.9-py2:arch-base-latest run_command: /usr/lib/systemd/systemd - ## SALT `3000.8` - - name: gentoo-stage3-latest-3000-8-py3 - driver: - image: saltimages/salt-3000.8-py3:gentoo-stage3-latest - run_command: /sbin/init - - name: gentoo-stage3-systemd-3000-8-py3 - driver: - image: saltimages/salt-3000.8-py3:gentoo-stage3-systemd - provisioner: name: salt_solo log_level: debug @@ -375,6 +437,8 @@ suites: - centos-8-tiamat-py3 - centos-7-tiamat-py3 - oraclelinux-8-tiamat-py3 + - almalinux-8-tiamat-py3 + - rockylinux-8-tiamat-py3 - debian-10-master-py3 - debian-9-master-py3 - ubuntu-2004-master-py3 @@ -382,13 +446,15 @@ suites: - centos-8-master-py3 - centos-7-master-py3 - oraclelinux-8-master-py3 - - debian-10-3003-0-py3 - - debian-9-3003-0-py3 - - ubuntu-2004-3003-0-py3 - - ubuntu-1804-3003-0-py3 - - centos-8-3003-0-py3 - - centos-7-3003-0-py3 - - oraclelinux-8-3003-0-py3 + - almalinux-8-master-py3 + - rockylinux-8-master-py3 + - debian-10-3003-1-py3 + - debian-9-3003-1-py3 + - ubuntu-2004-3003-1-py3 + - ubuntu-1804-3003-1-py3 + - centos-8-3003-1-py3 + - centos-7-3003-1-py3 + - oraclelinux-8-3003-1-py3 - debian-10-3002-6-py3 - debian-9-3002-6-py3 - ubuntu-2004-3002-6-py3 diff --git a/test/integration/default/inspec.yml b/test/integration/default/inspec.yml index 9c0d8344..987eb15b 100644 --- a/test/integration/default/inspec.yml +++ b/test/integration/default/inspec.yml @@ -22,4 +22,6 @@ supports: - platform-name: oracle - platform-name: arch - platform-name: gentoo + - platform-name: almalinux + - platform-name: rocky - platform: windows diff --git a/test/integration/passenger/inspec.yml b/test/integration/passenger/inspec.yml index 02ea98d5..19741ce2 100644 --- a/test/integration/passenger/inspec.yml +++ b/test/integration/passenger/inspec.yml @@ -22,4 +22,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/inspec.yml b/test/integration/share/inspec.yml index cf623a19..ee200809 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 461dea4b..87daf086 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 124b219a64d5114299423cb2a7a547e500c56639 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 14 Jul 2021 12:14:12 +0100 Subject: [PATCH 03/42] 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 e2f62f3a..4f3f4ec0 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 79499e841be74162dd5ec869de267366b6048af1 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 17 Jul 2021 19:53:17 +0100 Subject: [PATCH 04/42] ci(gitlab-ci): enable instance after upstream issue resolved [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/342 --- .gitlab-ci.yml | 4 ++-- .travis.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2776168e..b4cc7036 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -149,9 +149,9 @@ ubuntu-1804-master-py3: {extends: '.test_instance'} # default-centos-8-master-py3: {extends: '.test_instance'} # passenger-centos-8-master-py3: {extends: '.test_instance'} centos-8-master-py3: {extends: '.test_instance'} -default-centos-7-master-py3: {extends: '.test_instance'} +# default-centos-7-master-py3: {extends: '.test_instance'} # passenger-centos-7-master-py3: {extends: '.test_instance'} -# centos-7-master-py3: {extends: '.test_instance'} +centos-7-master-py3: {extends: '.test_instance'} default-fedora-34-master-py3: {extends: '.test_instance'} # fedora-34-master-py3: {extends: '.test_instance'} default-fedora-33-master-py3: {extends: '.test_instance'} diff --git a/.travis.yml b/.travis.yml index 2b7acd3e..27a34736 100644 --- a/.travis.yml +++ b/.travis.yml @@ -109,9 +109,9 @@ jobs: # - env: INSTANCE=default-centos-8-master-py3 # - env: INSTANCE=passenger-centos-8-master-py3 - env: INSTANCE=centos-8-master-py3 - - env: INSTANCE=default-centos-7-master-py3 + # - env: INSTANCE=default-centos-7-master-py3 # - env: INSTANCE=passenger-centos-7-master-py3 - # - env: INSTANCE=centos-7-master-py3 + - env: INSTANCE=centos-7-master-py3 - env: INSTANCE=default-fedora-34-master-py3 # - env: INSTANCE=fedora-34-master-py3 - env: INSTANCE=default-fedora-33-master-py3 From e4b933c5d62faebef1465771c48bf85e25d97940 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 17 Jul 2021 20:27:50 +0100 Subject: [PATCH 05/42] 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 | 435 +++++++++++++++++++++++++++++---------------------- kitchen.yml | 2 +- 3 files changed, 250 insertions(+), 189 deletions(-) diff --git a/Gemfile b/Gemfile index 8be107e1..f4bb330e 100644 --- a/Gemfile +++ b/Gemfile @@ -10,7 +10,7 @@ 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' group :vagrant do diff --git a/Gemfile.lock b/Gemfile.lock index 4f3f4ec0..73588cca 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,23 +322,22 @@ 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) - kitchen-vagrant (1.7.0) - test-kitchen (>= 1.4, < 3) - libyajl2 (1.2.0) + kitchen-vagrant (1.9.0) + test-kitchen (>= 1.4, < 4) license-acceptance (1.0.19) pastel (~> 0.7) tomlrb (~> 1.2) @@ -306,16 +349,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) @@ -336,52 +379,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) @@ -393,28 +438,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) @@ -422,16 +469,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) @@ -440,48 +492,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) @@ -490,16 +550,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) @@ -507,8 +567,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) @@ -518,6 +578,7 @@ GEM rubyzip (~> 1.1) winrm (~> 2.0) wisper (2.0.1) + zeitwerk (2.4.2) PLATFORMS ruby @@ -525,7 +586,7 @@ PLATFORMS DEPENDENCIES inspec (~> 4.22.22) kitchen-docker! - kitchen-inspec (>= 2.2.1) + kitchen-inspec (>= 2.5.0) kitchen-salt (>= 0.6.3) kitchen-vagrant diff --git a/kitchen.yml b/kitchen.yml index 6a382585..823f5a4d 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -402,8 +402,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 6b650177aaa9800151f2e7f628551856f0c28c54 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 17 Jul 2021 21:10:35 +0100 Subject: [PATCH 06/42] ci(kitchen): move `provisioner` block & update `run_command` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/344 --- kitchen.yml | 65 ++++++++++++++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 30 deletions(-) diff --git a/kitchen.yml b/kitchen.yml index 823f5a4d..192af4ef 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -6,22 +6,36 @@ 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: nginx + 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 - name: centos-8-tiamat-py3 driver: image: saltimages/salt-tiamat-py3:centos-8 @@ -48,15 +62,19 @@ platforms: - 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 - name: centos-8-master-py3 driver: image: saltimages/salt-master-py3:centos-8 @@ -72,7 +90,6 @@ platforms: - name: opensuse-leap-153-master-py3 driver: image: saltimages/salt-master-py3:opensuse-leap-15.3 - run_command: /usr/lib/systemd/systemd # Workaround to avoid intermittent failures on `opensuse-leap-15.3`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: @@ -80,7 +97,6 @@ platforms: - name: opensuse-leap-152-master-py3 driver: image: saltimages/salt-master-py3:opensuse-leap-15.2 - run_command: /usr/lib/systemd/systemd # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: @@ -88,7 +104,6 @@ platforms: - name: opensuse-tmbl-latest-master-py3 driver: image: saltimages/salt-master-py3:opensuse-tumbleweed-latest - run_command: /usr/lib/systemd/systemd # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: @@ -105,7 +120,6 @@ platforms: - name: arch-base-latest-master-py3 driver: image: saltimages/salt-master-py3:arch-base-latest - run_command: /usr/lib/systemd/systemd - name: gentoo-stage3-latest-master-py3 driver: image: saltimages/salt-master-py3:gentoo-stage3-latest @@ -124,15 +138,19 @@ platforms: - 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 - name: centos-8-3003-1-py3 driver: image: saltimages/salt-3003.1-py3:centos-8 @@ -148,7 +166,6 @@ platforms: - name: opensuse-leap-153-3003-1-py3 driver: image: saltimages/salt-3003.1-py3:opensuse-leap-15.3 - run_command: /usr/lib/systemd/systemd # Workaround to avoid intermittent failures on `opensuse-leap-15.3`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: @@ -156,7 +173,6 @@ platforms: - name: opensuse-leap-152-3003-1-py3 driver: image: saltimages/salt-3003.1-py3:opensuse-leap-15.2 - run_command: /usr/lib/systemd/systemd # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: @@ -164,7 +180,6 @@ platforms: - name: opensuse-tmbl-latest-3003-1-py3 driver: image: saltimages/salt-3003.1-py3:opensuse-tumbleweed-latest - run_command: /usr/lib/systemd/systemd # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: @@ -181,7 +196,6 @@ platforms: - name: arch-base-latest-3003-1-py3 driver: image: saltimages/salt-3003.1-py3:arch-base-latest - run_command: /usr/lib/systemd/systemd - name: gentoo-stage3-latest-3003-1-py3 driver: image: saltimages/salt-3003.1-py3:gentoo-stage3-latest @@ -194,15 +208,19 @@ platforms: - 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 - name: centos-8-3002-6-py3 driver: image: saltimages/salt-3002.6-py3:centos-8 @@ -227,7 +245,6 @@ platforms: - name: arch-base-latest-3002-6-py3 driver: image: saltimages/salt-3002.6-py3:arch-base-latest - run_command: /usr/lib/systemd/systemd - name: gentoo-stage3-latest-3002-6-py3 driver: image: saltimages/salt-3002.6-py3:gentoo-stage3-latest @@ -240,7 +257,6 @@ platforms: - name: opensuse-leap-153-3002-2-py3 driver: image: saltimages/salt-3002.2-py3:opensuse-leap-15.3 - run_command: /usr/lib/systemd/systemd # Workaround to avoid intermittent failures on `opensuse-leap-15.3`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: @@ -248,7 +264,6 @@ platforms: - name: opensuse-leap-152-3002-2-py3 driver: image: saltimages/salt-3002.2-py3:opensuse-leap-15.2 - run_command: /usr/lib/systemd/systemd # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: @@ -256,7 +271,6 @@ platforms: - name: opensuse-tmbl-latest-3002-2-py3 driver: image: saltimages/salt-3002.2-py3:opensuse-tumbleweed-latest - run_command: /usr/lib/systemd/systemd # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: @@ -266,15 +280,19 @@ platforms: - 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 - name: centos-8-3001-7-py3 driver: image: saltimages/salt-3001.7-py3:centos-8 @@ -290,7 +308,6 @@ platforms: - name: opensuse-leap-153-3001-7-py3 driver: image: saltimages/salt-3001.7-py3:opensuse-leap-15.3 - run_command: /usr/lib/systemd/systemd # Workaround to avoid intermittent failures on `opensuse-leap-15.3`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: @@ -298,7 +315,6 @@ platforms: - name: opensuse-leap-152-3001-7-py3 driver: image: saltimages/salt-3001.7-py3:opensuse-leap-15.2 - run_command: /usr/lib/systemd/systemd # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: @@ -306,7 +322,6 @@ platforms: - name: opensuse-tmbl-latest-3001-7-py3 driver: image: saltimages/salt-3001.7-py3:opensuse-tumbleweed-latest - run_command: /usr/lib/systemd/systemd # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: @@ -323,7 +338,6 @@ platforms: - name: arch-base-latest-3001-7-py3 driver: image: saltimages/salt-3001.7-py3:arch-base-latest - run_command: /usr/lib/systemd/systemd - name: gentoo-stage3-latest-3001-7-py3 driver: image: saltimages/salt-3001.7-py3:gentoo-stage3-latest @@ -336,12 +350,15 @@ platforms: - name: debian-10-3000-9-py3 driver: image: saltimages/salt-3000.9-py3:debian-10 + run_command: /lib/systemd/systemd - name: debian-9-3000-9-py3 driver: image: saltimages/salt-3000.9-py3:debian-9 + run_command: /lib/systemd/systemd - name: ubuntu-1804-3000-9-py3 driver: image: saltimages/salt-3000.9-py3:ubuntu-18.04 + run_command: /lib/systemd/systemd - name: centos-8-3000-9-py3 driver: image: saltimages/salt-3000.9-py3:centos-8 @@ -351,7 +368,6 @@ platforms: - name: opensuse-leap-153-3000-9-py3 driver: image: saltimages/salt-3000.9-py3:opensuse-leap-15.3 - run_command: /usr/lib/systemd/systemd # Workaround to avoid intermittent failures on `opensuse-leap-15.3`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: @@ -359,7 +375,6 @@ platforms: - name: opensuse-leap-152-3000-9-py3 driver: image: saltimages/salt-3000.9-py3:opensuse-leap-15.2 - run_command: /usr/lib/systemd/systemd # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: @@ -383,20 +398,10 @@ platforms: - name: ubuntu-1804-3000-9-py2 driver: image: saltimages/salt-3000.9-py2:ubuntu-18.04 + run_command: /lib/systemd/systemd - name: arch-base-latest-3000-9-py2 driver: image: saltimages/salt-3000.9-py2:arch-base-latest - run_command: /usr/lib/systemd/systemd - -provisioner: - name: salt_solo - log_level: debug - salt_install: none - require_chef: false - formula: nginx - salt_copy_filter: - - .kitchen - - .git verifier: # https://www.inspec.io/ From fa8a5db5079b1e41eeac5d4ee25c06d976a24f3e Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sun, 18 Jul 2021 19:02:41 +0100 Subject: [PATCH 07/42] ci: add Debian 11 Bullseye & update `yamllint` configuration [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/345 --- .gitlab-ci.yml | 15 ++++++++++++++- .travis.yml | 6 ++++++ .yamllint | 14 ++++++++------ kitchen.yml | 20 ++++++++++++++++++++ 4 files changed, 48 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b4cc7036..747a4023 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,12 +117,20 @@ 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 ############################################################################### ## 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` +# default-debian-11-tiamat-py3: {extends: '.test_instance'} # default-debian-10-tiamat-py3: {extends: '.test_instance'} # default-debian-9-tiamat-py3: {extends: '.test_instance'} # default-ubuntu-2004-tiamat-py3: {extends: '.test_instance'} @@ -134,6 +142,9 @@ rubocop: # default-oraclelinux-7-tiamat-py3: {extends: '.test_instance'} # default-almalinux-8-tiamat-py3: {extends: '.test_instance'} # default-rockylinux-8-tiamat-py3: {extends: '.test_instance'} +# default-debian-11-master-py3: {extends: '.test_instance'} +# passenger-debian-11-master-py3: {extends: '.test_instance'} +debian-11-master-py3: {extends: '.test_instance_failure_permitted'} # default-debian-10-master-py3: {extends: '.test_instance'} # passenger-debian-10-master-py3: {extends: '.test_instance'} debian-10-master-py3: {extends: '.test_instance'} @@ -181,6 +192,7 @@ almalinux-8-master-py3: {extends: '.test_instance'} # default-rockylinux-8-master-py3: {extends: '.test_instance'} # passenger-rockylinux-8-master-py3: {extends: '.test_instance'} rockylinux-8-master-py3: {extends: '.test_instance'} +# default-debian-11-3003-1-py3: {extends: '.test_instance'} # default-debian-10-3003-1-py3: {extends: '.test_instance'} # default-debian-9-3003-1-py3: {extends: '.test_instance'} # default-ubuntu-2004-3003-1-py3: {extends: '.test_instance'} @@ -198,6 +210,7 @@ rockylinux-8-master-py3: {extends: '.test_instance'} # default-arch-base-latest-3003-1-py3: {extends: '.test_instance'} # default-gentoo-stage3-latest-3003-1-py3: {extends: '.test_instance'} # default-gentoo-stage3-systemd-3003-1-py3: {extends: '.test_instance'} +# default-debian-11-3002-6-py3: {extends: '.test_instance'} # default-debian-10-3002-6-py3: {extends: '.test_instance'} # default-debian-9-3002-6-py3: {extends: '.test_instance'} # default-ubuntu-2004-3002-6-py3: {extends: '.test_instance'} diff --git a/.travis.yml b/.travis.yml index 27a34736..412facf3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -83,6 +83,7 @@ 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=default-debian-11-tiamat-py3 # - env: INSTANCE=default-debian-10-tiamat-py3 # - env: INSTANCE=default-debian-9-tiamat-py3 # - env: INSTANCE=default-ubuntu-2004-tiamat-py3 @@ -94,6 +95,9 @@ jobs: # - env: INSTANCE=default-oraclelinux-7-tiamat-py3 # - env: INSTANCE=default-almalinux-8-tiamat-py3 # - env: INSTANCE=default-rockylinux-8-tiamat-py3 + # - env: INSTANCE=default-debian-11-master-py3 + # - env: INSTANCE=passenger-debian-11-master-py3 + - env: INSTANCE=debian-11-master-py3 # - env: INSTANCE=default-debian-10-master-py3 # - env: INSTANCE=passenger-debian-10-master-py3 - env: INSTANCE=debian-10-master-py3 @@ -141,6 +145,7 @@ jobs: # - env: INSTANCE=default-rockylinux-8-master-py3 # - env: INSTANCE=passenger-rockylinux-8-master-py3 - env: INSTANCE=rockylinux-8-master-py3 + # - env: INSTANCE=default-debian-11-3003-1-py3 # - env: INSTANCE=default-debian-10-3003-1-py3 # - env: INSTANCE=default-debian-9-3003-1-py3 # - env: INSTANCE=default-ubuntu-2004-3003-1-py3 @@ -158,6 +163,7 @@ jobs: # - env: INSTANCE=default-arch-base-latest-3003-1-py3 # - env: INSTANCE=default-gentoo-stage3-latest-3003-1-py3 # - env: INSTANCE=default-gentoo-stage3-systemd-3003-1-py3 + # - env: INSTANCE=default-debian-11-3002-6-py3 # - env: INSTANCE=default-debian-10-3002-6-py3 # - env: INSTANCE=default-debian-9-3002-6-py3 # - env: INSTANCE=default-ubuntu-2004-3002-6-py3 diff --git a/.yamllint b/.yamllint index f9a94a4b..08644861 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 192af4ef..7c56d884 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 @@ -59,6 +63,10 @@ platforms: image: saltimages/salt-tiamat-py3:rockylinux-8 ## 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 @@ -135,6 +143,10 @@ platforms: image: saltimages/salt-master-py3:rockylinux-8 ## 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 @@ -205,6 +217,10 @@ platforms: image: saltimages/salt-3003.1-py3:gentoo-stage3-systemd ## SALT `3002.6` + - name: debian-11-3002-6-py3 + driver: + image: saltimages/salt-3002.6-py3:debian-11 + run_command: /lib/systemd/systemd - name: debian-10-3002-6-py3 driver: image: saltimages/salt-3002.6-py3:debian-10 @@ -435,6 +451,7 @@ suites: - path: test/integration/default - name: passenger includes: + - debian-11-tiamat-py3 - debian-10-tiamat-py3 - debian-9-tiamat-py3 - ubuntu-2004-tiamat-py3 @@ -444,6 +461,7 @@ suites: - oraclelinux-8-tiamat-py3 - almalinux-8-tiamat-py3 - rockylinux-8-tiamat-py3 + - debian-11-master-py3 - debian-10-master-py3 - debian-9-master-py3 - ubuntu-2004-master-py3 @@ -453,6 +471,7 @@ suites: - oraclelinux-8-master-py3 - almalinux-8-master-py3 - rockylinux-8-master-py3 + - debian-11-3003-1-py3 - debian-10-3003-1-py3 - debian-9-3003-1-py3 - ubuntu-2004-3003-1-py3 @@ -460,6 +479,7 @@ suites: - centos-8-3003-1-py3 - centos-7-3003-1-py3 - oraclelinux-8-3003-1-py3 + - debian-11-3002-6-py3 - debian-10-3002-6-py3 - debian-9-3002-6-py3 - ubuntu-2004-3002-6-py3 From 3e047b2d43bc90f9122fc08476e03b2f31e3d8f3 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 21 Jul 2021 18:31:29 +0100 Subject: [PATCH 08/42] 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 73588cca..5c0b13a6 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 87daf086..af654492 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 860fabe327cfa9512152b0f278897311f35449bf Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 22 Jul 2021 08:36:01 +0100 Subject: [PATCH 09/42] ci(freebsd): update with latest pre-salted Vagrant boxes [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/350 --- .github/workflows/kitchen.vagrant.yml | 6 +++--- kitchen.vagrant.yml | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/kitchen.vagrant.yml b/.github/workflows/kitchen.vagrant.yml index 9d340488..7d090c35 100644 --- a/.github/workflows/kitchen.vagrant.yml +++ b/.github/workflows/kitchen.vagrant.yml @@ -20,9 +20,9 @@ jobs: # - freebsd-122-master-py3 - default-freebsd-114-master-py3 # - freebsd-114-master-py3 - # - default-freebsd-130-3002-6-py3 - # - default-freebsd-122-3002-6-py3 - # - default-freebsd-114-3002-6-py3 + # - default-freebsd-130-3003-1-py3 + # - default-freebsd-122-3003-1-py3 + # - default-freebsd-114-3003-1-py3 steps: - name: 'Check out code' uses: 'actions/checkout@v2' diff --git a/kitchen.vagrant.yml b/kitchen.vagrant.yml index 542ba907..2197d924 100644 --- a/kitchen.vagrant.yml +++ b/kitchen.vagrant.yml @@ -28,13 +28,13 @@ platforms: - name: freebsd-114-master-py3 driver: box: myii/freebsd-11.4-master-py3 - - name: freebsd-130-3002-6-py3 + - name: freebsd-130-3003-1-py3 driver: - box: myii/freebsd-13.0-3002.6-py3 + box: myii/freebsd-13.0-3003.1-py3 synced_folders: [] # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255208 - - name: freebsd-122-3002-6-py3 + - name: freebsd-122-3003-1-py3 driver: - box: myii/freebsd-12.2-3002.6-py3 - - name: freebsd-114-3002-6-py3 + box: myii/freebsd-12.2-3003.1-py3 + - name: freebsd-114-3003-1-py3 driver: - box: myii/freebsd-11.4-3002.6-py3 + box: myii/freebsd-11.4-3003.1-py3 From 98e62c617bf8362e7fb7a25b71f64923d6dcadc7 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 26 Jul 2021 14:28:33 +0100 Subject: [PATCH 10/42] 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 5c0b13a6..23d2d0d6 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 a4c1c39f66195cc8d5698cd6b6012418e3cdbd19 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 4 Aug 2021 21:37:49 +0100 Subject: [PATCH 11/42] 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 23d2d0d6..58c78984 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker - revision: 1f543f654da5c1774cb8737f6f07a01745520bb5 + revision: 428c89fc250b3790abad5ecb0afe0c3d4956084c branch: ssf specs: - kitchen-docker (2.10.0) + kitchen-docker (2.11.0) test-kitchen (>= 1.0.0) GEM @@ -18,18 +18,18 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.1.1) - aws-partitions (1.479.0) - aws-sdk-apigateway (1.62.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-partitions (1.482.0) + aws-sdk-apigateway (1.64.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-apigatewayv2 (1.32.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-apigatewayv2 (1.34.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-applicationautoscaling (1.51.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-athena (1.37.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-athena (1.39.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-autoscaling (1.61.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -37,41 +37,41 @@ GEM aws-sdk-batch (1.47.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-budgets (1.38.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-budgets (1.40.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudformation (1.53.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-cloudformation (1.55.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudfront (1.53.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-cloudfront (1.55.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsm (1.30.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-cloudhsm (1.32.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsmv2 (1.33.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-cloudhsmv2 (1.35.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudtrail (1.35.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-cloudtrail (1.37.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatch (1.51.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-cloudwatch (1.54.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-cloudwatchevents (1.46.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatchlogs (1.41.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-cloudwatchlogs (1.43.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-codecommit (1.42.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-codecommit (1.44.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-codedeploy (1.40.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-codedeploy (1.42.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-codepipeline (1.44.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-codepipeline (1.46.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-cognitoidentity (1.31.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -79,82 +79,82 @@ GEM aws-sdk-cognitoidentityprovider (1.51.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-configservice (1.62.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-configservice (1.64.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.117.0) + aws-sdk-core (3.119.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-costandusagereportservice (1.31.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-costandusagereportservice (1.33.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-databasemigrationservice (1.53.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-dynamodb (1.60.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-dynamodb (1.62.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.251.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-ec2 (1.254.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-ecr (1.42.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-ecr (1.44.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-ecrpublic (1.3.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-ecrpublic (1.5.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.81.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-ecs (1.83.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-efs (1.40.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-efs (1.42.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-eks (1.58.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-eks (1.60.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.57.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-elasticache (1.59.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticbeanstalk (1.42.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-elasticbeanstalk (1.44.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancing (1.31.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-elasticloadbalancing (1.33.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancingv2 (1.64.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-elasticloadbalancingv2 (1.66.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticsearchservice (1.52.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-elasticsearchservice (1.54.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-eventbridge (1.24.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-firehose (1.37.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-firehose (1.39.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-glue (1.87.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-guardduty (1.45.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-guardduty (1.47.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.57.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-iam (1.59.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-kafka (1.36.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-kafka (1.38.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-kinesis (1.32.1) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-kinesis (1.34.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.44.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-kms (1.46.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.64.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-lambda (1.66.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-organizations (1.59.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -162,51 +162,51 @@ GEM aws-sdk-ram (1.25.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-rds (1.122.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-rds (1.124.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.65.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-redshift (1.68.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-route53 (1.49.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-route53 (1.52.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-route53domains (1.30.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-route53domains (1.32.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-route53resolver (1.26.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-route53resolver (1.28.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.96.2) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-s3 (1.98.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) aws-sdk-secretsmanager (1.46.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-securityhub (1.48.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-securityhub (1.50.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-servicecatalog (1.59.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-ses (1.38.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-ses (1.40.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-shield (1.37.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-shield (1.40.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-sms (1.29.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-sms (1.31.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-sns (1.42.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-sns (1.44.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-sqs (1.40.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-sqs (1.42.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.112.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-ssm (1.114.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-states (1.39.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -235,7 +235,7 @@ GEM mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) tomlrb (~> 1.2) - chef-telemetry (1.0.29) + chef-telemetry (1.1.1) chef-config concurrent-ruby (~> 1.0) chef-utils (17.3.48) @@ -442,7 +442,7 @@ GEM timeliness (0.3.10) tomlrb (1.2.9) trailblazer-option (0.1.1) - train (3.7.4) + train (3.8.1) activesupport (>= 6.0.3.1) azure_graph_rbac (~> 0.16) azure_mgmt_key_vault (~> 0.17) @@ -453,7 +453,7 @@ GEM google-api-client (>= 0.23.9, <= 0.52.0) googleauth (>= 0.6.6, <= 0.14.0) inifile (~> 3.0) - train-core (= 3.7.4) + train-core (= 3.8.1) train-winrm (~> 0.2) train-aws (0.2.8) aws-sdk-apigateway (~> 1.0) @@ -520,7 +520,7 @@ GEM aws-sdk-ssm (~> 1.0) aws-sdk-states (>= 1.35, < 1.40) aws-sdk-transfer (>= 1.26, < 1.33) - train-core (3.7.4) + train-core (3.8.1) addressable (~> 2.5) ffi (!= 1.13.0) json (>= 1.8, < 3.0) From a11da83d03fad1c50a93ba06c1c5af21f1c79e7a Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 4 Aug 2021 21:54:57 +0100 Subject: [PATCH 12/42] 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 f4bb330e..9e812aa6 100644 --- a/Gemfile +++ b/Gemfile @@ -2,14 +2,19 @@ source 'https://rubygems.org' -# Use the latest version of `inspec` prior to `4.23.4`, which introduces a -# regression where the diff isn't displayed when comparing using `eq`. -gem 'inspec', '~> 4.22.22' -# Install the `kitchen-docker` gem using `git` because the latest version -# currently available (`2.10.0`) doesn't include a recent fix for Gentoo. +# Install the `inspec` gem using `git` because versions after `4.22.22` +# suppress diff output; this version fixes this for our uses. +# rubocop:disable Layout/LineLength +gem 'inspec', git: 'https://gitlab.com/saltstack-formulas/infrastructure/inspec', branch: 'ssf' +# rubocop:enable Layout/LineLength + +# Install the `kitchen-docker` gem using `git` in order to gain a performance +# improvement: avoid package installations which are already covered by the +# `salt-image-builder` (i.e. the pre-salted images that we're using) # rubocop:disable Layout/LineLength gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker', branch: 'ssf' # rubocop:enable Layout/LineLength + gem 'kitchen-inspec', '>= 2.5.0' gem 'kitchen-salt', '>= 0.6.3' diff --git a/Gemfile.lock b/Gemfile.lock index 58c78984..30d10a55 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,40 @@ +GIT + remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec + revision: 1dfd086de2d2ba87fd755b0c9063b43ab682519d + branch: ssf + specs: + inspec (4.41.0) + faraday_middleware (>= 0.12.2, < 1.1) + inspec-core (= 4.41.0) + mongo + train (~> 3.0) + train-aws (~> 0.1) + train-habitat (~> 0.1) + train-winrm (~> 0.2) + inspec-core (4.41.0) + addressable (~> 2.4) + chef-telemetry (~> 1.0, >= 1.0.8) + faraday (>= 0.9.0, < 1.5) + faraday_middleware (~> 1.0) + hashie (>= 3.4, < 5.0) + license-acceptance (>= 0.2.13, < 3.0) + method_source (>= 0.8, < 2.0) + mixlib-log (~> 3.0) + multipart-post (~> 2.0) + parallel (~> 1.9) + parslet (>= 1.5, < 2.0) + pry (~> 0.13) + rspec (>= 3.9, < 3.11) + rspec-its (~> 1.2) + rubyzip (>= 1.2.2, < 3.0) + semverse (~> 3.0) + sslshake (~> 1.2) + thor (>= 0.20, < 2.0) + tomlrb (>= 1.2, < 2.1) + train-core (~> 3.0) + tty-prompt (~> 0.17) + tty-table (~> 0.10) + GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker revision: 428c89fc250b3790abad5ecb0afe0c3d4956084c @@ -227,6 +264,7 @@ GEM azure_mgmt_storage (0.23.0) ms_rest_azure (~> 0.12.0) bcrypt_pbkdf (1.1.0) + bson (4.12.1) builder (3.2.4) chef-config (17.3.48) addressable @@ -249,18 +287,27 @@ GEM multi_json domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - ecma-re-validator (0.2.1) - regexp_parser (~> 1.2) ed25519 (1.2.4) erubi (1.10.0) excon (0.85.0) - faraday (0.17.4) + faraday (1.4.3) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.1) multipart-post (>= 1.2, < 3) + ruby2_keywords (>= 0.0.4) faraday-cookie_jar (0.0.7) faraday (>= 0.8.0) http-cookie (~> 1.0.0) - faraday_middleware (0.12.2) - faraday (>= 0.7.4, < 1.0) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday_middleware (1.0.0) + faraday (~> 1.0) ffi (1.15.3) fuzzyurl (0.9.0) google-api-client (0.52.0) @@ -283,51 +330,15 @@ GEM ffi (>= 1.0.1) gyoku (1.3.1) builder (>= 2.1.2) - hana (1.3.7) - hashie (3.6.0) + hashie (4.1.0) http-cookie (1.0.4) domain_name (~> 0.5) httpclient (2.8.3) i18n (1.8.10) concurrent-ruby (~> 1.0) inifile (3.0.0) - inspec (4.22.22) - faraday_middleware (~> 0.12.2) - inspec-core (= 4.22.22) - train (~> 3.0) - train-aws (~> 0.1) - train-habitat (~> 0.1) - train-winrm (~> 0.2) - inspec-core (4.22.22) - addressable (~> 2.4) - chef-telemetry (~> 1.0) - faraday (>= 0.9.0) - hashie (~> 3.4) - json_schemer (>= 0.2.1, < 0.2.12) - license-acceptance (>= 0.2.13, < 2.0) - method_source (>= 0.8, < 2.0) - mixlib-log (~> 3.0) - multipart-post (~> 2.0) - parallel (~> 1.9) - parslet (~> 1.5) - pry (~> 0.13) - rspec (~> 3.9) - rspec-its (~> 1.2) - rubyzip (~> 1.2, >= 1.2.2) - semverse (~> 3.0) - sslshake (~> 1.2) - thor (>= 0.20, < 2.0) - tomlrb (~> 1.2.0) - train-core (~> 3.0) - tty-prompt (~> 0.17) - tty-table (~> 0.10) jmespath (1.4.0) json (2.5.1) - json_schemer (0.2.11) - ecma-re-validator (~> 0.2) - hana (~> 1.3) - regexp_parser (~> 1.5) - uri_template (~> 0.7) jwt (2.2.3) kitchen-inspec (2.5.0) hashie (>= 3.4, <= 5.0) @@ -338,11 +349,11 @@ GEM test-kitchen (>= 1.4) kitchen-vagrant (1.9.0) test-kitchen (>= 1.4, < 4) - license-acceptance (1.0.19) + license-acceptance (2.1.13) pastel (~> 0.7) - tomlrb (~> 1.2) - tty-box (~> 0.3) - tty-prompt (~> 0.18) + tomlrb (>= 1.2, < 3.0) + tty-box (~> 0.6) + tty-prompt (~> 0.20) little-plugger (1.1.4) logging (2.3.0) little-plugger (~> 1.1) @@ -361,6 +372,8 @@ GEM mixlib-shellout (3.2.5) chef-utils mixlib-versioning (1.2.12) + mongo (2.15.0) + bson (>= 4.8.2, < 5.0.0) ms_rest (0.7.6) concurrent-ruby (~> 1.0) faraday (>= 0.9, < 2.0.0) @@ -387,7 +400,6 @@ GEM coderay (~> 1.1) method_source (~> 1.0) public_suffix (4.0.6) - regexp_parser (1.8.2) representable (3.1.1) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) @@ -410,8 +422,9 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.2) + ruby2_keywords (0.0.5) rubyntlm (0.6.3) - rubyzip (1.3.0) + rubyzip (2.3.2) semverse (3.0.0) signet (0.15.0) addressable (~> 2.3) @@ -440,7 +453,7 @@ GEM winrm-fs (~> 1.1) thor (1.1.0) timeliness (0.3.10) - tomlrb (1.2.9) + tomlrb (1.3.0) trailblazer-option (0.1.1) train (3.8.1) activesupport (>= 6.0.3.1) @@ -558,7 +571,6 @@ GEM unf_ext (0.0.7.7) unicode-display_width (2.0.0) unicode_utils (1.4.0) - uri_template (0.7.0) winrm (2.3.6) builder (>= 2.1.2) erubi (~> 1.8) @@ -572,10 +584,10 @@ GEM erubi (~> 1.8) winrm (~> 2.0) winrm-fs (~> 1.0) - winrm-fs (1.3.3) + winrm-fs (1.3.5) erubi (~> 1.8) logging (>= 1.6.1, < 3.0) - rubyzip (~> 1.1) + rubyzip (~> 2.0) winrm (~> 2.0) wisper (2.0.1) zeitwerk (2.4.2) @@ -584,7 +596,7 @@ PLATFORMS ruby DEPENDENCIES - inspec (~> 4.22.22) + inspec! kitchen-docker! kitchen-inspec (>= 2.5.0) kitchen-salt (>= 0.6.3) From 1a97990d3de05ed3a55fce97d2eb4ca854ddd54c Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 9 Aug 2021 12:14:04 +0100 Subject: [PATCH 13/42] 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 30d10a55..cb2af9ab 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -55,7 +55,7 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.1.1) - aws-partitions (1.482.0) + aws-partitions (1.484.0) aws-sdk-apigateway (1.64.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) @@ -65,7 +65,7 @@ GEM aws-sdk-applicationautoscaling (1.51.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-athena (1.39.0) + aws-sdk-athena (1.40.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-autoscaling (1.61.0) @@ -199,7 +199,7 @@ GEM aws-sdk-ram (1.25.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-rds (1.124.0) + aws-sdk-rds (1.125.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-redshift (1.68.0) From 7b654402cf7f916321da11ab71775427654bf0da Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 16 Aug 2021 18:23:58 +0100 Subject: [PATCH 14/42] 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 cb2af9ab..eff70b50 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,17 +1,17 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 1dfd086de2d2ba87fd755b0c9063b43ab682519d + revision: eaeef51095a51ba581c59209df9dd048d93b7154 branch: ssf specs: - inspec (4.41.0) + inspec (4.41.2) faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 4.41.0) - mongo + inspec-core (= 4.41.2) + mongo (= 2.13.2) train (~> 3.0) train-aws (~> 0.1) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.41.0) + inspec-core (4.41.2) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -55,11 +55,11 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.1.1) - aws-partitions (1.484.0) - aws-sdk-apigateway (1.64.0) + aws-partitions (1.487.0) + aws-sdk-apigateway (1.65.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-apigatewayv2 (1.34.0) + aws-sdk-apigatewayv2 (1.35.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-applicationautoscaling (1.51.0) @@ -142,7 +142,7 @@ GEM aws-sdk-ecrpublic (1.5.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.83.0) + aws-sdk-ecs (1.84.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-efs (1.42.0) @@ -151,7 +151,7 @@ GEM aws-sdk-eks (1.60.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.59.0) + aws-sdk-elasticache (1.60.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-elasticbeanstalk (1.44.0) @@ -190,7 +190,7 @@ GEM aws-sdk-kms (1.46.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.66.0) + aws-sdk-lambda (1.67.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-organizations (1.59.0) @@ -205,7 +205,7 @@ GEM aws-sdk-redshift (1.68.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-route53 (1.52.0) + aws-sdk-route53 (1.53.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-route53domains (1.32.0) @@ -242,7 +242,7 @@ GEM aws-sdk-sqs (1.42.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.114.0) + aws-sdk-ssm (1.115.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-states (1.39.0) @@ -364,7 +364,7 @@ GEM minitest (5.14.4) mixlib-config (3.0.9) tomlrb - mixlib-install (3.12.11) + mixlib-install (3.12.16) mixlib-shellout mixlib-versioning thor @@ -372,7 +372,7 @@ GEM mixlib-shellout (3.2.5) chef-utils mixlib-versioning (1.2.12) - mongo (2.15.0) + mongo (2.13.2) bson (>= 4.8.2, < 5.0.0) ms_rest (0.7.6) concurrent-ruby (~> 1.0) From 70a1f3135ccfde09f6016a46eee3fc55b2ca9840 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 19 Aug 2021 10:12:57 +0100 Subject: [PATCH 15/42] ci(kitchen+ci): update with latest `3003.2` pre-salted images [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/360 --- .gitlab-ci.yml | 34 ++++++++++-------- .travis.yml | 34 ++++++++++-------- kitchen.yml | 94 +++++++++++++++++++++++++++++--------------------- 3 files changed, 93 insertions(+), 69 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 747a4023..0eeec0dc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -192,21 +192,25 @@ almalinux-8-master-py3: {extends: '.test_instance'} # default-rockylinux-8-master-py3: {extends: '.test_instance'} # passenger-rockylinux-8-master-py3: {extends: '.test_instance'} rockylinux-8-master-py3: {extends: '.test_instance'} -# default-debian-11-3003-1-py3: {extends: '.test_instance'} -# default-debian-10-3003-1-py3: {extends: '.test_instance'} -# default-debian-9-3003-1-py3: {extends: '.test_instance'} -# default-ubuntu-2004-3003-1-py3: {extends: '.test_instance'} -# default-ubuntu-1804-3003-1-py3: {extends: '.test_instance'} -# default-centos-8-3003-1-py3: {extends: '.test_instance'} -# default-centos-7-3003-1-py3: {extends: '.test_instance'} -# default-fedora-34-3003-1-py3: {extends: '.test_instance'} -# default-fedora-33-3003-1-py3: {extends: '.test_instance'} -# default-opensuse-leap-153-3003-1-py3: {extends: '.test_instance'} -# default-opensuse-leap-152-3003-1-py3: {extends: '.test_instance'} -# default-opensuse-tmbl-latest-3003-1-py3: {extends: '.test_instance'} -# default-amazonlinux-2-3003-1-py3: {extends: '.test_instance'} -# default-oraclelinux-8-3003-1-py3: {extends: '.test_instance'} -# default-oraclelinux-7-3003-1-py3: {extends: '.test_instance'} +# default-debian-11-3003-2-py3: {extends: '.test_instance'} +# default-debian-10-3003-2-py3: {extends: '.test_instance'} +# default-debian-9-3003-2-py3: {extends: '.test_instance'} +# default-ubuntu-2004-3003-2-py3: {extends: '.test_instance'} +# default-ubuntu-1804-3003-2-py3: {extends: '.test_instance'} +# default-centos-8-3003-2-py3: {extends: '.test_instance'} +# default-centos-7-3003-2-py3: {extends: '.test_instance'} +# default-fedora-34-3003-2-py3: {extends: '.test_instance'} +# default-fedora-33-3003-2-py3: {extends: '.test_instance'} +# default-opensuse-leap-153-3003-2-py3: {extends: '.test_instance'} +# default-opensuse-leap-152-3003-2-py3: {extends: '.test_instance'} +# default-opensuse-tmbl-latest-3003-2-py3: {extends: '.test_instance'} +# default-amazonlinux-2-3003-2-py3: {extends: '.test_instance'} +# default-oraclelinux-8-3003-2-py3: {extends: '.test_instance'} +# default-oraclelinux-7-3003-2-py3: {extends: '.test_instance'} +# default-arch-base-latest-3003-2-py3: {extends: '.test_instance'} +# default-gentoo-stage3-latest-3003-2-py3: {extends: '.test_instance'} +# default-gentoo-stage3-systemd-3003-2-py3: {extends: '.test_instance'} +# default-almalinux-8-3003-2-py3: {extends: '.test_instance'} # default-arch-base-latest-3003-1-py3: {extends: '.test_instance'} # default-gentoo-stage3-latest-3003-1-py3: {extends: '.test_instance'} # default-gentoo-stage3-systemd-3003-1-py3: {extends: '.test_instance'} diff --git a/.travis.yml b/.travis.yml index 412facf3..f99ec046 100644 --- a/.travis.yml +++ b/.travis.yml @@ -145,21 +145,25 @@ jobs: # - env: INSTANCE=default-rockylinux-8-master-py3 # - env: INSTANCE=passenger-rockylinux-8-master-py3 - env: INSTANCE=rockylinux-8-master-py3 - # - env: INSTANCE=default-debian-11-3003-1-py3 - # - env: INSTANCE=default-debian-10-3003-1-py3 - # - env: INSTANCE=default-debian-9-3003-1-py3 - # - env: INSTANCE=default-ubuntu-2004-3003-1-py3 - # - env: INSTANCE=default-ubuntu-1804-3003-1-py3 - # - env: INSTANCE=default-centos-8-3003-1-py3 - # - env: INSTANCE=default-centos-7-3003-1-py3 - # - env: INSTANCE=default-fedora-34-3003-1-py3 - # - env: INSTANCE=default-fedora-33-3003-1-py3 - # - env: INSTANCE=default-opensuse-leap-153-3003-1-py3 - # - env: INSTANCE=default-opensuse-leap-152-3003-1-py3 - # - env: INSTANCE=default-opensuse-tmbl-latest-3003-1-py3 - # - env: INSTANCE=default-amazonlinux-2-3003-1-py3 - # - env: INSTANCE=default-oraclelinux-8-3003-1-py3 - # - env: INSTANCE=default-oraclelinux-7-3003-1-py3 + # - env: INSTANCE=default-debian-11-3003-2-py3 + # - env: INSTANCE=default-debian-10-3003-2-py3 + # - env: INSTANCE=default-debian-9-3003-2-py3 + # - env: INSTANCE=default-ubuntu-2004-3003-2-py3 + # - env: INSTANCE=default-ubuntu-1804-3003-2-py3 + # - env: INSTANCE=default-centos-8-3003-2-py3 + # - env: INSTANCE=default-centos-7-3003-2-py3 + # - env: INSTANCE=default-fedora-34-3003-2-py3 + # - env: INSTANCE=default-fedora-33-3003-2-py3 + # - env: INSTANCE=default-opensuse-leap-153-3003-2-py3 + # - env: INSTANCE=default-opensuse-leap-152-3003-2-py3 + # - env: INSTANCE=default-opensuse-tmbl-latest-3003-2-py3 + # - env: INSTANCE=default-amazonlinux-2-3003-2-py3 + # - env: INSTANCE=default-oraclelinux-8-3003-2-py3 + # - env: INSTANCE=default-oraclelinux-7-3003-2-py3 + # - env: INSTANCE=default-arch-base-latest-3003-2-py3 + # - env: INSTANCE=default-gentoo-stage3-latest-3003-2-py3 + # - env: INSTANCE=default-gentoo-stage3-systemd-3003-2-py3 + # - env: INSTANCE=default-almalinux-8-3003-2-py3 # - env: INSTANCE=default-arch-base-latest-3003-1-py3 # - env: INSTANCE=default-gentoo-stage3-latest-3003-1-py3 # - env: INSTANCE=default-gentoo-stage3-systemd-3003-1-py3 diff --git a/kitchen.yml b/kitchen.yml index 7c56d884..c5ab6629 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -142,69 +142,84 @@ platforms: driver: image: saltimages/salt-master-py3:rockylinux-8 - ## SALT `3003.1` - - name: debian-11-3003-1-py3 + ## SALT `3003.2` + - name: debian-11-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:debian-11 + image: saltimages/salt-3003.2-py3:debian-11 run_command: /lib/systemd/systemd - - name: debian-10-3003-1-py3 + - name: debian-10-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:debian-10 + image: saltimages/salt-3003.2-py3:debian-10 run_command: /lib/systemd/systemd - - name: debian-9-3003-1-py3 + - name: debian-9-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:debian-9 + image: saltimages/salt-3003.2-py3:debian-9 run_command: /lib/systemd/systemd - - name: ubuntu-2004-3003-1-py3 + - name: ubuntu-2004-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:ubuntu-20.04 + image: saltimages/salt-3003.2-py3:ubuntu-20.04 run_command: /lib/systemd/systemd - - name: ubuntu-1804-3003-1-py3 + - name: ubuntu-1804-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:ubuntu-18.04 + image: saltimages/salt-3003.2-py3:ubuntu-18.04 run_command: /lib/systemd/systemd - - name: centos-8-3003-1-py3 + - name: centos-8-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:centos-8 - - name: centos-7-3003-1-py3 + image: saltimages/salt-3003.2-py3:centos-8 + - name: centos-7-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:centos-7 - - name: fedora-34-3003-1-py3 + image: saltimages/salt-3003.2-py3:centos-7 + - name: fedora-34-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:fedora-34 - - name: fedora-33-3003-1-py3 + image: saltimages/salt-3003.2-py3:fedora-34 + - name: fedora-33-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:fedora-33 - - name: opensuse-leap-153-3003-1-py3 + image: saltimages/salt-3003.2-py3:fedora-33 + - name: opensuse-leap-153-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:opensuse-leap-15.3 + image: saltimages/salt-3003.2-py3:opensuse-leap-15.3 # Workaround to avoid intermittent failures on `opensuse-leap-15.3`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: opensuse-leap-152-3003-1-py3 + - name: opensuse-leap-152-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:opensuse-leap-15.2 + image: saltimages/salt-3003.2-py3:opensuse-leap-15.2 # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: opensuse-tmbl-latest-3003-1-py3 + - name: opensuse-tmbl-latest-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:opensuse-tumbleweed-latest + image: saltimages/salt-3003.2-py3:opensuse-tumbleweed-latest # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: amazonlinux-2-3003-1-py3 + - name: amazonlinux-2-3003-2-py3 + driver: + image: saltimages/salt-3003.2-py3:amazonlinux-2 + - name: oraclelinux-8-3003-2-py3 + driver: + image: saltimages/salt-3003.2-py3:oraclelinux-8 + - name: oraclelinux-7-3003-2-py3 + driver: + image: saltimages/salt-3003.2-py3:oraclelinux-7 + - name: arch-base-latest-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:amazonlinux-2 - - name: oraclelinux-8-3003-1-py3 + image: saltimages/salt-3003.2-py3:arch-base-latest + - name: gentoo-stage3-latest-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:oraclelinux-8 - - name: oraclelinux-7-3003-1-py3 + image: saltimages/salt-3003.2-py3:gentoo-stage3-latest + run_command: /sbin/init + - name: gentoo-stage3-systemd-3003-2-py3 + driver: + image: saltimages/salt-3003.2-py3:gentoo-stage3-systemd + - name: almalinux-8-3003-2-py3 driver: - image: saltimages/salt-3003.1-py3:oraclelinux-7 + image: saltimages/salt-3003.2-py3:almalinux-8 + + ## SALT `3003.1` - name: arch-base-latest-3003-1-py3 driver: image: saltimages/salt-3003.1-py3:arch-base-latest @@ -471,14 +486,15 @@ suites: - oraclelinux-8-master-py3 - almalinux-8-master-py3 - rockylinux-8-master-py3 - - debian-11-3003-1-py3 - - debian-10-3003-1-py3 - - debian-9-3003-1-py3 - - ubuntu-2004-3003-1-py3 - - ubuntu-1804-3003-1-py3 - - centos-8-3003-1-py3 - - centos-7-3003-1-py3 - - oraclelinux-8-3003-1-py3 + - debian-11-3003-2-py3 + - debian-10-3003-2-py3 + - debian-9-3003-2-py3 + - ubuntu-2004-3003-2-py3 + - ubuntu-1804-3003-2-py3 + - centos-8-3003-2-py3 + - centos-7-3003-2-py3 + - oraclelinux-8-3003-2-py3 + - almalinux-8-3003-2-py3 - debian-11-3002-6-py3 - debian-10-3002-6-py3 - debian-9-3002-6-py3 From 93024f744415dfdb4c56b9cdb9276b9aec0c942f Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 23 Aug 2021 09:24:06 +0100 Subject: [PATCH 16/42] 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 eff70b50..b53bf1c5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,17 +1,17 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: eaeef51095a51ba581c59209df9dd048d93b7154 + revision: 603468f3449c8581d05ea6b7328834115490dfb8 branch: ssf specs: - inspec (4.41.2) + inspec (4.41.7) faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 4.41.2) + inspec-core (= 4.41.7) mongo (= 2.13.2) train (~> 3.0) train-aws (~> 0.1) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.41.2) + inspec-core (4.41.7) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -46,7 +46,7 @@ GIT GEM remote: https://rubygems.org/ specs: - activesupport (6.1.4) + activesupport (6.1.4.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -55,7 +55,7 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.1.1) - aws-partitions (1.487.0) + aws-partitions (1.489.0) aws-sdk-apigateway (1.65.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) @@ -98,7 +98,7 @@ GEM aws-sdk-cloudwatchevents (1.46.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatchlogs (1.43.0) + aws-sdk-cloudwatchlogs (1.44.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-codecommit (1.44.0) @@ -116,10 +116,10 @@ GEM aws-sdk-cognitoidentityprovider (1.51.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-configservice (1.64.0) + aws-sdk-configservice (1.65.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.119.0) + aws-sdk-core (3.119.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) @@ -133,7 +133,7 @@ GEM aws-sdk-dynamodb (1.62.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.254.0) + aws-sdk-ec2 (1.257.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.44.0) @@ -148,7 +148,7 @@ GEM aws-sdk-efs (1.42.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-eks (1.60.0) + aws-sdk-eks (1.61.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-elasticache (1.60.0) @@ -205,16 +205,16 @@ GEM aws-sdk-redshift (1.68.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-route53 (1.53.0) + aws-sdk-route53 (1.54.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-route53domains (1.32.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-route53resolver (1.28.0) + aws-sdk-route53resolver (1.29.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.98.0) + aws-sdk-s3 (1.99.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -360,7 +360,7 @@ GEM multi_json (~> 1.14) memoist (0.16.2) method_source (1.0.0) - mini_mime (1.1.0) + mini_mime (1.1.1) minitest (5.14.4) mixlib-config (3.0.9) tomlrb From 24fa08ada5b02dfeef32980a268bdb890f85223c Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 30 Aug 2021 18:09:51 +0100 Subject: [PATCH 17/42] chore(gemfile.lock): update to latest gem versions (2021-W35) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/364 --- Gemfile.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b53bf1c5..47b3ab6a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,17 +1,17 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 603468f3449c8581d05ea6b7328834115490dfb8 + revision: 4fa6455347ea3c7123743dfd9796728cb0b77bb9 branch: ssf specs: - inspec (4.41.7) + inspec (4.41.11) faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 4.41.7) + inspec-core (= 4.41.11) mongo (= 2.13.2) train (~> 3.0) train-aws (~> 0.1) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.41.7) + inspec-core (4.41.11) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -55,8 +55,8 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.1.1) - aws-partitions (1.489.0) - aws-sdk-apigateway (1.65.0) + aws-partitions (1.492.0) + aws-sdk-apigateway (1.66.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-apigatewayv2 (1.35.0) @@ -133,7 +133,7 @@ GEM aws-sdk-dynamodb (1.62.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.257.0) + aws-sdk-ec2 (1.260.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.44.0) @@ -214,7 +214,7 @@ GEM aws-sdk-route53resolver (1.29.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.99.0) + aws-sdk-s3 (1.100.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -242,7 +242,7 @@ GEM aws-sdk-sqs (1.42.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.115.0) + aws-sdk-ssm (1.116.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-states (1.39.0) @@ -266,9 +266,9 @@ GEM bcrypt_pbkdf (1.1.0) bson (4.12.1) builder (3.2.4) - chef-config (17.3.48) + chef-config (17.4.38) addressable - chef-utils (= 17.3.48) + chef-utils (= 17.4.38) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -276,7 +276,7 @@ GEM chef-telemetry (1.1.1) chef-config concurrent-ruby (~> 1.0) - chef-utils (17.3.48) + chef-utils (17.4.38) concurrent-ruby coderay (1.1.3) concurrent-ruby (1.1.9) @@ -347,7 +347,7 @@ GEM kitchen-salt (0.6.3) hashie (>= 3.5) test-kitchen (>= 1.4) - kitchen-vagrant (1.9.0) + kitchen-vagrant (1.10.0) test-kitchen (>= 1.4, < 4) license-acceptance (2.1.13) pastel (~> 0.7) From 016786bac22f9786fbfec8bdf2b22c41f5274cb2 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 8 Sep 2021 23:33:44 +0100 Subject: [PATCH 18/42] 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 47b3ab6a..06584a84 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) @@ -426,8 +441,8 @@ GEM rubyntlm (0.6.3) rubyzip (2.3.2) semverse (3.0.0) - signet (0.15.0) - addressable (~> 2.3) + signet (0.16.0) + addressable (~> 2.8) faraday (>= 0.17.3, < 2.0) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) @@ -468,12 +483,14 @@ GEM inifile (~> 3.0) train-core (= 3.8.1) train-winrm (~> 0.2) - train-aws (0.2.8) + train-aws (0.2.19) + aws-sdk-alexaforbusiness (~> 1.0) + aws-sdk-amplify (~> 1.0) aws-sdk-apigateway (~> 1.0) aws-sdk-apigatewayv2 (~> 1.0) aws-sdk-applicationautoscaling (>= 1.46, < 1.52) aws-sdk-athena (~> 1.0) - aws-sdk-autoscaling (>= 1.22, < 1.62) + aws-sdk-autoscaling (>= 1.22, < 1.64) aws-sdk-batch (>= 1.36, < 1.48) aws-sdk-budgets (~> 1.0) aws-sdk-cloudformation (~> 1.0) @@ -488,7 +505,7 @@ GEM aws-sdk-codedeploy (~> 1.0) aws-sdk-codepipeline (~> 1.0) aws-sdk-cognitoidentity (>= 1.26, < 1.32) - aws-sdk-cognitoidentityprovider (>= 1.46, < 1.52) + aws-sdk-cognitoidentityprovider (>= 1.46, < 1.54) aws-sdk-configservice (~> 1.21) aws-sdk-core (~> 3.0) aws-sdk-costandusagereportservice (~> 1.6) @@ -507,15 +524,18 @@ GEM aws-sdk-elasticsearchservice (~> 1.0) aws-sdk-eventbridge (~> 1.24.0) aws-sdk-firehose (~> 1.0) - aws-sdk-glue (>= 1.71, < 1.88) + aws-sdk-glue (>= 1.71, < 1.89) aws-sdk-guardduty (~> 1.31) aws-sdk-iam (~> 1.13) aws-sdk-kafka (~> 1.0) aws-sdk-kinesis (~> 1.0) aws-sdk-kms (~> 1.13) aws-sdk-lambda (~> 1.0) + aws-sdk-mq (~> 1.0) + aws-sdk-networkfirewall (>= 1.6.0) + aws-sdk-networkmanager (>= 1.13.0) aws-sdk-organizations (>= 1.17, < 1.60) - aws-sdk-ram (>= 1.21, < 1.26) + aws-sdk-ram (>= 1.21, < 1.27) aws-sdk-rds (~> 1.43) aws-sdk-redshift (~> 1.0) aws-sdk-route53 (~> 1.0) @@ -524,7 +544,7 @@ GEM aws-sdk-s3 (~> 1.30) aws-sdk-secretsmanager (>= 1.42, < 1.47) aws-sdk-securityhub (~> 1.0) - aws-sdk-servicecatalog (>= 1.48, < 1.60) + aws-sdk-servicecatalog (>= 1.48, < 1.61) aws-sdk-ses (~> 1.0) aws-sdk-shield (~> 1.30) aws-sdk-sms (~> 1.0) @@ -532,7 +552,7 @@ GEM aws-sdk-sqs (~> 1.10) aws-sdk-ssm (~> 1.0) aws-sdk-states (>= 1.35, < 1.40) - aws-sdk-transfer (>= 1.26, < 1.33) + aws-sdk-transfer (>= 1.26, < 1.35) train-core (3.8.1) addressable (~> 2.5) ffi (!= 1.13.0) From 94317ef7b69757a2367f4a380f15229fe2820e23 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 14 Sep 2021 09:56:57 +0100 Subject: [PATCH 19/42] 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 06584a84..13b31289 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,17 +1,17 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 2654d96e9567010c80908b15e07b0c63220abda9 + revision: 9a3c06719f3a209f34212151883fda40787a1626 branch: ssf specs: - inspec (4.41.20) + inspec (4.46.4) faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 4.41.20) + inspec-core (= 4.46.4) mongo (= 2.13.2) train (~> 3.0) train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.41.20) + inspec-core (4.46.4) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -55,7 +55,7 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.2.0) - aws-partitions (1.497.0) + aws-partitions (1.501.0) aws-sdk-alexaforbusiness (1.50.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) @@ -83,7 +83,7 @@ GEM aws-sdk-budgets (1.41.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudformation (1.57.0) + aws-sdk-cloudformation (1.58.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-cloudfront (1.56.0) @@ -139,10 +139,10 @@ GEM aws-sdk-dynamodb (1.63.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.261.0) + aws-sdk-ec2 (1.262.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-ecr (1.45.0) + aws-sdk-ecr (1.46.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-ecrpublic (1.6.0) @@ -187,7 +187,7 @@ GEM aws-sdk-iam (1.60.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-kafka (1.39.0) + aws-sdk-kafka (1.40.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-kinesis (1.35.0) @@ -214,7 +214,7 @@ GEM aws-sdk-ram (1.26.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-rds (1.126.0) + aws-sdk-rds (1.127.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-redshift (1.69.0) @@ -407,7 +407,7 @@ GEM net-ssh (>= 4.0.0) nori (2.6.0) os (1.1.1) - parallel (1.20.1) + parallel (1.21.0) parslet (1.8.2) pastel (0.8.0) tty-color (~> 0.5) From 1ad223fb659a4e6a9e3741a3aef5fca6e7c5206b Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 21 Sep 2021 11:58:22 +0100 Subject: [PATCH 20/42] 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 13b31289..8da70332 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -55,7 +55,7 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.2.0) - aws-partitions (1.501.0) + aws-partitions (1.503.0) aws-sdk-alexaforbusiness (1.50.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) @@ -139,7 +139,7 @@ GEM aws-sdk-dynamodb (1.63.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.262.0) + aws-sdk-ec2 (1.263.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.46.0) @@ -169,7 +169,7 @@ GEM aws-sdk-elasticloadbalancingv2 (1.67.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticsearchservice (1.55.0) + aws-sdk-elasticsearchservice (1.56.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-eventbridge (1.24.0) @@ -229,7 +229,7 @@ GEM aws-sdk-route53resolver (1.30.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.102.0) + aws-sdk-s3 (1.103.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) @@ -588,8 +588,8 @@ GEM uber (0.1.0) unf (0.1.4) unf_ext - unf_ext (0.0.7.7) - unicode-display_width (2.0.0) + unf_ext (0.0.8) + unicode-display_width (2.1.0) unicode_utils (1.4.0) winrm (2.3.6) builder (>= 2.1.2) From 3233185565d36806abc19e240f5ed6ddb3035256 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 30 Sep 2021 07:16:29 +0100 Subject: [PATCH 21/42] 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 8da70332..d0e351df 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,17 +1,17 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 9a3c06719f3a209f34212151883fda40787a1626 + revision: 223002687f2cfa303b13457825665de6c5514c52 branch: ssf specs: - inspec (4.46.4) + inspec (4.46.13) faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 4.46.4) + inspec-core (= 4.46.13) mongo (= 2.13.2) train (~> 3.0) train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.46.4) + inspec-core (4.46.13) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -55,7 +55,7 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.2.0) - aws-partitions (1.503.0) + aws-partitions (1.507.0) aws-sdk-alexaforbusiness (1.50.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) @@ -125,7 +125,7 @@ GEM aws-sdk-configservice (1.66.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.121.0) + aws-sdk-core (3.121.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) @@ -139,10 +139,10 @@ GEM aws-sdk-dynamodb (1.63.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.263.0) + aws-sdk-ec2 (1.265.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-ecr (1.46.0) + aws-sdk-ecr (1.47.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-ecrpublic (1.6.0) @@ -166,7 +166,7 @@ GEM aws-sdk-elasticloadbalancing (1.34.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancingv2 (1.67.0) + aws-sdk-elasticloadbalancingv2 (1.68.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-elasticsearchservice (1.56.0) @@ -184,10 +184,10 @@ GEM aws-sdk-guardduty (1.48.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.60.0) + aws-sdk-iam (1.61.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-kafka (1.40.0) + aws-sdk-kafka (1.41.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-kinesis (1.35.0) @@ -257,7 +257,7 @@ GEM aws-sdk-sqs (1.44.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.117.0) + aws-sdk-ssm (1.118.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-states (1.39.0) @@ -281,9 +281,9 @@ GEM bcrypt_pbkdf (1.1.0) bson (4.12.1) builder (3.2.4) - chef-config (17.4.38) + chef-config (17.5.22) addressable - chef-utils (= 17.4.38) + chef-utils (= 17.5.22) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -291,7 +291,7 @@ GEM chef-telemetry (1.1.1) chef-config concurrent-ruby (~> 1.0) - chef-utils (17.4.38) + chef-utils (17.5.22) concurrent-ruby coderay (1.1.3) concurrent-ruby (1.1.9) From e0414181a724076176cb37f6402f013f4e498109 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 5 Oct 2021 11:14:59 +0100 Subject: [PATCH 22/42] ci(kitchen+ci): update with latest CVE pre-salted images [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/374 --- .github/workflows/kitchen.vagrant.yml | 3 - .gitignore | 1 + .gitlab-ci.yml | 125 ++++----- .travis.yml | 125 ++++----- kitchen.vagrant.yml | 6 - kitchen.yml | 362 ++++++++++---------------- 6 files changed, 251 insertions(+), 371 deletions(-) diff --git a/.github/workflows/kitchen.vagrant.yml b/.github/workflows/kitchen.vagrant.yml index 7d090c35..99a948b8 100644 --- a/.github/workflows/kitchen.vagrant.yml +++ b/.github/workflows/kitchen.vagrant.yml @@ -18,11 +18,8 @@ jobs: # - freebsd-130-master-py3 - default-freebsd-122-master-py3 # - freebsd-122-master-py3 - - default-freebsd-114-master-py3 - # - freebsd-114-master-py3 # - default-freebsd-130-3003-1-py3 # - default-freebsd-122-3003-1-py3 - # - default-freebsd-114-3003-1-py3 steps: - name: 'Check out code' uses: 'actions/checkout@v2' diff --git a/.gitignore b/.gitignore index 94f77a85..39752a7a 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 0eeec0dc..64322aad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -192,77 +192,60 @@ almalinux-8-master-py3: {extends: '.test_instance'} # default-rockylinux-8-master-py3: {extends: '.test_instance'} # passenger-rockylinux-8-master-py3: {extends: '.test_instance'} rockylinux-8-master-py3: {extends: '.test_instance'} -# default-debian-11-3003-2-py3: {extends: '.test_instance'} -# default-debian-10-3003-2-py3: {extends: '.test_instance'} -# default-debian-9-3003-2-py3: {extends: '.test_instance'} -# default-ubuntu-2004-3003-2-py3: {extends: '.test_instance'} -# default-ubuntu-1804-3003-2-py3: {extends: '.test_instance'} -# default-centos-8-3003-2-py3: {extends: '.test_instance'} -# default-centos-7-3003-2-py3: {extends: '.test_instance'} -# default-fedora-34-3003-2-py3: {extends: '.test_instance'} -# default-fedora-33-3003-2-py3: {extends: '.test_instance'} -# default-opensuse-leap-153-3003-2-py3: {extends: '.test_instance'} -# default-opensuse-leap-152-3003-2-py3: {extends: '.test_instance'} -# default-opensuse-tmbl-latest-3003-2-py3: {extends: '.test_instance'} -# default-amazonlinux-2-3003-2-py3: {extends: '.test_instance'} -# default-oraclelinux-8-3003-2-py3: {extends: '.test_instance'} -# default-oraclelinux-7-3003-2-py3: {extends: '.test_instance'} -# default-arch-base-latest-3003-2-py3: {extends: '.test_instance'} -# default-gentoo-stage3-latest-3003-2-py3: {extends: '.test_instance'} -# default-gentoo-stage3-systemd-3003-2-py3: {extends: '.test_instance'} -# default-almalinux-8-3003-2-py3: {extends: '.test_instance'} -# default-arch-base-latest-3003-1-py3: {extends: '.test_instance'} -# default-gentoo-stage3-latest-3003-1-py3: {extends: '.test_instance'} -# default-gentoo-stage3-systemd-3003-1-py3: {extends: '.test_instance'} -# default-debian-11-3002-6-py3: {extends: '.test_instance'} -# default-debian-10-3002-6-py3: {extends: '.test_instance'} -# default-debian-9-3002-6-py3: {extends: '.test_instance'} -# default-ubuntu-2004-3002-6-py3: {extends: '.test_instance'} -# default-ubuntu-1804-3002-6-py3: {extends: '.test_instance'} -# default-centos-8-3002-6-py3: {extends: '.test_instance'} -# default-centos-7-3002-6-py3: {extends: '.test_instance'} -# default-fedora-34-3002-6-py3: {extends: '.test_instance'} -# default-fedora-33-3002-6-py3: {extends: '.test_instance'} -# default-amazonlinux-2-3002-6-py3: {extends: '.test_instance'} -# default-oraclelinux-8-3002-6-py3: {extends: '.test_instance'} -# default-oraclelinux-7-3002-6-py3: {extends: '.test_instance'} -# default-arch-base-latest-3002-6-py3: {extends: '.test_instance'} -# default-gentoo-stage3-latest-3002-6-py3: {extends: '.test_instance'} -# default-gentoo-stage3-systemd-3002-6-py3: {extends: '.test_instance'} -# default-opensuse-leap-153-3002-2-py3: {extends: '.test_instance'} -# default-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'} -# default-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'} -# default-debian-10-3001-7-py3: {extends: '.test_instance'} -# default-debian-9-3001-7-py3: {extends: '.test_instance'} -# default-ubuntu-2004-3001-7-py3: {extends: '.test_instance'} -# default-ubuntu-1804-3001-7-py3: {extends: '.test_instance'} -# default-centos-8-3001-7-py3: {extends: '.test_instance'} -# default-centos-7-3001-7-py3: {extends: '.test_instance'} -# default-fedora-34-3001-7-py3: {extends: '.test_instance'} -# default-fedora-33-3001-7-py3: {extends: '.test_instance'} -# default-opensuse-leap-153-3001-7-py3: {extends: '.test_instance'} -# default-opensuse-leap-152-3001-7-py3: {extends: '.test_instance'} -# default-opensuse-tmbl-latest-3001-7-py3: {extends: '.test_instance'} -# default-amazonlinux-2-3001-7-py3: {extends: '.test_instance'} -# default-oraclelinux-8-3001-7-py3: {extends: '.test_instance'} -# default-oraclelinux-7-3001-7-py3: {extends: '.test_instance'} -# default-arch-base-latest-3001-7-py3: {extends: '.test_instance'} -# default-gentoo-stage3-latest-3001-7-py3: {extends: '.test_instance'} -# default-gentoo-stage3-systemd-3001-7-py3: {extends: '.test_instance'} -# default-debian-10-3000-9-py3: {extends: '.test_instance'} -# default-debian-9-3000-9-py3: {extends: '.test_instance'} -# default-ubuntu-1804-3000-9-py3: {extends: '.test_instance'} -# default-centos-8-3000-9-py3: {extends: '.test_instance'} -# default-centos-7-3000-9-py3: {extends: '.test_instance'} -# default-opensuse-leap-153-3000-9-py3: {extends: '.test_instance'} -# default-opensuse-leap-152-3000-9-py3: {extends: '.test_instance'} -# default-amazonlinux-2-3000-9-py3: {extends: '.test_instance'} -# default-oraclelinux-8-3000-9-py3: {extends: '.test_instance'} -# default-oraclelinux-7-3000-9-py3: {extends: '.test_instance'} -# default-gentoo-stage3-latest-3000-9-py3: {extends: '.test_instance'} -# default-gentoo-stage3-systemd-3000-9-py3: {extends: '.test_instance'} -# default-ubuntu-1804-3000-9-py2: {extends: '.test_instance'} -# default-arch-base-latest-3000-9-py2: {extends: '.test_instance'} +# default-debian-11-3003-3-py3: {extends: '.test_instance'} +# default-debian-10-3003-3-py3: {extends: '.test_instance'} +# default-debian-9-3003-3-py3: {extends: '.test_instance'} +# default-ubuntu-2004-3003-3-py3: {extends: '.test_instance'} +# default-ubuntu-1804-3003-3-py3: {extends: '.test_instance'} +# default-centos-8-3003-3-py3: {extends: '.test_instance'} +# default-centos-7-3003-3-py3: {extends: '.test_instance'} +# default-fedora-34-3003-3-py3: {extends: '.test_instance'} +# default-fedora-33-3003-3-py3: {extends: '.test_instance'} +# default-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'} +# default-opensuse-leap-152-3003-3-py3: {extends: '.test_instance'} +# default-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance'} +# default-amazonlinux-2-3003-3-py3: {extends: '.test_instance'} +# default-oraclelinux-8-3003-3-py3: {extends: '.test_instance'} +# default-oraclelinux-7-3003-3-py3: {extends: '.test_instance'} +# default-arch-base-latest-3003-3-py3: {extends: '.test_instance'} +# default-gentoo-stage3-latest-3003-3-py3: {extends: '.test_instance'} +# default-gentoo-stage3-systemd-3003-3-py3: {extends: '.test_instance'} +# default-almalinux-8-3003-3-py3: {extends: '.test_instance'} +# default-debian-11-3002-7-py3: {extends: '.test_instance'} +# default-debian-10-3002-7-py3: {extends: '.test_instance'} +# default-debian-9-3002-7-py3: {extends: '.test_instance'} +# default-ubuntu-2004-3002-7-py3: {extends: '.test_instance'} +# default-ubuntu-1804-3002-7-py3: {extends: '.test_instance'} +# default-centos-8-3002-7-py3: {extends: '.test_instance'} +# default-centos-7-3002-7-py3: {extends: '.test_instance'} +# default-fedora-34-3002-7-py3: {extends: '.test_instance'} +# default-fedora-33-3002-7-py3: {extends: '.test_instance'} +# default-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'} +# default-opensuse-leap-152-3002-7-py3: {extends: '.test_instance'} +# default-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance'} +# default-amazonlinux-2-3002-7-py3: {extends: '.test_instance'} +# default-oraclelinux-8-3002-7-py3: {extends: '.test_instance'} +# default-oraclelinux-7-3002-7-py3: {extends: '.test_instance'} +# default-arch-base-latest-3002-7-py3: {extends: '.test_instance'} +# default-gentoo-stage3-latest-3002-7-py3: {extends: '.test_instance'} +# default-gentoo-stage3-systemd-3002-7-py3: {extends: '.test_instance'} +# default-debian-10-3001-8-py3: {extends: '.test_instance'} +# default-debian-9-3001-8-py3: {extends: '.test_instance'} +# default-ubuntu-2004-3001-8-py3: {extends: '.test_instance'} +# default-ubuntu-1804-3001-8-py3: {extends: '.test_instance'} +# default-centos-8-3001-8-py3: {extends: '.test_instance'} +# default-centos-7-3001-8-py3: {extends: '.test_instance'} +# default-fedora-34-3001-8-py3: {extends: '.test_instance'} +# default-fedora-33-3001-8-py3: {extends: '.test_instance'} +# default-opensuse-leap-153-3001-8-py3: {extends: '.test_instance'} +# default-opensuse-leap-152-3001-8-py3: {extends: '.test_instance'} +# default-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance'} +# default-amazonlinux-2-3001-8-py3: {extends: '.test_instance'} +# default-oraclelinux-8-3001-8-py3: {extends: '.test_instance'} +# default-oraclelinux-7-3001-8-py3: {extends: '.test_instance'} +# default-arch-base-latest-3001-8-py3: {extends: '.test_instance'} +# default-gentoo-stage3-latest-3001-8-py3: {extends: '.test_instance'} +# default-gentoo-stage3-systemd-3001-8-py3: {extends: '.test_instance'} ############################################################################### # `release` stage: `semantic-release` diff --git a/.travis.yml b/.travis.yml index f99ec046..58830226 100644 --- a/.travis.yml +++ b/.travis.yml @@ -145,77 +145,60 @@ jobs: # - env: INSTANCE=default-rockylinux-8-master-py3 # - env: INSTANCE=passenger-rockylinux-8-master-py3 - env: INSTANCE=rockylinux-8-master-py3 - # - env: INSTANCE=default-debian-11-3003-2-py3 - # - env: INSTANCE=default-debian-10-3003-2-py3 - # - env: INSTANCE=default-debian-9-3003-2-py3 - # - env: INSTANCE=default-ubuntu-2004-3003-2-py3 - # - env: INSTANCE=default-ubuntu-1804-3003-2-py3 - # - env: INSTANCE=default-centos-8-3003-2-py3 - # - env: INSTANCE=default-centos-7-3003-2-py3 - # - env: INSTANCE=default-fedora-34-3003-2-py3 - # - env: INSTANCE=default-fedora-33-3003-2-py3 - # - env: INSTANCE=default-opensuse-leap-153-3003-2-py3 - # - env: INSTANCE=default-opensuse-leap-152-3003-2-py3 - # - env: INSTANCE=default-opensuse-tmbl-latest-3003-2-py3 - # - env: INSTANCE=default-amazonlinux-2-3003-2-py3 - # - env: INSTANCE=default-oraclelinux-8-3003-2-py3 - # - env: INSTANCE=default-oraclelinux-7-3003-2-py3 - # - env: INSTANCE=default-arch-base-latest-3003-2-py3 - # - env: INSTANCE=default-gentoo-stage3-latest-3003-2-py3 - # - env: INSTANCE=default-gentoo-stage3-systemd-3003-2-py3 - # - env: INSTANCE=default-almalinux-8-3003-2-py3 - # - env: INSTANCE=default-arch-base-latest-3003-1-py3 - # - env: INSTANCE=default-gentoo-stage3-latest-3003-1-py3 - # - env: INSTANCE=default-gentoo-stage3-systemd-3003-1-py3 - # - env: INSTANCE=default-debian-11-3002-6-py3 - # - env: INSTANCE=default-debian-10-3002-6-py3 - # - env: INSTANCE=default-debian-9-3002-6-py3 - # - env: INSTANCE=default-ubuntu-2004-3002-6-py3 - # - env: INSTANCE=default-ubuntu-1804-3002-6-py3 - # - env: INSTANCE=default-centos-8-3002-6-py3 - # - env: INSTANCE=default-centos-7-3002-6-py3 - # - env: INSTANCE=default-fedora-34-3002-6-py3 - # - env: INSTANCE=default-fedora-33-3002-6-py3 - # - env: INSTANCE=default-amazonlinux-2-3002-6-py3 - # - env: INSTANCE=default-oraclelinux-8-3002-6-py3 - # - env: INSTANCE=default-oraclelinux-7-3002-6-py3 - # - env: INSTANCE=default-arch-base-latest-3002-6-py3 - # - env: INSTANCE=default-gentoo-stage3-latest-3002-6-py3 - # - env: INSTANCE=default-gentoo-stage3-systemd-3002-6-py3 - # - env: INSTANCE=default-opensuse-leap-153-3002-2-py3 - # - env: INSTANCE=default-opensuse-leap-152-3002-2-py3 - # - env: INSTANCE=default-opensuse-tmbl-latest-3002-2-py3 - # - env: INSTANCE=default-debian-10-3001-7-py3 - # - env: INSTANCE=default-debian-9-3001-7-py3 - # - env: INSTANCE=default-ubuntu-2004-3001-7-py3 - # - env: INSTANCE=default-ubuntu-1804-3001-7-py3 - # - env: INSTANCE=default-centos-8-3001-7-py3 - # - env: INSTANCE=default-centos-7-3001-7-py3 - # - env: INSTANCE=default-fedora-34-3001-7-py3 - # - env: INSTANCE=default-fedora-33-3001-7-py3 - # - env: INSTANCE=default-opensuse-leap-153-3001-7-py3 - # - env: INSTANCE=default-opensuse-leap-152-3001-7-py3 - # - env: INSTANCE=default-opensuse-tmbl-latest-3001-7-py3 - # - env: INSTANCE=default-amazonlinux-2-3001-7-py3 - # - env: INSTANCE=default-oraclelinux-8-3001-7-py3 - # - env: INSTANCE=default-oraclelinux-7-3001-7-py3 - # - env: INSTANCE=default-arch-base-latest-3001-7-py3 - # - env: INSTANCE=default-gentoo-stage3-latest-3001-7-py3 - # - env: INSTANCE=default-gentoo-stage3-systemd-3001-7-py3 - # - env: INSTANCE=default-debian-10-3000-9-py3 - # - env: INSTANCE=default-debian-9-3000-9-py3 - # - env: INSTANCE=default-ubuntu-1804-3000-9-py3 - # - env: INSTANCE=default-centos-8-3000-9-py3 - # - env: INSTANCE=default-centos-7-3000-9-py3 - # - env: INSTANCE=default-opensuse-leap-153-3000-9-py3 - # - env: INSTANCE=default-opensuse-leap-152-3000-9-py3 - # - env: INSTANCE=default-amazonlinux-2-3000-9-py3 - # - env: INSTANCE=default-oraclelinux-8-3000-9-py3 - # - env: INSTANCE=default-oraclelinux-7-3000-9-py3 - # - env: INSTANCE=default-gentoo-stage3-latest-3000-9-py3 - # - env: INSTANCE=default-gentoo-stage3-systemd-3000-9-py3 - # - env: INSTANCE=default-ubuntu-1804-3000-9-py2 - # - env: INSTANCE=default-arch-base-latest-3000-9-py2 + # - env: INSTANCE=default-debian-11-3003-3-py3 + # - env: INSTANCE=default-debian-10-3003-3-py3 + # - env: INSTANCE=default-debian-9-3003-3-py3 + # - env: INSTANCE=default-ubuntu-2004-3003-3-py3 + # - env: INSTANCE=default-ubuntu-1804-3003-3-py3 + # - env: INSTANCE=default-centos-8-3003-3-py3 + # - env: INSTANCE=default-centos-7-3003-3-py3 + # - env: INSTANCE=default-fedora-34-3003-3-py3 + # - env: INSTANCE=default-fedora-33-3003-3-py3 + # - env: INSTANCE=default-opensuse-leap-153-3003-3-py3 + # - env: INSTANCE=default-opensuse-leap-152-3003-3-py3 + # - env: INSTANCE=default-opensuse-tmbl-latest-3003-3-py3 + # - env: INSTANCE=default-amazonlinux-2-3003-3-py3 + # - env: INSTANCE=default-oraclelinux-8-3003-3-py3 + # - env: INSTANCE=default-oraclelinux-7-3003-3-py3 + # - env: INSTANCE=default-arch-base-latest-3003-3-py3 + # - env: INSTANCE=default-gentoo-stage3-latest-3003-3-py3 + # - env: INSTANCE=default-gentoo-stage3-systemd-3003-3-py3 + # - env: INSTANCE=default-almalinux-8-3003-3-py3 + # - env: INSTANCE=default-debian-11-3002-7-py3 + # - env: INSTANCE=default-debian-10-3002-7-py3 + # - env: INSTANCE=default-debian-9-3002-7-py3 + # - env: INSTANCE=default-ubuntu-2004-3002-7-py3 + # - env: INSTANCE=default-ubuntu-1804-3002-7-py3 + # - env: INSTANCE=default-centos-8-3002-7-py3 + # - env: INSTANCE=default-centos-7-3002-7-py3 + # - env: INSTANCE=default-fedora-34-3002-7-py3 + # - env: INSTANCE=default-fedora-33-3002-7-py3 + # - env: INSTANCE=default-opensuse-leap-153-3002-7-py3 + # - env: INSTANCE=default-opensuse-leap-152-3002-7-py3 + # - env: INSTANCE=default-opensuse-tmbl-latest-3002-7-py3 + # - env: INSTANCE=default-amazonlinux-2-3002-7-py3 + # - env: INSTANCE=default-oraclelinux-8-3002-7-py3 + # - env: INSTANCE=default-oraclelinux-7-3002-7-py3 + # - env: INSTANCE=default-arch-base-latest-3002-7-py3 + # - env: INSTANCE=default-gentoo-stage3-latest-3002-7-py3 + # - env: INSTANCE=default-gentoo-stage3-systemd-3002-7-py3 + # - env: INSTANCE=default-debian-10-3001-8-py3 + # - env: INSTANCE=default-debian-9-3001-8-py3 + # - env: INSTANCE=default-ubuntu-2004-3001-8-py3 + # - env: INSTANCE=default-ubuntu-1804-3001-8-py3 + # - env: INSTANCE=default-centos-8-3001-8-py3 + # - env: INSTANCE=default-centos-7-3001-8-py3 + # - env: INSTANCE=default-fedora-34-3001-8-py3 + # - env: INSTANCE=default-fedora-33-3001-8-py3 + # - env: INSTANCE=default-opensuse-leap-153-3001-8-py3 + # - env: INSTANCE=default-opensuse-leap-152-3001-8-py3 + # - env: INSTANCE=default-opensuse-tmbl-latest-3001-8-py3 + # - env: INSTANCE=default-amazonlinux-2-3001-8-py3 + # - env: INSTANCE=default-oraclelinux-8-3001-8-py3 + # - env: INSTANCE=default-oraclelinux-7-3001-8-py3 + # - env: INSTANCE=default-arch-base-latest-3001-8-py3 + # - env: INSTANCE=default-gentoo-stage3-latest-3001-8-py3 + # - env: INSTANCE=default-gentoo-stage3-systemd-3001-8-py3 ## Define the release stage that runs `semantic-release` - stage: 'release' diff --git a/kitchen.vagrant.yml b/kitchen.vagrant.yml index 2197d924..eff870ae 100644 --- a/kitchen.vagrant.yml +++ b/kitchen.vagrant.yml @@ -25,9 +25,6 @@ platforms: - name: freebsd-122-master-py3 driver: box: myii/freebsd-12.2-master-py3 - - name: freebsd-114-master-py3 - driver: - box: myii/freebsd-11.4-master-py3 - name: freebsd-130-3003-1-py3 driver: box: myii/freebsd-13.0-3003.1-py3 @@ -35,6 +32,3 @@ platforms: - name: freebsd-122-3003-1-py3 driver: box: myii/freebsd-12.2-3003.1-py3 - - name: freebsd-114-3003-1-py3 - driver: - box: myii/freebsd-11.4-3003.1-py3 diff --git a/kitchen.yml b/kitchen.yml index c5ab6629..039f66fc 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -142,297 +142,226 @@ platforms: driver: image: saltimages/salt-master-py3:rockylinux-8 - ## SALT `3003.2` - - name: debian-11-3003-2-py3 + ## SALT `3003.3` + - name: debian-11-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:debian-11 + image: saltimages/salt-3003.3-py3:debian-11 run_command: /lib/systemd/systemd - - name: debian-10-3003-2-py3 + - name: debian-10-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:debian-10 + image: saltimages/salt-3003.3-py3:debian-10 run_command: /lib/systemd/systemd - - name: debian-9-3003-2-py3 + - name: debian-9-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:debian-9 + image: saltimages/salt-3003.3-py3:debian-9 run_command: /lib/systemd/systemd - - name: ubuntu-2004-3003-2-py3 + - name: ubuntu-2004-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:ubuntu-20.04 + image: saltimages/salt-3003.3-py3:ubuntu-20.04 run_command: /lib/systemd/systemd - - name: ubuntu-1804-3003-2-py3 + - name: ubuntu-1804-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:ubuntu-18.04 + image: saltimages/salt-3003.3-py3:ubuntu-18.04 run_command: /lib/systemd/systemd - - name: centos-8-3003-2-py3 + - name: centos-8-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:centos-8 - - name: centos-7-3003-2-py3 + image: saltimages/salt-3003.3-py3:centos-8 + - name: centos-7-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:centos-7 - - name: fedora-34-3003-2-py3 + image: saltimages/salt-3003.3-py3:centos-7 + - name: fedora-34-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:fedora-34 - - name: fedora-33-3003-2-py3 + image: saltimages/salt-3003.3-py3:fedora-34 + - name: fedora-33-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:fedora-33 - - name: opensuse-leap-153-3003-2-py3 + image: saltimages/salt-3003.3-py3:fedora-33 + - name: opensuse-leap-153-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:opensuse-leap-15.3 + image: saltimages/salt-3003.3-py3:opensuse-leap-15.3 # Workaround to avoid intermittent failures on `opensuse-leap-15.3`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: opensuse-leap-152-3003-2-py3 + - name: opensuse-leap-152-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:opensuse-leap-15.2 + image: saltimages/salt-3003.3-py3:opensuse-leap-15.2 # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: opensuse-tmbl-latest-3003-2-py3 + - name: opensuse-tmbl-latest-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:opensuse-tumbleweed-latest + image: saltimages/salt-3003.3-py3:opensuse-tumbleweed-latest # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: amazonlinux-2-3003-2-py3 + - name: amazonlinux-2-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:amazonlinux-2 - - name: oraclelinux-8-3003-2-py3 + image: saltimages/salt-3003.3-py3:amazonlinux-2 + - name: oraclelinux-8-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:oraclelinux-8 - - name: oraclelinux-7-3003-2-py3 + image: saltimages/salt-3003.3-py3:oraclelinux-8 + - name: oraclelinux-7-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:oraclelinux-7 - - name: arch-base-latest-3003-2-py3 + image: saltimages/salt-3003.3-py3:oraclelinux-7 + - name: arch-base-latest-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:arch-base-latest - - name: gentoo-stage3-latest-3003-2-py3 + image: saltimages/salt-3003.3-py3:arch-base-latest + - name: gentoo-stage3-latest-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:gentoo-stage3-latest + image: saltimages/salt-3003.3-py3:gentoo-stage3-latest run_command: /sbin/init - - name: gentoo-stage3-systemd-3003-2-py3 + - name: gentoo-stage3-systemd-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:gentoo-stage3-systemd - - name: almalinux-8-3003-2-py3 + image: saltimages/salt-3003.3-py3:gentoo-stage3-systemd + - name: almalinux-8-3003-3-py3 driver: - image: saltimages/salt-3003.2-py3:almalinux-8 + image: saltimages/salt-3003.3-py3:almalinux-8 - ## SALT `3003.1` - - name: arch-base-latest-3003-1-py3 + ## SALT `3002.7` + - name: debian-11-3002-7-py3 driver: - image: saltimages/salt-3003.1-py3:arch-base-latest - - name: gentoo-stage3-latest-3003-1-py3 - driver: - image: saltimages/salt-3003.1-py3:gentoo-stage3-latest - run_command: /sbin/init - - name: gentoo-stage3-systemd-3003-1-py3 - driver: - image: saltimages/salt-3003.1-py3:gentoo-stage3-systemd - - ## SALT `3002.6` - - name: debian-11-3002-6-py3 - driver: - image: saltimages/salt-3002.6-py3:debian-11 + image: saltimages/salt-3002.7-py3:debian-11 run_command: /lib/systemd/systemd - - name: debian-10-3002-6-py3 + - name: debian-10-3002-7-py3 driver: - image: saltimages/salt-3002.6-py3:debian-10 + image: saltimages/salt-3002.7-py3:debian-10 run_command: /lib/systemd/systemd - - name: debian-9-3002-6-py3 + - name: debian-9-3002-7-py3 driver: - image: saltimages/salt-3002.6-py3:debian-9 + image: saltimages/salt-3002.7-py3:debian-9 run_command: /lib/systemd/systemd - - name: ubuntu-2004-3002-6-py3 + - name: ubuntu-2004-3002-7-py3 driver: - image: saltimages/salt-3002.6-py3:ubuntu-20.04 + image: saltimages/salt-3002.7-py3:ubuntu-20.04 run_command: /lib/systemd/systemd - - name: ubuntu-1804-3002-6-py3 + - name: ubuntu-1804-3002-7-py3 driver: - image: saltimages/salt-3002.6-py3:ubuntu-18.04 + image: saltimages/salt-3002.7-py3:ubuntu-18.04 run_command: /lib/systemd/systemd - - name: centos-8-3002-6-py3 - driver: - image: saltimages/salt-3002.6-py3:centos-8 - - name: centos-7-3002-6-py3 + - name: centos-8-3002-7-py3 driver: - image: saltimages/salt-3002.6-py3:centos-7 - - name: fedora-34-3002-6-py3 + image: saltimages/salt-3002.7-py3:centos-8 + - name: centos-7-3002-7-py3 driver: - image: saltimages/salt-3002.6-py3:fedora-34 - - name: fedora-33-3002-6-py3 + image: saltimages/salt-3002.7-py3:centos-7 + - name: fedora-34-3002-7-py3 driver: - image: saltimages/salt-3002.6-py3:fedora-33 - - name: amazonlinux-2-3002-6-py3 - driver: - image: saltimages/salt-3002.6-py3:amazonlinux-2 - - name: oraclelinux-8-3002-6-py3 - driver: - image: saltimages/salt-3002.6-py3:oraclelinux-8 - - name: oraclelinux-7-3002-6-py3 - driver: - image: saltimages/salt-3002.6-py3:oraclelinux-7 - - name: arch-base-latest-3002-6-py3 - driver: - image: saltimages/salt-3002.6-py3:arch-base-latest - - name: gentoo-stage3-latest-3002-6-py3 - driver: - image: saltimages/salt-3002.6-py3:gentoo-stage3-latest - run_command: /sbin/init - - name: gentoo-stage3-systemd-3002-6-py3 + image: saltimages/salt-3002.7-py3:fedora-34 + - name: fedora-33-3002-7-py3 driver: - image: saltimages/salt-3002.6-py3:gentoo-stage3-systemd - - ## SALT `3002.2` - - name: opensuse-leap-153-3002-2-py3 + image: saltimages/salt-3002.7-py3:fedora-33 + - name: opensuse-leap-153-3002-7-py3 driver: - image: saltimages/salt-3002.2-py3:opensuse-leap-15.3 + image: saltimages/salt-3002.7-py3:opensuse-leap-15.3 # Workaround to avoid intermittent failures on `opensuse-leap-15.3`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: opensuse-leap-152-3002-2-py3 + - name: opensuse-leap-152-3002-7-py3 driver: - image: saltimages/salt-3002.2-py3:opensuse-leap-15.2 + image: saltimages/salt-3002.7-py3:opensuse-leap-15.2 # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: opensuse-tmbl-latest-3002-2-py3 + - name: opensuse-tmbl-latest-3002-7-py3 driver: - image: saltimages/salt-3002.2-py3:opensuse-tumbleweed-latest + image: saltimages/salt-3002.7-py3:opensuse-tumbleweed-latest # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 + - name: amazonlinux-2-3002-7-py3 + driver: + image: saltimages/salt-3002.7-py3:amazonlinux-2 + - name: oraclelinux-8-3002-7-py3 + driver: + image: saltimages/salt-3002.7-py3:oraclelinux-8 + - name: oraclelinux-7-3002-7-py3 + driver: + image: saltimages/salt-3002.7-py3:oraclelinux-7 + - name: arch-base-latest-3002-7-py3 + driver: + image: saltimages/salt-3002.7-py3:arch-base-latest + - name: gentoo-stage3-latest-3002-7-py3 + driver: + image: saltimages/salt-3002.7-py3:gentoo-stage3-latest + run_command: /sbin/init + - name: gentoo-stage3-systemd-3002-7-py3 + driver: + image: saltimages/salt-3002.7-py3:gentoo-stage3-systemd - ## SALT `3001.7` - - name: debian-10-3001-7-py3 + ## SALT `3001.8` + - name: debian-10-3001-8-py3 driver: - image: saltimages/salt-3001.7-py3:debian-10 + image: saltimages/salt-3001.8-py3:debian-10 run_command: /lib/systemd/systemd - - name: debian-9-3001-7-py3 + - name: debian-9-3001-8-py3 driver: - image: saltimages/salt-3001.7-py3:debian-9 + image: saltimages/salt-3001.8-py3:debian-9 run_command: /lib/systemd/systemd - - name: ubuntu-2004-3001-7-py3 + - name: ubuntu-2004-3001-8-py3 driver: - image: saltimages/salt-3001.7-py3:ubuntu-20.04 + image: saltimages/salt-3001.8-py3:ubuntu-20.04 run_command: /lib/systemd/systemd - - name: ubuntu-1804-3001-7-py3 + - name: ubuntu-1804-3001-8-py3 driver: - image: saltimages/salt-3001.7-py3:ubuntu-18.04 + image: saltimages/salt-3001.8-py3:ubuntu-18.04 run_command: /lib/systemd/systemd - - name: centos-8-3001-7-py3 + - name: centos-8-3001-8-py3 driver: - image: saltimages/salt-3001.7-py3:centos-8 - - name: centos-7-3001-7-py3 + image: saltimages/salt-3001.8-py3:centos-8 + - name: centos-7-3001-8-py3 driver: - image: saltimages/salt-3001.7-py3:centos-7 - - name: fedora-34-3001-7-py3 + image: saltimages/salt-3001.8-py3:centos-7 + - name: fedora-34-3001-8-py3 driver: - image: saltimages/salt-3001.7-py3:fedora-34 - - name: fedora-33-3001-7-py3 + image: saltimages/salt-3001.8-py3:fedora-34 + - name: fedora-33-3001-8-py3 driver: - image: saltimages/salt-3001.7-py3:fedora-33 - - name: opensuse-leap-153-3001-7-py3 + image: saltimages/salt-3001.8-py3:fedora-33 + - name: opensuse-leap-153-3001-8-py3 driver: - image: saltimages/salt-3001.7-py3:opensuse-leap-15.3 + image: saltimages/salt-3001.8-py3:opensuse-leap-15.3 # Workaround to avoid intermittent failures on `opensuse-leap-15.3`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: opensuse-leap-152-3001-7-py3 + - name: opensuse-leap-152-3001-8-py3 driver: - image: saltimages/salt-3001.7-py3:opensuse-leap-15.2 + image: saltimages/salt-3001.8-py3:opensuse-leap-15.2 # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: opensuse-tmbl-latest-3001-7-py3 + - name: opensuse-tmbl-latest-3001-8-py3 driver: - image: saltimages/salt-3001.7-py3:opensuse-tumbleweed-latest + image: saltimages/salt-3001.8-py3:opensuse-tumbleweed-latest # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: amazonlinux-2-3001-7-py3 - driver: - image: saltimages/salt-3001.7-py3:amazonlinux-2 - - name: oraclelinux-8-3001-7-py3 - driver: - image: saltimages/salt-3001.7-py3:oraclelinux-8 - - name: oraclelinux-7-3001-7-py3 - driver: - image: saltimages/salt-3001.7-py3:oraclelinux-7 - - name: arch-base-latest-3001-7-py3 - driver: - image: saltimages/salt-3001.7-py3:arch-base-latest - - name: gentoo-stage3-latest-3001-7-py3 - driver: - image: saltimages/salt-3001.7-py3:gentoo-stage3-latest - run_command: /sbin/init - - name: gentoo-stage3-systemd-3001-7-py3 - driver: - image: saltimages/salt-3001.7-py3:gentoo-stage3-systemd - - ## SALT `3000.9` - - name: debian-10-3000-9-py3 - driver: - image: saltimages/salt-3000.9-py3:debian-10 - run_command: /lib/systemd/systemd - - name: debian-9-3000-9-py3 - driver: - image: saltimages/salt-3000.9-py3:debian-9 - run_command: /lib/systemd/systemd - - name: ubuntu-1804-3000-9-py3 - driver: - image: saltimages/salt-3000.9-py3:ubuntu-18.04 - run_command: /lib/systemd/systemd - - name: centos-8-3000-9-py3 - driver: - image: saltimages/salt-3000.9-py3:centos-8 - - name: centos-7-3000-9-py3 - driver: - image: saltimages/salt-3000.9-py3:centos-7 - - name: opensuse-leap-153-3000-9-py3 - driver: - image: saltimages/salt-3000.9-py3:opensuse-leap-15.3 - # Workaround to avoid intermittent failures on `opensuse-leap-15.3`: - # => SCP did not finish successfully (255): (Net::SCP::Error) - transport: - max_ssh_sessions: 1 - - name: opensuse-leap-152-3000-9-py3 + - name: amazonlinux-2-3001-8-py3 driver: - image: saltimages/salt-3000.9-py3:opensuse-leap-15.2 - # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: - # => SCP did not finish successfully (255): (Net::SCP::Error) - transport: - max_ssh_sessions: 1 - - name: amazonlinux-2-3000-9-py3 + image: saltimages/salt-3001.8-py3:amazonlinux-2 + - name: oraclelinux-8-3001-8-py3 driver: - image: saltimages/salt-3000.9-py3:amazonlinux-2 - - name: oraclelinux-8-3000-9-py3 + image: saltimages/salt-3001.8-py3:oraclelinux-8 + - name: oraclelinux-7-3001-8-py3 driver: - image: saltimages/salt-3000.9-py3:oraclelinux-8 - - name: oraclelinux-7-3000-9-py3 + image: saltimages/salt-3001.8-py3:oraclelinux-7 + - name: arch-base-latest-3001-8-py3 driver: - image: saltimages/salt-3000.9-py3:oraclelinux-7 - - name: gentoo-stage3-latest-3000-9-py3 + image: saltimages/salt-3001.8-py3:arch-base-latest + - name: gentoo-stage3-latest-3001-8-py3 driver: - image: saltimages/salt-3000.9-py3:gentoo-stage3-latest + image: saltimages/salt-3001.8-py3:gentoo-stage3-latest run_command: /sbin/init - - name: gentoo-stage3-systemd-3000-9-py3 - driver: - image: saltimages/salt-3000.9-py3:gentoo-stage3-systemd - - name: ubuntu-1804-3000-9-py2 - driver: - image: saltimages/salt-3000.9-py2:ubuntu-18.04 - run_command: /lib/systemd/systemd - - name: arch-base-latest-3000-9-py2 + - name: gentoo-stage3-systemd-3001-8-py3 driver: - image: saltimages/salt-3000.9-py2:arch-base-latest + image: saltimages/salt-3001.8-py3:gentoo-stage3-systemd verifier: # https://www.inspec.io/ @@ -486,37 +415,30 @@ suites: - oraclelinux-8-master-py3 - almalinux-8-master-py3 - rockylinux-8-master-py3 - - debian-11-3003-2-py3 - - debian-10-3003-2-py3 - - debian-9-3003-2-py3 - - ubuntu-2004-3003-2-py3 - - ubuntu-1804-3003-2-py3 - - centos-8-3003-2-py3 - - centos-7-3003-2-py3 - - oraclelinux-8-3003-2-py3 - - almalinux-8-3003-2-py3 - - debian-11-3002-6-py3 - - debian-10-3002-6-py3 - - debian-9-3002-6-py3 - - ubuntu-2004-3002-6-py3 - - ubuntu-1804-3002-6-py3 - - centos-8-3002-6-py3 - - centos-7-3002-6-py3 - - oraclelinux-8-3002-6-py3 - - debian-10-3001-7-py3 - - debian-9-3001-7-py3 - - ubuntu-2004-3001-7-py3 - - ubuntu-1804-3001-7-py3 - - centos-8-3001-7-py3 - - centos-7-3001-7-py3 - - oraclelinux-8-3001-7-py3 - - debian-10-3000-9-py3 - - debian-9-3000-9-py3 - - ubuntu-1804-3000-9-py3 - - centos-8-3000-9-py3 - - centos-7-3000-9-py3 - - oraclelinux-8-3000-9-py3 - - ubuntu-1804-3000-9-py2 + - debian-11-3003-3-py3 + - debian-10-3003-3-py3 + - debian-9-3003-3-py3 + - ubuntu-2004-3003-3-py3 + - ubuntu-1804-3003-3-py3 + - centos-8-3003-3-py3 + - centos-7-3003-3-py3 + - oraclelinux-8-3003-3-py3 + - almalinux-8-3003-3-py3 + - debian-11-3002-7-py3 + - debian-10-3002-7-py3 + - debian-9-3002-7-py3 + - ubuntu-2004-3002-7-py3 + - ubuntu-1804-3002-7-py3 + - centos-8-3002-7-py3 + - centos-7-3002-7-py3 + - oraclelinux-8-3002-7-py3 + - debian-10-3001-8-py3 + - debian-9-3001-8-py3 + - ubuntu-2004-3001-8-py3 + - ubuntu-1804-3001-8-py3 + - centos-8-3001-8-py3 + - centos-7-3001-8-py3 + - oraclelinux-8-3001-8-py3 provisioner: state_top: base: From a73fa023ff6a2a3fb918baf0a7088dd9e878f89b Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 6 Oct 2021 17:04:02 +0100 Subject: [PATCH 23/42] 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 d0e351df..94478e8a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -55,7 +55,7 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.2.0) - aws-partitions (1.507.0) + aws-partitions (1.510.0) aws-sdk-alexaforbusiness (1.50.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) @@ -139,7 +139,7 @@ GEM aws-sdk-dynamodb (1.63.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.265.0) + aws-sdk-ec2 (1.266.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.47.0) @@ -151,7 +151,7 @@ GEM aws-sdk-ecs (1.85.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-efs (1.44.0) + aws-sdk-efs (1.45.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-eks (1.63.0) @@ -193,16 +193,16 @@ GEM aws-sdk-kinesis (1.35.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.48.0) + aws-sdk-kms (1.49.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.68.0) + aws-sdk-lambda (1.69.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-mq (1.40.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-networkfirewall (1.7.0) + aws-sdk-networkfirewall (1.8.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-networkmanager (1.14.0) @@ -248,6 +248,12 @@ GEM aws-sdk-shield (1.41.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) + aws-sdk-signer (1.32.0) + aws-sdk-core (~> 3, >= 3.120.0) + aws-sigv4 (~> 1.1) + aws-sdk-simpledb (1.29.0) + aws-sdk-core (~> 3, >= 3.120.0) + aws-sigv2 (~> 1.0) aws-sdk-sms (1.32.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) @@ -257,7 +263,7 @@ GEM aws-sdk-sqs (1.44.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.118.0) + aws-sdk-ssm (1.119.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-states (1.39.0) @@ -266,6 +272,7 @@ GEM aws-sdk-transfer (1.34.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) + aws-sigv2 (1.1.0) aws-sigv4 (1.4.0) aws-eventstream (~> 1, >= 1.0.2) azure_graph_rbac (0.17.2) @@ -281,9 +288,9 @@ GEM bcrypt_pbkdf (1.1.0) bson (4.12.1) builder (3.2.4) - chef-config (17.5.22) + chef-config (17.6.18) addressable - chef-utils (= 17.5.22) + chef-utils (= 17.6.18) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -291,7 +298,7 @@ GEM chef-telemetry (1.1.1) chef-config concurrent-ruby (~> 1.0) - chef-utils (17.5.22) + chef-utils (17.6.18) concurrent-ruby coderay (1.1.3) concurrent-ruby (1.1.9) @@ -304,7 +311,7 @@ GEM unf (>= 0.0.5, < 1.0.0) ed25519 (1.2.4) erubi (1.10.0) - excon (0.85.0) + excon (0.86.0) faraday (1.4.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -354,7 +361,7 @@ GEM inifile (3.0.0) jmespath (1.4.0) json (2.5.1) - jwt (2.2.3) + jwt (2.3.0) kitchen-inspec (2.5.0) hashie (>= 3.4, <= 5.0) inspec (>= 2.2.64, < 5.0) @@ -452,7 +459,7 @@ GEM unicode-display_width (>= 1.5, < 3.0) unicode_utils (~> 1.4) strings-ansi (0.2.0) - test-kitchen (3.0.0) + test-kitchen (3.1.0) bcrypt_pbkdf (~> 1.0) chef-utils (>= 16.4.35) ed25519 (~> 1.2) @@ -483,9 +490,9 @@ GEM inifile (~> 3.0) train-core (= 3.8.1) train-winrm (~> 0.2) - train-aws (0.2.19) + train-aws (0.2.20) aws-sdk-alexaforbusiness (~> 1.0) - aws-sdk-amplify (~> 1.0) + aws-sdk-amplify (~> 1.32.0) aws-sdk-apigateway (~> 1.0) aws-sdk-apigatewayv2 (~> 1.0) aws-sdk-applicationautoscaling (>= 1.46, < 1.52) @@ -531,7 +538,7 @@ GEM aws-sdk-kinesis (~> 1.0) aws-sdk-kms (~> 1.13) aws-sdk-lambda (~> 1.0) - aws-sdk-mq (~> 1.0) + aws-sdk-mq (~> 1.40.0) aws-sdk-networkfirewall (>= 1.6.0) aws-sdk-networkmanager (>= 1.13.0) aws-sdk-organizations (>= 1.17, < 1.60) @@ -545,8 +552,10 @@ GEM aws-sdk-secretsmanager (>= 1.42, < 1.47) aws-sdk-securityhub (~> 1.0) aws-sdk-servicecatalog (>= 1.48, < 1.61) - aws-sdk-ses (~> 1.0) + aws-sdk-ses (~> 1.41.0) aws-sdk-shield (~> 1.30) + aws-sdk-signer (~> 1.32.0) + aws-sdk-simpledb (~> 1.29.0) aws-sdk-sms (~> 1.0) aws-sdk-sns (~> 1.9) aws-sdk-sqs (~> 1.10) From d66c482435c5e69813a9ad68f81ef81e7b2c668a Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 15 Oct 2021 19:09:49 +0100 Subject: [PATCH 24/42] 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 94478e8a..a0372796 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) @@ -382,7 +382,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 0066a301e61567bcfa4e7576a07d297aca9c2d31 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 23 Oct 2021 21:10:03 +0100 Subject: [PATCH 25/42] 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 a0372796..fc0c6cfe 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) @@ -490,7 +496,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) @@ -529,6 +535,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) @@ -561,6 +568,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) @@ -619,7 +627,7 @@ GEM rubyzip (~> 2.0) winrm (~> 2.0) wisper (2.0.1) - zeitwerk (2.4.2) + zeitwerk (2.5.1) PLATFORMS ruby From c5894e07a33d848abc7e68e360509b24b4696918 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 26 Oct 2021 11:14:30 +0100 Subject: [PATCH 26/42] 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 fc0c6cfe..12fac8d0 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) @@ -421,6 +425,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) @@ -428,6 +434,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) @@ -450,6 +458,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 30f87cc84b2991c7f0ed1f0066f9241a3754e8df Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 23 Nov 2021 10:35:12 +0000 Subject: [PATCH 27/42] ci(kitchen+ci): update with `3004` pre-salted images/boxes [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/385 --- .github/workflows/kitchen.vagrant.yml | 4 +- .gitlab-ci.yml | 36 +++++++-- .travis.yml | 26 +++++++ CODEOWNERS | 1 + kitchen.vagrant.yml | 8 +- kitchen.yml | 106 ++++++++++++++++++++++++++ 6 files changed, 170 insertions(+), 11 deletions(-) diff --git a/.github/workflows/kitchen.vagrant.yml b/.github/workflows/kitchen.vagrant.yml index 99a948b8..cac08441 100644 --- a/.github/workflows/kitchen.vagrant.yml +++ b/.github/workflows/kitchen.vagrant.yml @@ -18,8 +18,8 @@ jobs: # - freebsd-130-master-py3 - default-freebsd-122-master-py3 # - freebsd-122-master-py3 - # - default-freebsd-130-3003-1-py3 - # - default-freebsd-122-3003-1-py3 + # - default-freebsd-130-3004-0-py3 + # - default-freebsd-122-3004-0-py3 steps: - name: 'Check out code' uses: 'actions/checkout@v2' diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 64322aad..50a66172 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -135,6 +135,7 @@ rubocop: # default-debian-9-tiamat-py3: {extends: '.test_instance'} # default-ubuntu-2004-tiamat-py3: {extends: '.test_instance'} # default-ubuntu-1804-tiamat-py3: {extends: '.test_instance'} +# default-centos-stream8-tiamat-py3: {extends: '.test_instance_failure_permitted'} # default-centos-8-tiamat-py3: {extends: '.test_instance'} # default-centos-7-tiamat-py3: {extends: '.test_instance'} # default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'} @@ -157,6 +158,9 @@ ubuntu-2004-master-py3: {extends: '.test_instance'} # default-ubuntu-1804-master-py3: {extends: '.test_instance'} # passenger-ubuntu-1804-master-py3: {extends: '.test_instance'} ubuntu-1804-master-py3: {extends: '.test_instance'} +# default-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'} +# passenger-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'} +centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'} # default-centos-8-master-py3: {extends: '.test_instance'} # passenger-centos-8-master-py3: {extends: '.test_instance'} centos-8-master-py3: {extends: '.test_instance'} @@ -171,8 +175,8 @@ default-opensuse-leap-153-master-py3: {extends: '.test_instance'} # opensuse-leap-153-master-py3: {extends: '.test_instance'} default-opensuse-leap-152-master-py3: {extends: '.test_instance'} # opensuse-leap-152-master-py3: {extends: '.test_instance'} -default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'} -# opensuse-tmbl-latest-master-py3: {extends: '.test_instance'} +default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'} +# opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'} default-amazonlinux-2-master-py3: {extends: '.test_instance'} # amazonlinux-2-master-py3: {extends: '.test_instance'} # default-oraclelinux-8-master-py3: {extends: '.test_instance'} @@ -192,18 +196,40 @@ almalinux-8-master-py3: {extends: '.test_instance'} # default-rockylinux-8-master-py3: {extends: '.test_instance'} # passenger-rockylinux-8-master-py3: {extends: '.test_instance'} rockylinux-8-master-py3: {extends: '.test_instance'} +# default-debian-11-3004-0-py3: {extends: '.test_instance'} +# default-debian-10-3004-0-py3: {extends: '.test_instance'} +# default-debian-9-3004-0-py3: {extends: '.test_instance'} +# default-ubuntu-2004-3004-0-py3: {extends: '.test_instance'} +# default-ubuntu-1804-3004-0-py3: {extends: '.test_instance'} +# default-centos-stream8-3004-0-py3: {extends: '.test_instance_failure_permitted'} +# default-centos-8-3004-0-py3: {extends: '.test_instance'} +# default-centos-7-3004-0-py3: {extends: '.test_instance'} +# default-fedora-34-3004-0-py3: {extends: '.test_instance'} +# default-fedora-33-3004-0-py3: {extends: '.test_instance'} +# default-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'} +# default-opensuse-leap-152-3004-0-py3: {extends: '.test_instance'} +# default-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'} +# default-amazonlinux-2-3004-0-py3: {extends: '.test_instance'} +# default-oraclelinux-8-3004-0-py3: {extends: '.test_instance'} +# default-oraclelinux-7-3004-0-py3: {extends: '.test_instance'} +# default-arch-base-latest-3004-0-py3: {extends: '.test_instance'} +# default-gentoo-stage3-latest-3004-0-py3: {extends: '.test_instance'} +# default-gentoo-stage3-systemd-3004-0-py3: {extends: '.test_instance'} +# default-almalinux-8-3004-0-py3: {extends: '.test_instance'} +# default-rockylinux-8-3004-0-py3: {extends: '.test_instance'} # default-debian-11-3003-3-py3: {extends: '.test_instance'} # default-debian-10-3003-3-py3: {extends: '.test_instance'} # default-debian-9-3003-3-py3: {extends: '.test_instance'} # default-ubuntu-2004-3003-3-py3: {extends: '.test_instance'} # default-ubuntu-1804-3003-3-py3: {extends: '.test_instance'} +# default-centos-stream8-3003-3-py3: {extends: '.test_instance_failure_permitted'} # default-centos-8-3003-3-py3: {extends: '.test_instance'} # default-centos-7-3003-3-py3: {extends: '.test_instance'} # default-fedora-34-3003-3-py3: {extends: '.test_instance'} # default-fedora-33-3003-3-py3: {extends: '.test_instance'} # default-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'} # default-opensuse-leap-152-3003-3-py3: {extends: '.test_instance'} -# default-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance'} +# default-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance_failure_permitted'} # default-amazonlinux-2-3003-3-py3: {extends: '.test_instance'} # default-oraclelinux-8-3003-3-py3: {extends: '.test_instance'} # default-oraclelinux-7-3003-3-py3: {extends: '.test_instance'} @@ -222,7 +248,7 @@ rockylinux-8-master-py3: {extends: '.test_instance'} # default-fedora-33-3002-7-py3: {extends: '.test_instance'} # default-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'} # default-opensuse-leap-152-3002-7-py3: {extends: '.test_instance'} -# default-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance'} +# default-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance_failure_permitted'} # default-amazonlinux-2-3002-7-py3: {extends: '.test_instance'} # default-oraclelinux-8-3002-7-py3: {extends: '.test_instance'} # default-oraclelinux-7-3002-7-py3: {extends: '.test_instance'} @@ -239,7 +265,7 @@ rockylinux-8-master-py3: {extends: '.test_instance'} # default-fedora-33-3001-8-py3: {extends: '.test_instance'} # default-opensuse-leap-153-3001-8-py3: {extends: '.test_instance'} # default-opensuse-leap-152-3001-8-py3: {extends: '.test_instance'} -# default-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance'} +# default-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance_failure_permitted'} # default-amazonlinux-2-3001-8-py3: {extends: '.test_instance'} # default-oraclelinux-8-3001-8-py3: {extends: '.test_instance'} # default-oraclelinux-7-3001-8-py3: {extends: '.test_instance'} diff --git a/.travis.yml b/.travis.yml index 58830226..c72b3a90 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,6 +88,7 @@ jobs: # - env: INSTANCE=default-debian-9-tiamat-py3 # - env: INSTANCE=default-ubuntu-2004-tiamat-py3 # - env: INSTANCE=default-ubuntu-1804-tiamat-py3 + # - env: INSTANCE=default-centos-stream8-tiamat-py3 # - env: INSTANCE=default-centos-8-tiamat-py3 # - env: INSTANCE=default-centos-7-tiamat-py3 # - env: INSTANCE=default-amazonlinux-2-tiamat-py3 @@ -110,6 +111,9 @@ jobs: # - env: INSTANCE=default-ubuntu-1804-master-py3 # - env: INSTANCE=passenger-ubuntu-1804-master-py3 - env: INSTANCE=ubuntu-1804-master-py3 + # - env: INSTANCE=default-centos-stream8-master-py3 + # - env: INSTANCE=passenger-centos-stream8-master-py3 + - env: INSTANCE=centos-stream8-master-py3 # - env: INSTANCE=default-centos-8-master-py3 # - env: INSTANCE=passenger-centos-8-master-py3 - env: INSTANCE=centos-8-master-py3 @@ -145,11 +149,33 @@ jobs: # - env: INSTANCE=default-rockylinux-8-master-py3 # - env: INSTANCE=passenger-rockylinux-8-master-py3 - env: INSTANCE=rockylinux-8-master-py3 + # - env: INSTANCE=default-debian-11-3004-0-py3 + # - env: INSTANCE=default-debian-10-3004-0-py3 + # - env: INSTANCE=default-debian-9-3004-0-py3 + # - env: INSTANCE=default-ubuntu-2004-3004-0-py3 + # - env: INSTANCE=default-ubuntu-1804-3004-0-py3 + # - env: INSTANCE=default-centos-stream8-3004-0-py3 + # - env: INSTANCE=default-centos-8-3004-0-py3 + # - env: INSTANCE=default-centos-7-3004-0-py3 + # - env: INSTANCE=default-fedora-34-3004-0-py3 + # - env: INSTANCE=default-fedora-33-3004-0-py3 + # - env: INSTANCE=default-opensuse-leap-153-3004-0-py3 + # - env: INSTANCE=default-opensuse-leap-152-3004-0-py3 + # - env: INSTANCE=default-opensuse-tmbl-latest-3004-0-py3 + # - env: INSTANCE=default-amazonlinux-2-3004-0-py3 + # - env: INSTANCE=default-oraclelinux-8-3004-0-py3 + # - env: INSTANCE=default-oraclelinux-7-3004-0-py3 + # - env: INSTANCE=default-arch-base-latest-3004-0-py3 + # - env: INSTANCE=default-gentoo-stage3-latest-3004-0-py3 + # - env: INSTANCE=default-gentoo-stage3-systemd-3004-0-py3 + # - env: INSTANCE=default-almalinux-8-3004-0-py3 + # - env: INSTANCE=default-rockylinux-8-3004-0-py3 # - env: INSTANCE=default-debian-11-3003-3-py3 # - env: INSTANCE=default-debian-10-3003-3-py3 # - env: INSTANCE=default-debian-9-3003-3-py3 # - env: INSTANCE=default-ubuntu-2004-3003-3-py3 # - env: INSTANCE=default-ubuntu-1804-3003-3-py3 + # - env: INSTANCE=default-centos-stream8-3003-3-py3 # - env: INSTANCE=default-centos-8-3003-3-py3 # - env: INSTANCE=default-centos-7-3003-3-py3 # - env: INSTANCE=default-fedora-34-3003-3-py3 diff --git a/CODEOWNERS b/CODEOWNERS index 2dd5bf89..a3076444 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.vagrant.yml b/kitchen.vagrant.yml index eff870ae..a6e7bc39 100644 --- a/kitchen.vagrant.yml +++ b/kitchen.vagrant.yml @@ -25,10 +25,10 @@ platforms: - name: freebsd-122-master-py3 driver: box: myii/freebsd-12.2-master-py3 - - name: freebsd-130-3003-1-py3 + - name: freebsd-130-3004-0-py3 driver: - box: myii/freebsd-13.0-3003.1-py3 + box: myii/freebsd-13.0-3004.0-py3 synced_folders: [] # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255208 - - name: freebsd-122-3003-1-py3 + - name: freebsd-122-3004-0-py3 driver: - box: myii/freebsd-12.2-3003.1-py3 + box: myii/freebsd-12.2-3004.0-py3 diff --git a/kitchen.yml b/kitchen.yml index 039f66fc..39812e56 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -40,6 +40,9 @@ platforms: driver: image: saltimages/salt-tiamat-py3:ubuntu-18.04 run_command: /lib/systemd/systemd + - name: centos-stream8-tiamat-py3 + driver: + image: saltimages/salt-tiamat-py3:centos-stream8 - name: centos-8-tiamat-py3 driver: image: saltimages/salt-tiamat-py3:centos-8 @@ -83,6 +86,9 @@ platforms: driver: image: saltimages/salt-master-py3:ubuntu-18.04 run_command: /lib/systemd/systemd + - name: centos-stream8-master-py3 + driver: + image: saltimages/salt-master-py3:centos-stream8 - name: centos-8-master-py3 driver: image: saltimages/salt-master-py3:centos-8 @@ -142,6 +148,89 @@ platforms: driver: image: saltimages/salt-master-py3:rockylinux-8 + ## 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 + - name: centos-stream8-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:centos-stream8 + - name: centos-8-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:centos-8 + - name: centos-7-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:centos-7 + - name: fedora-34-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:fedora-34 + - name: fedora-33-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:fedora-33 + - name: opensuse-leap-153-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:opensuse-leap-15.3 + # Workaround to avoid intermittent failures on `opensuse-leap-15.3`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 + - name: opensuse-leap-152-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:opensuse-leap-15.2 + # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 + - name: opensuse-tmbl-latest-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:opensuse-tumbleweed-latest + # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 + - name: amazonlinux-2-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:amazonlinux-2 + - name: oraclelinux-8-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:oraclelinux-8 + - name: oraclelinux-7-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:oraclelinux-7 + - name: arch-base-latest-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:arch-base-latest + - name: gentoo-stage3-latest-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:gentoo-stage3-latest + run_command: /sbin/init + - name: gentoo-stage3-systemd-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:gentoo-stage3-systemd + - name: almalinux-8-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:almalinux-8 + - name: rockylinux-8-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:rockylinux-8 + ## SALT `3003.3` - name: debian-11-3003-3-py3 driver: @@ -163,6 +252,9 @@ platforms: driver: image: saltimages/salt-3003.3-py3:ubuntu-18.04 run_command: /lib/systemd/systemd + - name: centos-stream8-3003-3-py3 + driver: + image: saltimages/salt-3003.3-py3:centos-stream8 - name: centos-8-3003-3-py3 driver: image: saltimages/salt-3003.3-py3:centos-8 @@ -400,6 +492,7 @@ suites: - debian-9-tiamat-py3 - ubuntu-2004-tiamat-py3 - ubuntu-1804-tiamat-py3 + - centos-stream8-tiamat-py3 - centos-8-tiamat-py3 - centos-7-tiamat-py3 - oraclelinux-8-tiamat-py3 @@ -410,16 +503,29 @@ suites: - debian-9-master-py3 - ubuntu-2004-master-py3 - ubuntu-1804-master-py3 + - centos-stream8-master-py3 - centos-8-master-py3 - centos-7-master-py3 - oraclelinux-8-master-py3 - almalinux-8-master-py3 - rockylinux-8-master-py3 + - debian-11-3004-0-py3 + - debian-10-3004-0-py3 + - debian-9-3004-0-py3 + - ubuntu-2004-3004-0-py3 + - ubuntu-1804-3004-0-py3 + - centos-stream8-3004-0-py3 + - centos-8-3004-0-py3 + - centos-7-3004-0-py3 + - oraclelinux-8-3004-0-py3 + - almalinux-8-3004-0-py3 + - rockylinux-8-3004-0-py3 - debian-11-3003-3-py3 - debian-10-3003-3-py3 - debian-9-3003-3-py3 - ubuntu-2004-3003-3-py3 - ubuntu-1804-3003-3-py3 + - centos-stream8-3003-3-py3 - centos-8-3003-3-py3 - centos-7-3003-3-py3 - oraclelinux-8-3003-3-py3 From 2c3643bdf9dd028b27779634cabc46ed287de368 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 23 Nov 2021 11:42:47 +0000 Subject: [PATCH 28/42] chore(gemfile.lock): update to latest gem versions (2021-W47) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/386 --- Gemfile.lock | 244 ++++++++++++++++++++++++++------------------------- 1 file changed, 123 insertions(+), 121 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 12fac8d0..3a9e15d3 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) @@ -379,7 +380,7 @@ GEM kitchen-salt (0.6.3) hashie (>= 3.5) test-kitchen (>= 1.4) - kitchen-vagrant (1.10.0) + kitchen-vagrant (1.11.0) test-kitchen (>= 1.4, < 4) license-acceptance (2.1.13) pastel (~> 0.7) @@ -423,7 +424,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) @@ -435,6 +436,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) @@ -457,8 +459,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) @@ -467,7 +469,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) @@ -485,7 +487,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) @@ -502,7 +504,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 b74877f7ef71bbed22baed26c2d2229afa4fa754 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 6 Dec 2021 08:21:05 +0000 Subject: [PATCH 29/42] 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 3a9e15d3..5bc43401 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) @@ -426,7 +432,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) @@ -437,7 +443,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) @@ -469,7 +475,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) @@ -487,7 +493,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) @@ -505,7 +511,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) @@ -516,9 +522,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) @@ -578,6 +584,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) @@ -592,7 +599,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 845635c086f2bc0fd55d1a44124370fba0aa80b5 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 14 Dec 2021 15:21:16 +0000 Subject: [PATCH 30/42] 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 5bc43401..8b142b36 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) @@ -432,7 +432,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) @@ -475,7 +475,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 a8e73238284752635914bea21494d1a0a285457a Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 22 Dec 2021 11:56:48 +0000 Subject: [PATCH 31/42] 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 8b142b36..0ac52f77 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) @@ -400,7 +399,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) @@ -511,7 +510,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) @@ -522,7 +521,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) @@ -600,7 +599,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) @@ -657,7 +656,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 af654492..7471ddcf 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 7deb74fdbccad7e8590b9ddf7d0630e9a2ba56e1 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 24 Dec 2021 14:05:57 +0000 Subject: [PATCH 32/42] ci(vagrant): replace FreeBSD 12.2 with 12.3 [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/395 --- .github/workflows/kitchen.vagrant.yml | 6 +++--- kitchen.vagrant.yml | 10 ++++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/kitchen.vagrant.yml b/.github/workflows/kitchen.vagrant.yml index cac08441..ee67a32c 100644 --- a/.github/workflows/kitchen.vagrant.yml +++ b/.github/workflows/kitchen.vagrant.yml @@ -16,10 +16,10 @@ jobs: instance: - default-freebsd-130-master-py3 # - freebsd-130-master-py3 - - default-freebsd-122-master-py3 - # - freebsd-122-master-py3 + - default-freebsd-123-master-py3 + # - freebsd-123-master-py3 # - default-freebsd-130-3004-0-py3 - # - default-freebsd-122-3004-0-py3 + # - default-freebsd-123-3004-0-py3 steps: - name: 'Check out code' uses: 'actions/checkout@v2' diff --git a/kitchen.vagrant.yml b/kitchen.vagrant.yml index a6e7bc39..f9661b3e 100644 --- a/kitchen.vagrant.yml +++ b/kitchen.vagrant.yml @@ -21,14 +21,12 @@ platforms: - name: freebsd-130-master-py3 driver: box: myii/freebsd-13.0-master-py3 - synced_folders: [] # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255208 - - name: freebsd-122-master-py3 + - name: freebsd-123-master-py3 driver: - box: myii/freebsd-12.2-master-py3 + box: myii/freebsd-12.3-master-py3 - name: freebsd-130-3004-0-py3 driver: box: myii/freebsd-13.0-3004.0-py3 - synced_folders: [] # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255208 - - name: freebsd-122-3004-0-py3 + - name: freebsd-123-3004-0-py3 driver: - box: myii/freebsd-12.2-3004.0-py3 + box: myii/freebsd-12.3-3004.0-py3 From f8f635309f86da04c78274cc3cdefa1e3a48f7c3 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 28 Dec 2021 21:05:05 +0000 Subject: [PATCH 33/42] 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 0ac52f77..7fed9dac 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 @@ -474,7 +474,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 20bb1f2101392b73d879f586bdc9ce090d20ec07 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 6 Jan 2022 08:06:38 +0000 Subject: [PATCH 34/42] 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 7fed9dac..d28f6503 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) @@ -431,7 +431,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 772a5af55f4d13034a4337446a58ad556a7e024d Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 11 Jan 2022 09:37:00 +0000 Subject: [PATCH 35/42] 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 d28f6503..582da8de 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) kitchen-vagrant (1.11.0) @@ -440,7 +440,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) @@ -465,13 +465,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) @@ -506,7 +506,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 67adbb248303f76258a34642f28b10f5d1885a88 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 17 Jan 2022 08:14:46 +0000 Subject: [PATCH 36/42] 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 458b7b64..80f46e20 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 437fe7fc0debcc3b9900d2ff18be90e86e5c5d13 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 17 Jan 2022 19:48:48 +0000 Subject: [PATCH 37/42] 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 582da8de..2d401f98 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) kitchen-vagrant (1.11.0) @@ -455,7 +455,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 182dc71a03c5e7c0da07fd6e0cd4f03434d78d6f Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 25 Jan 2022 14:12:50 +0000 Subject: [PATCH 38/42] 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 2d401f98..cd04cb43 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) @@ -465,9 +465,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 155747346c5b0fe7e1af5214734581e992832b45 Mon Sep 17 00:00:00 2001 From: noelmcloughlin Date: Wed, 26 Jan 2022 08:41:55 +0000 Subject: [PATCH 39/42] 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 9e812aa6..7ccf824f 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 9dfc1c1b2f4a0cd17221b303c95af1d7a9aba781 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20B=C3=A9rtoli?= Date: Thu, 15 Apr 2021 15:11:41 -0300 Subject: [PATCH 40/42] fix(snippets): make sure they're deployed before being used --- nginx/snippets.sls | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nginx/snippets.sls b/nginx/snippets.sls index f19905ba..3bd78349 100644 --- a/nginx/snippets.sls +++ b/nginx/snippets.sls @@ -32,5 +32,7 @@ nginx_snippet_{{ snippet }}: - file: nginx_snippets_dir - require_in: - file: nginx_config + - sls: nginx.servers + - sls: nginx.servers_config - service: nginx_service {% endfor %} From 93d6a9fe46eb259f2c9a0be55a733e4fa6dc5f15 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 1 Feb 2022 23:40:26 +0000 Subject: [PATCH 41/42] 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 7ccf824f..8020f666 100644 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,7 @@ 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' group :vagrant do gem 'kitchen-vagrant' diff --git a/Gemfile.lock b/Gemfile.lock index cd04cb43..7e910a56 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) @@ -453,7 +453,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) @@ -461,7 +461,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 3f1a7b70827198d9885907e46671e8af4103232e Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Wed, 2 Feb 2022 13:14:17 +0000 Subject: [PATCH 42/42] chore(release): 2.7.5 [skip ci] ## [2.7.5](https://github.com/saltstack-formulas/nginx-formula/compare/v2.7.4...v2.7.5) (2022-02-02) ### Bug Fixes * **snippets:** make sure they're deployed before being used ([9dfc1c1](https://github.com/saltstack-formulas/nginx-formula/commit/9dfc1c1b2f4a0cd17221b303c95af1d7a9aba781)) ### Continuous Integration * **3003.1:** update inc. AlmaLinux, Rocky & `rst-lint` [skip ci] ([6a42a9b](https://github.com/saltstack-formulas/nginx-formula/commit/6a42a9bdf84e764cb4b3313ad2b6d95688517dec)) * **freebsd:** update with latest pre-salted Vagrant boxes [skip ci] ([860fabe](https://github.com/saltstack-formulas/nginx-formula/commit/860fabe327cfa9512152b0f278897311f35449bf)) * **gemfile:** allow rubygems proxy to be provided as an env var [skip ci] ([1557473](https://github.com/saltstack-formulas/nginx-formula/commit/155747346c5b0fe7e1af5214734581e992832b45)) * **gemfile+lock:** use `ssf` customised `inspec` repo [skip ci] ([a11da83](https://github.com/saltstack-formulas/nginx-formula/commit/a11da83d03fad1c50a93ba06c1c5af21f1c79e7a)) * **gitlab-ci:** enable instance after upstream issue resolved [skip ci] ([79499e8](https://github.com/saltstack-formulas/nginx-formula/commit/79499e841be74162dd5ec869de267366b6048af1)) * **kitchen:** move `provisioner` block & update `run_command` [skip ci] ([6b65017](https://github.com/saltstack-formulas/nginx-formula/commit/6b650177aaa9800151f2e7f628551856f0c28c54)) * **kitchen+ci:** update with `3004` pre-salted images/boxes [skip ci] ([30f87cc](https://github.com/saltstack-formulas/nginx-formula/commit/30f87cc84b2991c7f0ed1f0066f9241a3754e8df)) * **kitchen+ci:** update with latest `3003.2` pre-salted images [skip ci] ([70a1f31](https://github.com/saltstack-formulas/nginx-formula/commit/70a1f3135ccfde09f6016a46eee3fc55b2ca9840)) * **kitchen+ci:** update with latest CVE pre-salted images [skip ci] ([e041418](https://github.com/saltstack-formulas/nginx-formula/commit/e0414181a724076176cb37f6402f013f4e498109)) * **vagrant:** replace FreeBSD 12.2 with 12.3 [skip ci] ([7deb74f](https://github.com/saltstack-formulas/nginx-formula/commit/7deb74fdbccad7e8590b9ddf7d0630e9a2ba56e1)) * add Debian 11 Bullseye & update `yamllint` configuration [skip ci] ([fa8a5db](https://github.com/saltstack-formulas/nginx-formula/commit/fa8a5db5079b1e41eeac5d4ee25c06d976a24f3e)) * **kitchen+gitlab:** remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci] ([d15f3de](https://github.com/saltstack-formulas/nginx-formula/commit/d15f3decb3fb1d8d1d04934c8d909913380d53f1)) --- AUTHORS.md | 10 +++++----- CHANGELOG.md | 23 +++++++++++++++++++++++ FORMULA | 2 +- docs/AUTHORS.rst | 12 ++++++------ docs/CHANGELOG.rst | 26 ++++++++++++++++++++++++++ 5 files changed, 61 insertions(+), 12 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index b9e6fb27..e2105b7f 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -4,12 +4,12 @@ This list is sorted by the number of commits per contributor in _descending_ ord Avatar|Contributor|Contributions :-:|---|:-: -@myii|[@myii](https://github.com/myii)|107 +@myii|[@myii](https://github.com/myii)|146 @aboe76|[@aboe76](https://github.com/aboe76)|46 @gravyboat|[@gravyboat](https://github.com/gravyboat)|27 @nmadhok|[@nmadhok](https://github.com/nmadhok)|24 -@javierbertoli|[@javierbertoli](https://github.com/javierbertoli)|21 -@noelmcloughlin|[@noelmcloughlin](https://github.com/noelmcloughlin)|18 +@javierbertoli|[@javierbertoli](https://github.com/javierbertoli)|23 +@noelmcloughlin|[@noelmcloughlin](https://github.com/noelmcloughlin)|19 @whiteinge|[@whiteinge](https://github.com/whiteinge)|17 @ross-p|[@ross-p](https://github.com/ross-p)|13 @daks|[@daks](https://github.com/daks)|11 @@ -74,7 +74,7 @@ Avatar|Contributor|Contributions @scub|[@scub](https://github.com/scub)|1 @thatch45|[@thatch45](https://github.com/thatch45)|1 @blarghmatey|[@blarghmatey](https://github.com/blarghmatey)|1 -@babilen5|[@babilen5](https://github.com/babilen5)|1 +@babilen|[@babilen](https://github.com/babilen)|1 @abednarik|[@abednarik](https://github.com/abednarik)|1 @francesco-a|[@francesco-a](https://github.com/francesco-a)|1 @oboyle|[@oboyle](https://github.com/oboyle)|1 @@ -82,4 +82,4 @@ Avatar|Contributor|Contributions --- -Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-06-15. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2022-02-02. diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d9a66aa..7125d13a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,28 @@ # Changelog +## [2.7.5](https://github.com/saltstack-formulas/nginx-formula/compare/v2.7.4...v2.7.5) (2022-02-02) + + +### Bug Fixes + +* **snippets:** make sure they're deployed before being used ([9dfc1c1](https://github.com/saltstack-formulas/nginx-formula/commit/9dfc1c1b2f4a0cd17221b303c95af1d7a9aba781)) + + +### Continuous Integration + +* **3003.1:** update inc. AlmaLinux, Rocky & `rst-lint` [skip ci] ([6a42a9b](https://github.com/saltstack-formulas/nginx-formula/commit/6a42a9bdf84e764cb4b3313ad2b6d95688517dec)) +* **freebsd:** update with latest pre-salted Vagrant boxes [skip ci] ([860fabe](https://github.com/saltstack-formulas/nginx-formula/commit/860fabe327cfa9512152b0f278897311f35449bf)) +* **gemfile:** allow rubygems proxy to be provided as an env var [skip ci] ([1557473](https://github.com/saltstack-formulas/nginx-formula/commit/155747346c5b0fe7e1af5214734581e992832b45)) +* **gemfile+lock:** use `ssf` customised `inspec` repo [skip ci] ([a11da83](https://github.com/saltstack-formulas/nginx-formula/commit/a11da83d03fad1c50a93ba06c1c5af21f1c79e7a)) +* **gitlab-ci:** enable instance after upstream issue resolved [skip ci] ([79499e8](https://github.com/saltstack-formulas/nginx-formula/commit/79499e841be74162dd5ec869de267366b6048af1)) +* **kitchen:** move `provisioner` block & update `run_command` [skip ci] ([6b65017](https://github.com/saltstack-formulas/nginx-formula/commit/6b650177aaa9800151f2e7f628551856f0c28c54)) +* **kitchen+ci:** update with `3004` pre-salted images/boxes [skip ci] ([30f87cc](https://github.com/saltstack-formulas/nginx-formula/commit/30f87cc84b2991c7f0ed1f0066f9241a3754e8df)) +* **kitchen+ci:** update with latest `3003.2` pre-salted images [skip ci] ([70a1f31](https://github.com/saltstack-formulas/nginx-formula/commit/70a1f3135ccfde09f6016a46eee3fc55b2ca9840)) +* **kitchen+ci:** update with latest CVE pre-salted images [skip ci] ([e041418](https://github.com/saltstack-formulas/nginx-formula/commit/e0414181a724076176cb37f6402f013f4e498109)) +* **vagrant:** replace FreeBSD 12.2 with 12.3 [skip ci] ([7deb74f](https://github.com/saltstack-formulas/nginx-formula/commit/7deb74fdbccad7e8590b9ddf7d0630e9a2ba56e1)) +* add Debian 11 Bullseye & update `yamllint` configuration [skip ci] ([fa8a5db](https://github.com/saltstack-formulas/nginx-formula/commit/fa8a5db5079b1e41eeac5d4ee25c06d976a24f3e)) +* **kitchen+gitlab:** remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci] ([d15f3de](https://github.com/saltstack-formulas/nginx-formula/commit/d15f3decb3fb1d8d1d04934c8d909913380d53f1)) + ## [2.7.4](https://github.com/saltstack-formulas/nginx-formula/compare/v2.7.3...v2.7.4) (2021-06-15) diff --git a/FORMULA b/FORMULA index 636b36f8..07761522 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: nginx os: Debian, Ubuntu, RedHat, Fedora, CentOS, Suse, openSUSE os_family: Debian, RedHat, Suse -version: 2.7.4 +version: 2.7.5 release: 1 minimum_version: 2017.3 summary: nginx formula diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index a8e625cb..69297cc1 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -15,7 +15,7 @@ This list is sorted by the number of commits per contributor in *descending* ord - Contributions * - :raw-html-m2r:`@myii` - `@myii `_ - - 107 + - 146 * - :raw-html-m2r:`@aboe76` - `@aboe76 `_ - 46 @@ -27,10 +27,10 @@ This list is sorted by the number of commits per contributor in *descending* ord - 24 * - :raw-html-m2r:`@javierbertoli` - `@javierbertoli `_ - - 21 + - 23 * - :raw-html-m2r:`@noelmcloughlin` - `@noelmcloughlin `_ - - 18 + - 19 * - :raw-html-m2r:`@whiteinge` - `@whiteinge `_ - 17 @@ -223,8 +223,8 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@blarghmatey` - `@blarghmatey `_ - 1 - * - :raw-html-m2r:`@babilen5` - - `@babilen5 `_ + * - :raw-html-m2r:`@babilen` + - `@babilen `_ - 1 * - :raw-html-m2r:`@abednarik` - `@abednarik `_ @@ -242,4 +242,4 @@ This list is sorted by the number of commits per contributor in *descending* ord ---- -Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2021-06-15. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2022-02-02. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index f25d2def..24412f49 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,32 @@ Changelog ========= +`2.7.5 `_ (2022-02-02) +------------------------------------------------------------------------------------------------------- + +Bug Fixes +^^^^^^^^^ + + +* **snippets:** make sure they're deployed before being used (\ `9dfc1c1 `_\ ) + +Continuous Integration +^^^^^^^^^^^^^^^^^^^^^^ + + +* **3003.1:** update inc. AlmaLinux, Rocky & ``rst-lint`` [skip ci] (\ `6a42a9b `_\ ) +* **freebsd:** update with latest pre-salted Vagrant boxes [skip ci] (\ `860fabe `_\ ) +* **gemfile:** allow rubygems proxy to be provided as an env var [skip ci] (\ `1557473 `_\ ) +* **gemfile+lock:** use ``ssf`` customised ``inspec`` repo [skip ci] (\ `a11da83 `_\ ) +* **gitlab-ci:** enable instance after upstream issue resolved [skip ci] (\ `79499e8 `_\ ) +* **kitchen:** move ``provisioner`` block & update ``run_command`` [skip ci] (\ `6b65017 `_\ ) +* **kitchen+ci:** update with ``3004`` pre-salted images/boxes [skip ci] (\ `30f87cc `_\ ) +* **kitchen+ci:** update with latest ``3003.2`` pre-salted images [skip ci] (\ `70a1f31 `_\ ) +* **kitchen+ci:** update with latest CVE pre-salted images [skip ci] (\ `e041418 `_\ ) +* **vagrant:** replace FreeBSD 12.2 with 12.3 [skip ci] (\ `7deb74f `_\ ) +* add Debian 11 Bullseye & update ``yamllint`` configuration [skip ci] (\ `fa8a5db `_\ ) +* **kitchen+gitlab:** remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci] (\ `d15f3de `_\ ) + `2.7.4 `_ (2021-06-15) -------------------------------------------------------------------------------------------------------