From 13c8450069aad9bf1ff25a0c7870a82d5a0b3e7f Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 21 Jun 2021 20:45:55 +0100 Subject: [PATCH 01/14] 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 | 10 ---------- .travis.yml | 10 ---------- kitchen.yml | 30 ------------------------------ 3 files changed, 50 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 032ee4f..df53e9d 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'} @@ -137,12 +136,10 @@ default-debian-10-master-py3: {extends: '.test_instance'} default-debian-9-master-py3: {extends: '.test_instance'} default-ubuntu-2004-master-py3: {extends: '.test_instance'} default-ubuntu-1804-master-py3: {extends: '.test_instance'} -default-ubuntu-1604-master-py3: {extends: '.test_instance'} # default-centos-8-master-py3: {extends: '.test_instance'} # default-centos-7-master-py3: {extends: '.test_instance'} # default-fedora-34-master-py3: {extends: '.test_instance'} # default-fedora-33-master-py3: {extends: '.test_instance'} -# default-fedora-32-master-py3: {extends: '.test_instance'} # default-opensuse-leap-152-master-py3: {extends: '.test_instance'} # default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'} # default-amazonlinux-2-master-py3: {extends: '.test_instance'} @@ -159,7 +156,6 @@ default-ubuntu-1604-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'} @@ -170,12 +166,10 @@ default-ubuntu-1604-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'} @@ -188,12 +182,10 @@ default-ubuntu-1604-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'} @@ -205,7 +197,6 @@ default-ubuntu-1604-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'} @@ -213,7 +204,6 @@ default-ubuntu-1604-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 cf6fd59..7091c6d 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 @@ -97,12 +96,10 @@ jobs: - env: INSTANCE=default-debian-9-master-py3 - env: INSTANCE=default-ubuntu-2004-master-py3 - env: INSTANCE=default-ubuntu-1804-master-py3 - - env: INSTANCE=default-ubuntu-1604-master-py3 # - env: INSTANCE=default-centos-8-master-py3 # - env: INSTANCE=default-centos-7-master-py3 # - env: INSTANCE=default-fedora-34-master-py3 # - env: INSTANCE=default-fedora-33-master-py3 - # - env: INSTANCE=default-fedora-32-master-py3 # - env: INSTANCE=default-opensuse-leap-152-master-py3 # - env: INSTANCE=default-opensuse-tmbl-latest-master-py3 # - env: INSTANCE=default-amazonlinux-2-master-py3 @@ -119,7 +116,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 @@ -130,12 +126,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 @@ -148,12 +142,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 @@ -165,7 +157,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 @@ -173,7 +164,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 fc17c56..f0f94b7 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 4d5e6d9e1924fdabae726b1ef6cdc58b8dcb331f Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 2 Jul 2021 00:04:34 +0100 Subject: [PATCH 02/14] ci(3003.1): update inc. AlmaLinux, Rocky & `rst-lint` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/335 --- .gitlab-ci.yml | 51 ++++--- .pre-commit-config.yaml | 11 ++ .travis.yml | 51 ++++--- Gemfile.lock | 2 +- kitchen.yml | 168 ++++++++++++++------- test/integration/default/inspec.yml | 2 + test/integration/share/inspec.yml | 2 + test/integration/share/libraries/system.rb | 2 +- 8 files changed, 194 insertions(+), 95 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index df53e9d..cea0765 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'} default-debian-9-master-py3: {extends: '.test_instance'} default-ubuntu-2004-master-py3: {extends: '.test_instance'} @@ -140,6 +142,7 @@ default-ubuntu-1804-master-py3: {extends: '.test_instance'} # default-centos-7-master-py3: {extends: '.test_instance'} # default-fedora-34-master-py3: {extends: '.test_instance'} # default-fedora-33-master-py3: {extends: '.test_instance'} +# default-opensuse-leap-153-master-py3: {extends: '.test_instance'} # default-opensuse-leap-152-master-py3: {extends: '.test_instance'} # default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'} # default-amazonlinux-2-master-py3: {extends: '.test_instance'} @@ -148,20 +151,25 @@ default-ubuntu-1804-master-py3: {extends: '.test_instance'} # default-arch-base-latest-master-py3: {extends: '.test_instance'} # default-gentoo-stage3-latest-master-py3: {extends: '.test_instance'} # default-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'} +# default-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'} @@ -174,8 +182,9 @@ default-ubuntu-1804-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'} @@ -186,27 +195,29 @@ default-ubuntu-1804-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 9bc4109..41b5f35 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -52,3 +52,14 @@ repos: - id: rstcheck name: Check reST files using rstcheck exclude: 'docs/CHANGELOG.rst' + - repo: https://github.com/saltstack-formulas/mirrors-rst-lint + rev: v1.3.2 + hooks: + - id: rst-lint + name: Check reST files using rst-lint + exclude: | + (?x)^( + docs/CHANGELOG.rst| + docs/TOFS_pattern.rst| + )$ + additional_dependencies: [pygments==2.9.0] diff --git a/.travis.yml b/.travis.yml index 7091c6d..4f7cc76 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=default-debian-9-master-py3 - env: INSTANCE=default-ubuntu-2004-master-py3 @@ -100,6 +102,7 @@ jobs: # - env: INSTANCE=default-centos-7-master-py3 # - env: INSTANCE=default-fedora-34-master-py3 # - env: INSTANCE=default-fedora-33-master-py3 + # - env: INSTANCE=default-opensuse-leap-153-master-py3 # - env: INSTANCE=default-opensuse-leap-152-master-py3 # - env: INSTANCE=default-opensuse-tmbl-latest-master-py3 # - env: INSTANCE=default-amazonlinux-2-master-py3 @@ -108,20 +111,25 @@ jobs: # - env: INSTANCE=default-arch-base-latest-master-py3 # - env: INSTANCE=default-gentoo-stage3-latest-master-py3 # - env: INSTANCE=default-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=default-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 @@ -134,8 +142,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 @@ -146,27 +155,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 d7cbc3b..6ad4ef9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker - revision: 042e6921940a28d2502258b6a5ff3be17dd2fd37 + revision: 1f543f654da5c1774cb8737f6f07a01745520bb5 branch: ssf specs: kitchen-docker (2.10.0) diff --git a/kitchen.yml b/kitchen.yml index f0f94b7..f3192fb 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.0-py3:debian-10 - - name: debian-9-3003-0-py3 + image: saltimages/salt-3003.1-py3:debian-10 + - name: debian-9-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:debian-9 - - name: ubuntu-2004-3003-0-py3 + image: saltimages/salt-3003.1-py3:debian-9 + - name: ubuntu-2004-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:ubuntu-20.04 - - name: ubuntu-1804-3003-0-py3 + image: saltimages/salt-3003.1-py3:ubuntu-20.04 + - name: ubuntu-1804-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:ubuntu-18.04 - - name: centos-8-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:centos-8 - - name: centos-7-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-7 - - name: fedora-34-3003-0-py3 + image: saltimages/salt-3003.1-py3:centos-7 + - name: fedora-34-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-34 + - name: fedora-33-3003-1-py3 driver: - image: saltimages/salt-3003.0-py3:fedora-33 - - name: amazonlinux-2-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:amazonlinux-2 - - name: oraclelinux-8-3003-0-py3 - driver: - image: saltimages/salt-3003.0-py3:oraclelinux-8 - - name: oraclelinux-7-3003-0-py3 - driver: - image: saltimages/salt-3003.0-py3:oraclelinux-7 - - name: arch-base-latest-3003-0-py3 - driver: - image: saltimages/salt-3003.0-py3:arch-base-latest + image: saltimages/salt-3003.1-py3:opensuse-leap-15.3 run_command: /usr/lib/systemd/systemd - - name: gentoo-stage3-latest-3003-0-py3 + # 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.0-py3:gentoo-stage3-latest + 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.1-py3:amazonlinux-2 + - name: oraclelinux-8-3003-1-py3 + driver: + image: saltimages/salt-3003.1-py3:oraclelinux-8 + - name: oraclelinux-7-3003-1-py3 + driver: + image: saltimages/salt-3003.1-py3:oraclelinux-7 + - 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 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 diff --git a/test/integration/default/inspec.yml b/test/integration/default/inspec.yml index 1866903..d8d9955 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/share/inspec.yml b/test/integration/share/inspec.yml index cf623a1..ee20080 100644 --- a/test/integration/share/inspec.yml +++ b/test/integration/share/inspec.yml @@ -19,4 +19,6 @@ supports: - platform-name: oracle - platform-name: arch - platform-name: gentoo + - platform-name: almalinux + - platform-name: rocky - platform: windows diff --git a/test/integration/share/libraries/system.rb b/test/integration/share/libraries/system.rb index 461dea4..87daf08 100644 --- a/test/integration/share/libraries/system.rb +++ b/test/integration/share/libraries/system.rb @@ -36,7 +36,7 @@ class SystemResource < Inspec.resource(1) 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 42c1cda60968cff1155bfe5c4caa62ea3cc22f76 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 14 Jul 2021 12:13:57 +0100 Subject: [PATCH 03/14] chore(deps): bump `addressable` from `2.7.0` to `2.8.0` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/340 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6ad4ef9..d0dedb8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -14,7 +14,7 @@ GEM i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.7.0) + addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.1.0) aws-partitions (1.386.0) From 3ea9b347590e6f15761d07567a7640d138f74128 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 15 Jul 2021 11:12:09 +0100 Subject: [PATCH 04/14] feat(osfingermap): add support for `Debian 11` [skip ci] --- mysql/osfingermap.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/mysql/osfingermap.yaml b/mysql/osfingermap.yaml index e2a92a1..fd13162 100644 --- a/mysql/osfingermap.yaml +++ b/mysql/osfingermap.yaml @@ -2,6 +2,15 @@ # vim: ft=yaml --- # Debian +Debian-11: + serverpkg: mariadb-server + service: mariadb + clientpkg: mariadb-client + devpkg: libmariadbclient-dev + config: + append: | + !includedir /etc/mysql/conf.d/ + # !includedir /etc/mysql/mariadb.conf.d/ Debian-10: serverpkg: mariadb-server service: mariadb From fd0ebf6f1aae5f1e0f38cfa6a6a6d68f51ba6f88 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 17 Jul 2021 20:27:38 +0100 Subject: [PATCH 05/14] chore(gemfile+lock): update to latest gem versions (2021-W28) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/343 --- Gemfile | 2 +- Gemfile.lock | 431 +++++++++++++++++++++++++++++---------------------- kitchen.yml | 2 +- 3 files changed, 248 insertions(+), 187 deletions(-) diff --git a/Gemfile b/Gemfile index c08ad6c..9774aac 100644 --- a/Gemfile +++ b/Gemfile @@ -10,5 +10,5 @@ gem 'inspec', '~> 4.22.22' # rubocop:disable Layout/LineLength gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker', branch: 'ssf' # rubocop:enable Layout/LineLength -gem 'kitchen-inspec', '>= 2.2.1' +gem 'kitchen-inspec', '>= 2.5.0' gem 'kitchen-salt', '>= 0.6.3' diff --git a/Gemfile.lock b/Gemfile.lock index d0dedb8..4e0ccc9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,197 +9,242 @@ GIT GEM remote: https://rubygems.org/ specs: - activesupport (5.2.4.4) + activesupport (6.1.4) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) - aws-eventstream (1.1.0) - aws-partitions (1.386.0) - aws-sdk-apigateway (1.55.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-eventstream (1.1.1) + aws-partitions (1.478.0) + aws-sdk-apigateway (1.62.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-apigatewayv2 (1.29.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-apigatewayv2 (1.32.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-athena (1.33.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-applicationautoscaling (1.51.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-autoscaling (1.22.0) - aws-sdk-core (~> 3, >= 3.52.1) + aws-sdk-athena (1.37.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-budgets (1.36.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-autoscaling (1.61.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudformation (1.44.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-batch (1.47.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudfront (1.46.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-budgets (1.38.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsm (1.27.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-cloudformation (1.53.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsmv2 (1.30.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-cloudfront (1.53.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudtrail (1.29.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-cloudhsm (1.30.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatch (1.45.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-cloudhsmv2 (1.33.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatchlogs (1.38.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-cloudtrail (1.35.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-codecommit (1.40.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-cloudwatch (1.51.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-codedeploy (1.37.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-cloudwatchevents (1.46.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-codepipeline (1.37.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-cloudwatchlogs (1.41.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-configservice (1.53.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-codecommit (1.42.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.109.1) + aws-sdk-codedeploy (1.40.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-codepipeline (1.44.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-cognitoidentity (1.31.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-cognitoidentityprovider (1.51.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-configservice (1.62.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-core (3.117.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-costandusagereportservice (1.28.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-costandusagereportservice (1.31.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-dynamodb (1.55.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-databasemigrationservice (1.53.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-dynamodb (1.60.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-ec2 (1.248.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-ecr (1.42.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-ecrpublic (1.3.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-ecs (1.80.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-efs (1.40.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-eks (1.58.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-elasticache (1.57.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-elasticbeanstalk (1.42.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-elasticloadbalancing (1.31.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-elasticloadbalancingv2 (1.62.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-elasticsearchservice (1.52.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-eventbridge (1.24.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-firehose (1.37.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-glue (1.87.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-guardduty (1.45.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-iam (1.56.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-kafka (1.36.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-kinesis (1.32.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-kms (1.44.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-lambda (1.63.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-organizations (1.59.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-ram (1.25.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-rds (1.121.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-redshift (1.65.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-route53 (1.49.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-route53domains (1.30.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + 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-ses (1.36.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-securityhub (1.47.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-servicecatalog (1.59.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-ses (1.38.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-shield (1.37.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-sms (1.29.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sigv4 (1.2.2) + aws-sdk-sns (1.42.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-sqs (1.40.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-ssm (1.112.0) + aws-sdk-core (~> 3, >= 3.112.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-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sigv4 (1.2.4) aws-eventstream (~> 1, >= 1.0.2) azure_graph_rbac (0.17.2) ms_rest_azure (~> 0.12.0) - azure_mgmt_key_vault (0.17.6) + azure_mgmt_key_vault (0.17.7) ms_rest_azure (~> 0.12.0) - azure_mgmt_resources (0.18.0) + azure_mgmt_resources (0.18.2) ms_rest_azure (~> 0.12.0) - azure_mgmt_security (0.18.2) + azure_mgmt_security (0.19.0) ms_rest_azure (~> 0.12.0) - azure_mgmt_storage (0.22.0) + azure_mgmt_storage (0.23.0) ms_rest_azure (~> 0.12.0) - bcrypt_pbkdf (1.0.1) + bcrypt_pbkdf (1.1.0) builder (3.2.4) - chef-config (16.6.14) + chef-config (17.2.29) addressable - chef-utils (= 16.6.14) + chef-utils (= 17.2.29) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) tomlrb (~> 1.2) - chef-telemetry (1.0.14) + chef-telemetry (1.0.29) chef-config concurrent-ruby (~> 1.0) - ffi-yajl (~> 2.2) - chef-utils (16.6.14) + chef-utils (17.2.29) + concurrent-ruby coderay (1.1.3) - concurrent-ruby (1.1.7) + concurrent-ruby (1.1.9) declarative (0.0.20) - declarative-option (0.1.0) diff-lcs (1.4.4) - docker-api (2.0.0) + docker-api (2.2.0) excon (>= 0.47.0) multi_json domain_name (0.5.20190701) @@ -207,44 +252,43 @@ GEM ecma-re-validator (0.2.1) regexp_parser (~> 1.2) ed25519 (1.2.4) - erubi (1.9.0) - excon (0.78.0) - faraday (0.17.3) + erubi (1.10.0) + excon (0.84.0) + faraday (0.17.4) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.7) faraday (>= 0.8.0) http-cookie (~> 1.0.0) faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) - ffi (1.13.1) - ffi-yajl (2.3.4) - libyajl2 (~> 1.2) + ffi (1.15.3) fuzzyurl (0.9.0) - google-api-client (0.44.0) + google-api-client (0.52.0) addressable (~> 2.5, >= 2.5.1) googleauth (~> 0.9) httpclient (>= 2.8.1, < 3.0) mini_mime (~> 1.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) + rexml signet (~> 0.12) - googleauth (0.13.0) + googleauth (0.14.0) faraday (>= 0.17.3, < 2.0) jwt (>= 1.4, < 3.0) memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (~> 0.14) - gssapi (1.3.0) + gssapi (1.3.1) ffi (>= 1.0.1) gyoku (1.3.1) builder (>= 2.1.2) - hana (1.3.6) + hana (1.3.7) hashie (3.6.0) - http-cookie (1.0.3) + http-cookie (1.0.4) domain_name (~> 0.5) httpclient (2.8.3) - i18n (1.8.5) + i18n (1.8.10) concurrent-ruby (~> 1.0) inifile (3.0.0) inspec (4.22.22) @@ -278,21 +322,20 @@ GEM tty-prompt (~> 0.17) tty-table (~> 0.10) jmespath (1.4.0) - json (2.3.1) + json (2.5.1) json_schemer (0.2.11) ecma-re-validator (~> 0.2) hana (~> 1.3) regexp_parser (~> 1.5) uri_template (~> 0.7) - jwt (2.2.2) - kitchen-inspec (2.2.1) - hashie (~> 3.4) + jwt (2.2.3) + kitchen-inspec (2.5.0) + hashie (>= 3.4, <= 5.0) inspec (>= 2.2.64, < 5.0) - test-kitchen (>= 2.7, < 3) + test-kitchen (>= 2.7, < 4) kitchen-salt (0.6.3) hashie (>= 3.5) test-kitchen (>= 1.4) - libyajl2 (1.2.0) license-acceptance (1.0.19) pastel (~> 0.7) tomlrb (~> 1.2) @@ -304,16 +347,16 @@ GEM multi_json (~> 1.14) memoist (0.16.2) method_source (1.0.0) - mini_mime (1.0.2) - minitest (5.14.2) + mini_mime (1.1.0) + minitest (5.14.4) mixlib-config (3.0.9) tomlrb - mixlib-install (3.12.3) + mixlib-install (3.12.11) mixlib-shellout mixlib-versioning thor mixlib-log (3.0.9) - mixlib-shellout (3.1.6) + mixlib-shellout (3.2.5) chef-utils mixlib-versioning (1.2.12) ms_rest (0.7.6) @@ -334,52 +377,54 @@ GEM net-ssh (>= 4.0.0) nori (2.6.0) os (1.1.1) - parallel (1.19.2) + parallel (1.20.1) parslet (1.8.2) pastel (0.8.0) tty-color (~> 0.5) - pry (0.13.1) + pry (0.14.1) coderay (~> 1.1) method_source (~> 1.0) public_suffix (4.0.6) regexp_parser (1.8.2) - representable (3.0.4) + representable (3.1.1) declarative (< 0.1.0) - declarative-option (< 0.2.0) + trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rspec (3.9.0) - rspec-core (~> 3.9.0) - rspec-expectations (~> 3.9.0) - rspec-mocks (~> 3.9.0) - rspec-core (3.9.3) - rspec-support (~> 3.9.3) - rspec-expectations (3.9.3) + rexml (3.2.5) + rspec (3.10.0) + rspec-core (~> 3.10.0) + rspec-expectations (~> 3.10.0) + rspec-mocks (~> 3.10.0) + rspec-core (3.10.1) + rspec-support (~> 3.10.0) + rspec-expectations (3.10.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) + rspec-support (~> 3.10.0) rspec-its (1.3.0) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) - rspec-mocks (3.9.1) + rspec-mocks (3.10.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-support (3.9.4) - rubyntlm (0.6.2) + rspec-support (~> 3.10.0) + rspec-support (3.10.2) + rubyntlm (0.6.3) rubyzip (1.3.0) semverse (3.0.0) - signet (0.14.0) + signet (0.15.0) addressable (~> 2.3) faraday (>= 0.17.3, < 2.0) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) sslshake (1.3.1) - strings (0.2.0) + strings (0.2.1) strings-ansi (~> 0.2) - unicode-display_width (~> 1.5) + unicode-display_width (>= 1.5, < 3.0) unicode_utils (~> 1.4) strings-ansi (0.2.0) - test-kitchen (2.7.2) + test-kitchen (3.0.0) bcrypt_pbkdf (~> 1.0) + chef-utils (>= 16.4.35) ed25519 (~> 1.2) license-acceptance (>= 1.0.11, < 3.0) mixlib-install (~> 3.6) @@ -391,28 +436,30 @@ GEM winrm (~> 2.0) winrm-elevated (~> 1.0) winrm-fs (~> 1.1) - thor (1.0.1) - thread_safe (0.3.6) + thor (1.1.0) timeliness (0.3.10) tomlrb (1.2.9) - train (3.3.27) - activesupport (>= 5.2.4.3, < 6.0.0) + trailblazer-option (0.1.1) + train (3.7.4) + activesupport (>= 6.0.3.1) azure_graph_rbac (~> 0.16) azure_mgmt_key_vault (~> 0.17) azure_mgmt_resources (~> 0.15) azure_mgmt_security (~> 0.18) azure_mgmt_storage (~> 0.18) docker-api (>= 1.26, < 3.0) - google-api-client (>= 0.23.9, < 0.44.1) - googleauth (>= 0.6.6, < 0.13.1) + google-api-client (>= 0.23.9, <= 0.52.0) + googleauth (>= 0.6.6, <= 0.14.0) inifile (~> 3.0) - train-core (= 3.3.27) + train-core (= 3.7.4) train-winrm (~> 0.2) - train-aws (0.1.18) + train-aws (0.2.8) aws-sdk-apigateway (~> 1.0) aws-sdk-apigatewayv2 (~> 1.0) + aws-sdk-applicationautoscaling (>= 1.46, < 1.52) aws-sdk-athena (~> 1.0) - aws-sdk-autoscaling (~> 1.22.0) + aws-sdk-autoscaling (>= 1.22, < 1.62) + aws-sdk-batch (>= 1.36, < 1.48) aws-sdk-budgets (~> 1.0) aws-sdk-cloudformation (~> 1.0) aws-sdk-cloudfront (~> 1.0) @@ -420,16 +467,21 @@ GEM aws-sdk-cloudhsmv2 (~> 1.0) aws-sdk-cloudtrail (~> 1.8) aws-sdk-cloudwatch (~> 1.13) + aws-sdk-cloudwatchevents (>= 1.36, < 1.47) aws-sdk-cloudwatchlogs (~> 1.13) aws-sdk-codecommit (~> 1.0) aws-sdk-codedeploy (~> 1.0) aws-sdk-codepipeline (~> 1.0) + aws-sdk-cognitoidentity (>= 1.26, < 1.32) + aws-sdk-cognitoidentityprovider (>= 1.46, < 1.52) aws-sdk-configservice (~> 1.21) aws-sdk-core (~> 3.0) aws-sdk-costandusagereportservice (~> 1.6) + aws-sdk-databasemigrationservice (>= 1.42, < 1.54) aws-sdk-dynamodb (~> 1.31) aws-sdk-ec2 (~> 1.70) aws-sdk-ecr (~> 1.18) + aws-sdk-ecrpublic (~> 1.3) aws-sdk-ecs (~> 1.30) aws-sdk-efs (~> 1.0) aws-sdk-eks (~> 1.9) @@ -438,48 +490,56 @@ GEM aws-sdk-elasticloadbalancing (~> 1.8) aws-sdk-elasticloadbalancingv2 (~> 1.0) aws-sdk-elasticsearchservice (~> 1.0) + aws-sdk-eventbridge (~> 1.24.0) aws-sdk-firehose (~> 1.0) + aws-sdk-glue (>= 1.71, < 1.88) aws-sdk-guardduty (~> 1.31) aws-sdk-iam (~> 1.13) aws-sdk-kafka (~> 1.0) aws-sdk-kinesis (~> 1.0) aws-sdk-kms (~> 1.13) aws-sdk-lambda (~> 1.0) - aws-sdk-organizations (~> 1.17.0) + aws-sdk-organizations (>= 1.17, < 1.60) + aws-sdk-ram (>= 1.21, < 1.26) aws-sdk-rds (~> 1.43) aws-sdk-redshift (~> 1.0) aws-sdk-route53 (~> 1.0) aws-sdk-route53domains (~> 1.0) aws-sdk-route53resolver (~> 1.0) aws-sdk-s3 (~> 1.30) + aws-sdk-secretsmanager (>= 1.42, < 1.47) aws-sdk-securityhub (~> 1.0) + aws-sdk-servicecatalog (>= 1.48, < 1.60) aws-sdk-ses (~> 1.0) + aws-sdk-shield (~> 1.30) aws-sdk-sms (~> 1.0) aws-sdk-sns (~> 1.9) aws-sdk-sqs (~> 1.10) aws-sdk-ssm (~> 1.0) - train-core (3.3.27) + aws-sdk-states (>= 1.35, < 1.40) + aws-sdk-transfer (>= 1.26, < 1.33) + train-core (3.7.4) addressable (~> 2.5) ffi (!= 1.13.0) json (>= 1.8, < 3.0) mixlib-shellout (>= 2.0, < 4.0) net-scp (>= 1.2, < 4.0) net-ssh (>= 2.9, < 7.0) - train-habitat (0.2.13) - train-winrm (0.2.11) - winrm (~> 2.0) + train-habitat (0.2.22) + train-winrm (0.2.12) + winrm (>= 2.3.6, < 3.0) winrm-elevated (~> 1.2.2) winrm-fs (~> 1.0) - tty-box (0.6.0) + tty-box (0.7.0) pastel (~> 0.8) strings (~> 0.2.0) tty-cursor (~> 0.7) - tty-color (0.5.2) + tty-color (0.6.0) tty-cursor (0.7.1) - tty-prompt (0.22.0) + tty-prompt (0.23.1) pastel (~> 0.8) tty-reader (~> 0.8) - tty-reader (0.8.0) + tty-reader (0.9.0) tty-cursor (~> 0.7) tty-screen (~> 0.8) wisper (~> 2.0) @@ -488,16 +548,16 @@ GEM pastel (~> 0.8) strings (~> 0.2.0) tty-screen (~> 0.8) - tzinfo (1.2.7) - thread_safe (~> 0.1) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) uber (0.1.0) unf (0.1.4) unf_ext unf_ext (0.0.7.7) - unicode-display_width (1.7.0) + unicode-display_width (2.0.0) unicode_utils (1.4.0) uri_template (0.7.0) - winrm (2.3.5) + winrm (2.3.6) builder (>= 2.1.2) erubi (~> 1.8) gssapi (~> 1.2) @@ -505,8 +565,8 @@ GEM httpclient (~> 2.2, >= 2.2.0.2) logging (>= 1.6.1, < 3.0) nori (~> 2.0) - rubyntlm (~> 0.6.0, >= 0.6.1) - winrm-elevated (1.2.2) + rubyntlm (~> 0.6.0, >= 0.6.3) + winrm-elevated (1.2.3) erubi (~> 1.8) winrm (~> 2.0) winrm-fs (~> 1.0) @@ -516,6 +576,7 @@ GEM rubyzip (~> 1.1) winrm (~> 2.0) wisper (2.0.1) + zeitwerk (2.4.2) PLATFORMS ruby @@ -523,7 +584,7 @@ PLATFORMS DEPENDENCIES inspec (~> 4.22.22) kitchen-docker! - kitchen-inspec (>= 2.2.1) + kitchen-inspec (>= 2.5.0) kitchen-salt (>= 0.6.3) BUNDLED WITH diff --git a/kitchen.yml b/kitchen.yml index f3192fb..200215f 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 f51d4ba4ced7d7a6b13da091b838e60a16be7d1b Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 17 Jul 2021 21:10:24 +0100 Subject: [PATCH 06/14] 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 200215f..f0ce44a 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: mysql + 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: mysql - salt_copy_filter: - - .kitchen - - .git verifier: # https://www.inspec.io/ From ee34e48fae56a5ca06557d8997e47d100eef8c48 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sun, 18 Jul 2021 19:02:26 +0100 Subject: [PATCH 07/14] ci: add Debian 11 Bullseye & update `yamllint` configuration [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/345 --- .gitlab-ci.yml | 4 ++++ .travis.yml | 4 ++++ .yamllint | 16 +++++++++------- kitchen.yml | 16 ++++++++++++++++ 4 files changed, 33 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cea0765..dda5397 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -123,6 +123,7 @@ rubocop: ## Define the rest of the matrix based on Kitchen testing # Make sure the instances listed below match up with # the `platforms` defined in `kitchen.yml` +# 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 +135,7 @@ 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'} default-debian-10-master-py3: {extends: '.test_instance'} default-debian-9-master-py3: {extends: '.test_instance'} default-ubuntu-2004-master-py3: {extends: '.test_instance'} @@ -153,6 +155,7 @@ default-ubuntu-1804-master-py3: {extends: '.test_instance'} # default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'} # default-almalinux-8-master-py3: {extends: '.test_instance'} # default-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'} @@ -170,6 +173,7 @@ default-ubuntu-1804-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 4f7cc76..46d3925 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,7 @@ 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=default-debian-10-master-py3 - env: INSTANCE=default-debian-9-master-py3 - env: INSTANCE=default-ubuntu-2004-master-py3 @@ -113,6 +115,7 @@ jobs: # - env: INSTANCE=default-gentoo-stage3-systemd-master-py3 # - env: INSTANCE=default-almalinux-8-master-py3 # - env: INSTANCE=default-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 @@ -130,6 +133,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 79d4cf0..3720973 100644 --- a/.yamllint +++ b/.yamllint @@ -5,14 +5,16 @@ 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 -# 7. Any YAML files using Jinja (result in `yamllint` syntax errors) +# 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 +# 8. Any YAML files using Jinja (result in `yamllint` syntax errors) ignore: | + .bundle/ .cache/ .git/ node_modules/ diff --git a/kitchen.yml b/kitchen.yml index f0ce44a..55ffb50 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 From 70eeed80c1b0ce0dfd1ffe539b5e0be6ba5415fd Mon Sep 17 00:00:00 2001 From: sticky-note Date: Mon, 19 Jul 2021 12:01:13 +1100 Subject: [PATCH 08/14] feat(freebsd): update packages from ``py37-*`` => ``py38-*`` --- mysql/osfamilymap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql/osfamilymap.yaml b/mysql/osfamilymap.yaml index e95b7a0..c4ee9fe 100644 --- a/mysql/osfamilymap.yaml +++ b/mysql/osfamilymap.yaml @@ -208,7 +208,7 @@ FreeBSD: serverpkg: mysql57-server clientpkg: mysql57-client service: mysql-server - pythonpkg: py37-pymysql + pythonpkg: py38-pymysql devpkg: mysql57-server config: From bac7ff2d3f05e5d86df0eb6a6206129ad63ccb9e Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Mon, 19 Jul 2021 14:53:47 +0000 Subject: [PATCH 09/14] chore(release): 0.56.0 [skip ci] # [0.56.0](https://github.com/saltstack-formulas/mysql-formula/compare/v0.55.2...v0.56.0) (2021-07-19) ### Continuous Integration * add Debian 11 Bullseye & update `yamllint` configuration [skip ci] ([ee34e48](https://github.com/saltstack-formulas/mysql-formula/commit/ee34e48fae56a5ca06557d8997e47d100eef8c48)) * **3003.1:** update inc. AlmaLinux, Rocky & `rst-lint` [skip ci] ([4d5e6d9](https://github.com/saltstack-formulas/mysql-formula/commit/4d5e6d9e1924fdabae726b1ef6cdc58b8dcb331f)) * **kitchen:** move `provisioner` block & update `run_command` [skip ci] ([f51d4ba](https://github.com/saltstack-formulas/mysql-formula/commit/f51d4ba4ced7d7a6b13da091b838e60a16be7d1b)) * **kitchen+gitlab:** remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci] ([13c8450](https://github.com/saltstack-formulas/mysql-formula/commit/13c8450069aad9bf1ff25a0c7870a82d5a0b3e7f)) * add `arch-master` to matrix and update `.travis.yml` [skip ci] ([8dbff38](https://github.com/saltstack-formulas/mysql-formula/commit/8dbff388203b9b6156d07e6cc4bb6558c7ad72e0)) ### Features * **freebsd:** update packages from ``py37-*`` => ``py38-*`` ([70eeed8](https://github.com/saltstack-formulas/mysql-formula/commit/70eeed80c1b0ce0dfd1ffe539b5e0be6ba5415fd)) * **osfingermap:** add support for `Debian 11` [skip ci] ([3ea9b34](https://github.com/saltstack-formulas/mysql-formula/commit/3ea9b347590e6f15761d07567a7640d138f74128)) --- AUTHORS.md | 6 +++--- CHANGELOG.md | 17 +++++++++++++++++ FORMULA | 2 +- docs/AUTHORS.rst | 10 +++++----- docs/CHANGELOG.rst | 20 ++++++++++++++++++++ 5 files changed, 46 insertions(+), 9 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index 79a8dac..21d83bc 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -4,7 +4,7 @@ This list is sorted by the number of commits per contributor in _descending_ ord Avatar|Contributor|Contributions :-:|---|:-: -@myii|[@myii](https://github.com/myii)|85 +@myii|[@myii](https://github.com/myii)|95 @gravyboat|[@gravyboat](https://github.com/gravyboat)|38 @aboe76|[@aboe76](https://github.com/aboe76)|37 @noelmcloughlin|[@noelmcloughlin](https://github.com/noelmcloughlin)|30 @@ -23,6 +23,7 @@ Avatar|Contributor|Contributions @thatch45|[@thatch45](https://github.com/thatch45)|4 @tiger-seo|[@tiger-seo](https://github.com/tiger-seo)|4 @gtmanfred|[@gtmanfred](https://github.com/gtmanfred)|4 +@sticky-note|[@sticky-note](https://github.com/sticky-note)|4 @alexhayes|[@alexhayes](https://github.com/alexhayes)|3 @dafyddj|[@dafyddj](https://github.com/dafyddj)|3 @javierbertoli|[@javierbertoli](https://github.com/javierbertoli)|3 @@ -30,7 +31,6 @@ Avatar|Contributor|Contributions @alfonsfoubert|[@alfonsfoubert](https://github.com/alfonsfoubert)|3 @cboltz|[@cboltz](https://github.com/cboltz)|3 @pcdummy|[@pcdummy](https://github.com/pcdummy)|3 -@sticky-note|[@sticky-note](https://github.com/sticky-note)|3 @amontalban|[@amontalban](https://github.com/amontalban)|2 @iggy|[@iggy](https://github.com/iggy)|2 @ogabrielsantos|[@ogabrielsantos](https://github.com/ogabrielsantos)|2 @@ -88,4 +88,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-05-07. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-07-19. diff --git a/CHANGELOG.md b/CHANGELOG.md index 56b7d82..aba480d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,22 @@ # Changelog +# [0.56.0](https://github.com/saltstack-formulas/mysql-formula/compare/v0.55.2...v0.56.0) (2021-07-19) + + +### Continuous Integration + +* add Debian 11 Bullseye & update `yamllint` configuration [skip ci] ([ee34e48](https://github.com/saltstack-formulas/mysql-formula/commit/ee34e48fae56a5ca06557d8997e47d100eef8c48)) +* **3003.1:** update inc. AlmaLinux, Rocky & `rst-lint` [skip ci] ([4d5e6d9](https://github.com/saltstack-formulas/mysql-formula/commit/4d5e6d9e1924fdabae726b1ef6cdc58b8dcb331f)) +* **kitchen:** move `provisioner` block & update `run_command` [skip ci] ([f51d4ba](https://github.com/saltstack-formulas/mysql-formula/commit/f51d4ba4ced7d7a6b13da091b838e60a16be7d1b)) +* **kitchen+gitlab:** remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci] ([13c8450](https://github.com/saltstack-formulas/mysql-formula/commit/13c8450069aad9bf1ff25a0c7870a82d5a0b3e7f)) +* add `arch-master` to matrix and update `.travis.yml` [skip ci] ([8dbff38](https://github.com/saltstack-formulas/mysql-formula/commit/8dbff388203b9b6156d07e6cc4bb6558c7ad72e0)) + + +### Features + +* **freebsd:** update packages from ``py37-*`` => ``py38-*`` ([70eeed8](https://github.com/saltstack-formulas/mysql-formula/commit/70eeed80c1b0ce0dfd1ffe539b5e0be6ba5415fd)) +* **osfingermap:** add support for `Debian 11` [skip ci] ([3ea9b34](https://github.com/saltstack-formulas/mysql-formula/commit/3ea9b347590e6f15761d07567a7640d138f74128)) + ## [0.55.2](https://github.com/saltstack-formulas/mysql-formula/compare/v0.55.1...v0.55.2) (2021-05-07) diff --git a/FORMULA b/FORMULA index 9f2b458..55108ca 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: mysql os: RedHat, CentOS, Debian, Ubuntu, Suse, Gentoo, FreeBSD os_family: RedHat, Debian, Suse, Gentoo, FreeBSD -version: 0.55.2 +version: 0.56.0 release: 1 minimum_version: 2015.8 summary: Formula for installing MySQL diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index cd40532..5a262bc 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 `_ - - 85 + - 95 * - :raw-html-m2r:`@gravyboat` - `@gravyboat `_ - 38 @@ -70,6 +70,9 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@gtmanfred` - `@gtmanfred `_ - 4 + * - :raw-html-m2r:`@sticky-note` + - `@sticky-note `_ + - 4 * - :raw-html-m2r:`@alexhayes` - `@alexhayes `_ - 3 @@ -91,9 +94,6 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@pcdummy` - `@pcdummy `_ - 3 - * - :raw-html-m2r:`@sticky-note` - - `@sticky-note `_ - - 3 * - :raw-html-m2r:`@amontalban` - `@amontalban `_ - 2 @@ -260,4 +260,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-05-07. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2021-07-19. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 1ff8c76..2a565b0 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,26 @@ Changelog ========= +`0.56.0 `_ (2021-07-19) +---------------------------------------------------------------------------------------------------------- + +Continuous Integration +^^^^^^^^^^^^^^^^^^^^^^ + + +* add Debian 11 Bullseye & update ``yamllint`` configuration [skip ci] (\ `ee34e48 `_\ ) +* **3003.1:** update inc. AlmaLinux, Rocky & ``rst-lint`` [skip ci] (\ `4d5e6d9 `_\ ) +* **kitchen:** move ``provisioner`` block & update ``run_command`` [skip ci] (\ `f51d4ba `_\ ) +* **kitchen+gitlab:** remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci] (\ `13c8450 `_\ ) +* add ``arch-master`` to matrix and update ``.travis.yml`` [skip ci] (\ `8dbff38 `_\ ) + +Features +^^^^^^^^ + + +* **freebsd:** update packages from ``py37-*`` => ``py38-*`` (\ `70eeed8 `_\ ) +* **osfingermap:** add support for ``Debian 11`` [skip ci] (\ `3ea9b34 `_\ ) + `0.55.2 `_ (2021-05-07) ---------------------------------------------------------------------------------------------------------- From 8c8025f9a5201ed86a6244d8ebd63b7f36a7e66d Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 21 Jul 2021 18:31:11 +0100 Subject: [PATCH 10/14] chore(gemfile.lock): update to latest gem versions (2021-W29) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/349 --- Gemfile.lock | 12 ++++++------ test/integration/share/libraries/system.rb | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4e0ccc9..7919fa7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -18,7 +18,7 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.1.1) - aws-partitions (1.478.0) + aws-partitions (1.479.0) aws-sdk-apigateway (1.62.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) @@ -96,7 +96,7 @@ GEM aws-sdk-dynamodb (1.60.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.248.0) + aws-sdk-ec2 (1.250.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.42.0) @@ -105,7 +105,7 @@ GEM aws-sdk-ecrpublic (1.3.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.80.0) + aws-sdk-ecs (1.81.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sdk-efs (1.40.0) @@ -147,7 +147,7 @@ GEM aws-sdk-kafka (1.36.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-kinesis (1.32.0) + aws-sdk-kinesis (1.32.1) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sdk-kms (1.44.0) @@ -177,7 +177,7 @@ GEM aws-sdk-route53resolver (1.26.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.96.1) + aws-sdk-s3 (1.96.2) aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -253,7 +253,7 @@ GEM regexp_parser (~> 1.2) ed25519 (1.2.4) erubi (1.10.0) - excon (0.84.0) + excon (0.85.0) faraday (0.17.4) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.7) diff --git a/test/integration/share/libraries/system.rb b/test/integration/share/libraries/system.rb index 87daf08..af65449 100644 --- a/test/integration/share/libraries/system.rb +++ b/test/integration/share/libraries/system.rb @@ -49,7 +49,7 @@ class SystemResource < Inspec.resource(1) 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 dbc775619b32827c8e471b54e0349626c566248e Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 26 Jul 2021 14:28:14 +0100 Subject: [PATCH 11/14] chore(gemfile.lock): update to latest gem versions (2021-W30) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/353 --- Gemfile.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7919fa7..5c05698 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -96,7 +96,7 @@ GEM aws-sdk-dynamodb (1.60.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.250.0) + aws-sdk-ec2 (1.251.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.42.0) @@ -123,7 +123,7 @@ GEM aws-sdk-elasticloadbalancing (1.31.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancingv2 (1.62.0) + aws-sdk-elasticloadbalancingv2 (1.64.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sdk-elasticsearchservice (1.52.0) @@ -141,7 +141,7 @@ GEM aws-sdk-guardduty (1.45.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.56.0) + aws-sdk-iam (1.57.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sdk-kafka (1.36.0) @@ -153,7 +153,7 @@ GEM aws-sdk-kms (1.44.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.63.0) + aws-sdk-lambda (1.64.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sdk-organizations (1.59.0) @@ -162,7 +162,7 @@ GEM aws-sdk-ram (1.25.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-rds (1.121.0) + aws-sdk-rds (1.122.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sdk-redshift (1.65.0) @@ -184,7 +184,7 @@ GEM aws-sdk-secretsmanager (1.46.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-securityhub (1.47.0) + aws-sdk-securityhub (1.48.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sdk-servicecatalog (1.59.0) @@ -228,9 +228,9 @@ GEM ms_rest_azure (~> 0.12.0) bcrypt_pbkdf (1.1.0) builder (3.2.4) - chef-config (17.2.29) + chef-config (17.3.48) addressable - chef-utils (= 17.2.29) + chef-utils (= 17.3.48) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -238,7 +238,7 @@ GEM chef-telemetry (1.0.29) chef-config concurrent-ruby (~> 1.0) - chef-utils (17.2.29) + chef-utils (17.3.48) concurrent-ruby coderay (1.1.3) concurrent-ruby (1.1.9) From 598b23462c5a1822d0504451e81055b4009889df Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 4 Aug 2021 21:37:38 +0100 Subject: [PATCH 12/14] chore(gemfile.lock): update to latest gem versions (2021-W31) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/356 --- Gemfile.lock | 208 +++++++++++++++++++++++++-------------------------- 1 file changed, 104 insertions(+), 104 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5c05698..18134ba 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker - revision: 1f543f654da5c1774cb8737f6f07a01745520bb5 + revision: 428c89fc250b3790abad5ecb0afe0c3d4956084c branch: ssf specs: - kitchen-docker (2.10.0) + kitchen-docker (2.11.0) test-kitchen (>= 1.0.0) GEM @@ -18,18 +18,18 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.1.1) - aws-partitions (1.479.0) - aws-sdk-apigateway (1.62.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-partitions (1.482.0) + aws-sdk-apigateway (1.64.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-apigatewayv2 (1.32.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-apigatewayv2 (1.34.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-applicationautoscaling (1.51.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-athena (1.37.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-athena (1.39.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-autoscaling (1.61.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -37,41 +37,41 @@ GEM aws-sdk-batch (1.47.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-budgets (1.38.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-budgets (1.40.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudformation (1.53.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-cloudformation (1.55.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudfront (1.53.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-cloudfront (1.55.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsm (1.30.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-cloudhsm (1.32.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsmv2 (1.33.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-cloudhsmv2 (1.35.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudtrail (1.35.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-cloudtrail (1.37.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatch (1.51.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-cloudwatch (1.54.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-cloudwatchevents (1.46.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatchlogs (1.41.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-cloudwatchlogs (1.43.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-codecommit (1.42.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-codecommit (1.44.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-codedeploy (1.40.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-codedeploy (1.42.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-codepipeline (1.44.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-codepipeline (1.46.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-cognitoidentity (1.31.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -79,82 +79,82 @@ GEM aws-sdk-cognitoidentityprovider (1.51.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-configservice (1.62.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-configservice (1.64.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.117.0) + aws-sdk-core (3.119.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-costandusagereportservice (1.31.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-costandusagereportservice (1.33.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-databasemigrationservice (1.53.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-dynamodb (1.60.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-dynamodb (1.62.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.251.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-ec2 (1.254.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-ecr (1.42.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-ecr (1.44.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-ecrpublic (1.3.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-ecrpublic (1.5.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.81.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-ecs (1.83.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-efs (1.40.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-efs (1.42.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-eks (1.58.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-eks (1.60.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.57.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-elasticache (1.59.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticbeanstalk (1.42.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-elasticbeanstalk (1.44.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancing (1.31.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-elasticloadbalancing (1.33.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancingv2 (1.64.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-elasticloadbalancingv2 (1.66.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticsearchservice (1.52.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-elasticsearchservice (1.54.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-eventbridge (1.24.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-firehose (1.37.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-firehose (1.39.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-glue (1.87.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-guardduty (1.45.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-guardduty (1.47.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.57.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-iam (1.59.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-kafka (1.36.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-kafka (1.38.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-kinesis (1.32.1) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-kinesis (1.34.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.44.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-kms (1.46.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.64.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-lambda (1.66.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-organizations (1.59.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -162,51 +162,51 @@ GEM aws-sdk-ram (1.25.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-rds (1.122.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-rds (1.124.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.65.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-redshift (1.68.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-route53 (1.49.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-route53 (1.52.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-route53domains (1.30.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-route53domains (1.32.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-route53resolver (1.26.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-route53resolver (1.28.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.96.2) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-s3 (1.98.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) aws-sdk-secretsmanager (1.46.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-securityhub (1.48.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-securityhub (1.50.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-servicecatalog (1.59.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-ses (1.38.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-ses (1.40.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-shield (1.37.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-shield (1.40.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-sms (1.29.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-sms (1.31.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-sns (1.42.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-sns (1.44.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-sqs (1.40.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-sqs (1.42.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.112.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-ssm (1.114.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-states (1.39.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -235,7 +235,7 @@ GEM mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) tomlrb (~> 1.2) - chef-telemetry (1.0.29) + chef-telemetry (1.1.1) chef-config concurrent-ruby (~> 1.0) chef-utils (17.3.48) @@ -440,7 +440,7 @@ GEM timeliness (0.3.10) tomlrb (1.2.9) trailblazer-option (0.1.1) - train (3.7.4) + train (3.8.1) activesupport (>= 6.0.3.1) azure_graph_rbac (~> 0.16) azure_mgmt_key_vault (~> 0.17) @@ -451,7 +451,7 @@ GEM google-api-client (>= 0.23.9, <= 0.52.0) googleauth (>= 0.6.6, <= 0.14.0) inifile (~> 3.0) - train-core (= 3.7.4) + train-core (= 3.8.1) train-winrm (~> 0.2) train-aws (0.2.8) aws-sdk-apigateway (~> 1.0) @@ -518,7 +518,7 @@ GEM aws-sdk-ssm (~> 1.0) aws-sdk-states (>= 1.35, < 1.40) aws-sdk-transfer (>= 1.26, < 1.33) - train-core (3.7.4) + train-core (3.8.1) addressable (~> 2.5) ffi (!= 1.13.0) json (>= 1.8, < 3.0) From 8f91b4f3ecd2b9c9ee862aa607993f5b81ef4d6c Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 4 Aug 2021 21:54:46 +0100 Subject: [PATCH 13/14] ci(gemfile+lock): use `ssf` customised `inspec` repo [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/357 --- Gemfile | 15 ++++--- Gemfile.lock | 118 ++++++++++++++++++++++++++++----------------------- 2 files changed, 75 insertions(+), 58 deletions(-) diff --git a/Gemfile b/Gemfile index 9774aac..1fc06c5 100644 --- a/Gemfile +++ b/Gemfile @@ -2,13 +2,18 @@ source 'https://rubygems.org' -# Use the latest version of `inspec` prior to `4.23.4`, which introduces a -# regression where the diff isn't displayed when comparing using `eq`. -gem 'inspec', '~> 4.22.22' -# Install the `kitchen-docker` gem using `git` because the latest version -# currently available (`2.10.0`) doesn't include a recent fix for Gentoo. +# Install the `inspec` gem using `git` because versions after `4.22.22` +# suppress diff output; this version fixes this for our uses. +# rubocop:disable Layout/LineLength +gem 'inspec', git: 'https://gitlab.com/saltstack-formulas/infrastructure/inspec', branch: 'ssf' +# rubocop:enable Layout/LineLength + +# Install the `kitchen-docker` gem using `git` in order to gain a performance +# improvement: avoid package installations which are already covered by the +# `salt-image-builder` (i.e. the pre-salted images that we're using) # rubocop:disable Layout/LineLength gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker', branch: 'ssf' # rubocop:enable Layout/LineLength + gem 'kitchen-inspec', '>= 2.5.0' gem 'kitchen-salt', '>= 0.6.3' diff --git a/Gemfile.lock b/Gemfile.lock index 18134ba..d9395ac 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,40 @@ +GIT + remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec + revision: 1dfd086de2d2ba87fd755b0c9063b43ab682519d + branch: ssf + specs: + inspec (4.41.0) + faraday_middleware (>= 0.12.2, < 1.1) + inspec-core (= 4.41.0) + mongo + train (~> 3.0) + train-aws (~> 0.1) + train-habitat (~> 0.1) + train-winrm (~> 0.2) + inspec-core (4.41.0) + addressable (~> 2.4) + chef-telemetry (~> 1.0, >= 1.0.8) + faraday (>= 0.9.0, < 1.5) + faraday_middleware (~> 1.0) + hashie (>= 3.4, < 5.0) + license-acceptance (>= 0.2.13, < 3.0) + method_source (>= 0.8, < 2.0) + mixlib-log (~> 3.0) + multipart-post (~> 2.0) + parallel (~> 1.9) + parslet (>= 1.5, < 2.0) + pry (~> 0.13) + rspec (>= 3.9, < 3.11) + rspec-its (~> 1.2) + rubyzip (>= 1.2.2, < 3.0) + semverse (~> 3.0) + sslshake (~> 1.2) + thor (>= 0.20, < 2.0) + tomlrb (>= 1.2, < 2.1) + train-core (~> 3.0) + tty-prompt (~> 0.17) + tty-table (~> 0.10) + GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker revision: 428c89fc250b3790abad5ecb0afe0c3d4956084c @@ -227,6 +264,7 @@ GEM azure_mgmt_storage (0.23.0) ms_rest_azure (~> 0.12.0) bcrypt_pbkdf (1.1.0) + bson (4.12.1) builder (3.2.4) chef-config (17.3.48) addressable @@ -249,18 +287,27 @@ GEM multi_json domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - ecma-re-validator (0.2.1) - regexp_parser (~> 1.2) ed25519 (1.2.4) erubi (1.10.0) excon (0.85.0) - faraday (0.17.4) + faraday (1.4.3) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.1) multipart-post (>= 1.2, < 3) + ruby2_keywords (>= 0.0.4) faraday-cookie_jar (0.0.7) faraday (>= 0.8.0) http-cookie (~> 1.0.0) - faraday_middleware (0.12.2) - faraday (>= 0.7.4, < 1.0) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday_middleware (1.0.0) + faraday (~> 1.0) ffi (1.15.3) fuzzyurl (0.9.0) google-api-client (0.52.0) @@ -283,51 +330,15 @@ GEM ffi (>= 1.0.1) gyoku (1.3.1) builder (>= 2.1.2) - hana (1.3.7) - hashie (3.6.0) + hashie (4.1.0) http-cookie (1.0.4) domain_name (~> 0.5) httpclient (2.8.3) i18n (1.8.10) concurrent-ruby (~> 1.0) inifile (3.0.0) - inspec (4.22.22) - faraday_middleware (~> 0.12.2) - inspec-core (= 4.22.22) - train (~> 3.0) - train-aws (~> 0.1) - train-habitat (~> 0.1) - train-winrm (~> 0.2) - inspec-core (4.22.22) - addressable (~> 2.4) - chef-telemetry (~> 1.0) - faraday (>= 0.9.0) - hashie (~> 3.4) - json_schemer (>= 0.2.1, < 0.2.12) - license-acceptance (>= 0.2.13, < 2.0) - method_source (>= 0.8, < 2.0) - mixlib-log (~> 3.0) - multipart-post (~> 2.0) - parallel (~> 1.9) - parslet (~> 1.5) - pry (~> 0.13) - rspec (~> 3.9) - rspec-its (~> 1.2) - rubyzip (~> 1.2, >= 1.2.2) - semverse (~> 3.0) - sslshake (~> 1.2) - thor (>= 0.20, < 2.0) - tomlrb (~> 1.2.0) - train-core (~> 3.0) - tty-prompt (~> 0.17) - tty-table (~> 0.10) jmespath (1.4.0) json (2.5.1) - json_schemer (0.2.11) - ecma-re-validator (~> 0.2) - hana (~> 1.3) - regexp_parser (~> 1.5) - uri_template (~> 0.7) jwt (2.2.3) kitchen-inspec (2.5.0) hashie (>= 3.4, <= 5.0) @@ -336,11 +347,11 @@ GEM kitchen-salt (0.6.3) hashie (>= 3.5) test-kitchen (>= 1.4) - license-acceptance (1.0.19) + license-acceptance (2.1.13) pastel (~> 0.7) - tomlrb (~> 1.2) - tty-box (~> 0.3) - tty-prompt (~> 0.18) + tomlrb (>= 1.2, < 3.0) + tty-box (~> 0.6) + tty-prompt (~> 0.20) little-plugger (1.1.4) logging (2.3.0) little-plugger (~> 1.1) @@ -359,6 +370,8 @@ GEM mixlib-shellout (3.2.5) chef-utils mixlib-versioning (1.2.12) + mongo (2.15.0) + bson (>= 4.8.2, < 5.0.0) ms_rest (0.7.6) concurrent-ruby (~> 1.0) faraday (>= 0.9, < 2.0.0) @@ -385,7 +398,6 @@ GEM coderay (~> 1.1) method_source (~> 1.0) public_suffix (4.0.6) - regexp_parser (1.8.2) representable (3.1.1) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) @@ -408,8 +420,9 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.2) + ruby2_keywords (0.0.5) rubyntlm (0.6.3) - rubyzip (1.3.0) + rubyzip (2.3.2) semverse (3.0.0) signet (0.15.0) addressable (~> 2.3) @@ -438,7 +451,7 @@ GEM winrm-fs (~> 1.1) thor (1.1.0) timeliness (0.3.10) - tomlrb (1.2.9) + tomlrb (1.3.0) trailblazer-option (0.1.1) train (3.8.1) activesupport (>= 6.0.3.1) @@ -556,7 +569,6 @@ GEM unf_ext (0.0.7.7) unicode-display_width (2.0.0) unicode_utils (1.4.0) - uri_template (0.7.0) winrm (2.3.6) builder (>= 2.1.2) erubi (~> 1.8) @@ -570,10 +582,10 @@ GEM erubi (~> 1.8) winrm (~> 2.0) winrm-fs (~> 1.0) - winrm-fs (1.3.3) + winrm-fs (1.3.5) erubi (~> 1.8) logging (>= 1.6.1, < 3.0) - rubyzip (~> 1.1) + rubyzip (~> 2.0) winrm (~> 2.0) wisper (2.0.1) zeitwerk (2.4.2) @@ -582,7 +594,7 @@ PLATFORMS ruby DEPENDENCIES - inspec (~> 4.22.22) + inspec! kitchen-docker! kitchen-inspec (>= 2.5.0) kitchen-salt (>= 0.6.3) From 89dcb3a5b095ef49ea5fd90887468eaa93857b12 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 9 Aug 2021 12:13:47 +0100 Subject: [PATCH 14/14] chore(gemfile.lock): update to latest gem versions (2021-W32) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/358 --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index d9395ac..6e72407 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -55,7 +55,7 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.1.1) - aws-partitions (1.482.0) + aws-partitions (1.484.0) aws-sdk-apigateway (1.64.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) @@ -65,7 +65,7 @@ GEM aws-sdk-applicationautoscaling (1.51.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-athena (1.39.0) + aws-sdk-athena (1.40.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-autoscaling (1.61.0) @@ -199,7 +199,7 @@ GEM aws-sdk-ram (1.25.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-rds (1.124.0) + aws-sdk-rds (1.125.0) aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) aws-sdk-redshift (1.68.0)