From 1a132d84422218bc12f31890c1a92b51bb3ec71c Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 14 Feb 2022 08:03:53 +0000 Subject: [PATCH 01/31] test(system): add `build_platform_codename` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/415 --- test/integration/share/libraries/system.rb | 44 +++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/test/integration/share/libraries/system.rb b/test/integration/share/libraries/system.rb index 7471ddc..64fe7ea 100644 --- a/test/integration/share/libraries/system.rb +++ b/test/integration/share/libraries/system.rb @@ -4,6 +4,7 @@ # Author: Daniel Dehennin # Copyright (C) 2020 Daniel Dehennin +# rubocop:disable Metrics/ClassLength class SystemResource < Inspec.resource(1) name 'system' @@ -21,7 +22,8 @@ def build_platform family: build_platform_family, name: build_platform_name, release: build_platform_release, - finger: build_platform_finger + finger: build_platform_finger, + codename: build_platform_codename } end @@ -89,4 +91,44 @@ def build_finger_release build_platform_release.split('.')[0] end end + + # rubocop:disable Metrics/MethodLength,Metrics/CyclomaticComplexity + def build_platform_codename + case build_platform_finger + when 'ubuntu-20.04' + 'focal' + when 'ubuntu-18.04' + 'bionic' + when 'debian-11' + 'bullseye' + when 'debian-10' + 'buster' + when 'debian-9' + 'stretch' + when 'almalinux-8' + "AlmaLinux #{build_platform_release} (Arctic Sphynx)" + when 'amazonlinux-2' + 'Amazon Linux 2' + when 'arch-base-latest' + 'Arch Linux' + when 'centos-7' + 'CentOS Linux 7 (Core)' + when 'centos-8' + 'CentOS Stream 8' + when 'opensuse-tumbleweed' + 'openSUSE Tumbleweed' + when 'opensuse-15' + "openSUSE Leap #{build_platform_release}" + when 'oraclelinux-8', 'oraclelinux-7' + "Oracle Linux Server #{build_platform_release}" + when 'gentoo-2-sysd', 'gentoo-2-sysv' + 'Gentoo/Linux' + when 'rockylinux-8' + "Rocky Linux #{build_platform_release} (Green Obsidian)" + else + '' + end + end + # rubocop:enable Metrics/MethodLength,Metrics/CyclomaticComplexity end +# rubocop:enable Metrics/ClassLength From 498ea4fa8e2b37e1d91c89d579805f791fa035f9 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 15 Feb 2022 08:57:41 +0000 Subject: [PATCH 02/31] chore(gemfile.lock): update to latest gem versions (2022-W07) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/416 --- Gemfile.lock | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0975c26..138c044 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,19 +1,19 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 76ec461092da3f08b0e8976df10db6ae687895ab + revision: 8f9d68f8c3ba20abf366af8e735287bf83fb93b1 branch: ssf specs: - inspec (4.55.9) + inspec (4.56.4) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 4.55.9) + inspec-core (= 4.56.4) mongo (= 2.13.2) rake train (~> 3.0) train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.55.9) + inspec-core (4.56.4) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -48,7 +48,7 @@ GIT GEM remote: https://rubygems.org/ specs: - activesupport (7.0.1) + activesupport (7.0.2.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -57,7 +57,7 @@ GEM public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.553.0) + aws-partitions (1.554.0) aws-sdk-alexaforbusiness (1.55.0) aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) @@ -85,7 +85,7 @@ GEM aws-sdk-budgets (1.46.0) aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudformation (1.65.0) + aws-sdk-cloudformation (1.67.0) aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) aws-sdk-cloudfront (1.62.0) @@ -265,13 +265,13 @@ GEM aws-sdk-sms (1.38.0) aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-sns (1.51.0) + aws-sdk-sns (1.52.0) aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) aws-sdk-sqs (1.50.0) aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.129.0) + aws-sdk-ssm (1.130.0) aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) aws-sdk-states (1.39.0) @@ -302,9 +302,9 @@ GEM bcrypt_pbkdf (1.1.0) bson (4.14.1) builder (3.2.4) - chef-config (17.9.42) + chef-config (17.9.46) addressable - chef-utils (= 17.9.42) + chef-utils (= 17.9.46) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -312,7 +312,7 @@ GEM chef-telemetry (1.1.1) chef-config concurrent-ruby (~> 1.0) - chef-utils (17.9.42) + chef-utils (17.9.46) concurrent-ruby coderay (1.1.3) concurrent-ruby (1.1.9) @@ -440,7 +440,7 @@ GEM public_suffix (4.0.6) rainbow (3.1.1) rake (13.0.6) - regexp_parser (2.2.0) + regexp_parser (2.2.1) representable (3.1.1) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) @@ -472,7 +472,7 @@ GEM rubocop-ast (>= 1.15.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.15.1) + rubocop-ast (1.15.2) parser (>= 3.0.1.1) ruby-progressbar (1.11.0) ruby2_keywords (0.0.5) From cbc57d78363ae71e1d9df3a5e335f3953dc36604 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 21 Feb 2022 19:05:14 +0000 Subject: [PATCH 03/31] chore(gemfile.lock): update to latest gem versions (2022-W08) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/419 --- .gitlab-ci.yml | 2 ++ Gemfile.lock | 42 +++++++++++++++++++++--------------------- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5316b7d..f1d9049 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -130,6 +130,7 @@ rubocop: ## Define the rest of the matrix based on Kitchen testing # Make sure the instances listed below match up with # the `platforms` defined in `kitchen.yml` +# yamllint disable rule:line-length # repositories-debian-11-tiamat-py3: {extends: '.test_instance'} # repositories-debian-10-tiamat-py3: {extends: '.test_instance'} # repositories-debian-9-tiamat-py3: {extends: '.test_instance'} @@ -168,6 +169,7 @@ ubuntu-1804-master-py3: {extends: '.test_instance'} # repositories-debian-9-3002-7-py3: {extends: '.test_instance'} # repositories-ubuntu-2004-3002-7-py3: {extends: '.test_instance'} # repositories-ubuntu-1804-3002-7-py3: {extends: '.test_instance'} +# yamllint enable rule:line-length ############################################################################### # `release` stage: `semantic-release` diff --git a/Gemfile.lock b/Gemfile.lock index 138c044..c25b847 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,19 +1,19 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 8f9d68f8c3ba20abf366af8e735287bf83fb93b1 + revision: 1dd91ba6544d9e26c266b055f7648defc89ca9ce branch: ssf specs: - inspec (4.56.4) + inspec (5.0.4) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 4.56.4) + inspec-core (= 5.0.4) mongo (= 2.13.2) rake train (~> 3.0) train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.56.4) + inspec-core (5.0.4) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -57,7 +57,7 @@ GEM public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.554.0) + aws-partitions (1.555.0) aws-sdk-alexaforbusiness (1.55.0) aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) @@ -73,7 +73,7 @@ GEM aws-sdk-applicationautoscaling (1.51.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-athena (1.48.0) + aws-sdk-athena (1.49.0) aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) aws-sdk-autoscaling (1.63.0) @@ -82,7 +82,7 @@ GEM aws-sdk-batch (1.47.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-budgets (1.46.0) + aws-sdk-budgets (1.48.0) aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) aws-sdk-cloudformation (1.67.0) @@ -127,7 +127,7 @@ GEM aws-sdk-configservice (1.73.0) aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.126.0) + aws-sdk-core (3.126.2) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) @@ -141,7 +141,7 @@ GEM aws-sdk-dynamodb (1.72.0) aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.298.0) + aws-sdk-ec2 (1.299.0) aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.53.0) @@ -189,7 +189,7 @@ GEM aws-sdk-guardduty (1.55.0) aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.66.0) + aws-sdk-iam (1.67.0) aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) aws-sdk-kafka (1.48.0) @@ -219,10 +219,10 @@ GEM aws-sdk-ram (1.26.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-rds (1.138.0) + aws-sdk-rds (1.139.0) aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.77.0) + aws-sdk-redshift (1.78.0) aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) aws-sdk-route53 (1.61.0) @@ -271,7 +271,7 @@ GEM aws-sdk-sqs (1.50.0) aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.130.0) + aws-sdk-ssm (1.131.0) aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) aws-sdk-states (1.39.0) @@ -302,9 +302,9 @@ GEM bcrypt_pbkdf (1.1.0) bson (4.14.1) builder (3.2.4) - chef-config (17.9.46) + chef-config (17.9.52) addressable - chef-utils (= 17.9.46) + chef-utils (= 17.9.52) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -312,11 +312,11 @@ GEM chef-telemetry (1.1.1) chef-config concurrent-ruby (~> 1.0) - chef-utils (17.9.46) + chef-utils (17.9.52) concurrent-ruby coderay (1.1.3) concurrent-ruby (1.1.9) - cookstyle (7.31.3) + cookstyle (7.31.7) rubocop (= 1.25.1) declarative (0.0.20) diff-lcs (1.5.0) @@ -372,15 +372,15 @@ GEM http-cookie (1.0.4) domain_name (~> 0.5) httpclient (2.8.3) - i18n (1.9.1) + i18n (1.10.0) concurrent-ruby (~> 1.0) inifile (3.0.0) - jmespath (1.5.0) + jmespath (1.6.0) json (2.6.1) jwt (2.3.0) - kitchen-inspec (2.5.0) + kitchen-inspec (2.5.2) hashie (>= 3.4, <= 5.0) - inspec (>= 2.2.64, < 5.0) + inspec (>= 2.2.64, < 6.0) test-kitchen (>= 2.7, < 4) kitchen-salt (0.7.2) hashie (>= 3.5) From 80e0ef90da1a8964f9d2b917b4319c1400ab5870 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 4 Mar 2022 15:28:09 +0000 Subject: [PATCH 04/31] chore(gemfile.lock): update to latest gem versions (2022-W09) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/421 --- Gemfile.lock | 250 +++++++++++++++++++++++++-------------------------- 1 file changed, 125 insertions(+), 125 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c25b847..10fe0ba 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,19 +1,19 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 1dd91ba6544d9e26c266b055f7648defc89ca9ce + revision: 29c9f7b3a2d3197a368ced0b12bceddf9ff9185a branch: ssf specs: - inspec (5.0.4) + inspec (5.4.1) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 5.0.4) + inspec-core (= 5.4.1) mongo (= 2.13.2) rake train (~> 3.0) train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (5.0.4) + inspec-core (5.4.1) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -26,7 +26,7 @@ GIT parallel (~> 1.9) parslet (>= 1.5, < 2.0) pry (~> 0.13) - rspec (>= 3.9, < 3.11) + rspec (>= 3.9, <= 3.11) rspec-its (~> 1.2) rubyzip (>= 1.2.2, < 3.0) semverse (~> 3.0) @@ -57,24 +57,24 @@ GEM public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.555.0) - aws-sdk-alexaforbusiness (1.55.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-partitions (1.563.0) + aws-sdk-alexaforbusiness (1.56.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-amplify (1.32.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-apigateway (1.74.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-apigateway (1.75.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-apigatewayv2 (1.41.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-apigatewayv2 (1.42.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-applicationautoscaling (1.51.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-athena (1.49.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-athena (1.52.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-autoscaling (1.63.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -82,41 +82,41 @@ GEM aws-sdk-batch (1.47.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-budgets (1.48.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-budgets (1.49.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudformation (1.67.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-cloudformation (1.68.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudfront (1.62.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-cloudfront (1.63.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsm (1.38.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-cloudhsm (1.39.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsmv2 (1.41.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-cloudhsmv2 (1.42.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudtrail (1.46.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-cloudtrail (1.48.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatch (1.61.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-cloudwatch (1.62.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-cloudwatchevents (1.46.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatchlogs (1.51.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-cloudwatchlogs (1.52.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-codecommit (1.50.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-codecommit (1.51.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-codedeploy (1.48.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-codedeploy (1.49.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-codepipeline (1.52.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-codepipeline (1.53.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-cognitoidentity (1.31.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -124,55 +124,55 @@ GEM aws-sdk-cognitoidentityprovider (1.53.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-configservice (1.73.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-configservice (1.74.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.126.2) + aws-sdk-core (3.127.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-costandusagereportservice (1.39.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-costandusagereportservice (1.40.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-databasemigrationservice (1.53.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-dynamodb (1.72.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-dynamodb (1.74.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.299.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-ec2 (1.301.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ecr (1.53.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-ecr (1.55.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ecrpublic (1.11.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-ecrpublic (1.12.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.95.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-ecs (1.96.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-efs (1.52.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-efs (1.53.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-eks (1.72.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-eks (1.73.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.72.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-elasticache (1.74.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticbeanstalk (1.50.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-elasticbeanstalk (1.51.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancing (1.39.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-elasticloadbalancing (1.40.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancingv2 (1.76.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-elasticloadbalancingv2 (1.77.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticsearchservice (1.64.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-elasticsearchservice (1.65.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-emr (1.53.0) aws-sdk-core (~> 3, >= 3.121.2) @@ -180,38 +180,38 @@ GEM aws-sdk-eventbridge (1.24.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-firehose (1.47.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-firehose (1.48.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-glue (1.88.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-guardduty (1.55.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-guardduty (1.56.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.67.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-iam (1.68.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-kafka (1.48.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-kafka (1.49.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-kinesis (1.40.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-kinesis (1.41.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.54.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-kms (1.55.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.78.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-lambda (1.80.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-mq (1.40.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-networkfirewall (1.14.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-networkfirewall (1.15.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-networkmanager (1.21.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-networkmanager (1.22.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-organizations (1.59.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -219,23 +219,23 @@ GEM aws-sdk-ram (1.26.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-rds (1.139.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-rds (1.141.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.78.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-redshift (1.79.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-route53 (1.61.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-route53 (1.62.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-route53domains (1.39.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-route53domains (1.40.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-route53resolver (1.36.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-route53resolver (1.37.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.112.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-s3 (1.113.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) aws-sdk-s3control (1.43.0) @@ -244,8 +244,8 @@ GEM aws-sdk-secretsmanager (1.46.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-securityhub (1.61.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-securityhub (1.62.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-servicecatalog (1.60.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -253,8 +253,8 @@ GEM aws-sdk-ses (1.41.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-shield (1.47.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-shield (1.48.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-signer (1.32.0) aws-sdk-core (~> 3, >= 3.120.0) @@ -262,17 +262,17 @@ GEM aws-sdk-simpledb (1.29.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv2 (~> 1.0) - aws-sdk-sms (1.38.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-sms (1.39.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-sns (1.52.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-sns (1.53.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-sqs (1.50.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-sqs (1.51.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.131.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-ssm (1.132.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-states (1.39.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -316,7 +316,7 @@ GEM concurrent-ruby coderay (1.1.3) concurrent-ruby (1.1.9) - cookstyle (7.31.7) + cookstyle (7.32.0) rubocop (= 1.25.1) declarative (0.0.20) diff-lcs (1.5.0) @@ -429,7 +429,7 @@ GEM nori (2.6.0) os (1.1.4) parallel (1.21.0) - parser (3.1.0.0) + parser (3.1.1.0) ast (~> 2.4.1) parslet (1.8.2) pastel (0.8.0) @@ -447,22 +447,22 @@ GEM uber (< 0.2.0) retriable (3.1.2) rexml (3.2.5) - rspec (3.10.0) - rspec-core (~> 3.10.0) - rspec-expectations (~> 3.10.0) - rspec-mocks (~> 3.10.0) - rspec-core (3.10.2) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.2) + rspec (3.11.0) + rspec-core (~> 3.11.0) + rspec-expectations (~> 3.11.0) + rspec-mocks (~> 3.11.0) + rspec-core (3.11.0) + rspec-support (~> 3.11.0) + rspec-expectations (3.11.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) + rspec-support (~> 3.11.0) rspec-its (1.3.0) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) - rspec-mocks (3.10.3) + rspec-mocks (3.11.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-support (3.10.3) + rspec-support (~> 3.11.0) + rspec-support (3.11.0) rubocop (1.25.1) parallel (~> 1.10) parser (>= 3.1.0.0) @@ -472,16 +472,16 @@ GEM rubocop-ast (>= 1.15.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.15.2) - parser (>= 3.0.1.1) + rubocop-ast (1.16.0) + parser (>= 3.1.1.0) ruby-progressbar (1.11.0) ruby2_keywords (0.0.5) rubyntlm (0.6.3) rubyzip (2.3.2) semverse (3.0.0) - signet (0.16.0) + signet (0.16.1) addressable (~> 2.8) - faraday (>= 0.17.3, < 2.0) + faraday (>= 0.17.5, < 3.0) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) sslshake (1.3.1) @@ -605,7 +605,7 @@ GEM net-scp (>= 1.2, < 4.0) net-ssh (>= 2.9, < 7.0) train-habitat (0.2.22) - train-winrm (0.2.12) + train-winrm (0.2.13) winrm (>= 2.3.6, < 3.0) winrm-elevated (~> 1.2.2) winrm-fs (~> 1.0) From ab2e06d5960d50244fea24503888c374c16a33d1 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 12 Mar 2022 10:00:50 +0000 Subject: [PATCH 05/31] chore(gemfile.lock): update to latest gem versions (2022-W10) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/422 --- Gemfile.lock | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 10fe0ba..a6e45b8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,19 +1,20 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 29c9f7b3a2d3197a368ced0b12bceddf9ff9185a + revision: 2c075651c0de1eac9e6bdbf820c03529ad2f59e1 branch: ssf specs: - inspec (5.4.1) + inspec (5.7.6) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 5.4.1) + inspec-core (= 5.7.6) mongo (= 2.13.2) + progress_bar (~> 1.3.3) rake train (~> 3.0) train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (5.4.1) + inspec-core (5.7.6) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -48,7 +49,7 @@ GIT GEM remote: https://rubygems.org/ specs: - activesupport (7.0.2.2) + activesupport (7.0.2.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -57,7 +58,7 @@ GEM public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.563.0) + aws-partitions (1.566.0) aws-sdk-alexaforbusiness (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) @@ -127,7 +128,7 @@ GEM aws-sdk-configservice (1.74.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.127.0) + aws-sdk-core (3.129.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) @@ -141,7 +142,7 @@ GEM aws-sdk-dynamodb (1.74.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.301.0) + aws-sdk-ec2 (1.302.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.55.0) @@ -150,13 +151,13 @@ GEM aws-sdk-ecrpublic (1.12.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.96.0) + aws-sdk-ecs (1.97.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-efs (1.53.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-eks (1.73.0) + aws-sdk-eks (1.74.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-elasticache (1.74.0) @@ -316,7 +317,7 @@ GEM concurrent-ruby coderay (1.1.3) concurrent-ruby (1.1.9) - cookstyle (7.32.0) + cookstyle (7.32.1) rubocop (= 1.25.1) declarative (0.0.20) diff-lcs (1.5.0) @@ -369,13 +370,14 @@ GEM gyoku (1.3.1) builder (>= 2.1.2) hashie (4.1.0) + highline (2.0.3) http-cookie (1.0.4) domain_name (~> 0.5) httpclient (2.8.3) i18n (1.10.0) concurrent-ruby (~> 1.0) inifile (3.0.0) - jmespath (1.6.0) + jmespath (1.6.1) json (2.6.1) jwt (2.3.0) kitchen-inspec (2.5.2) @@ -427,6 +429,7 @@ GEM net-ssh-gateway (2.0.0) net-ssh (>= 4.0.0) nori (2.6.0) + options (2.3.2) os (1.1.4) parallel (1.21.0) parser (3.1.1.0) @@ -434,6 +437,9 @@ GEM parslet (1.8.2) pastel (0.8.0) tty-color (~> 0.5) + progress_bar (1.3.3) + highline (>= 1.6, < 3) + options (~> 2.3.0) pry (0.14.1) coderay (~> 1.1) method_source (~> 1.0) @@ -508,7 +514,7 @@ GEM timeliness (0.3.10) tomlrb (1.3.0) trailblazer-option (0.1.2) - train (3.8.7) + train (3.8.9) activesupport (>= 6.0.3.1) azure_graph_rbac (~> 0.16) azure_mgmt_key_vault (~> 0.17) @@ -519,7 +525,7 @@ GEM google-api-client (>= 0.23.9, <= 0.52.0) googleauth (>= 0.6.6, <= 0.14.0) inifile (~> 3.0) - train-core (= 3.8.7) + train-core (= 3.8.9) train-winrm (~> 0.2) train-aws (0.2.24) aws-sdk-alexaforbusiness (~> 1.0) @@ -597,7 +603,7 @@ GEM aws-sdk-synthetics (~> 1.19.0) aws-sdk-transfer (>= 1.26, < 1.35) aws-sdk-waf (~> 1.43.0) - train-core (3.8.7) + train-core (3.8.9) addressable (~> 2.5) ffi (!= 1.13.0) json (>= 1.8, < 3.0) From 8d8ff87cfe9fc45d80643fc65bee21e598d30000 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 17 Mar 2022 23:35:24 +0000 Subject: [PATCH 06/31] chore(gemfile.lock): update to latest gem versions (2022-W11) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/423 --- Gemfile.lock | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a6e45b8..e89b756 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 2c075651c0de1eac9e6bdbf820c03529ad2f59e1 + revision: 3dab2e31799c850afcd377e331e150e97cc48e85 branch: ssf specs: - inspec (5.7.6) + inspec (5.7.10) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 5.7.6) + inspec-core (= 5.7.10) mongo (= 2.13.2) progress_bar (~> 1.3.3) rake @@ -14,7 +14,7 @@ GIT train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (5.7.6) + inspec-core (5.7.10) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -58,7 +58,7 @@ GEM public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.566.0) + aws-partitions (1.568.0) aws-sdk-alexaforbusiness (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) @@ -125,10 +125,10 @@ GEM aws-sdk-cognitoidentityprovider (1.53.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-configservice (1.74.0) + aws-sdk-configservice (1.75.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.129.1) + aws-sdk-core (3.130.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) @@ -142,7 +142,7 @@ GEM aws-sdk-dynamodb (1.74.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.302.0) + aws-sdk-ec2 (1.303.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.55.0) @@ -151,7 +151,7 @@ GEM aws-sdk-ecrpublic (1.12.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.97.0) + aws-sdk-ecs (1.98.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-efs (1.53.0) @@ -160,7 +160,7 @@ GEM aws-sdk-eks (1.74.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.74.0) + aws-sdk-elasticache (1.75.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-elasticbeanstalk (1.51.0) @@ -202,7 +202,7 @@ GEM aws-sdk-kms (1.55.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.80.0) + aws-sdk-lambda (1.81.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-mq (1.40.0) @@ -220,7 +220,7 @@ GEM aws-sdk-ram (1.26.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-rds (1.141.0) + aws-sdk-rds (1.142.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-redshift (1.79.0) @@ -328,7 +328,7 @@ GEM unf (>= 0.0.5, < 1.0.0) ed25519 (1.3.0) erubi (1.10.0) - excon (0.91.0) + excon (0.92.0) faraday (1.4.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -638,7 +638,7 @@ GEM uber (0.1.0) unf (0.1.4) unf_ext - unf_ext (0.0.8) + unf_ext (0.0.8.1) unicode-display_width (2.1.0) unicode_utils (1.4.0) winrm (2.3.6) From 3cf3cdd6d886890bd866e0eec2ac058834ee755a Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 22 Mar 2022 11:56:57 +0000 Subject: [PATCH 07/31] chore(gemfile.lock): update to latest gem versions (2022-W12) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/424 --- Gemfile.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index e89b756..0a92ec6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 3dab2e31799c850afcd377e331e150e97cc48e85 + revision: 8b29ba7ad69faeb103c345c560417c5374db8df3 branch: ssf specs: - inspec (5.7.10) + inspec (5.8.0) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 5.7.10) + inspec-core (= 5.8.0) mongo (= 2.13.2) progress_bar (~> 1.3.3) rake @@ -14,7 +14,7 @@ GIT train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (5.7.10) + inspec-core (5.8.0) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -145,7 +145,7 @@ GEM aws-sdk-ec2 (1.303.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ecr (1.55.0) + aws-sdk-ecr (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-ecrpublic (1.12.0) @@ -303,9 +303,9 @@ GEM bcrypt_pbkdf (1.1.0) bson (4.14.1) builder (3.2.4) - chef-config (17.9.52) + chef-config (17.10.0) addressable - chef-utils (= 17.9.52) + chef-utils (= 17.10.0) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -313,10 +313,10 @@ GEM chef-telemetry (1.1.1) chef-config concurrent-ruby (~> 1.0) - chef-utils (17.9.52) + chef-utils (17.10.0) concurrent-ruby coderay (1.1.3) - concurrent-ruby (1.1.9) + concurrent-ruby (1.1.10) cookstyle (7.32.1) rubocop (= 1.25.1) declarative (0.0.20) @@ -328,7 +328,7 @@ GEM unf (>= 0.0.5, < 1.0.0) ed25519 (1.3.0) erubi (1.10.0) - excon (0.92.0) + excon (0.92.1) faraday (1.4.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -431,7 +431,7 @@ GEM nori (2.6.0) options (2.3.2) os (1.1.4) - parallel (1.21.0) + parallel (1.22.0) parser (3.1.1.0) ast (~> 2.4.1) parslet (1.8.2) From f4b282548cfc09bc9ef4795859cad73cc93e7e34 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 1 Apr 2022 15:29:15 +0100 Subject: [PATCH 08/31] chore(gemfile.lock): update to latest gem versions (2022-W13) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/425 --- Gemfile.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0a92ec6..788512c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 8b29ba7ad69faeb103c345c560417c5374db8df3 + revision: 36118e817641fbc1d4bd9753a77c383e7b20caff branch: ssf specs: - inspec (5.8.0) + inspec (5.10.7) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 5.8.0) + inspec-core (= 5.10.7) mongo (= 2.13.2) progress_bar (~> 1.3.3) rake @@ -14,7 +14,7 @@ GIT train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (5.8.0) + inspec-core (5.10.7) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -58,7 +58,7 @@ GEM public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.568.0) + aws-partitions (1.571.0) aws-sdk-alexaforbusiness (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) @@ -125,7 +125,7 @@ GEM aws-sdk-cognitoidentityprovider (1.53.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-configservice (1.75.0) + aws-sdk-configservice (1.76.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-core (3.130.0) @@ -142,7 +142,7 @@ GEM aws-sdk-dynamodb (1.74.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.303.0) + aws-sdk-ec2 (1.304.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.56.0) @@ -151,7 +151,7 @@ GEM aws-sdk-ecrpublic (1.12.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.98.0) + aws-sdk-ecs (1.99.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-efs (1.53.0) @@ -160,7 +160,7 @@ GEM aws-sdk-eks (1.74.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.75.0) + aws-sdk-elasticache (1.76.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-elasticbeanstalk (1.51.0) @@ -202,7 +202,7 @@ GEM aws-sdk-kms (1.55.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.81.0) + aws-sdk-lambda (1.82.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-mq (1.40.0) @@ -223,7 +223,7 @@ GEM aws-sdk-rds (1.142.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.79.0) + aws-sdk-redshift (1.80.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-route53 (1.62.0) @@ -272,7 +272,7 @@ GEM aws-sdk-sqs (1.51.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.132.0) + aws-sdk-ssm (1.134.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-states (1.39.0) @@ -431,7 +431,7 @@ GEM nori (2.6.0) options (2.3.2) os (1.1.4) - parallel (1.22.0) + parallel (1.22.1) parser (3.1.1.0) ast (~> 2.4.1) parslet (1.8.2) From 31773f18966831cba08939cd7987750c0961a491 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sun, 3 Apr 2022 15:02:15 +0100 Subject: [PATCH 09/31] ci(kitchen+gitlab): update for new pre-salted images [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/426 --- .gitlab-ci.yml | 26 +++++++++++----------- .travis.yml | 26 +++++++++++----------- kitchen.yml | 58 +++++++++++++++++++++++++------------------------- 3 files changed, 55 insertions(+), 55 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f1d9049..ac368d7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -156,19 +156,19 @@ ubuntu-2004-master-py3: {extends: '.test_instance'} # preferences-ubuntu-1804-master-py3: {extends: '.test_instance'} # unattended-ubuntu-1804-master-py3: {extends: '.test_instance'} ubuntu-1804-master-py3: {extends: '.test_instance'} -# repositories-debian-11-3004-0-py3: {extends: '.test_instance'} -# repositories-debian-10-3004-0-py3: {extends: '.test_instance'} -# repositories-debian-9-3004-0-py3: {extends: '.test_instance'} -# repositories-ubuntu-2004-3004-0-py3: {extends: '.test_instance'} -# repositories-ubuntu-1804-3004-0-py3: {extends: '.test_instance'} -# repositories-debian-10-3003-3-py3: {extends: '.test_instance'} -# repositories-debian-9-3003-3-py3: {extends: '.test_instance'} -# repositories-ubuntu-2004-3003-3-py3: {extends: '.test_instance'} -# repositories-ubuntu-1804-3003-3-py3: {extends: '.test_instance'} -# repositories-debian-10-3002-7-py3: {extends: '.test_instance'} -# repositories-debian-9-3002-7-py3: {extends: '.test_instance'} -# repositories-ubuntu-2004-3002-7-py3: {extends: '.test_instance'} -# repositories-ubuntu-1804-3002-7-py3: {extends: '.test_instance'} +# repositories-debian-11-3004-1-py3: {extends: '.test_instance'} +# repositories-debian-10-3004-1-py3: {extends: '.test_instance'} +# repositories-debian-9-3004-1-py3: {extends: '.test_instance'} +# repositories-ubuntu-2004-3004-1-py3: {extends: '.test_instance'} +# repositories-ubuntu-1804-3004-1-py3: {extends: '.test_instance'} +# repositories-debian-10-3003-4-py3: {extends: '.test_instance'} +# repositories-debian-9-3003-4-py3: {extends: '.test_instance'} +# repositories-ubuntu-2004-3003-4-py3: {extends: '.test_instance'} +# repositories-ubuntu-1804-3003-4-py3: {extends: '.test_instance'} +# repositories-debian-10-3002-8-py3: {extends: '.test_instance'} +# repositories-debian-9-3002-8-py3: {extends: '.test_instance'} +# repositories-ubuntu-2004-3002-8-py3: {extends: '.test_instance'} +# repositories-ubuntu-1804-3002-8-py3: {extends: '.test_instance'} # yamllint enable rule:line-length ############################################################################### diff --git a/.travis.yml b/.travis.yml index 3d66280..8f48b18 100644 --- a/.travis.yml +++ b/.travis.yml @@ -108,19 +108,19 @@ jobs: # - env: INSTANCE=preferences-ubuntu-1804-master-py3 # - env: INSTANCE=unattended-ubuntu-1804-master-py3 - env: INSTANCE=ubuntu-1804-master-py3 - # - env: INSTANCE=repositories-debian-11-3004-0-py3 - # - env: INSTANCE=repositories-debian-10-3004-0-py3 - # - env: INSTANCE=repositories-debian-9-3004-0-py3 - # - env: INSTANCE=repositories-ubuntu-2004-3004-0-py3 - # - env: INSTANCE=repositories-ubuntu-1804-3004-0-py3 - # - env: INSTANCE=repositories-debian-10-3003-3-py3 - # - env: INSTANCE=repositories-debian-9-3003-3-py3 - # - env: INSTANCE=repositories-ubuntu-2004-3003-3-py3 - # - env: INSTANCE=repositories-ubuntu-1804-3003-3-py3 - # - env: INSTANCE=repositories-debian-10-3002-7-py3 - # - env: INSTANCE=repositories-debian-9-3002-7-py3 - # - env: INSTANCE=repositories-ubuntu-2004-3002-7-py3 - # - env: INSTANCE=repositories-ubuntu-1804-3002-7-py3 + # - env: INSTANCE=repositories-debian-11-3004-1-py3 + # - env: INSTANCE=repositories-debian-10-3004-1-py3 + # - env: INSTANCE=repositories-debian-9-3004-1-py3 + # - env: INSTANCE=repositories-ubuntu-2004-3004-1-py3 + # - env: INSTANCE=repositories-ubuntu-1804-3004-1-py3 + # - env: INSTANCE=repositories-debian-10-3003-4-py3 + # - env: INSTANCE=repositories-debian-9-3003-4-py3 + # - env: INSTANCE=repositories-ubuntu-2004-3003-4-py3 + # - env: INSTANCE=repositories-ubuntu-1804-3003-4-py3 + # - env: INSTANCE=repositories-debian-10-3002-8-py3 + # - env: INSTANCE=repositories-debian-9-3002-8-py3 + # - env: INSTANCE=repositories-ubuntu-2004-3002-8-py3 + # - env: INSTANCE=repositories-ubuntu-1804-3002-8-py3 ## Define the release stage that runs `semantic-release` - stage: 'release' diff --git a/kitchen.yml b/kitchen.yml index 50f1ef7..6c7b2c4 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -63,62 +63,62 @@ platforms: image: saltimages/salt-master-py3:ubuntu-18.04 run_command: /lib/systemd/systemd - ## SALT `3004.0` - - name: debian-11-3004-0-py3 + ## SALT `3004.1` + - name: debian-11-3004-1-py3 driver: - image: saltimages/salt-3004.0-py3:debian-11 + image: saltimages/salt-3004.1-py3:debian-11 run_command: /lib/systemd/systemd - - name: debian-10-3004-0-py3 + - name: debian-10-3004-1-py3 driver: - image: saltimages/salt-3004.0-py3:debian-10 + image: saltimages/salt-3004.1-py3:debian-10 run_command: /lib/systemd/systemd - - name: debian-9-3004-0-py3 + - name: debian-9-3004-1-py3 driver: - image: saltimages/salt-3004.0-py3:debian-9 + image: saltimages/salt-3004.1-py3:debian-9 run_command: /lib/systemd/systemd - - name: ubuntu-2004-3004-0-py3 + - name: ubuntu-2004-3004-1-py3 driver: - image: saltimages/salt-3004.0-py3:ubuntu-20.04 + image: saltimages/salt-3004.1-py3:ubuntu-20.04 run_command: /lib/systemd/systemd - - name: ubuntu-1804-3004-0-py3 + - name: ubuntu-1804-3004-1-py3 driver: - image: saltimages/salt-3004.0-py3:ubuntu-18.04 + image: saltimages/salt-3004.1-py3:ubuntu-18.04 run_command: /lib/systemd/systemd - ## SALT `3003.3` - - name: debian-10-3003-3-py3 + ## SALT `3003.4` + - name: debian-10-3003-4-py3 driver: - image: saltimages/salt-3003.3-py3:debian-10 + image: saltimages/salt-3003.4-py3:debian-10 run_command: /lib/systemd/systemd - - name: debian-9-3003-3-py3 + - name: debian-9-3003-4-py3 driver: - image: saltimages/salt-3003.3-py3:debian-9 + image: saltimages/salt-3003.4-py3:debian-9 run_command: /lib/systemd/systemd - - name: ubuntu-2004-3003-3-py3 + - name: ubuntu-2004-3003-4-py3 driver: - image: saltimages/salt-3003.3-py3:ubuntu-20.04 + image: saltimages/salt-3003.4-py3:ubuntu-20.04 run_command: /lib/systemd/systemd - - name: ubuntu-1804-3003-3-py3 + - name: ubuntu-1804-3003-4-py3 driver: - image: saltimages/salt-3003.3-py3:ubuntu-18.04 + image: saltimages/salt-3003.4-py3:ubuntu-18.04 run_command: /lib/systemd/systemd - ## SALT `3002.7` - - name: debian-10-3002-7-py3 + ## SALT `3002.8` + - name: debian-10-3002-8-py3 driver: - image: saltimages/salt-3002.7-py3:debian-10 + image: saltimages/salt-3002.8-py3:debian-10 run_command: /lib/systemd/systemd - - name: debian-9-3002-7-py3 + - name: debian-9-3002-8-py3 driver: - image: saltimages/salt-3002.7-py3:debian-9 + image: saltimages/salt-3002.8-py3:debian-9 run_command: /lib/systemd/systemd - - name: ubuntu-2004-3002-7-py3 + - name: ubuntu-2004-3002-8-py3 driver: - image: saltimages/salt-3002.7-py3:ubuntu-20.04 + image: saltimages/salt-3002.8-py3:ubuntu-20.04 run_command: /lib/systemd/systemd - - name: ubuntu-1804-3002-7-py3 + - name: ubuntu-1804-3002-8-py3 driver: - image: saltimages/salt-3002.7-py3:ubuntu-18.04 + image: saltimages/salt-3002.8-py3:ubuntu-18.04 run_command: /lib/systemd/systemd verifier: From 467773901ac5b25f7fd3854979b1cb5c0a52ed7b Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 4 Apr 2022 09:18:17 +0100 Subject: [PATCH 10/31] chore(gemfile.lock): update to latest gem versions (2022-W14) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/427 --- Gemfile.lock | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 788512c..ddb1742 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 36118e817641fbc1d4bd9753a77c383e7b20caff + revision: 31b5b09a827ed9fcbc0b2d550ae4056013dcc92e branch: ssf specs: - inspec (5.10.7) + inspec (5.10.11) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 5.10.7) + inspec-core (= 5.10.11) mongo (= 2.13.2) progress_bar (~> 1.3.3) rake @@ -14,7 +14,7 @@ GIT train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (5.10.7) + inspec-core (5.10.11) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -58,7 +58,7 @@ GEM public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.571.0) + aws-partitions (1.573.0) aws-sdk-alexaforbusiness (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) @@ -142,7 +142,7 @@ GEM aws-sdk-dynamodb (1.74.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.304.0) + aws-sdk-ec2 (1.305.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.56.0) @@ -328,7 +328,7 @@ GEM unf (>= 0.0.5, < 1.0.0) ed25519 (1.3.0) erubi (1.10.0) - excon (0.92.1) + excon (0.92.2) faraday (1.4.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -367,8 +367,9 @@ GEM signet (~> 0.14) gssapi (1.3.1) ffi (>= 1.0.1) - gyoku (1.3.1) + gyoku (1.4.0) builder (>= 2.1.2) + rexml (~> 3.0) hashie (4.1.0) highline (2.0.3) http-cookie (1.0.4) @@ -407,7 +408,7 @@ GEM mixlib-versioning thor mixlib-log (3.0.9) - mixlib-shellout (3.2.5) + mixlib-shellout (3.2.6) chef-utils mixlib-versioning (1.2.12) mongo (2.13.2) @@ -465,7 +466,7 @@ GEM rspec-its (1.3.0) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) - rspec-mocks (3.11.0) + rspec-mocks (3.11.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.11.0) rspec-support (3.11.0) From eae6ce48c6e7f28b027df712183798119a7ec807 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 11 Apr 2022 19:15:56 +0100 Subject: [PATCH 11/31] chore(gemfile.lock): update to latest gem versions (2022-W15) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/428 --- Gemfile.lock | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ddb1742..5b3b684 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 31b5b09a827ed9fcbc0b2d550ae4056013dcc92e + revision: 1821d2dfd3365e8f05b8439845c58fa4d069806b branch: ssf specs: - inspec (5.10.11) + inspec (5.12.2) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 5.10.11) + inspec-core (= 5.12.2) mongo (= 2.13.2) progress_bar (~> 1.3.3) rake @@ -14,7 +14,7 @@ GIT train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (5.10.11) + inspec-core (5.12.2) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -40,7 +40,7 @@ GIT GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker - revision: 4e03ca42d98624323c1c2d91ceb39c09a29bbfc8 + revision: 9a09bc1e571e25f3ccabf4725ca2048d970fff82 branch: ssf specs: kitchen-docker (2.12.0) @@ -58,14 +58,14 @@ GEM public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.573.0) + aws-partitions (1.574.0) aws-sdk-alexaforbusiness (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-amplify (1.32.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-apigateway (1.75.0) + aws-sdk-apigateway (1.76.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-apigatewayv2 (1.42.0) @@ -125,7 +125,7 @@ GEM aws-sdk-cognitoidentityprovider (1.53.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-configservice (1.76.0) + aws-sdk-configservice (1.77.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-core (3.130.0) @@ -202,7 +202,7 @@ GEM aws-sdk-kms (1.55.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.82.0) + aws-sdk-lambda (1.83.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-mq (1.40.0) @@ -245,7 +245,7 @@ GEM aws-sdk-secretsmanager (1.46.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-securityhub (1.62.0) + aws-sdk-securityhub (1.63.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-servicecatalog (1.60.0) @@ -263,7 +263,7 @@ GEM aws-sdk-simpledb (1.29.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv2 (~> 1.0) - aws-sdk-sms (1.39.0) + aws-sdk-sms (1.40.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-sns (1.53.0) @@ -408,7 +408,7 @@ GEM mixlib-versioning thor mixlib-log (3.0.9) - mixlib-shellout (3.2.6) + mixlib-shellout (3.2.7) chef-utils mixlib-versioning (1.2.12) mongo (2.13.2) @@ -447,7 +447,7 @@ GEM public_suffix (4.0.6) rainbow (3.1.1) rake (13.0.6) - regexp_parser (2.2.1) + regexp_parser (2.3.0) representable (3.1.1) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) @@ -479,7 +479,7 @@ GEM rubocop-ast (>= 1.15.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.16.0) + rubocop-ast (1.17.0) parser (>= 3.1.1.0) ruby-progressbar (1.11.0) ruby2_keywords (0.0.5) @@ -515,7 +515,7 @@ GEM timeliness (0.3.10) tomlrb (1.3.0) trailblazer-option (0.1.2) - train (3.8.9) + train (3.9.2) activesupport (>= 6.0.3.1) azure_graph_rbac (~> 0.16) azure_mgmt_key_vault (~> 0.17) @@ -526,7 +526,7 @@ GEM google-api-client (>= 0.23.9, <= 0.52.0) googleauth (>= 0.6.6, <= 0.14.0) inifile (~> 3.0) - train-core (= 3.8.9) + train-core (= 3.9.2) train-winrm (~> 0.2) train-aws (0.2.24) aws-sdk-alexaforbusiness (~> 1.0) @@ -604,7 +604,7 @@ GEM aws-sdk-synthetics (~> 1.19.0) aws-sdk-transfer (>= 1.26, < 1.35) aws-sdk-waf (~> 1.43.0) - train-core (3.8.9) + train-core (3.9.2) addressable (~> 2.5) ffi (!= 1.13.0) json (>= 1.8, < 3.0) From 2a7e4afe5a2804035a09a742361354c8039a7d80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20B=C3=A9rtoli?= Date: Mon, 18 Apr 2022 09:09:08 -0300 Subject: [PATCH 12/31] feat(repositories): allow to specify custom filename --- apt/repositories.sls | 5 +++-- pillar.example | 3 +++ .../repositories/controls/repositories_spec.rb | 16 ++++++++++++++++ test/salt/pillar/repositories.sls | 8 ++++++++ 4 files changed, 30 insertions(+), 2 deletions(-) diff --git a/apt/repositories.sls b/apt/repositories.sls index 4373b01..032cc47 100644 --- a/apt/repositories.sls +++ b/apt/repositories.sls @@ -58,12 +58,13 @@ {%- set r_keyserver = args.keyserver if args.keyserver is defined else apt_map.default_keyserver %} {%- for type in args.type|d(['binary']) %} - {%- set r_type = 'deb-src' if type == 'source' else 'deb' %} + {%- set r_type = 'deb-src' if type == 'source' else 'deb' %} + {%- set r_file = args.filename if args.filename is defined else repo ~ '-' ~ type ~ '.list' %} {{ r_type }} {{ repo }}: pkgrepo.managed: - name: {{ r_type }} {{ r_options }} {{ r_url }} {{ r_distro }} {{ r_comps }} - - file: {{ sources_list_dir }}/{{ repo }}-{{ type }}.list + - file: {{ sources_list_dir }}/{{ r_file }} {# You can use either keyid+keyserver or key_url. If both are provided the latter will be used. #} {% if args.key_url is defined %} diff --git a/pillar.example b/pillar.example index c4e4ad7..6f313a0 100644 --- a/pillar.example +++ b/pillar.example @@ -98,6 +98,9 @@ apt: comps: [main, contrib, non-free] key_url: https://ftp-master.debian.org/keys/archive-key-10.asc raspbian: + # If you want to use a particular filename under /etc/apt/sources.list.d + # set it here, with extension included + filename: my_raspbian_repo.list distro: stable url: http://archive.raspbian.org/raspbian type: [source] diff --git a/test/integration/repositories/controls/repositories_spec.rb b/test/integration/repositories/controls/repositories_spec.rb index 1a65d1e..c08eef9 100644 --- a/test/integration/repositories/controls/repositories_spec.rb +++ b/test/integration/repositories/controls/repositories_spec.rb @@ -48,4 +48,20 @@ ) end end + + describe file('/etc/apt/sources.list.d/my_raspbian_repo.list') do + it { should exist } + it { should be_owned_by 'root' } + it { should be_grouped_into 'root' } + its('mode') { should cmp '0644' } + its(:content) do + should match( + %r{deb-src http://archive.raspbian.org/raspbian stable main} + ) + end + end + + describe file('/etc/apt/sources.list.d/raspbian-binary.list') do + it { should_not exist } + end end diff --git a/test/salt/pillar/repositories.sls b/test/salt/pillar/repositories.sls index 642b9dc..97aeb3b 100644 --- a/test/salt/pillar/repositories.sls +++ b/test/salt/pillar/repositories.sls @@ -19,3 +19,11 @@ apt: arch: [amd64] comps: [] key_url: https://cli-assets.heroku.com/apt/release.key + raspbian: + # If you want to use a particular filename under /etc/apt/sources.list.d + # set it here, with extension included + filename: my_raspbian_repo.list + distro: stable + url: http://archive.raspbian.org/raspbian + type: [source] + key_url: https://archive.raspbian.org/raspbian.public.key From 04612df951f5b71b58eb39ecc40e4b6404200885 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Mon, 18 Apr 2022 15:29:45 +0000 Subject: [PATCH 13/31] chore(release): 0.11.0 [skip ci] # [0.11.0](https://github.com/saltstack-formulas/apt-formula/compare/v0.10.4...v0.11.0) (2022-04-18) ### Continuous Integration * **kitchen+gitlab:** update for new pre-salted images [skip ci] ([31773f1](https://github.com/saltstack-formulas/apt-formula/commit/31773f18966831cba08939cd7987750c0961a491)) ### Features * **repositories:** allow to specify custom filename ([2a7e4af](https://github.com/saltstack-formulas/apt-formula/commit/2a7e4afe5a2804035a09a742361354c8039a7d80)) ### Tests * **system:** add `build_platform_codename` [skip ci] ([1a132d8](https://github.com/saltstack-formulas/apt-formula/commit/1a132d84422218bc12f31890c1a92b51bb3ec71c)) --- AUTHORS.md | 8 ++++---- CHANGELOG.md | 17 +++++++++++++++++ FORMULA | 2 +- docs/AUTHORS.rst | 10 +++++----- docs/CHANGELOG.rst | 21 +++++++++++++++++++++ 5 files changed, 48 insertions(+), 10 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index 6c9de1d..44721b0 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -4,12 +4,12 @@ This list is sorted by the number of commits per contributor in _descending_ ord Avatar|Contributor|Contributions :-:|---|:-: -@myii|[@myii](https://github.com/myii)|117 -@javierbertoli|[@javierbertoli](https://github.com/javierbertoli)|29 +@myii|[@myii](https://github.com/myii)|129 +@javierbertoli|[@javierbertoli](https://github.com/javierbertoli)|30 @gravyboat|[@gravyboat](https://github.com/gravyboat)|12 @bmcclure|[@bmcclure](https://github.com/bmcclure)|8 @aboe76|[@aboe76](https://github.com/aboe76)|8 -@arthurlogilab|[@arthurlogilab](https://github.com/arthurlogilab)|7 +@arthurzenika|[@arthurzenika](https://github.com/arthurzenika)|7 @nmadhok|[@nmadhok](https://github.com/nmadhok)|7 @boltronics|[@boltronics](https://github.com/boltronics)|5 @dafyddj|[@dafyddj](https://github.com/dafyddj)|5 @@ -29,4 +29,4 @@ Avatar|Contributor|Contributions --- -Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2022-02-12. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2022-04-18. diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e393d3..3e64c45 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,22 @@ # Changelog +# [0.11.0](https://github.com/saltstack-formulas/apt-formula/compare/v0.10.4...v0.11.0) (2022-04-18) + + +### Continuous Integration + +* **kitchen+gitlab:** update for new pre-salted images [skip ci] ([31773f1](https://github.com/saltstack-formulas/apt-formula/commit/31773f18966831cba08939cd7987750c0961a491)) + + +### Features + +* **repositories:** allow to specify custom filename ([2a7e4af](https://github.com/saltstack-formulas/apt-formula/commit/2a7e4afe5a2804035a09a742361354c8039a7d80)) + + +### Tests + +* **system:** add `build_platform_codename` [skip ci] ([1a132d8](https://github.com/saltstack-formulas/apt-formula/commit/1a132d84422218bc12f31890c1a92b51bb3ec71c)) + ## [0.10.4](https://github.com/saltstack-formulas/apt-formula/compare/v0.10.3...v0.10.4) (2022-02-12) diff --git a/FORMULA b/FORMULA index 98b238f..451a44a 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: apt os: Debian, Ubuntu, Raspbian os_family: Debian -version: 0.10.4 +version: 0.11.0 release: 1 minimum_version: 2017.7 summary: Apt formula diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 2faf91e..4ba7a4f 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -15,10 +15,10 @@ This list is sorted by the number of commits per contributor in *descending* ord - Contributions * - :raw-html-m2r:`@myii` - `@myii `_ - - 117 + - 129 * - :raw-html-m2r:`@javierbertoli` - `@javierbertoli `_ - - 29 + - 30 * - :raw-html-m2r:`@gravyboat` - `@gravyboat `_ - 12 @@ -28,8 +28,8 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@aboe76` - `@aboe76 `_ - 8 - * - :raw-html-m2r:`@arthurlogilab` - - `@arthurlogilab `_ + * - :raw-html-m2r:`@arthurzenika` + - `@arthurzenika `_ - 7 * - :raw-html-m2r:`@nmadhok` - `@nmadhok `_ @@ -83,4 +83,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 2022-02-12. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2022-04-18. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 50b72e2..1a19dd6 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,27 @@ Changelog ========= +`0.11.0 `_ (2022-04-18) +-------------------------------------------------------------------------------------------------------- + +Continuous Integration +^^^^^^^^^^^^^^^^^^^^^^ + + +* **kitchen+gitlab:** update for new pre-salted images [skip ci] (\ `31773f1 `_\ ) + +Features +^^^^^^^^ + + +* **repositories:** allow to specify custom filename (\ `2a7e4af `_\ ) + +Tests +^^^^^ + + +* **system:** add ``build_platform_codename`` [skip ci] (\ `1a132d8 `_\ ) + `0.10.4 `_ (2022-02-12) -------------------------------------------------------------------------------------------------------- From 5da46afb8a708ef0d5610fc4a17a289b7270eab0 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 18 Apr 2022 23:32:13 +0100 Subject: [PATCH 14/31] chore(gemfile.lock): update to latest gem versions (2022-W16) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/431 --- Gemfile.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5b3b684..2dcf0f9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -58,7 +58,7 @@ GEM public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.574.0) + aws-partitions (1.577.0) aws-sdk-alexaforbusiness (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) @@ -74,7 +74,7 @@ GEM aws-sdk-applicationautoscaling (1.51.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-athena (1.52.0) + aws-sdk-athena (1.53.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-autoscaling (1.63.0) @@ -101,7 +101,7 @@ GEM aws-sdk-cloudtrail (1.48.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatch (1.62.0) + aws-sdk-cloudwatch (1.64.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-cloudwatchevents (1.46.0) @@ -128,7 +128,7 @@ GEM aws-sdk-configservice (1.77.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.130.0) + aws-sdk-core (3.130.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) @@ -142,7 +142,7 @@ GEM aws-sdk-dynamodb (1.74.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.305.0) + aws-sdk-ec2 (1.307.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.56.0) @@ -154,7 +154,7 @@ GEM aws-sdk-ecs (1.99.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-efs (1.53.0) + aws-sdk-efs (1.54.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-eks (1.74.0) @@ -220,7 +220,7 @@ GEM aws-sdk-ram (1.26.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-rds (1.142.0) + aws-sdk-rds (1.143.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-redshift (1.80.0) @@ -433,7 +433,7 @@ GEM options (2.3.2) os (1.1.4) parallel (1.22.1) - parser (3.1.1.0) + parser (3.1.2.0) ast (~> 2.4.1) parslet (1.8.2) pastel (0.8.0) @@ -444,7 +444,7 @@ GEM pry (0.14.1) coderay (~> 1.1) method_source (~> 1.0) - public_suffix (4.0.6) + public_suffix (4.0.7) rainbow (3.1.1) rake (13.0.6) regexp_parser (2.3.0) From 664bfe211cd2c5b26499f59a55066a602a12c9aa Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 25 Apr 2022 09:05:54 +0100 Subject: [PATCH 15/31] chore(gemfile.lock): update to latest gem versions (2022-W17) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/433 --- Gemfile.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2dcf0f9..6ac2669 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 1821d2dfd3365e8f05b8439845c58fa4d069806b + revision: 90eafd68e8ca3d7444c4a83c5c2e38e32285410c branch: ssf specs: - inspec (5.12.2) + inspec (5.14.0) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 5.12.2) + inspec-core (= 5.14.0) mongo (= 2.13.2) progress_bar (~> 1.3.3) rake @@ -14,7 +14,7 @@ GIT train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (5.12.2) + inspec-core (5.14.0) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -58,7 +58,7 @@ GEM public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.577.0) + aws-partitions (1.579.0) aws-sdk-alexaforbusiness (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) @@ -128,7 +128,7 @@ GEM aws-sdk-configservice (1.77.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.130.1) + aws-sdk-core (3.130.2) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) @@ -142,7 +142,7 @@ GEM aws-sdk-dynamodb (1.74.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.307.0) + aws-sdk-ec2 (1.308.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.56.0) @@ -160,7 +160,7 @@ GEM aws-sdk-eks (1.74.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.76.0) + aws-sdk-elasticache (1.77.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-elasticbeanstalk (1.51.0) @@ -199,7 +199,7 @@ GEM aws-sdk-kinesis (1.41.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.55.0) + aws-sdk-kms (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-lambda (1.83.0) @@ -220,10 +220,10 @@ GEM aws-sdk-ram (1.26.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-rds (1.143.0) + aws-sdk-rds (1.144.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.80.0) + aws-sdk-redshift (1.81.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-route53 (1.62.0) @@ -272,7 +272,7 @@ GEM aws-sdk-sqs (1.51.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.134.0) + aws-sdk-ssm (1.135.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-states (1.39.0) @@ -288,7 +288,7 @@ GEM aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) aws-sigv2 (1.1.0) - aws-sigv4 (1.4.0) + aws-sigv4 (1.5.0) aws-eventstream (~> 1, >= 1.0.2) azure_graph_rbac (0.17.2) ms_rest_azure (~> 0.12.0) @@ -301,7 +301,7 @@ GEM azure_mgmt_storage (0.23.0) ms_rest_azure (~> 0.12.0) bcrypt_pbkdf (1.1.0) - bson (4.14.1) + bson (4.15.0) builder (3.2.4) chef-config (17.10.0) addressable @@ -447,7 +447,7 @@ GEM public_suffix (4.0.7) rainbow (3.1.1) rake (13.0.6) - regexp_parser (2.3.0) + regexp_parser (2.3.1) representable (3.1.1) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) From 4efd0d4b22e9522357c02f5e17099128c51dbd0a Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 6 May 2022 23:11:26 +0100 Subject: [PATCH 16/31] chore(gemfile.lock): update to latest gem versions (2022-W18) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/437 --- .gitlab-ci.yml | 6 ++++++ .travis.yml | 6 ++++++ Gemfile.lock | 34 +++++++++++++++++----------------- kitchen.yml | 12 ++++++++++++ 4 files changed, 41 insertions(+), 17 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ac368d7..f50f662 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -134,6 +134,7 @@ rubocop: # repositories-debian-11-tiamat-py3: {extends: '.test_instance'} # repositories-debian-10-tiamat-py3: {extends: '.test_instance'} # repositories-debian-9-tiamat-py3: {extends: '.test_instance'} +# repositories-ubuntu-2204-tiamat-py3: {extends: '.test_instance_failure_permitted'} # repositories-ubuntu-2004-tiamat-py3: {extends: '.test_instance'} # repositories-ubuntu-1804-tiamat-py3: {extends: '.test_instance'} # repositories-debian-11-master-py3: {extends: '.test_instance'} @@ -148,6 +149,10 @@ debian-10-master-py3: {extends: '.test_instance'} # preferences-debian-9-master-py3: {extends: '.test_instance'} # unattended-debian-9-master-py3: {extends: '.test_instance'} debian-9-master-py3: {extends: '.test_instance'} +# repositories-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'} +# preferences-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'} +# unattended-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'} +ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'} # repositories-ubuntu-2004-master-py3: {extends: '.test_instance'} # preferences-ubuntu-2004-master-py3: {extends: '.test_instance'} # unattended-ubuntu-2004-master-py3: {extends: '.test_instance'} @@ -159,6 +164,7 @@ ubuntu-1804-master-py3: {extends: '.test_instance'} # repositories-debian-11-3004-1-py3: {extends: '.test_instance'} # repositories-debian-10-3004-1-py3: {extends: '.test_instance'} # repositories-debian-9-3004-1-py3: {extends: '.test_instance'} +# repositories-ubuntu-2204-3004-1-py3: {extends: '.test_instance_failure_permitted'} # repositories-ubuntu-2004-3004-1-py3: {extends: '.test_instance'} # repositories-ubuntu-1804-3004-1-py3: {extends: '.test_instance'} # repositories-debian-10-3003-4-py3: {extends: '.test_instance'} diff --git a/.travis.yml b/.travis.yml index 8f48b18..d66e9e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -86,6 +86,7 @@ jobs: # - env: INSTANCE=repositories-debian-11-tiamat-py3 # - env: INSTANCE=repositories-debian-10-tiamat-py3 # - env: INSTANCE=repositories-debian-9-tiamat-py3 + # - env: INSTANCE=repositories-ubuntu-2204-tiamat-py3 # - env: INSTANCE=repositories-ubuntu-2004-tiamat-py3 # - env: INSTANCE=repositories-ubuntu-1804-tiamat-py3 # - env: INSTANCE=repositories-debian-11-master-py3 @@ -100,6 +101,10 @@ jobs: # - env: INSTANCE=preferences-debian-9-master-py3 # - env: INSTANCE=unattended-debian-9-master-py3 - env: INSTANCE=debian-9-master-py3 + # - env: INSTANCE=repositories-ubuntu-2204-master-py3 + # - env: INSTANCE=preferences-ubuntu-2204-master-py3 + # - env: INSTANCE=unattended-ubuntu-2204-master-py3 + - env: INSTANCE=ubuntu-2204-master-py3 # - env: INSTANCE=repositories-ubuntu-2004-master-py3 # - env: INSTANCE=preferences-ubuntu-2004-master-py3 # - env: INSTANCE=unattended-ubuntu-2004-master-py3 @@ -111,6 +116,7 @@ jobs: # - env: INSTANCE=repositories-debian-11-3004-1-py3 # - env: INSTANCE=repositories-debian-10-3004-1-py3 # - env: INSTANCE=repositories-debian-9-3004-1-py3 + # - env: INSTANCE=repositories-ubuntu-2204-3004-1-py3 # - env: INSTANCE=repositories-ubuntu-2004-3004-1-py3 # - env: INSTANCE=repositories-ubuntu-1804-3004-1-py3 # - env: INSTANCE=repositories-debian-10-3003-4-py3 diff --git a/Gemfile.lock b/Gemfile.lock index 6ac2669..6885a49 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 90eafd68e8ca3d7444c4a83c5c2e38e32285410c + revision: bb1df209366a8054faff1d85bd2566b5f97b339e branch: ssf specs: - inspec (5.14.0) + inspec (5.14.5) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 5.14.0) + inspec-core (= 5.14.5) mongo (= 2.13.2) progress_bar (~> 1.3.3) rake @@ -14,7 +14,7 @@ GIT train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (5.14.0) + inspec-core (5.14.5) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -49,7 +49,7 @@ GIT GEM remote: https://rubygems.org/ specs: - activesupport (7.0.2.3) + activesupport (7.0.2.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -58,7 +58,7 @@ GEM public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.579.0) + aws-partitions (1.584.0) aws-sdk-alexaforbusiness (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) @@ -89,7 +89,7 @@ GEM aws-sdk-cloudformation (1.68.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudfront (1.63.0) + aws-sdk-cloudfront (1.64.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-cloudhsm (1.39.0) @@ -98,7 +98,7 @@ GEM aws-sdk-cloudhsmv2 (1.42.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudtrail (1.48.0) + aws-sdk-cloudtrail (1.49.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-cloudwatch (1.64.0) @@ -142,7 +142,7 @@ GEM aws-sdk-dynamodb (1.74.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.308.0) + aws-sdk-ec2 (1.310.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.56.0) @@ -187,7 +187,7 @@ GEM aws-sdk-glue (1.88.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-guardduty (1.56.0) + aws-sdk-guardduty (1.57.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.68.0) @@ -208,7 +208,7 @@ GEM aws-sdk-mq (1.40.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-networkfirewall (1.15.0) + aws-sdk-networkfirewall (1.17.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-networkmanager (1.22.0) @@ -220,7 +220,7 @@ GEM aws-sdk-ram (1.26.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-rds (1.144.0) + aws-sdk-rds (1.145.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-redshift (1.81.0) @@ -235,7 +235,7 @@ GEM aws-sdk-route53resolver (1.37.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.113.0) + aws-sdk-s3 (1.114.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) @@ -245,7 +245,7 @@ GEM aws-sdk-secretsmanager (1.46.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-securityhub (1.63.0) + aws-sdk-securityhub (1.64.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-servicecatalog (1.60.0) @@ -269,10 +269,10 @@ GEM aws-sdk-sns (1.53.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-sqs (1.51.0) + aws-sdk-sqs (1.51.1) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.135.0) + aws-sdk-ssm (1.137.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-states (1.39.0) @@ -328,7 +328,7 @@ GEM unf (>= 0.0.5, < 1.0.0) ed25519 (1.3.0) erubi (1.10.0) - excon (0.92.2) + excon (0.92.3) faraday (1.4.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) diff --git a/kitchen.yml b/kitchen.yml index 6c7b2c4..d3e0c34 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -32,6 +32,10 @@ platforms: driver: image: saltimages/salt-tiamat-py3:debian-9 run_command: /lib/systemd/systemd + - name: ubuntu-2204-tiamat-py3 + driver: + image: saltimages/salt-tiamat-py3:ubuntu-22.04 + run_command: /lib/systemd/systemd - name: ubuntu-2004-tiamat-py3 driver: image: saltimages/salt-tiamat-py3:ubuntu-20.04 @@ -54,6 +58,10 @@ platforms: driver: image: saltimages/salt-master-py3:debian-9 run_command: /lib/systemd/systemd + - name: ubuntu-2204-master-py3 + driver: + image: saltimages/salt-master-py3:ubuntu-22.04 + run_command: /lib/systemd/systemd - name: ubuntu-2004-master-py3 driver: image: saltimages/salt-master-py3:ubuntu-20.04 @@ -76,6 +84,10 @@ platforms: driver: image: saltimages/salt-3004.1-py3:debian-9 run_command: /lib/systemd/systemd + - name: ubuntu-2204-3004-1-py3 + driver: + image: saltimages/salt-3004.1-py3:ubuntu-22.04 + run_command: /lib/systemd/systemd - name: ubuntu-2004-3004-1-py3 driver: image: saltimages/salt-3004.1-py3:ubuntu-20.04 From f710aa4d814f24caa3f4a8f565f3adcfdba46da1 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 10 May 2022 07:28:18 +0100 Subject: [PATCH 17/31] chore(gemfile.lock): update to latest gem versions (2022-W19) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/439 --- Gemfile.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6885a49..e0c9b6b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: bb1df209366a8054faff1d85bd2566b5f97b339e + revision: ece601f5dd4bacf5d0dca49cd5c13896a7120255 branch: ssf specs: - inspec (5.14.5) + inspec (5.15.0) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 5.14.5) + inspec-core (= 5.15.0) mongo (= 2.13.2) progress_bar (~> 1.3.3) rake @@ -14,7 +14,7 @@ GIT train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (5.14.5) + inspec-core (5.15.0) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -49,7 +49,7 @@ GIT GEM remote: https://rubygems.org/ specs: - activesupport (7.0.2.4) + activesupport (7.0.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -58,7 +58,7 @@ GEM public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.584.0) + aws-partitions (1.587.0) aws-sdk-alexaforbusiness (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) @@ -142,7 +142,7 @@ GEM aws-sdk-dynamodb (1.74.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.310.0) + aws-sdk-ec2 (1.312.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.56.0) @@ -220,10 +220,10 @@ GEM aws-sdk-ram (1.26.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-rds (1.145.0) + aws-sdk-rds (1.146.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.81.0) + aws-sdk-redshift (1.82.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-route53 (1.62.0) @@ -245,7 +245,7 @@ GEM aws-sdk-secretsmanager (1.46.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-securityhub (1.64.0) + aws-sdk-securityhub (1.65.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-servicecatalog (1.60.0) @@ -447,7 +447,7 @@ GEM public_suffix (4.0.7) rainbow (3.1.1) rake (13.0.6) - regexp_parser (2.3.1) + regexp_parser (2.4.0) representable (3.1.1) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) From bb4d0f86db59cf323032c5cee5c8cba22c2fa9cf Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 17 May 2022 08:46:31 +0100 Subject: [PATCH 18/31] test(system.rb): add support for `mac_os_x` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/442 --- test/integration/share/inspec.yml | 1 + test/integration/share/libraries/system.rb | 2 ++ 2 files changed, 3 insertions(+) diff --git a/test/integration/share/inspec.yml b/test/integration/share/inspec.yml index ee20080..28a97b9 100644 --- a/test/integration/share/inspec.yml +++ b/test/integration/share/inspec.yml @@ -21,4 +21,5 @@ supports: - platform-name: gentoo - platform-name: almalinux - platform-name: rocky + - platform-name: mac_os_x - platform: windows diff --git a/test/integration/share/libraries/system.rb b/test/integration/share/libraries/system.rb index 64fe7ea..0db9d0b 100644 --- a/test/integration/share/libraries/system.rb +++ b/test/integration/share/libraries/system.rb @@ -57,6 +57,8 @@ def build_platform_release 'base-latest' when 'gentoo' "#{inspec.platform[:release].split('.')[0]}-#{derive_gentoo_init_system}" + when 'mac_os_x' + inspec.command('sw_vers -productVersion').stdout.to_s when 'opensuse' # rubocop:disable Style/NumericLiterals,Layout/LineLength inspec.platform[:release].to_i > 20210101 ? 'tumbleweed' : inspec.platform[:release] From 92c20b991bce12be222a88e6c353b6b93f32a7f8 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 17 May 2022 13:15:57 +0100 Subject: [PATCH 19/31] chore(gemfile.lock): update to latest gem versions (2022-W20) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/444 --- Gemfile.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index e0c9b6b..44ef385 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: ece601f5dd4bacf5d0dca49cd5c13896a7120255 + revision: 7efb86a1b5a2b79390bc1e9e364ee219f92a0057 branch: ssf specs: - inspec (5.15.0) + inspec (5.16.2) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 5.15.0) + inspec-core (= 5.16.2) mongo (= 2.13.2) progress_bar (~> 1.3.3) rake @@ -14,7 +14,7 @@ GIT train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (5.15.0) + inspec-core (5.16.2) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -89,7 +89,7 @@ GEM aws-sdk-cloudformation (1.68.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudfront (1.64.0) + aws-sdk-cloudfront (1.65.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-cloudhsm (1.39.0) @@ -128,7 +128,7 @@ GEM aws-sdk-configservice (1.77.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.130.2) + aws-sdk-core (3.131.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) @@ -142,7 +142,7 @@ GEM aws-sdk-dynamodb (1.74.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.312.0) + aws-sdk-ec2 (1.315.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.56.0) @@ -157,7 +157,7 @@ GEM aws-sdk-efs (1.54.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-eks (1.74.0) + aws-sdk-eks (1.75.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-elasticache (1.77.0) @@ -202,7 +202,7 @@ GEM aws-sdk-kms (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.83.0) + aws-sdk-lambda (1.84.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-mq (1.40.0) @@ -379,7 +379,7 @@ GEM concurrent-ruby (~> 1.0) inifile (3.0.0) jmespath (1.6.1) - json (2.6.1) + json (2.6.2) jwt (2.3.0) kitchen-inspec (2.5.2) hashie (>= 3.4, <= 5.0) @@ -448,7 +448,7 @@ GEM rainbow (3.1.1) rake (13.0.6) regexp_parser (2.4.0) - representable (3.1.1) + representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) @@ -479,7 +479,7 @@ GEM rubocop-ast (>= 1.15.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.17.0) + rubocop-ast (1.18.0) parser (>= 3.1.1.0) ruby-progressbar (1.11.0) ruby2_keywords (0.0.5) From 320dad6ded3101a6a67d01fed1c4cdb58a8d5c2f Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 30 May 2022 17:22:52 +0100 Subject: [PATCH 20/31] chore(gemfile.lock): update to latest gem versions (2022-W22) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/447 --- Gemfile | 2 +- Gemfile.lock | 38 +++++++++++++++++++------------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Gemfile b/Gemfile index 5991260..12d9b1d 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ # frozen_string_literal: true -source ENV['PROXY_RUBYGEMSORG'] || 'https://rubygems.org' +source ENV.fetch('PROXY_RUBYGEMSORG', 'https://rubygems.org') # Install the `inspec` gem using `git` because versions after `4.22.22` # suppress diff output; this version fixes this for our uses. diff --git a/Gemfile.lock b/Gemfile.lock index 44ef385..b2437ac 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 7efb86a1b5a2b79390bc1e9e364ee219f92a0057 + revision: 2b56b68db2a758041b9df5b2e4bdc3c6700558ea branch: ssf specs: - inspec (5.16.2) + inspec (5.17.4) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 5.16.2) + inspec-core (= 5.17.4) mongo (= 2.13.2) progress_bar (~> 1.3.3) rake @@ -14,7 +14,7 @@ GIT train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (5.16.2) + inspec-core (5.17.4) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -58,14 +58,14 @@ GEM public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.587.0) + aws-partitions (1.594.0) aws-sdk-alexaforbusiness (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-amplify (1.32.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-apigateway (1.76.0) + aws-sdk-apigateway (1.77.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-apigatewayv2 (1.42.0) @@ -86,7 +86,7 @@ GEM aws-sdk-budgets (1.49.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudformation (1.68.0) + aws-sdk-cloudformation (1.69.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-cloudfront (1.65.0) @@ -107,7 +107,7 @@ GEM aws-sdk-cloudwatchevents (1.46.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatchlogs (1.52.0) + aws-sdk-cloudwatchlogs (1.53.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-codecommit (1.51.0) @@ -128,11 +128,11 @@ GEM aws-sdk-configservice (1.77.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.131.0) + aws-sdk-core (3.131.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) - jmespath (~> 1.0) + jmespath (~> 1, >= 1.6.1) aws-sdk-costandusagereportservice (1.40.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) @@ -142,7 +142,7 @@ GEM aws-sdk-dynamodb (1.74.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.315.0) + aws-sdk-ec2 (1.317.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.56.0) @@ -160,7 +160,7 @@ GEM aws-sdk-eks (1.75.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.77.0) + aws-sdk-elasticache (1.78.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-elasticbeanstalk (1.51.0) @@ -199,7 +199,7 @@ GEM aws-sdk-kinesis (1.41.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.56.0) + aws-sdk-kms (1.57.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-lambda (1.84.0) @@ -211,7 +211,7 @@ GEM aws-sdk-networkfirewall (1.17.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-networkmanager (1.22.0) + aws-sdk-networkmanager (1.23.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-organizations (1.59.0) @@ -372,7 +372,7 @@ GEM rexml (~> 3.0) hashie (4.1.0) highline (2.0.3) - http-cookie (1.0.4) + http-cookie (1.0.5) domain_name (~> 0.5) httpclient (2.8.3) i18n (1.10.0) @@ -394,7 +394,7 @@ GEM tty-box (~> 0.6) tty-prompt (~> 0.20) little-plugger (1.1.4) - logging (2.3.0) + logging (2.3.1) little-plugger (~> 1.1) multi_json (~> 1.14) memoist (0.16.2) @@ -447,7 +447,7 @@ GEM public_suffix (4.0.7) rainbow (3.1.1) rake (13.0.6) - regexp_parser (2.4.0) + regexp_parser (2.5.0) representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) @@ -485,7 +485,7 @@ GEM ruby2_keywords (0.0.5) rubyntlm (0.6.3) rubyzip (2.3.2) - semverse (3.0.0) + semverse (3.0.2) signet (0.16.1) addressable (~> 2.8) faraday (>= 0.17.5, < 3.0) @@ -639,7 +639,7 @@ GEM uber (0.1.0) unf (0.1.4) unf_ext - unf_ext (0.0.8.1) + unf_ext (0.0.8.2) unicode-display_width (2.1.0) unicode_utils (1.4.0) winrm (2.3.6) From a070106db709eea9b846e8ee3630dbaaef874ac0 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 7 Jun 2022 23:25:25 +0100 Subject: [PATCH 21/31] chore(gemfile.lock): update to latest gem versions (2022-W23) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/449 --- Gemfile.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b2437ac..8ed6cd1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 2b56b68db2a758041b9df5b2e4bdc3c6700558ea + revision: 6bedc829b7fcec035311d8c6086db5d59414428c branch: ssf specs: - inspec (5.17.4) + inspec (5.17.9) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 5.17.4) + inspec-core (= 5.17.9) mongo (= 2.13.2) progress_bar (~> 1.3.3) rake @@ -14,7 +14,7 @@ GIT train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (5.17.4) + inspec-core (5.17.9) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -58,7 +58,7 @@ GEM public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.594.0) + aws-partitions (1.596.0) aws-sdk-alexaforbusiness (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) @@ -226,7 +226,7 @@ GEM aws-sdk-redshift (1.82.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-route53 (1.62.0) + aws-sdk-route53 (1.63.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-route53domains (1.40.0) @@ -380,8 +380,8 @@ GEM inifile (3.0.0) jmespath (1.6.1) json (2.6.2) - jwt (2.3.0) - kitchen-inspec (2.5.2) + jwt (2.4.0) + kitchen-inspec (2.6.0) hashie (>= 3.4, <= 5.0) inspec (>= 2.2.64, < 6.0) test-kitchen (>= 2.7, < 4) @@ -403,7 +403,7 @@ GEM minitest (5.15.0) mixlib-config (3.0.9) tomlrb - mixlib-install (3.12.16) + mixlib-install (3.12.19) mixlib-shellout mixlib-versioning thor @@ -423,7 +423,7 @@ GEM faraday-cookie_jar (~> 0.0.6) ms_rest (~> 0.7.6) multi_json (1.15.0) - multipart-post (2.1.1) + multipart-post (2.2.0) net-scp (3.0.0) net-ssh (>= 2.6.5, < 7.0.0) net-ssh (6.1.0) From 347dc41faa1520a83e79adc814099abf985612d1 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 8 Jun 2022 23:58:01 +0100 Subject: [PATCH 22/31] ci: update `pre-commit` configuration inc. for pre-commit.ci [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/450 --- .gitlab-ci.yml | 4 ---- .pre-commit-config.yaml | 14 +++++++++++++- .travis.yml | 4 ---- kitchen.yml | 18 ------------------ 4 files changed, 13 insertions(+), 27 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f50f662..d92b1bc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -171,10 +171,6 @@ ubuntu-1804-master-py3: {extends: '.test_instance'} # repositories-debian-9-3003-4-py3: {extends: '.test_instance'} # repositories-ubuntu-2004-3003-4-py3: {extends: '.test_instance'} # repositories-ubuntu-1804-3003-4-py3: {extends: '.test_instance'} -# repositories-debian-10-3002-8-py3: {extends: '.test_instance'} -# repositories-debian-9-3002-8-py3: {extends: '.test_instance'} -# repositories-ubuntu-2004-3002-8-py3: {extends: '.test_instance'} -# repositories-ubuntu-1804-3002-8-py3: {extends: '.test_instance'} # yamllint enable rule:line-length ############################################################################### diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2cb381e..1299a84 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,6 +3,18 @@ --- # See https://pre-commit.com for more information # See https://pre-commit.com/hooks.html for more hooks +ci: + autofix_commit_msg: | + ci(pre-commit.ci): apply auto fixes from pre-commit.com hooks + + For more information, see https://pre-commit.ci + autofix_prs: true + autoupdate_branch: '' + autoupdate_commit_msg: | + ci(pre-commit.ci): perform `pre-commit` autoupdate + autoupdate_schedule: quarterly + skip: [] + submodules: false default_stages: [commit] repos: - repo: https://github.com/dafyddj/commitlint-pre-commit-hook @@ -18,7 +30,7 @@ repos: additional_dependencies: ['@commitlint/config-conventional@8.3.4'] always_run: true - repo: https://github.com/rubocop-hq/rubocop - rev: v1.25.1 + rev: v1.30.1 hooks: - id: rubocop name: Check Ruby files with rubocop diff --git a/.travis.yml b/.travis.yml index d66e9e1..75dabaf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -123,10 +123,6 @@ jobs: # - env: INSTANCE=repositories-debian-9-3003-4-py3 # - env: INSTANCE=repositories-ubuntu-2004-3003-4-py3 # - env: INSTANCE=repositories-ubuntu-1804-3003-4-py3 - # - env: INSTANCE=repositories-debian-10-3002-8-py3 - # - env: INSTANCE=repositories-debian-9-3002-8-py3 - # - env: INSTANCE=repositories-ubuntu-2004-3002-8-py3 - # - env: INSTANCE=repositories-ubuntu-1804-3002-8-py3 ## Define the release stage that runs `semantic-release` - stage: 'release' diff --git a/kitchen.yml b/kitchen.yml index d3e0c34..a46b6c6 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -115,24 +115,6 @@ platforms: image: saltimages/salt-3003.4-py3:ubuntu-18.04 run_command: /lib/systemd/systemd - ## SALT `3002.8` - - name: debian-10-3002-8-py3 - driver: - image: saltimages/salt-3002.8-py3:debian-10 - run_command: /lib/systemd/systemd - - name: debian-9-3002-8-py3 - driver: - image: saltimages/salt-3002.8-py3:debian-9 - run_command: /lib/systemd/systemd - - name: ubuntu-2004-3002-8-py3 - driver: - image: saltimages/salt-3002.8-py3:ubuntu-20.04 - run_command: /lib/systemd/systemd - - name: ubuntu-1804-3002-8-py3 - driver: - image: saltimages/salt-3002.8-py3:ubuntu-18.04 - run_command: /lib/systemd/systemd - verifier: # https://www.inspec.io/ name: inspec From 812182ae0fe3542a61ff14691b70dd95b17464c8 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 15 Jun 2022 23:00:27 +0100 Subject: [PATCH 23/31] chore(gemfile.lock): update to latest gem versions (2022-W24) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/452 --- Gemfile.lock | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8ed6cd1..35206e0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: 6bedc829b7fcec035311d8c6086db5d59414428c + revision: fdc592e2c7b999166f404ae28119866e805c3cd2 branch: ssf specs: - inspec (5.17.9) + inspec (5.18.5) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 5.17.9) + inspec-core (= 5.18.5) mongo (= 2.13.2) progress_bar (~> 1.3.3) rake @@ -14,7 +14,7 @@ GIT train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (5.17.9) + inspec-core (5.18.5) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -58,7 +58,7 @@ GEM public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.596.0) + aws-partitions (1.598.0) aws-sdk-alexaforbusiness (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) @@ -83,7 +83,7 @@ GEM aws-sdk-batch (1.47.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-budgets (1.49.0) + aws-sdk-budgets (1.50.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-cloudformation (1.69.0) @@ -142,7 +142,7 @@ GEM aws-sdk-dynamodb (1.74.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.317.0) + aws-sdk-ec2 (1.318.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.56.0) @@ -190,7 +190,7 @@ GEM aws-sdk-guardduty (1.57.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.68.0) + aws-sdk-iam (1.69.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-kafka (1.49.0) @@ -223,7 +223,7 @@ GEM aws-sdk-rds (1.146.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.82.0) + aws-sdk-redshift (1.83.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-route53 (1.63.0) @@ -380,10 +380,10 @@ GEM inifile (3.0.0) jmespath (1.6.1) json (2.6.2) - jwt (2.4.0) - kitchen-inspec (2.6.0) + jwt (2.4.1) + kitchen-inspec (2.6.1) hashie (>= 3.4, <= 5.0) - inspec (>= 2.2.64, < 6.0) + inspec (>= 2.2.64, < 7.0) test-kitchen (>= 2.7, < 4) kitchen-salt (0.7.2) hashie (>= 3.5) @@ -400,8 +400,8 @@ GEM memoist (0.16.2) method_source (1.0.0) mini_mime (1.1.2) - minitest (5.15.0) - mixlib-config (3.0.9) + minitest (5.16.0) + mixlib-config (3.0.27) tomlrb mixlib-install (3.12.19) mixlib-shellout @@ -423,7 +423,7 @@ GEM faraday-cookie_jar (~> 0.0.6) ms_rest (~> 0.7.6) multi_json (1.15.0) - multipart-post (2.2.0) + multipart-post (2.2.3) net-scp (3.0.0) net-ssh (>= 2.6.5, < 7.0.0) net-ssh (6.1.0) @@ -497,7 +497,7 @@ GEM unicode-display_width (>= 1.5, < 3.0) unicode_utils (~> 1.4) strings-ansi (0.2.0) - test-kitchen (3.2.2) + test-kitchen (3.3.0) bcrypt_pbkdf (~> 1.0) chef-utils (>= 16.4.35) ed25519 (~> 1.2) From 4fe4fb8afcafd1dba0faff75a8dcfc581fafe179 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 30 Jun 2022 23:03:01 +0100 Subject: [PATCH 24/31] chore(gemfile.lock): update to latest gem versions (2022-W26) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/453 --- Gemfile.lock | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 35206e0..4307147 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: fdc592e2c7b999166f404ae28119866e805c3cd2 + revision: da3b324893676451fbe419cb11dff91372a9bb9e branch: ssf specs: - inspec (5.18.5) + inspec (5.18.9) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 5.18.5) + inspec-core (= 5.18.9) mongo (= 2.13.2) progress_bar (~> 1.3.3) rake @@ -14,7 +14,7 @@ GIT train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (5.18.5) + inspec-core (5.18.9) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -58,14 +58,14 @@ GEM public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.598.0) + aws-partitions (1.602.0) aws-sdk-alexaforbusiness (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-amplify (1.32.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-apigateway (1.77.0) + aws-sdk-apigateway (1.78.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-apigatewayv2 (1.42.0) @@ -74,7 +74,7 @@ GEM aws-sdk-applicationautoscaling (1.51.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-athena (1.53.0) + aws-sdk-athena (1.54.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-autoscaling (1.63.0) @@ -128,7 +128,7 @@ GEM aws-sdk-configservice (1.77.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.131.1) + aws-sdk-core (3.131.2) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) @@ -139,10 +139,10 @@ GEM aws-sdk-databasemigrationservice (1.53.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-dynamodb (1.74.0) + aws-sdk-dynamodb (1.75.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.318.0) + aws-sdk-ec2 (1.320.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.56.0) @@ -151,7 +151,7 @@ GEM aws-sdk-ecrpublic (1.12.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.99.0) + aws-sdk-ecs (1.100.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-efs (1.54.0) @@ -169,7 +169,7 @@ GEM aws-sdk-elasticloadbalancing (1.40.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancingv2 (1.77.0) + aws-sdk-elasticloadbalancingv2 (1.78.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-elasticsearchservice (1.65.0) @@ -187,13 +187,13 @@ GEM aws-sdk-glue (1.88.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-guardduty (1.57.0) + aws-sdk-guardduty (1.58.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.69.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-kafka (1.49.0) + aws-sdk-kafka (1.50.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-kinesis (1.41.0) @@ -245,7 +245,7 @@ GEM aws-sdk-secretsmanager (1.46.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-securityhub (1.65.0) + aws-sdk-securityhub (1.67.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-servicecatalog (1.60.0) @@ -400,7 +400,7 @@ GEM memoist (0.16.2) method_source (1.0.0) mini_mime (1.1.2) - minitest (5.16.0) + minitest (5.16.1) mixlib-config (3.0.27) tomlrb mixlib-install (3.12.19) @@ -486,9 +486,9 @@ GEM rubyntlm (0.6.3) rubyzip (2.3.2) semverse (3.0.2) - signet (0.16.1) + signet (0.17.0) addressable (~> 2.8) - faraday (>= 0.17.5, < 3.0) + faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) sslshake (1.3.1) @@ -515,7 +515,7 @@ GEM timeliness (0.3.10) tomlrb (1.3.0) trailblazer-option (0.1.2) - train (3.9.2) + train (3.10.1) activesupport (>= 6.0.3.1) azure_graph_rbac (~> 0.16) azure_mgmt_key_vault (~> 0.17) @@ -526,7 +526,7 @@ GEM google-api-client (>= 0.23.9, <= 0.52.0) googleauth (>= 0.6.6, <= 0.14.0) inifile (~> 3.0) - train-core (= 3.9.2) + train-core (= 3.10.1) train-winrm (~> 0.2) train-aws (0.2.24) aws-sdk-alexaforbusiness (~> 1.0) @@ -604,7 +604,7 @@ GEM aws-sdk-synthetics (~> 1.19.0) aws-sdk-transfer (>= 1.26, < 1.35) aws-sdk-waf (~> 1.43.0) - train-core (3.9.2) + train-core (3.10.1) addressable (~> 2.5) ffi (!= 1.13.0) json (>= 1.8, < 3.0) @@ -640,7 +640,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.8.2) - unicode-display_width (2.1.0) + unicode-display_width (2.2.0) unicode_utils (1.4.0) winrm (2.3.6) builder (>= 2.1.2) From bea590babc31b60e8c4e2db6e3194d92d128bbb3 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sun, 17 Jul 2022 19:41:27 +0100 Subject: [PATCH 25/31] chore(gemfile.lock): update to latest gem versions (2022-W28) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/454 --- Gemfile.lock | 38 +++++++++++----------- bin/kitchen | 4 +-- test/integration/share/libraries/system.rb | 2 ++ 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4307147..471bb68 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,20 +1,20 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: da3b324893676451fbe419cb11dff91372a9bb9e + revision: aaef842906a5666f0fc0b4f186b4dd3498f5b28c branch: ssf specs: - inspec (5.18.9) + inspec (5.18.15) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 5.18.9) + inspec-core (= 5.18.15) mongo (= 2.13.2) progress_bar (~> 1.3.3) rake - train (~> 3.0) + train (~> 3.10) train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (5.18.9) + inspec-core (5.18.15) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -34,7 +34,7 @@ GIT sslshake (~> 1.2) thor (>= 0.20, < 2.0) tomlrb (>= 1.2, < 2.1) - train-core (~> 3.0) + train-core (~> 3.10) tty-prompt (~> 0.17) tty-table (~> 0.10) @@ -49,7 +49,7 @@ GIT GEM remote: https://rubygems.org/ specs: - activesupport (7.0.3) + activesupport (7.0.3.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -58,7 +58,7 @@ GEM public_suffix (>= 2.0.2, < 5.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.602.0) + aws-partitions (1.607.0) aws-sdk-alexaforbusiness (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) @@ -74,7 +74,7 @@ GEM aws-sdk-applicationautoscaling (1.51.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-athena (1.54.0) + aws-sdk-athena (1.55.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-autoscaling (1.63.0) @@ -86,7 +86,7 @@ GEM aws-sdk-budgets (1.50.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudformation (1.69.0) + aws-sdk-cloudformation (1.70.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-cloudfront (1.65.0) @@ -125,7 +125,7 @@ GEM aws-sdk-cognitoidentityprovider (1.53.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-configservice (1.77.0) + aws-sdk-configservice (1.79.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-core (3.131.2) @@ -142,7 +142,7 @@ GEM aws-sdk-dynamodb (1.75.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.320.0) + aws-sdk-ec2 (1.322.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.56.0) @@ -211,7 +211,7 @@ GEM aws-sdk-networkfirewall (1.17.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-networkmanager (1.23.0) + aws-sdk-networkmanager (1.24.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-organizations (1.59.0) @@ -220,10 +220,10 @@ GEM aws-sdk-ram (1.26.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-rds (1.146.0) + aws-sdk-rds (1.148.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.83.0) + aws-sdk-redshift (1.84.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-route53 (1.63.0) @@ -375,7 +375,7 @@ GEM http-cookie (1.0.5) domain_name (~> 0.5) httpclient (2.8.3) - i18n (1.10.0) + i18n (1.12.0) concurrent-ruby (~> 1.0) inifile (3.0.0) jmespath (1.6.1) @@ -400,7 +400,7 @@ GEM memoist (0.16.2) method_source (1.0.0) mini_mime (1.1.2) - minitest (5.16.1) + minitest (5.16.2) mixlib-config (3.0.27) tomlrb mixlib-install (3.12.19) @@ -479,7 +479,7 @@ GEM rubocop-ast (>= 1.15.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.18.0) + rubocop-ast (1.19.1) parser (>= 3.1.1.0) ruby-progressbar (1.11.0) ruby2_keywords (0.0.5) @@ -497,7 +497,7 @@ GEM unicode-display_width (>= 1.5, < 3.0) unicode_utils (~> 1.4) strings-ansi (0.2.0) - test-kitchen (3.3.0) + test-kitchen (3.3.1) bcrypt_pbkdf (~> 1.0) chef-utils (>= 16.4.35) ed25519 (~> 1.2) diff --git a/bin/kitchen b/bin/kitchen index dcfdb4c..5d5663e 100755 --- a/bin/kitchen +++ b/bin/kitchen @@ -19,8 +19,8 @@ if File.file?(bundle_binstub) load(bundle_binstub) else abort( - 'Your `bin/bundle` was not generated by Bundler, '\ - 'so this binstub cannot run. Replace `bin/bundle` by running '\ + 'Your `bin/bundle` was not generated by Bundler, ' \ + 'so this binstub cannot run. Replace `bin/bundle` by running ' \ '`bundle binstubs bundler --force`, then run this command again.' ) end diff --git a/test/integration/share/libraries/system.rb b/test/integration/share/libraries/system.rb index 0db9d0b..64405bb 100644 --- a/test/integration/share/libraries/system.rb +++ b/test/integration/share/libraries/system.rb @@ -97,6 +97,8 @@ def build_finger_release # rubocop:disable Metrics/MethodLength,Metrics/CyclomaticComplexity def build_platform_codename case build_platform_finger + when 'ubuntu-22.04' + 'jammy' when 'ubuntu-20.04' 'focal' when 'ubuntu-18.04' From 222aa6c79b7e5b8c4907666b6b361c7885ef17f8 Mon Sep 17 00:00:00 2001 From: Sylvain Faivre Date: Wed, 9 Apr 2025 15:49:53 +0200 Subject: [PATCH 26/31] ci: use latest test images --- .gitlab-ci.yml | 59 ++---- .pre-commit-config.yaml | 50 +++-- Gemfile | 3 + Gemfile.lock | 440 ++++++++++++++++++++++------------------ kitchen.yml | 242 +++++++++++++++++----- 5 files changed, 481 insertions(+), 313 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d92b1bc..0919397 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,11 +13,10 @@ stage_release: &stage_release 'release' stage_test: &stage_test 'test' # `image` - image_commitlint: &image_commitlint 'myii/ssf-commitlint:11' - image_dindruby: &image_dindruby 'myii/ssf-dind-ruby:2.7.1-r3' - image_precommit: &image_precommit - name: 'myii/ssf-pre-commit:2.9.2' - entrypoint: ['/bin/bash', '-c'] + image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.76' + image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.45' + image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.45' + image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.4.10' image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest' image_semantic-release: &image_semanticrelease 'myii/ssf-semantic-release:15.14' # `services` @@ -131,46 +130,18 @@ rubocop: # Make sure the instances listed below match up with # the `platforms` defined in `kitchen.yml` # yamllint disable rule:line-length -# repositories-debian-11-tiamat-py3: {extends: '.test_instance'} -# repositories-debian-10-tiamat-py3: {extends: '.test_instance'} -# repositories-debian-9-tiamat-py3: {extends: '.test_instance'} -# repositories-ubuntu-2204-tiamat-py3: {extends: '.test_instance_failure_permitted'} -# repositories-ubuntu-2004-tiamat-py3: {extends: '.test_instance'} -# repositories-ubuntu-1804-tiamat-py3: {extends: '.test_instance'} -# repositories-debian-11-master-py3: {extends: '.test_instance'} -# preferences-debian-11-master-py3: {extends: '.test_instance'} -# unattended-debian-11-master-py3: {extends: '.test_instance'} +debian-12-master-py3: {extends: '.test_instance'} debian-11-master-py3: {extends: '.test_instance'} -# repositories-debian-10-master-py3: {extends: '.test_instance'} -# preferences-debian-10-master-py3: {extends: '.test_instance'} -# unattended-debian-10-master-py3: {extends: '.test_instance'} -debian-10-master-py3: {extends: '.test_instance'} -# repositories-debian-9-master-py3: {extends: '.test_instance'} -# preferences-debian-9-master-py3: {extends: '.test_instance'} -# unattended-debian-9-master-py3: {extends: '.test_instance'} -debian-9-master-py3: {extends: '.test_instance'} -# repositories-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'} -# preferences-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'} -# unattended-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'} -ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'} -# repositories-ubuntu-2004-master-py3: {extends: '.test_instance'} -# preferences-ubuntu-2004-master-py3: {extends: '.test_instance'} -# unattended-ubuntu-2004-master-py3: {extends: '.test_instance'} -ubuntu-2004-master-py3: {extends: '.test_instance'} -# repositories-ubuntu-1804-master-py3: {extends: '.test_instance'} -# preferences-ubuntu-1804-master-py3: {extends: '.test_instance'} -# unattended-ubuntu-1804-master-py3: {extends: '.test_instance'} -ubuntu-1804-master-py3: {extends: '.test_instance'} -# repositories-debian-11-3004-1-py3: {extends: '.test_instance'} -# repositories-debian-10-3004-1-py3: {extends: '.test_instance'} -# repositories-debian-9-3004-1-py3: {extends: '.test_instance'} -# repositories-ubuntu-2204-3004-1-py3: {extends: '.test_instance_failure_permitted'} -# repositories-ubuntu-2004-3004-1-py3: {extends: '.test_instance'} -# repositories-ubuntu-1804-3004-1-py3: {extends: '.test_instance'} -# repositories-debian-10-3003-4-py3: {extends: '.test_instance'} -# repositories-debian-9-3003-4-py3: {extends: '.test_instance'} -# repositories-ubuntu-2004-3003-4-py3: {extends: '.test_instance'} -# repositories-ubuntu-1804-3003-4-py3: {extends: '.test_instance'} +ubuntu-2404-master-py3: {extends: '.test_instance'} +ubuntu-2204-master-py3: {extends: '.test_instance'} +debian-12-3007-1-py3: {extends: '.test_instance'} +debian-11-3007-1-py3: {extends: '.test_instance'} +ubuntu-2404-3007-1-py3: {extends: '.test_instance'} +ubuntu-2204-3007-1-py3: {extends: '.test_instance'} +debian-12-3006-10-py3: {extends: '.test_instance'} +debian-11-3006-10-py3: {extends: '.test_instance'} +ubuntu-2404-3006-10-py3: {extends: '.test_instance'} +ubuntu-2204-3006-10-py3: {extends: '.test_instance'} # yamllint enable rule:line-length ############################################################################### diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 1299a84..01e4346 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -24,46 +24,62 @@ repos: name: Check commit message using commitlint description: Lint commit message against @commitlint/config-conventional rules stages: [commit-msg] - additional_dependencies: ['@commitlint/config-conventional@8.3.4'] - - id: commitlint-travis - stages: [manual] - additional_dependencies: ['@commitlint/config-conventional@8.3.4'] - always_run: true + additional_dependencies: ['@commitlint/config-conventional@17.1.0'] - repo: https://github.com/rubocop-hq/rubocop - rev: v1.30.1 + rev: v1.57.0 hooks: - id: rubocop name: Check Ruby files with rubocop args: [--debug] - always_run: true - pass_filenames: false - repo: https://github.com/shellcheck-py/shellcheck-py - rev: v0.8.0.4 + rev: v0.9.0.6 hooks: - id: shellcheck name: Check shell scripts with shellcheck files: ^.*\.(sh|bash|ksh)$ types: [] - repo: https://github.com/adrienverge/yamllint - rev: v1.26.3 + rev: v1.32.0 hooks: - id: yamllint name: Check YAML syntax with yamllint - args: [--strict, '.'] - always_run: true - pass_filenames: false + args: [--strict] + types: [file] + # Files to include + # 1. Obvious YAML files + # 2. `pillar.example` and similar files + # 3. SLS files under directory `test/` which are pillar files + # Files to exclude + # 1. SLS files under directory `test/` which are state files + # 2. `kitchen.vagrant.yml`, which contains Embedded Ruby (ERB) template syntax + # 3. YAML files heavily reliant on Jinja + files: | + (?x)^( + .*\.yaml| + .*\.yml| + \.salt-lint| + \.yamllint| + .*\.example| + test/.*\.sls + )$ + exclude: | + (?x)^( + kitchen.vagrant.yml| + test/.*/states/.*\.sls + )$ - repo: https://github.com/warpnet/salt-lint - rev: v0.8.0 + rev: v0.9.2 hooks: - id: salt-lint name: Check Salt files using salt-lint files: ^.*\.(sls|jinja|j2|tmpl|tst)$ - repo: https://github.com/myint/rstcheck - rev: 3f929574 + rev: v6.2.0 hooks: - id: rstcheck name: Check reST files using rstcheck exclude: 'docs/CHANGELOG.rst' + additional_dependencies: [sphinx==7.2.6] - repo: https://github.com/saltstack-formulas/mirrors-rst-lint rev: v1.3.2 hooks: @@ -73,5 +89,7 @@ repos: (?x)^( docs/CHANGELOG.rst| docs/TOFS_pattern.rst| + docs/CONTRIBUTING_DOCS.rst| + docs/index.rst| )$ - additional_dependencies: [pygments==2.9.0] + additional_dependencies: [pygments==2.16.1] diff --git a/Gemfile b/Gemfile index 12d9b1d..51d2dc9 100644 --- a/Gemfile +++ b/Gemfile @@ -17,3 +17,6 @@ gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure gem 'kitchen-inspec', '>= 2.5.0' gem 'kitchen-salt', '>= 0.7.2' + +# Avoid the error 'pkeys are immutable on OpenSSL 3.0' +gem 'net-ssh', '>= 7.0.0' diff --git a/Gemfile.lock b/Gemfile.lock index 471bb68..be16d6e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,24 +1,26 @@ GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec - revision: aaef842906a5666f0fc0b4f186b4dd3498f5b28c + revision: a0c6295303f7d7a4d2a6164b5e77868560b04945 branch: ssf specs: - inspec (5.18.15) + inspec (5.21.15) cookstyle faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 5.18.15) + inspec-core (= 5.21.15) mongo (= 2.13.2) progress_bar (~> 1.3.3) rake + roo (~> 2.9.0) + roo-xls train (~> 3.10) train-aws (~> 0.2) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (5.18.15) + inspec-core (5.21.15) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) - faraday (>= 0.9.0, < 1.5) - faraday_middleware (~> 1.0) + faraday (>= 1, < 3) + faraday-follow_redirects (~> 0.3) hashie (>= 3.4, < 5.0) license-acceptance (>= 0.2.13, < 3.0) method_source (>= 0.8, < 2.0) @@ -40,213 +42,221 @@ GIT GIT remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker - revision: 9a09bc1e571e25f3ccabf4725ca2048d970fff82 + revision: 104079a1d2fe34f5b076f4d316f6f837fa76e412 branch: ssf specs: - kitchen-docker (2.12.0) + kitchen-docker (2.13.0) test-kitchen (>= 1.0.0) GEM remote: https://rubygems.org/ specs: - activesupport (7.0.3.1) + activesupport (7.1.1) + base64 + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) minitest (>= 5.1) + mutex_m tzinfo (~> 2.0) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.5) + public_suffix (>= 2.0.2, < 6.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.607.0) - aws-sdk-alexaforbusiness (1.56.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-partitions (1.836.0) + aws-sdk-account (1.18.0) + aws-sdk-core (~> 3, >= 3.184.0) + aws-sigv4 (~> 1.1) + aws-sdk-alexaforbusiness (1.65.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) aws-sdk-amplify (1.32.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-apigateway (1.78.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-apigateway (1.88.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-apigatewayv2 (1.42.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-apigatewayv2 (1.51.0) + aws-sdk-core (~> 3, >= 3.184.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.55.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-athena (1.75.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-autoscaling (1.63.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-autoscaling (1.92.0) + aws-sdk-core (~> 3, >= 3.176.0) aws-sigv4 (~> 1.1) - aws-sdk-batch (1.47.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-batch (1.73.0) + aws-sdk-core (~> 3, >= 3.176.0) aws-sigv4 (~> 1.1) - aws-sdk-budgets (1.50.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-budgets (1.60.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudformation (1.70.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-cloudformation (1.91.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudfront (1.65.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-cloudfront (1.83.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsm (1.39.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-cloudhsm (1.48.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsmv2 (1.42.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-cloudhsmv2 (1.51.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudtrail (1.49.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-cloudtrail (1.69.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatch (1.64.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-cloudwatch (1.81.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatchevents (1.46.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-cloudwatchevents (1.62.0) + aws-sdk-core (~> 3, >= 3.176.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatchlogs (1.53.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-cloudwatchlogs (1.71.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-codecommit (1.51.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-codecommit (1.60.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-codedeploy (1.49.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-codedeploy (1.60.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-codepipeline (1.53.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-codepipeline (1.62.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-cognitoidentity (1.31.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-cognitoidentity (1.45.0) + aws-sdk-core (~> 3, >= 3.176.0) aws-sigv4 (~> 1.1) - aws-sdk-cognitoidentityprovider (1.53.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-cognitoidentityprovider (1.76.0) + aws-sdk-core (~> 3, >= 3.176.0) aws-sigv4 (~> 1.1) - aws-sdk-configservice (1.79.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-configservice (1.99.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.131.2) + aws-sdk-core (3.185.1) aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.525.0) - aws-sigv4 (~> 1.1) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-costandusagereportservice (1.40.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-costandusagereportservice (1.50.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-databasemigrationservice (1.53.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-databasemigrationservice (1.80.0) + aws-sdk-core (~> 3, >= 3.176.0) aws-sigv4 (~> 1.1) - aws-sdk-dynamodb (1.75.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-dynamodb (1.95.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.322.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-ec2 (1.413.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-ecr (1.56.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-ecr (1.65.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-ecrpublic (1.12.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-ecrpublic (1.23.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.100.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-ecs (1.130.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-efs (1.54.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-efs (1.67.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-eks (1.75.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-eks (1.90.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.78.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-elasticache (1.92.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticbeanstalk (1.51.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-elasticbeanstalk (1.61.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancing (1.40.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-elasticloadbalancing (1.49.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancingv2 (1.78.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-elasticloadbalancingv2 (1.93.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticsearchservice (1.65.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-elasticsearchservice (1.77.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) aws-sdk-emr (1.53.0) aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-eventbridge (1.24.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-eventbridge (1.46.0) + aws-sdk-core (~> 3, >= 3.176.0) aws-sigv4 (~> 1.1) - aws-sdk-firehose (1.48.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-firehose (1.58.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-glue (1.88.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-glue (1.145.0) + aws-sdk-core (~> 3, >= 3.176.0) aws-sigv4 (~> 1.1) - aws-sdk-guardduty (1.58.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-guardduty (1.80.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.69.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-iam (1.87.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-kafka (1.50.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-kafka (1.63.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-kinesis (1.41.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-kinesis (1.52.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.57.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-kms (1.72.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.84.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-lambda (1.106.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) aws-sdk-mq (1.40.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-networkfirewall (1.17.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-networkfirewall (1.35.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-networkmanager (1.24.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-networkmanager (1.37.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-organizations (1.59.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-organizations (1.77.0) + aws-sdk-core (~> 3, >= 3.176.0) aws-sigv4 (~> 1.1) aws-sdk-ram (1.26.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-rds (1.148.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-rds (1.197.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.84.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-redshift (1.99.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-route53 (1.63.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-route53 (1.80.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-route53domains (1.40.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-route53domains (1.52.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-route53resolver (1.37.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-route53resolver (1.49.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.114.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-s3 (1.136.0) + aws-sdk-core (~> 3, >= 3.181.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.4) + aws-sigv4 (~> 1.6) aws-sdk-s3control (1.43.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) aws-sdk-secretsmanager (1.46.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-securityhub (1.67.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-securityhub (1.94.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) aws-sdk-servicecatalog (1.60.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -254,8 +264,8 @@ GEM aws-sdk-ses (1.41.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-shield (1.48.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-shield (1.58.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) aws-sdk-signer (1.32.0) aws-sdk-core (~> 3, >= 3.120.0) @@ -263,17 +273,17 @@ GEM aws-sdk-simpledb (1.29.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv2 (~> 1.0) - aws-sdk-sms (1.40.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-sms (1.50.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-sns (1.53.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-sns (1.67.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-sqs (1.51.1) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-sqs (1.64.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.137.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-ssm (1.158.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) aws-sdk-states (1.39.0) aws-sdk-core (~> 3, >= 3.112.0) @@ -281,14 +291,14 @@ GEM aws-sdk-synthetics (1.19.0) aws-sdk-core (~> 3, >= 3.121.2) aws-sigv4 (~> 1.1) - aws-sdk-transfer (1.34.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-transfer (1.73.0) + aws-sdk-core (~> 3, >= 3.176.0) aws-sigv4 (~> 1.1) aws-sdk-waf (1.43.0) aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) aws-sigv2 (1.1.0) - aws-sigv4 (1.5.0) + aws-sigv4 (1.6.0) aws-eventstream (~> 1, >= 1.0.2) azure_graph_rbac (0.17.2) ms_rest_azure (~> 0.12.0) @@ -300,12 +310,14 @@ GEM ms_rest_azure (~> 0.12.0) azure_mgmt_storage (0.23.0) ms_rest_azure (~> 0.12.0) + base64 (0.1.1) bcrypt_pbkdf (1.1.0) + bigdecimal (3.1.4) bson (4.15.0) builder (3.2.4) - chef-config (17.10.0) + chef-config (18.3.0) addressable - chef-utils (= 17.10.0) + chef-utils (= 18.3.0) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -313,11 +325,12 @@ GEM chef-telemetry (1.1.1) chef-config concurrent-ruby (~> 1.0) - chef-utils (17.10.0) + chef-utils (18.3.0) concurrent-ruby coderay (1.1.3) - concurrent-ruby (1.1.10) - cookstyle (7.32.1) + concurrent-ruby (1.2.2) + connection_pool (2.4.1) + cookstyle (7.32.2) rubocop (= 1.25.1) declarative (0.0.20) diff-lcs (1.5.0) @@ -326,16 +339,22 @@ GEM multi_json domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) + drb (2.1.1) + ruby2_keywords ed25519 (1.3.0) - erubi (1.10.0) - excon (0.92.3) - faraday (1.4.3) + erubi (1.12.0) + excon (0.104.0) + faraday (1.10.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.1) - multipart-post (>= 1.2, < 3) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) ruby2_keywords (>= 0.0.4) faraday-cookie_jar (0.0.7) faraday (>= 0.8.0) @@ -343,11 +362,19 @@ GEM faraday-em_http (1.0.0) faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) + faraday-follow_redirects (0.3.0) + faraday (>= 1, < 3) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) faraday-net_http (1.0.1) faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) faraday_middleware (1.0.0) faraday (~> 1.0) - ffi (1.15.5) + ffi (1.16.3) fuzzyurl (0.9.0) google-api-client (0.52.0) addressable (~> 2.5, >= 2.5.1) @@ -371,19 +398,19 @@ GEM builder (>= 2.1.2) rexml (~> 3.0) hashie (4.1.0) - highline (2.0.3) + highline (2.1.0) http-cookie (1.0.5) domain_name (~> 0.5) httpclient (2.8.3) - i18n (1.12.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) inifile (3.0.0) - jmespath (1.6.1) - json (2.6.2) - jwt (2.4.1) - kitchen-inspec (2.6.1) + jmespath (1.6.2) + json (2.6.3) + jwt (2.7.1) + kitchen-inspec (2.6.2) hashie (>= 3.4, <= 5.0) - inspec (>= 2.2.64, < 7.0) + inspec (>= 2.2.64, < 6.0) test-kitchen (>= 2.7, < 4) kitchen-salt (0.7.2) hashie (>= 3.5) @@ -399,11 +426,12 @@ GEM multi_json (~> 1.14) memoist (0.16.2) method_source (1.0.0) - mini_mime (1.1.2) - minitest (5.16.2) + mini_mime (1.1.5) + mini_portile2 (2.8.4) + minitest (5.20.0) mixlib-config (3.0.27) tomlrb - mixlib-install (3.12.19) + mixlib-install (3.12.27) mixlib-shellout mixlib-versioning thor @@ -423,53 +451,66 @@ GEM faraday-cookie_jar (~> 0.0.6) ms_rest (~> 0.7.6) multi_json (1.15.0) - multipart-post (2.2.3) - net-scp (3.0.0) - net-ssh (>= 2.6.5, < 7.0.0) - net-ssh (6.1.0) + multipart-post (2.3.0) + mutex_m (0.1.2) + net-scp (4.0.0) + net-ssh (>= 2.6.5, < 8.0.0) + net-ssh (7.2.0) net-ssh-gateway (2.0.0) net-ssh (>= 4.0.0) + nokogiri (1.15.4) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) nori (2.6.0) options (2.3.2) os (1.1.4) - parallel (1.22.1) - parser (3.1.2.0) + parallel (1.23.0) + parser (3.2.2.4) ast (~> 2.4.1) + racc parslet (1.8.2) pastel (0.8.0) tty-color (~> 0.5) progress_bar (1.3.3) highline (>= 1.6, < 3) options (~> 2.3.0) - pry (0.14.1) + pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) - public_suffix (4.0.7) + public_suffix (5.0.3) + racc (1.7.1) rainbow (3.1.1) rake (13.0.6) - regexp_parser (2.5.0) + regexp_parser (2.8.2) representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rexml (3.2.5) + rexml (3.2.6) + roo (2.9.0) + nokogiri (~> 1) + rubyzip (>= 1.3.0, < 3.0.0) + roo-xls (1.2.0) + nokogiri + roo (>= 2.0.0, < 3) + spreadsheet (> 0.9.0) rspec (3.11.0) rspec-core (~> 3.11.0) rspec-expectations (~> 3.11.0) rspec-mocks (~> 3.11.0) rspec-core (3.11.0) rspec-support (~> 3.11.0) - rspec-expectations (3.11.0) + rspec-expectations (3.11.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.11.0) rspec-its (1.3.0) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) - rspec-mocks (3.11.1) + rspec-mocks (3.11.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.11.0) - rspec-support (3.11.0) + rspec-support (3.11.1) rubocop (1.25.1) parallel (~> 1.10) parser (>= 3.1.0.0) @@ -479,43 +520,46 @@ GEM rubocop-ast (>= 1.15.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.19.1) - parser (>= 3.1.1.0) - ruby-progressbar (1.11.0) + rubocop-ast (1.29.0) + parser (>= 3.2.1.0) + ruby-ole (1.2.12.2) + ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) rubyntlm (0.6.3) rubyzip (2.3.2) semverse (3.0.2) - signet (0.17.0) + signet (0.18.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) + spreadsheet (1.3.0) + ruby-ole sslshake (1.3.1) strings (0.2.1) strings-ansi (~> 0.2) unicode-display_width (>= 1.5, < 3.0) unicode_utils (~> 1.4) strings-ansi (0.2.0) - test-kitchen (3.3.1) + test-kitchen (3.5.0) bcrypt_pbkdf (~> 1.0) chef-utils (>= 16.4.35) ed25519 (~> 1.2) license-acceptance (>= 1.0.11, < 3.0) mixlib-install (~> 3.6) mixlib-shellout (>= 1.2, < 4.0) - net-scp (>= 1.1, < 4.0) - net-ssh (>= 2.9, < 7.0) + net-scp (>= 1.1, < 5.0) + net-ssh (>= 2.9, < 8.0) net-ssh-gateway (>= 1.2, < 3.0) thor (>= 0.19, < 2.0) winrm (~> 2.0) winrm-elevated (~> 1.0) winrm-fs (~> 1.1) - thor (1.2.1) + thor (1.2.2) timeliness (0.3.10) tomlrb (1.3.0) trailblazer-option (0.1.2) - train (3.10.1) + train (3.10.8) activesupport (>= 6.0.3.1) azure_graph_rbac (~> 0.16) azure_mgmt_key_vault (~> 0.17) @@ -526,17 +570,18 @@ GEM google-api-client (>= 0.23.9, <= 0.52.0) googleauth (>= 0.6.6, <= 0.14.0) inifile (~> 3.0) - train-core (= 3.10.1) + train-core (= 3.10.8) train-winrm (~> 0.2) - train-aws (0.2.24) + train-aws (0.2.36) + aws-sdk-account (~> 1.14) aws-sdk-alexaforbusiness (~> 1.0) aws-sdk-amplify (~> 1.32.0) aws-sdk-apigateway (~> 1.0) aws-sdk-apigatewayv2 (~> 1.0) aws-sdk-applicationautoscaling (>= 1.46, < 1.52) aws-sdk-athena (~> 1.0) - aws-sdk-autoscaling (>= 1.22, < 1.64) - aws-sdk-batch (>= 1.36, < 1.48) + aws-sdk-autoscaling (>= 1.22, < 1.93) + aws-sdk-batch (>= 1.36, < 1.74) aws-sdk-budgets (~> 1.0) aws-sdk-cloudformation (~> 1.0) aws-sdk-cloudfront (~> 1.0) @@ -544,17 +589,17 @@ 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-cloudwatchevents (>= 1.36, < 1.63) 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.54) + aws-sdk-cognitoidentity (>= 1.26, < 1.46) + aws-sdk-cognitoidentityprovider (>= 1.46, < 1.77) aws-sdk-configservice (~> 1.21) aws-sdk-core (~> 3.0) aws-sdk-costandusagereportservice (~> 1.6) - aws-sdk-databasemigrationservice (>= 1.42, < 1.54) + aws-sdk-databasemigrationservice (>= 1.42, < 1.81) aws-sdk-dynamodb (~> 1.31) aws-sdk-ec2 (~> 1.70) aws-sdk-ecr (~> 1.18) @@ -568,9 +613,9 @@ GEM aws-sdk-elasticloadbalancingv2 (~> 1.0) aws-sdk-elasticsearchservice (~> 1.0) aws-sdk-emr (~> 1.53.0) - aws-sdk-eventbridge (~> 1.24.0) + aws-sdk-eventbridge (>= 1.24, < 1.47) aws-sdk-firehose (~> 1.0) - aws-sdk-glue (>= 1.71, < 1.89) + aws-sdk-glue (>= 1.71, < 1.146) aws-sdk-guardduty (~> 1.31) aws-sdk-iam (~> 1.13) aws-sdk-kafka (~> 1.0) @@ -580,7 +625,7 @@ GEM aws-sdk-mq (~> 1.40.0) aws-sdk-networkfirewall (>= 1.6.0) aws-sdk-networkmanager (>= 1.13.0) - aws-sdk-organizations (>= 1.17, < 1.60) + aws-sdk-organizations (>= 1.17, < 1.78) aws-sdk-ram (>= 1.21, < 1.27) aws-sdk-rds (~> 1.43) aws-sdk-redshift (~> 1.0) @@ -602,15 +647,15 @@ GEM aws-sdk-ssm (~> 1.0) aws-sdk-states (>= 1.35, < 1.40) aws-sdk-synthetics (~> 1.19.0) - aws-sdk-transfer (>= 1.26, < 1.35) + aws-sdk-transfer (>= 1.26, < 1.74) aws-sdk-waf (~> 1.43.0) - train-core (3.10.1) + train-core (3.10.8) 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) + net-scp (>= 1.2, < 5.0) + net-ssh (>= 2.9, < 8.0) train-habitat (0.2.22) train-winrm (0.2.13) winrm (>= 2.3.6, < 3.0) @@ -634,13 +679,13 @@ GEM pastel (~> 0.8) strings (~> 0.2.0) tty-screen (~> 0.8) - tzinfo (2.0.4) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) uber (0.1.0) unf (0.1.4) unf_ext unf_ext (0.0.8.2) - unicode-display_width (2.2.0) + unicode-display_width (2.5.0) unicode_utils (1.4.0) winrm (2.3.6) builder (>= 2.1.2) @@ -670,6 +715,7 @@ DEPENDENCIES kitchen-docker! kitchen-inspec (>= 2.5.0) kitchen-salt (>= 0.7.2) + net-ssh (>= 7.0.0) BUNDLED WITH 2.1.2 diff --git a/kitchen.yml b/kitchen.yml index a46b6c6..b35a801 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -19,101 +19,231 @@ provisioner: - .git platforms: - ## SALT `tiamat` - - name: debian-11-tiamat-py3 + ## SALT `master` + - name: debian-12-master-py3 driver: - image: saltimages/salt-tiamat-py3:debian-11 + image: saltimages/salt-master-py3:debian-12 run_command: /lib/systemd/systemd - - name: debian-10-tiamat-py3 + - name: debian-11-master-py3 driver: - image: saltimages/salt-tiamat-py3:debian-10 + image: saltimages/salt-master-py3:debian-11 run_command: /lib/systemd/systemd - - name: debian-9-tiamat-py3 + - name: ubuntu-2404-master-py3 driver: - image: saltimages/salt-tiamat-py3:debian-9 + image: saltimages/salt-master-py3:ubuntu-24.04 run_command: /lib/systemd/systemd - - name: ubuntu-2204-tiamat-py3 + - name: ubuntu-2204-master-py3 driver: - image: saltimages/salt-tiamat-py3:ubuntu-22.04 + image: saltimages/salt-master-py3:ubuntu-22.04 run_command: /lib/systemd/systemd - - name: ubuntu-2004-tiamat-py3 + - name: ubuntu-2004-master-py3 driver: - image: saltimages/salt-tiamat-py3:ubuntu-20.04 + image: saltimages/salt-master-py3:ubuntu-20.04 run_command: /lib/systemd/systemd - - name: ubuntu-1804-tiamat-py3 + - name: centos-stream9-master-py3 driver: - image: saltimages/salt-tiamat-py3:ubuntu-18.04 - run_command: /lib/systemd/systemd + image: saltimages/salt-master-py3:centos-stream9 + - name: opensuse-leap-156-master-py3 + driver: + image: saltimages/salt-master-py3:opensuse-leap-15.6 + # Workaround to avoid intermittent failures on `opensuse-leap-15.6`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 + - name: opensuse-leap-155-master-py3 + driver: + image: saltimages/salt-master-py3:opensuse-leap-15.5 + # Workaround to avoid intermittent failures on `opensuse-leap-15.5`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 + - name: opensuse-tmbl-latest-master-py3 + driver: + image: saltimages/salt-master-py3:opensuse-tumbleweed-latest + # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 + - name: fedora-41-master-py3 + driver: + image: saltimages/salt-master-py3:fedora-41 + - name: fedora-40-master-py3 + driver: + image: saltimages/salt-master-py3:fedora-40 + - name: amazonlinux-2023-master-py3 + driver: + image: saltimages/salt-master-py3:amazonlinux-2023 + - name: oraclelinux-9-master-py3 + driver: + image: saltimages/salt-master-py3:oraclelinux-9 + - name: oraclelinux-8-master-py3 + driver: + image: saltimages/salt-master-py3:oraclelinux-8 + - name: almalinux-9-master-py3 + driver: + image: saltimages/salt-master-py3:almalinux-9 + - name: almalinux-8-master-py3 + driver: + image: saltimages/salt-master-py3:almalinux-8 + - name: rockylinux-9-master-py3 + driver: + image: saltimages/salt-master-py3:rockylinux-9 + - name: rockylinux-8-master-py3 + driver: + image: saltimages/salt-master-py3:rockylinux-8 - ## SALT `master` - - name: debian-11-master-py3 + ## SALT `3007.1` + - name: debian-12-3007-1-py3 driver: - image: saltimages/salt-master-py3:debian-11 + image: saltimages/salt-3007.1-py3:debian-12 run_command: /lib/systemd/systemd - - name: debian-10-master-py3 + - name: debian-11-3007-1-py3 driver: - image: saltimages/salt-master-py3:debian-10 + image: saltimages/salt-3007.1-py3:debian-11 run_command: /lib/systemd/systemd - - name: debian-9-master-py3 + - name: ubuntu-2404-3007-1-py3 driver: - image: saltimages/salt-master-py3:debian-9 + image: saltimages/salt-3007.1-py3:ubuntu-24.04 run_command: /lib/systemd/systemd - - name: ubuntu-2204-master-py3 + - name: ubuntu-2204-3007-1-py3 driver: - image: saltimages/salt-master-py3:ubuntu-22.04 + image: saltimages/salt-3007.1-py3:ubuntu-22.04 run_command: /lib/systemd/systemd - - name: ubuntu-2004-master-py3 + - name: ubuntu-2004-3007-1-py3 driver: - image: saltimages/salt-master-py3:ubuntu-20.04 + image: saltimages/salt-3007.1-py3:ubuntu-20.04 run_command: /lib/systemd/systemd - - name: ubuntu-1804-master-py3 + - name: centos-stream9-3007-1-py3 driver: - image: saltimages/salt-master-py3:ubuntu-18.04 - run_command: /lib/systemd/systemd + image: saltimages/salt-3007.1-py3:centos-stream9 + - name: opensuse-leap-155-3007-1-py3 + driver: + image: saltimages/salt-3007.1-py3:opensuse-leap-15.5 + # Workaround to avoid intermittent failures on `opensuse-leap-15.5`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 + - name: opensuse-leap-156-3007-1-py3 + driver: + image: saltimages/salt-3007.1-py3:opensuse-leap-15.6 + # Workaround to avoid intermittent failures on `opensuse-leap-15.6`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 + - name: opensuse-tmbl-latest-3007-1-py3 + driver: + image: saltimages/salt-3007.1-py3:opensuse-tumbleweed-latest + # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 + - name: fedora-41-3007-1-py3 + driver: + image: saltimages/salt-3007.1-py3:fedora-41 + - name: fedora-40-3007-1-py3 + driver: + image: saltimages/salt-3007.1-py3:fedora-40 + - name: amazonlinux-2023-3007-1-py3 + driver: + image: saltimages/salt-3007.1-py3:amazonlinux-2023 + - name: amazonlinux-2-3007-1-py3 + driver: + image: saltimages/salt-3007.1-py3:amazonlinux-2 + - name: oraclelinux-9-3007-1-py3 + driver: + image: saltimages/salt-3007.1-py3:oraclelinux-9 + - name: oraclelinux-8-3007-1-py3 + driver: + image: saltimages/salt-3007.1-py3:oraclelinux-8 + - name: almalinux-9-3007-1-py3 + driver: + image: saltimages/salt-3007.1-py3:almalinux-9 + - name: almalinux-8-3007-1-py3 + driver: + image: saltimages/salt-3007.1-py3:almalinux-8 + - name: rockylinux-9-3007-1-py3 + driver: + image: saltimages/salt-3007.1-py3:rockylinux-9 + - name: rockylinux-8-3007-1-py3 + driver: + image: saltimages/salt-3007.1-py3:rockylinux-8 - ## SALT `3004.1` - - name: debian-11-3004-1-py3 + ## SALT `3006.10` + - name: debian-12-3006-10-py3 driver: - image: saltimages/salt-3004.1-py3:debian-11 + image: saltimages/salt-3006.10-py3:debian-12 run_command: /lib/systemd/systemd - - name: debian-10-3004-1-py3 + - name: debian-11-3006-10-py3 driver: - image: saltimages/salt-3004.1-py3:debian-10 + image: saltimages/salt-3006.10-py3:debian-11 run_command: /lib/systemd/systemd - - name: debian-9-3004-1-py3 + - name: ubuntu-2404-3006-10-py3 driver: - image: saltimages/salt-3004.1-py3:debian-9 + image: saltimages/salt-3006.10-py3:ubuntu-24.04 run_command: /lib/systemd/systemd - - name: ubuntu-2204-3004-1-py3 + - name: ubuntu-2204-3006-10-py3 driver: - image: saltimages/salt-3004.1-py3:ubuntu-22.04 + image: saltimages/salt-3006.10-py3:ubuntu-22.04 run_command: /lib/systemd/systemd - - name: ubuntu-2004-3004-1-py3 + - name: ubuntu-2004-3006-10-py3 driver: - image: saltimages/salt-3004.1-py3:ubuntu-20.04 + image: saltimages/salt-3006.10-py3:ubuntu-20.04 run_command: /lib/systemd/systemd - - name: ubuntu-1804-3004-1-py3 + - name: centos-stream9-3006-10-py3 driver: - image: saltimages/salt-3004.1-py3:ubuntu-18.04 - run_command: /lib/systemd/systemd - - ## SALT `3003.4` - - name: debian-10-3003-4-py3 + image: saltimages/salt-3006.10-py3:centos-stream9 + - name: opensuse-tmbl-latest-3006-10-py3 driver: - image: saltimages/salt-3003.4-py3:debian-10 - run_command: /lib/systemd/systemd - - name: debian-9-3003-4-py3 + image: saltimages/salt-3006.10-py3:opensuse-tumbleweed-latest + # Workaround to avoid intermittent failures on `opensuse-tumbleweed`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 + - name: opensuse-leap-156-3006-10-py3 driver: - image: saltimages/salt-3003.4-py3:debian-9 - run_command: /lib/systemd/systemd - - name: ubuntu-2004-3003-4-py3 + image: saltimages/salt-3006.10-py3:opensuse-leap-15.6 + # Workaround to avoid intermittent failures on `opensuse-leap-15.6`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 + - name: opensuse-leap-155-3006-10-py3 driver: - image: saltimages/salt-3003.4-py3:ubuntu-20.04 - run_command: /lib/systemd/systemd - - name: ubuntu-1804-3003-4-py3 + image: saltimages/salt-3006.10-py3:opensuse-leap-15.5 + # Workaround to avoid intermittent failures on `opensuse-leap-15.5`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 + - name: fedora-41-3006-10-py3 driver: - image: saltimages/salt-3003.4-py3:ubuntu-18.04 - run_command: /lib/systemd/systemd + image: saltimages/salt-3006.10-py3:fedora-41 + - name: fedora-40-3006-10-py3 + driver: + image: saltimages/salt-3006.10-py3:fedora-40 + - name: amazonlinux-2023-3006-10-py3 + driver: + image: saltimages/salt-3006.10-py3:amazonlinux-2023 + - name: amazonlinux-2-3006-10-py3 + driver: + image: saltimages/salt-3006.10-py3:amazonlinux-2 + - name: oraclelinux-9-3006-10-py3 + driver: + image: saltimages/salt-3006.10-py3:oraclelinux-9 + - name: oraclelinux-8-3006-10-py3 + driver: + image: saltimages/salt-3006.10-py3:oraclelinux-8 + - name: almalinux-9-3006-10-py3 + driver: + image: saltimages/salt-3006.10-py3:almalinux-9 + - name: almalinux-8-3006-10-py3 + driver: + image: saltimages/salt-3006.10-py3:almalinux-8 + - name: rockylinux-9-3006-10-py3 + driver: + image: saltimages/salt-3006.10-py3:rockylinux-9 + - name: rockylinux-8-3006-10-py3 + driver: + image: saltimages/salt-3006.10-py3:rockylinux-8 + verifier: # https://www.inspec.io/ From 70d13b3bbf633130d379bc593c650a78e3e0468c Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Thu, 10 Apr 2025 14:21:17 +0000 Subject: [PATCH 27/31] chore(release): 0.11.1 [skip ci] ## [0.11.1](https://github.com/saltstack-formulas/apt-formula/compare/v0.11.0...v0.11.1) (2025-04-10) ### Continuous Integration * update `pre-commit` configuration inc. for pre-commit.ci [skip ci] ([347dc41](https://github.com/saltstack-formulas/apt-formula/commit/347dc41faa1520a83e79adc814099abf985612d1)) * use latest test images ([222aa6c](https://github.com/saltstack-formulas/apt-formula/commit/222aa6c79b7e5b8c4907666b6b361c7885ef17f8)) ### Tests * **system.rb:** add support for `mac_os_x` [skip ci] ([bb4d0f8](https://github.com/saltstack-formulas/apt-formula/commit/bb4d0f86db59cf323032c5cee5c8cba22c2fa9cf)) --- AUTHORS.md | 10 +++++----- CHANGELOG.md | 13 +++++++++++++ FORMULA | 2 +- docs/AUTHORS.rst | 20 ++++++++++---------- docs/CHANGELOG.rst | 16 ++++++++++++++++ 5 files changed, 45 insertions(+), 16 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index 44721b0..22871f3 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -4,18 +4,18 @@ This list is sorted by the number of commits per contributor in _descending_ ord Avatar|Contributor|Contributions :-:|---|:-: -@myii|[@myii](https://github.com/myii)|129 +@myii|[@myii](https://github.com/myii)|141 @javierbertoli|[@javierbertoli](https://github.com/javierbertoli)|30 @gravyboat|[@gravyboat](https://github.com/gravyboat)|12 @bmcclure|[@bmcclure](https://github.com/bmcclure)|8 @aboe76|[@aboe76](https://github.com/aboe76)|8 @arthurzenika|[@arthurzenika](https://github.com/arthurzenika)|7 @nmadhok|[@nmadhok](https://github.com/nmadhok)|7 +@dafyddj|[@dafyddj](https://github.com/dafyddj)|6 @boltronics|[@boltronics](https://github.com/boltronics)|5 -@dafyddj|[@dafyddj](https://github.com/dafyddj)|5 @jdkelleher|[@jdkelleher](https://github.com/jdkelleher)|5 -@westurner|[@westurner](https://github.com/westurner)|4 @daschatten|[@daschatten](https://github.com/daschatten)|4 +@westurner|[@westurner](https://github.com/westurner)|4 @techhat|[@techhat](https://github.com/techhat)|3 @whiteinge|[@whiteinge](https://github.com/whiteinge)|3 @devster31|[@devster31](https://github.com/devster31)|3 @@ -23,10 +23,10 @@ Avatar|Contributor|Contributions @jerrykan|[@jerrykan](https://github.com/jerrykan)|1 @rpatterson|[@rpatterson](https://github.com/rpatterson)|1 @simonclausen|[@simonclausen](https://github.com/simonclausen)|1 -@babilen|[@babilen](https://github.com/babilen)|1 +@wwentland|[@wwentland](https://github.com/wwentland)|1 @noelmcloughlin|[@noelmcloughlin](https://github.com/noelmcloughlin)|1 @daks|[@daks](https://github.com/daks)|1 --- -Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2022-04-18. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2025-04-10. diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e64c45..42baefc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [0.11.1](https://github.com/saltstack-formulas/apt-formula/compare/v0.11.0...v0.11.1) (2025-04-10) + + +### Continuous Integration + +* update `pre-commit` configuration inc. for pre-commit.ci [skip ci] ([347dc41](https://github.com/saltstack-formulas/apt-formula/commit/347dc41faa1520a83e79adc814099abf985612d1)) +* use latest test images ([222aa6c](https://github.com/saltstack-formulas/apt-formula/commit/222aa6c79b7e5b8c4907666b6b361c7885ef17f8)) + + +### Tests + +* **system.rb:** add support for `mac_os_x` [skip ci] ([bb4d0f8](https://github.com/saltstack-formulas/apt-formula/commit/bb4d0f86db59cf323032c5cee5c8cba22c2fa9cf)) + # [0.11.0](https://github.com/saltstack-formulas/apt-formula/compare/v0.10.4...v0.11.0) (2022-04-18) diff --git a/FORMULA b/FORMULA index 451a44a..5f31945 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: apt os: Debian, Ubuntu, Raspbian os_family: Debian -version: 0.11.0 +version: 0.11.1 release: 1 minimum_version: 2017.7 summary: Apt formula diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 4ba7a4f..d18f516 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 `_ - - 129 + - 141 * - :raw-html-m2r:`@javierbertoli` - `@javierbertoli `_ - 30 @@ -34,21 +34,21 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@nmadhok` - `@nmadhok `_ - 7 - * - :raw-html-m2r:`@boltronics` - - `@boltronics `_ - - 5 * - :raw-html-m2r:`@dafyddj` - `@dafyddj `_ + - 6 + * - :raw-html-m2r:`@boltronics` + - `@boltronics `_ - 5 * - :raw-html-m2r:`@jdkelleher` - `@jdkelleher `_ - 5 - * - :raw-html-m2r:`@westurner` - - `@westurner `_ - - 4 * - :raw-html-m2r:`@daschatten` - `@daschatten `_ - 4 + * - :raw-html-m2r:`@westurner` + - `@westurner `_ + - 4 * - :raw-html-m2r:`@techhat` - `@techhat `_ - 3 @@ -70,8 +70,8 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@simonclausen` - `@simonclausen `_ - 1 - * - :raw-html-m2r:`@babilen` - - `@babilen `_ + * - :raw-html-m2r:`@wwentland` + - `@wwentland `_ - 1 * - :raw-html-m2r:`@noelmcloughlin` - `@noelmcloughlin `_ @@ -83,4 +83,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 2022-04-18. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2025-04-10. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 1a19dd6..717bd7f 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,22 @@ Changelog ========= +`0.11.1 `_ (2025-04-10) +-------------------------------------------------------------------------------------------------------- + +Continuous Integration +^^^^^^^^^^^^^^^^^^^^^^ + + +* update ``pre-commit`` configuration inc. for pre-commit.ci [skip ci] (\ `347dc41 `_\ ) +* use latest test images (\ `222aa6c `_\ ) + +Tests +^^^^^ + + +* **system.rb:** add support for ``mac_os_x`` [skip ci] (\ `bb4d0f8 `_\ ) + `0.11.0 `_ (2022-04-18) -------------------------------------------------------------------------------------------------------- From 3e11c5999255f22f36e1fd63e10e9e553ed3f538 Mon Sep 17 00:00:00 2001 From: Didier METRAL Date: Thu, 10 Apr 2025 18:23:04 +0200 Subject: [PATCH 28/31] fix(repositories): force aptkey if signed-by and allow aptkey --- apt/map.jinja | 4 ++++ apt/repositories.sls | 15 +++++++++++++++ pillar.example | 10 ++++++++++ .../controls/repositories_spec.rb | 19 +++++++++++++++++++ test/salt/pillar/repositories.sls | 8 ++++++++ 5 files changed, 56 insertions(+) diff --git a/apt/map.jinja b/apt/map.jinja index d77073e..2355584 100644 --- a/apt/map.jinja +++ b/apt/map.jinja @@ -13,6 +13,8 @@ 'preferences': {}, 'remove_preferences': false, 'clean_preferences_d': false, + 'keyrings_dir': '/etc/apt/keyrings', + 'clean_keyrings_d': false, 'remove_apt_conf': false, 'clean_apt_conf_d': false, 'apt_conf_d': {}, @@ -52,6 +54,8 @@ 'preferences': {}, 'remove_preferences': false, 'clean_preferences_d': false, + 'keyrings_dir': '/etc/apt/keyrings', + 'clean_keyrings_d': false, 'remove_apt_conf': false, 'clean_apt_conf_d': false, 'apt_conf_d': {}, diff --git a/apt/repositories.sls b/apt/repositories.sls index 032cc47..beb3266 100644 --- a/apt/repositories.sls +++ b/apt/repositories.sls @@ -4,6 +4,8 @@ {% set clean_sources_list_d = apt.get('clean_sources_list_d', apt_map.clean_sources_list_d) %} {% set sources_list_dir = apt.get('sources_list_dir', apt_map.sources_list_dir) %} {% set repositories = apt.get('repositories', apt_map.repositories) %} +{% set keyrings_dir = apt.get('keyrings_dir', apt_map.keyrings_dir) %} +{% set clean_keyrings_d = apt.get('clean_keyrings_d', apt_map.clean_keyrings_d) %} {% set default_url = apt.get('default_url', apt_map.default_url) %} {% set keyring_package = apt.get('keyring_package', apt_map.default_keyring_package) %} @@ -30,6 +32,13 @@ - group: root - clean: {{ clean_sources_list_d }} +{{ keyrings_dir }}: + file.directory: + - mode: '0755' + - user: root + - group: root + - clean: {{ clean_keyrings_d }} + {% for repo, args in repositories.items() %} {% set r_opts = '' %} @@ -69,6 +78,9 @@ the latter will be used. #} {% if args.key_url is defined %} - key_url: {{ args.key_url }} + {% if 'signed-by=' in r_opts|lower and args.aptkey is not defined %} + - aptkey: false + {% endif %} {% elif args.key_text is defined %} - key_text: {{ args.key_text }} {% elif args.keyid is defined %} @@ -78,6 +90,9 @@ - clean_file: true - refresh: False - refresh_db: False + {% if args.aptkey is defined %} + - aptkey: {{ args.aptkey }} + {% endif %} - onchanges_in: - module: apt.refresh_db diff --git a/pillar.example b/pillar.example index 6f313a0..9a217ef 100644 --- a/pillar.example +++ b/pillar.example @@ -14,6 +14,9 @@ apt: remove_preferences: true clean_preferences_d: true + keyrings_dir: '/etc/apt/keyrings' + clean_keyrings_d: true + apt_conf_d: 30release: 'APT::Default-Release': stable @@ -126,6 +129,13 @@ apt: opts: trusted: 'yes' another: whatever + saltstack: + distro: stable + url: https://packages.broadcom.com/artifactory/saltproject-deb + comps: [main] + type: [binary] + key_url: https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public # yamllint disable-line rule:line-length + opts: "signed-by=/etc/apt/keyrings/salt-archive-keyring.pgp" preferences: 00-rspamd: diff --git a/test/integration/repositories/controls/repositories_spec.rb b/test/integration/repositories/controls/repositories_spec.rb index c08eef9..cac9731 100644 --- a/test/integration/repositories/controls/repositories_spec.rb +++ b/test/integration/repositories/controls/repositories_spec.rb @@ -64,4 +64,23 @@ describe file('/etc/apt/sources.list.d/raspbian-binary.list') do it { should_not exist } end + + describe file('/etc/apt/sources.list.d/saltstack.list') do + it { should exist } + it { should be_owned_by 'root' } + it { should be_grouped_into 'root' } + its('mode') { should cmp '0644' } + its(:content) do + should match( + %r{deb \[\s?signed-by=/etc/apt/keyrings/salt-archive-keyring.pgp\s?\] https://packages.broadcom.com/artifactory/saltproject-deb stable main} + ) + end + end + + describe file('/etc/apt/keyrings/salt-archive-keyring.pgp') do + it { should exist } + it { should be_owned_by 'root' } + it { should be_grouped_into 'root' } + its('mode') { should cmp '0644' } + end end diff --git a/test/salt/pillar/repositories.sls b/test/salt/pillar/repositories.sls index 97aeb3b..ade535e 100644 --- a/test/salt/pillar/repositories.sls +++ b/test/salt/pillar/repositories.sls @@ -27,3 +27,11 @@ apt: url: http://archive.raspbian.org/raspbian type: [source] key_url: https://archive.raspbian.org/raspbian.public.key + saltstack: + filename: saltstack.list + distro: stable + url: https://packages.broadcom.com/artifactory/saltproject-deb + comps: [main] + type: [binary] + key_url: https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public # yamllint disable-line rule:line-length + opts: "signed-by=/etc/apt/keyrings/salt-archive-keyring.pgp" From e6230fbca38423694f3f9787c8e09b879bc01a9d Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Mon, 14 Apr 2025 08:43:44 +0000 Subject: [PATCH 29/31] chore(release): 0.11.2 [skip ci] ## [0.11.2](https://github.com/saltstack-formulas/apt-formula/compare/v0.11.1...v0.11.2) (2025-04-14) ### Bug Fixes * **repositories:** force aptkey if signed-by and allow aptkey ([3e11c59](https://github.com/saltstack-formulas/apt-formula/commit/3e11c5999255f22f36e1fd63e10e9e553ed3f538)) --- AUTHORS.md | 9 +++++---- CHANGELOG.md | 7 +++++++ FORMULA | 2 +- docs/AUTHORS.rst | 19 +++++++++++-------- docs/CHANGELOG.rst | 9 +++++++++ 5 files changed, 33 insertions(+), 13 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index 22871f3..7261281 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -5,21 +5,22 @@ This list is sorted by the number of commits per contributor in _descending_ ord Avatar|Contributor|Contributions :-:|---|:-: @myii|[@myii](https://github.com/myii)|141 -@javierbertoli|[@javierbertoli](https://github.com/javierbertoli)|30 +@javierbertoli|[@javierbertoli](https://github.com/javierbertoli)|31 @gravyboat|[@gravyboat](https://github.com/gravyboat)|12 @bmcclure|[@bmcclure](https://github.com/bmcclure)|8 @aboe76|[@aboe76](https://github.com/aboe76)|8 @arthurzenika|[@arthurzenika](https://github.com/arthurzenika)|7 @nmadhok|[@nmadhok](https://github.com/nmadhok)|7 @dafyddj|[@dafyddj](https://github.com/dafyddj)|6 -@boltronics|[@boltronics](https://github.com/boltronics)|5 @jdkelleher|[@jdkelleher](https://github.com/jdkelleher)|5 -@daschatten|[@daschatten](https://github.com/daschatten)|4 +@boltronics|[@boltronics](https://github.com/boltronics)|5 @westurner|[@westurner](https://github.com/westurner)|4 +@daschatten|[@daschatten](https://github.com/daschatten)|4 @techhat|[@techhat](https://github.com/techhat)|3 @whiteinge|[@whiteinge](https://github.com/whiteinge)|3 @devster31|[@devster31](https://github.com/devster31)|3 @baby-gnu|[@baby-gnu](https://github.com/baby-gnu)|1 +@didiermfb|[@didiermfb](https://github.com/didiermfb)|1 @jerrykan|[@jerrykan](https://github.com/jerrykan)|1 @rpatterson|[@rpatterson](https://github.com/rpatterson)|1 @simonclausen|[@simonclausen](https://github.com/simonclausen)|1 @@ -29,4 +30,4 @@ Avatar|Contributor|Contributions --- -Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2025-04-10. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2025-04-14. diff --git a/CHANGELOG.md b/CHANGELOG.md index 42baefc..59a489f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.11.2](https://github.com/saltstack-formulas/apt-formula/compare/v0.11.1...v0.11.2) (2025-04-14) + + +### Bug Fixes + +* **repositories:** force aptkey if signed-by and allow aptkey ([3e11c59](https://github.com/saltstack-formulas/apt-formula/commit/3e11c5999255f22f36e1fd63e10e9e553ed3f538)) + ## [0.11.1](https://github.com/saltstack-formulas/apt-formula/compare/v0.11.0...v0.11.1) (2025-04-10) diff --git a/FORMULA b/FORMULA index 5f31945..ec9b6c5 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: apt os: Debian, Ubuntu, Raspbian os_family: Debian -version: 0.11.1 +version: 0.11.2 release: 1 minimum_version: 2017.7 summary: Apt formula diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index d18f516..baf26e8 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -18,7 +18,7 @@ This list is sorted by the number of commits per contributor in *descending* ord - 141 * - :raw-html-m2r:`@javierbertoli` - `@javierbertoli `_ - - 30 + - 31 * - :raw-html-m2r:`@gravyboat` - `@gravyboat `_ - 12 @@ -37,18 +37,18 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@dafyddj` - `@dafyddj `_ - 6 - * - :raw-html-m2r:`@boltronics` - - `@boltronics `_ - - 5 * - :raw-html-m2r:`@jdkelleher` - `@jdkelleher `_ - 5 - * - :raw-html-m2r:`@daschatten` - - `@daschatten `_ - - 4 + * - :raw-html-m2r:`@boltronics` + - `@boltronics `_ + - 5 * - :raw-html-m2r:`@westurner` - `@westurner `_ - 4 + * - :raw-html-m2r:`@daschatten` + - `@daschatten `_ + - 4 * - :raw-html-m2r:`@techhat` - `@techhat `_ - 3 @@ -61,6 +61,9 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@baby-gnu` - `@baby-gnu `_ - 1 + * - :raw-html-m2r:`@didiermfb` + - `@didiermfb `_ + - 1 * - :raw-html-m2r:`@jerrykan` - `@jerrykan `_ - 1 @@ -83,4 +86,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 2025-04-10. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2025-04-14. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 717bd7f..7de8960 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,15 @@ Changelog ========= +`0.11.2 `_ (2025-04-14) +-------------------------------------------------------------------------------------------------------- + +Bug Fixes +^^^^^^^^^ + + +* **repositories:** force aptkey if signed-by and allow aptkey (\ `3e11c59 `_\ ) + `0.11.1 `_ (2025-04-10) -------------------------------------------------------------------------------------------------------- From 6687a12f42b28fac7b170c03c150ec45f1c9acff Mon Sep 17 00:00:00 2001 From: Didier METRAL Date: Thu, 10 Apr 2025 19:00:35 +0200 Subject: [PATCH 30/31] feat(repositories): stop removing sources files and support unmanaged --- apt/apt_conf.sls | 4 ++-- apt/listchanges.sls | 2 +- apt/map.jinja | 10 +++++--- apt/repositories.sls | 24 ++++++++++++++++++- kitchen.yml | 4 ++++ pillar.example | 3 +++ .../controls/repositories_spec.rb | 9 ++----- test/salt/pillar/repositories.sls | 10 +++----- test/salt/states/unmanaged.sls | 5 ++++ 9 files changed, 50 insertions(+), 21 deletions(-) create mode 100644 test/salt/states/unmanaged.sls diff --git a/apt/apt_conf.sls b/apt/apt_conf.sls index 8a07461..be6d436 100644 --- a/apt/apt_conf.sls +++ b/apt/apt_conf.sls @@ -18,7 +18,7 @@ {{ confd_dir }}: file.directory: - - mode: 755 + - mode: '0755' - user: root - group: root - clean: {{ clean_apt_conf_d }} @@ -30,7 +30,7 @@ - template: jinja - user: root - group: root - - mode: 644 + - mode: '0644' - context: data: {{ contents }} - require_in: diff --git a/apt/listchanges.sls b/apt/listchanges.sls index 87fb06f..2d81edc 100644 --- a/apt/listchanges.sls +++ b/apt/listchanges.sls @@ -13,5 +13,5 @@ apt_listchanges_pkgs: - template: jinja - user: root - group: root - - mode: 644 + - mode: '0644' - source: {{ listchanges_config_template }} diff --git a/apt/map.jinja b/apt/map.jinja index 2355584..c1ae3b4 100644 --- a/apt/map.jinja +++ b/apt/map.jinja @@ -1,5 +1,6 @@ {% set distribution = salt['grains.get']('lsb_distrib_codename') %} {% set arch = salt['grains.get']('osarch').split(' ') %} +{% set debian_comp = ['main', 'contrib', 'non-free', 'non-free-firmware'] if salt['grains.get']('osmajorrelease') >= 12 else ['main', 'contrib', 'non-free'] %} {% set apt = salt['grains.filter_by']({ 'Debian': { 'pkgs': ['unattended-upgrades'], @@ -26,19 +27,22 @@ 'distro': distribution, 'url': 'http://deb.debian.org/debian/', 'arch': arch, - 'comps': ['main'], + 'comps': debian_comp, + 'opts': 'signed-by=/usr/share/keyrings/debian-archive-keyring.gpg' }, 'security-stable': { 'distro': distribution ~ '/updates', 'url': 'http://security.debian.org/', 'arch': arch, - 'comps': ['main'], + 'comps': debian_comp, + 'opts': 'signed-by=/usr/share/keyrings/debian-archive-keyring.gpg' }, 'default-updates': { 'distro': distribution ~ '-updates', 'url': 'http://deb.debian.org/debian/', 'arch': arch, - 'comps': ['main'], + 'comps': debian_comp, + 'opts': 'signed-by=/usr/share/keyrings/debian-archive-keyring.gpg' }, }, }, diff --git a/apt/repositories.sls b/apt/repositories.sls index beb3266..6f61a1d 100644 --- a/apt/repositories.sls +++ b/apt/repositories.sls @@ -25,12 +25,28 @@ - replace: False {% endif %} +{% set excluded_sources = [] %} +{% set unmanaged_repos = [] %} +{% for repo, args in repositories.items() %} + {% if args.unmanaged is defined and args.unmanaged %} + {# repo.list is considered the filename unless filename is explicitly defined. + # managed repo lists files are constructed repo-type.list #} + {% do excluded_sources.append(args.filename if args.filename is defined else repo ~ '.list') %} + {% do unmanaged_repos.append(repo) %} + {% endif %} +{% endfor %} +{% for repo in unmanaged_repos %} + {# remove these repo's to avoid pgrepo.managed loop #} + {% do repositories.pop(repo) %} +{% endfor %} + {{ sources_list_dir }}: file.directory: - mode: '0755' - user: root - group: root - clean: {{ clean_sources_list_d }} + - exclude_pat: {{ excluded_sources | json }} {{ keyrings_dir }}: file.directory: @@ -95,7 +111,13 @@ {% endif %} - onchanges_in: - module: apt.refresh_db - + file.managed: + - name: {{ sources_list_dir }}/{{ r_file }} + - replace: false + - require_in: + - file: {{ sources_list_dir }} + # require_in the directory clean state + # This way, we don't remove all the files, just to add them again. {%- endfor %} {% endfor %} diff --git a/kitchen.yml b/kitchen.yml index b35a801..c3c6eb0 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -259,6 +259,7 @@ suites: state_top: base: '*': + - states/unmanaged - apt._mapdata - apt.repositories - apt.update @@ -269,6 +270,9 @@ suites: - apt pillars_from_files: apt.sls: test/salt/pillar/repositories.sls + dependencies: + - name: states + path: ./test/salt verifier: inspec_tests: - path: test/integration/repositories diff --git a/pillar.example b/pillar.example index 9a217ef..8df4614 100644 --- a/pillar.example +++ b/pillar.example @@ -136,6 +136,9 @@ apt: type: [binary] key_url: https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public # yamllint disable-line rule:line-length opts: "signed-by=/etc/apt/keyrings/salt-archive-keyring.pgp" + rabbitmq: + unmanaged: true # useful when rabbitmq.list is managed by another formula + filename: rabbitmq.list preferences: 00-rspamd: diff --git a/test/integration/repositories/controls/repositories_spec.rb b/test/integration/repositories/controls/repositories_spec.rb index cac9731..12cfdd1 100644 --- a/test/integration/repositories/controls/repositories_spec.rb +++ b/test/integration/repositories/controls/repositories_spec.rb @@ -25,15 +25,10 @@ its('mode') { should cmp '0755' } end - describe file('/etc/apt/sources.list.d/multimedia-stable-binary.list') do + describe file('/etc/apt/sources.list.d/unmanaged.list') do it { should exist } - it { should be_owned_by 'root' } - it { should be_grouped_into 'root' } - its('mode') { should cmp '0644' } its(:content) do - should match( - %r{deb \[arch=amd64\] http://www.deb-multimedia.org stable main} - ) + should match("## unmanged list file that shouldn't be removed") end end diff --git a/test/salt/pillar/repositories.sls b/test/salt/pillar/repositories.sls index ade535e..91d82ce 100644 --- a/test/salt/pillar/repositories.sls +++ b/test/salt/pillar/repositories.sls @@ -6,13 +6,9 @@ apt: clean_sources_list_d: true repositories: - multimedia-stable: - distro: stable - url: http://www.deb-multimedia.org - arch: [amd64] - comps: [main] - keyid: 5C808C2B65558117 - keyserver: keyserver.ubuntu.com + unmanaged: + unmanaged: true # do not remove this file when clean_sources_list_d=true + filename: unmanaged.list # optional heroku: distro: ./ url: https://cli-assets.heroku.com/apt diff --git a/test/salt/states/unmanaged.sls b/test/salt/states/unmanaged.sls new file mode 100644 index 0000000..4cd5468 --- /dev/null +++ b/test/salt/states/unmanaged.sls @@ -0,0 +1,5 @@ +repos_maintained_by_another_formula: + file.managed: + - name: /etc/apt/sources.list.d/unmanaged.list + - mode: '0644' + - contents: "## unmanged list file that shouldn't be removed" From 0202854ad3259b61587d13190fbadc45684534fd Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Thu, 26 Jun 2025 03:49:29 +0000 Subject: [PATCH 31/31] chore(release): 0.12.0 [skip ci] # [0.12.0](https://github.com/saltstack-formulas/apt-formula/compare/v0.11.2...v0.12.0) (2025-06-26) ### Features * **repositories:** stop removing sources files and support unmanaged ([6687a12](https://github.com/saltstack-formulas/apt-formula/commit/6687a12f42b28fac7b170c03c150ec45f1c9acff)) --- AUTHORS.md | 6 +++--- CHANGELOG.md | 7 +++++++ FORMULA | 2 +- docs/AUTHORS.rst | 10 +++++----- docs/CHANGELOG.rst | 9 +++++++++ 5 files changed, 25 insertions(+), 9 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index 7261281..fc1403d 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -19,8 +19,8 @@ Avatar|Contributor|Contributions @techhat|[@techhat](https://github.com/techhat)|3 @whiteinge|[@whiteinge](https://github.com/whiteinge)|3 @devster31|[@devster31](https://github.com/devster31)|3 -@baby-gnu|[@baby-gnu](https://github.com/baby-gnu)|1 -@didiermfb|[@didiermfb](https://github.com/didiermfb)|1 +@didiermfb|[@didiermfb](https://github.com/didiermfb)|2 +@baby-gnu|[@baby-gnu](https://github.com/baby-gnu)|2 @jerrykan|[@jerrykan](https://github.com/jerrykan)|1 @rpatterson|[@rpatterson](https://github.com/rpatterson)|1 @simonclausen|[@simonclausen](https://github.com/simonclausen)|1 @@ -30,4 +30,4 @@ Avatar|Contributor|Contributions --- -Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2025-04-14. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2025-06-26. diff --git a/CHANGELOG.md b/CHANGELOG.md index 59a489f..141800a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +# [0.12.0](https://github.com/saltstack-formulas/apt-formula/compare/v0.11.2...v0.12.0) (2025-06-26) + + +### Features + +* **repositories:** stop removing sources files and support unmanaged ([6687a12](https://github.com/saltstack-formulas/apt-formula/commit/6687a12f42b28fac7b170c03c150ec45f1c9acff)) + ## [0.11.2](https://github.com/saltstack-formulas/apt-formula/compare/v0.11.1...v0.11.2) (2025-04-14) diff --git a/FORMULA b/FORMULA index ec9b6c5..a7dd04b 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: apt os: Debian, Ubuntu, Raspbian os_family: Debian -version: 0.11.2 +version: 0.12.0 release: 1 minimum_version: 2017.7 summary: Apt formula diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index baf26e8..aba796c 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -58,12 +58,12 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@devster31` - `@devster31 `_ - 3 - * - :raw-html-m2r:`@baby-gnu` - - `@baby-gnu `_ - - 1 * - :raw-html-m2r:`@didiermfb` - `@didiermfb `_ - - 1 + - 2 + * - :raw-html-m2r:`@baby-gnu` + - `@baby-gnu `_ + - 2 * - :raw-html-m2r:`@jerrykan` - `@jerrykan `_ - 1 @@ -86,4 +86,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 2025-04-14. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2025-06-26. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 7de8960..a9c0d0a 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,15 @@ Changelog ========= +`0.12.0 `_ (2025-06-26) +-------------------------------------------------------------------------------------------------------- + +Features +^^^^^^^^ + + +* **repositories:** stop removing sources files and support unmanaged (\ `6687a12 `_\ ) + `0.11.2 `_ (2025-04-14) --------------------------------------------------------------------------------------------------------