From 1a132d84422218bc12f31890c1a92b51bb3ec71c Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 14 Feb 2022 08:03:53 +0000 Subject: [PATCH 01/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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) --------------------------------------------------------------------------------------------------------