From 7b4da79e584ab0c0b08035ddc96b68e7b5e9b8fe Mon Sep 17 00:00:00 2001 From: Bram Vogelaar Date: Sun, 17 Jan 2021 11:41:54 +0100 Subject: [PATCH 01/61] [blacksmith] Bump version to 1.0.1-rc0 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 248c728..bfa4234 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppet-hashi_stack", - "version": "1.0.0", + "version": "1.0.1-rc0", "author": "Vox Pupuli", "summary": "This module contains shared code for various HashiCorp modules", "license": "AGPL-3.0", From 460012fd9e39c3f6082d1974079c9fe117f32397 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Tue, 9 Feb 2021 17:39:29 +0100 Subject: [PATCH 02/61] Enable Puppet 7 support/testing --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index bfa4234..12ba727 100644 --- a/metadata.json +++ b/metadata.json @@ -59,7 +59,7 @@ "requirements": [ { "name": "puppet", - "version_requirement": ">= 6.1.0 < 7.0.0" + "version_requirement": ">= 6.1.0 < 8.0.0" } ] } From 4a0d31fbf0d110e774ca5767638e3ca3d5e14705 Mon Sep 17 00:00:00 2001 From: Nacho Barrientos Date: Fri, 19 Mar 2021 15:11:32 +0100 Subject: [PATCH 03/61] Allow customising the base URL of the Yum repository Some people might have private mirrors of the repository and would rather to install the software from there. --- manifests/repo.pp | 4 +++- spec/classes/repo_spec.rb | 19 ++++++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/manifests/repo.pp b/manifests/repo.pp index 8b4d3f2..5c6db88 100644 --- a/manifests/repo.pp +++ b/manifests/repo.pp @@ -17,12 +17,14 @@ # @param key_id GPG key to authenticate Apt package signatures. # @param key_source The location of an existing GPG key file to copy. # @param description Repository description +# @param rpm_base Base URL for the Yum repository class hashi_stack::repo ( Optional[Integer] $priority = undef, String $proxy = 'absent', String $key_id = 'E8A032E094D8EB4EA189D270DA418C88A3219F7B', Stdlib::HTTPSUrl $key_source = 'https://apt.releases.hashicorp.com/gpg', String $description = 'HashiCorp package repository.', + String $rpm_base = 'https://rpm.releases.hashicorp.com', ) { case $facts['os']['family'] { 'Debian': { @@ -48,7 +50,7 @@ class hashi_stack::repo ( 'RedHat': { yumrepo { 'HashiCorp': descr => $description, - baseurl => 'https://rpm.releases.hashicorp.com/RHEL/$releasever/$basearch/stable', + baseurl => "${rpm_base}/RHEL/\$releasever/\$basearch/stable", gpgcheck => 1, gpgkey => $key_source, enabled => 1, diff --git a/spec/classes/repo_spec.rb b/spec/classes/repo_spec.rb index ebcd550..713a14d 100644 --- a/spec/classes/repo_spec.rb +++ b/spec/classes/repo_spec.rb @@ -9,7 +9,24 @@ describe 'hashi_stack::repo' do when 'Debian' it { is_expected.to contain_apt__source('HashiCorp') } when 'RedHat' - it { is_expected.to contain_yumrepo('HashiCorp') } + it { + is_expected.to contain_yumrepo('HashiCorp').with( + baseurl: 'https://rpm.releases.hashicorp.com/RHEL/$releasever/$basearch/stable', + ) + } + context "with custom Yum base url" do + let(:params) do + { + rpm_base: 'https://somewhere.else' + } + end + + it { + is_expected.to contain_yumrepo('HashiCorp').with( + baseurl: 'https://somewhere.else/RHEL/$releasever/$basearch/stable', + ) + } + end end end end From 1844a30bf91b7d83d78fc7914789dc5360d1369f Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Mon, 10 May 2021 11:32:16 -0400 Subject: [PATCH 04/61] Drop EoL Debian, adjust deps for Puppet 6 & 7 Module dependencies were updated minimum versions that support Puppet 6 and max versions that includes the latest releases. The "description" key was removed as it is no longer supported. yumrepo_core was also dropped as it is only needed in the fixtures file. yum was dropped because it is not used within this module --- .fixtures.yml | 1 - metadata.json | 14 ++------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/.fixtures.yml b/.fixtures.yml index 4d4db48..1841595 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -2,7 +2,6 @@ fixtures: repositories: apt: "https://github.com/puppetlabs/puppetlabs-apt.git" stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git" - yum: "https://github.com/voxpupuli/puppet-yum.git" yumrepo_core: repo: "https://github.com/puppetlabs/puppetlabs-yumrepo_core.git" puppet_version: ">= 6.0.0" diff --git a/metadata.json b/metadata.json index 12ba727..1500d2b 100644 --- a/metadata.json +++ b/metadata.json @@ -7,23 +7,14 @@ "source": "https://github.com/voxpupuli/puppet-hashi_stack", "project_page": "https://github.com/voxpupuli/puppet-hashi_stack", "issues_url": "https://github.com/voxpupuli/puppet-hashi_stack/issues", - "description": "This module contains shared code for various HashiCorp modules", "dependencies": [ { "name": "puppetlabs-stdlib", - "version_requirement": ">= 4.13.1 < 7.0.0" + "version_requirement": ">= 5.1.0 < 8.0.0" }, { "name": "puppetlabs/apt", - "version_requirement": ">= 2.0.0 < 8.0.0" - }, - { - "name": "puppet/yum", - "version_requirement": ">= 0.9.6 < 5.0.0" - }, - { - "name": "puppetlabs/yumrepo_core", - "version_requirement": ">= 1.0.0 < 2.0.0" + "version_requirement": ">= 6.1.0 < 9.0.0" } ], "operatingsystem_support": [ @@ -44,7 +35,6 @@ { "operatingsystem": "Debian", "operatingsystemrelease": [ - "9", "10" ] }, From ab0c6e18ec2c9396779db6b2d771b4fa6f1b5fe1 Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Mon, 10 May 2021 19:07:52 -0400 Subject: [PATCH 05/61] Release prep for 2.0.0 This is a major version bump because of the changes in supported operating systems and supported puppet versions. --- CHANGELOG.md | 18 +++++++++++++++--- REFERENCE.md | 29 ++++++++++++++++++++++------- metadata.json | 2 +- 3 files changed, 38 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 599befd..c4015db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,14 +4,26 @@ All notable changes to this project will be documented in this file. Each new release typically also includes the latest modulesync defaults. These should not affect the functionality of the module. -## [v1.0.0](https://github.com/voxpupuli/puppet-hashi_stack/tree/v1.0.0) (2021-01-16) +## [v2.0.0](https://github.com/voxpupuli/puppet-hashi_stack/tree/v2.0.0) (2021-05-10) + +[Full Changelog](https://github.com/voxpupuli/puppet-hashi_stack/compare/v1.0.0...v2.0.0) + +**Breaking changes:** + +- Drop EoL Debian, adjust deps for Puppet 6 & 7 [\#6](https://github.com/voxpupuli/puppet-hashi_stack/pull/6) ([genebean](https://github.com/genebean)) + +**Implemented enhancements:** + +- Allow customising the base URL of the Yum repository [\#5](https://github.com/voxpupuli/puppet-hashi_stack/pull/5) ([nbarrientos](https://github.com/nbarrientos)) +- Enable Puppet 7 support/testing [\#4](https://github.com/voxpupuli/puppet-hashi_stack/pull/4) ([bastelfreak](https://github.com/bastelfreak)) + +## [v1.0.0](https://github.com/voxpupuli/puppet-hashi_stack/tree/v1.0.0) (2021-01-17) [Full Changelog](https://github.com/voxpupuli/puppet-hashi_stack/compare/d9ceffd75b1f222e1145d58cceaf3a9bcb41b360...v1.0.0) -**Merged pull requests:** +**Implemented enhancements:** - moving parameters into appropriate place, adding meaning unit test, f… [\#2](https://github.com/voxpupuli/puppet-hashi_stack/pull/2) ([attachmentgenie](https://github.com/attachmentgenie)) -- modulesync 4.0.0-10-g1c946c3 [\#1](https://github.com/voxpupuli/puppet-hashi_stack/pull/1) ([attachmentgenie](https://github.com/attachmentgenie)) diff --git a/REFERENCE.md b/REFERENCE.md index abfbe26..d74ddfd 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -10,7 +10,7 @@ ## Classes -### `hashi_stack::repo` +### `hashi_stack::repo` This class installs the hashicorp repository @@ -34,9 +34,16 @@ package { 'packer': #### Parameters -The following parameters are available in the `hashi_stack::repo` class. +The following parameters are available in the `hashi_stack::repo` class: -##### `priority` +* [`priority`](#priority) +* [`proxy`](#proxy) +* [`key_id`](#key_id) +* [`key_source`](#key_source) +* [`description`](#description) +* [`rpm_base`](#rpm_base) + +##### `priority` Data type: `Optional[Integer]` @@ -44,7 +51,7 @@ A numeric priority for the repo, passed to the package management system Default value: ``undef`` -##### `proxy` +##### `proxy` Data type: `String` @@ -52,7 +59,7 @@ The URL of a HTTP proxy to use for package downloads (YUM only) Default value: `'absent'` -##### `key_id` +##### `key_id` Data type: `String` @@ -60,7 +67,7 @@ GPG key to authenticate Apt package signatures. Default value: `'E8A032E094D8EB4EA189D270DA418C88A3219F7B'` -##### `key_source` +##### `key_source` Data type: `Stdlib::HTTPSUrl` @@ -68,7 +75,7 @@ The location of an existing GPG key file to copy. Default value: `'https://apt.releases.hashicorp.com/gpg'` -##### `description` +##### `description` Data type: `String` @@ -76,3 +83,11 @@ Repository description Default value: `'HashiCorp package repository.'` +##### `rpm_base` + +Data type: `String` + +Base URL for the Yum repository + +Default value: `'https://rpm.releases.hashicorp.com'` + diff --git a/metadata.json b/metadata.json index 1500d2b..a12eb36 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppet-hashi_stack", - "version": "1.0.1-rc0", + "version": "2.0.0", "author": "Vox Pupuli", "summary": "This module contains shared code for various HashiCorp modules", "license": "AGPL-3.0", From f92d991d9a347471617adca7f11adbac3230978c Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Tue, 11 May 2021 08:30:58 -0400 Subject: [PATCH 06/61] [blacksmith] Bump version to 2.0.1-rc0 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index a12eb36..1d6d60a 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppet-hashi_stack", - "version": "2.0.0", + "version": "2.0.1-rc0", "author": "Vox Pupuli", "summary": "This module contains shared code for various HashiCorp modules", "license": "AGPL-3.0", From 413d7bbf50cb8642e9f33427c662f044a19cbbc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= Date: Wed, 25 Aug 2021 07:41:25 -1000 Subject: [PATCH 07/61] Allow stdlib 8.0.0 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 1d6d60a..b9f6fff 100644 --- a/metadata.json +++ b/metadata.json @@ -10,7 +10,7 @@ "dependencies": [ { "name": "puppetlabs-stdlib", - "version_requirement": ">= 5.1.0 < 8.0.0" + "version_requirement": ">= 5.1.0 < 9.0.0" }, { "name": "puppetlabs/apt", From 226505f4fdd7b42677268cf7fd0e5cd48329acf4 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Thu, 26 Aug 2021 10:39:14 +0200 Subject: [PATCH 08/61] modulesync 4.2.0 --- .editorconfig | 3 ++- .github/CONTRIBUTING.md | 36 +++----------------------------- .github/workflows/ci.yml | 39 ++++++++++++++++++++++------------- .github/workflows/release.yml | 5 +++++ .gitignore | 3 +++ .msync.yml | 5 ++++- .overcommit.yml | 3 ++- .pmtignore | 3 +++ .rspec | 3 +++ .rspec_parallel | 3 +++ .rubocop.yml | 3 +++ .yardopts | 2 -- Dockerfile | 5 ++++- Gemfile | 23 +++++++++++---------- Rakefile | 23 +++++++++++++++------ spec/spec_helper.rb | 5 ++--- 16 files changed, 91 insertions(+), 73 deletions(-) delete mode 100644 .yardopts diff --git a/.editorconfig b/.editorconfig index d77700e..ecb10a8 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,6 +1,7 @@ # editorconfig.org -# MANAGED BY MODULESYNC +# Managed by modulesync - DO NOT EDIT +# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ root = true diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index f1f88cc..048d2b5 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -25,7 +25,7 @@ By participating in this project you agree to abide by its terms. * Fork the repo. * Create a separate branch for your change. -* We only take pull requests with passing tests, and documentation. [travis-ci](http://travis-ci.org) runs the tests for us. You can also execute them locally. This is explained [in a later section](#the-test-matrix). +* We only take pull requests with passing tests, and documentation. [GitHub Actions](https://docs.github.com/en/actions) run the tests for us. You can also execute them locally. This is explained [in a later section](#the-test-matrix). * Checkout [our docs](https://voxpupuli.org/docs/reviewing_pr/) we use to review a module and the [official styleguide](https://puppet.com/docs/puppet/6.0/style_guide.html). They provide some guidance for new code that might help you before you submit a pull request. * Add a test for your change. Only refactoring and documentation changes require no new tests. If you are adding functionality or fixing a bug, please add a test. * Squash your commits down into logical components. Make sure to rebase against our current master. @@ -232,33 +232,7 @@ simple tests against it after applying the module. You can run this with: ```sh -bundle exec rake beaker -``` - -This will run the tests on the module's default nodeset. You can override the -nodeset used, e.g., - -```sh -BEAKER_set=centos-7-x64 bundle exec rake beaker -``` - -There are default rake tasks for the various acceptance test modules, e.g., - -```sh -bundle exec rake beaker:centos-7-x64 -bundle exec rake beaker:ssh:centos-7-x64 -``` - -If you don't want to have to recreate the virtual machine every time you can -use `BEAKER_destroy=no` and `BEAKER_provision=no`. On the first run you will at -least need `BEAKER_provision` set to yes (the default). The Vagrantfile for the -created virtual machines will be in `.vagrant/beaker_vagrant_files`. - -Beaker also supports docker containers. We also use that in our automated CI -pipeline at [travis-ci](http://travis-ci.org). To use that instead of Vagrant: - -```sh -PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=debian10-64{hypervisor=docker} BEAKER_destroy=yes bundle exec rake beaker +BEAKER_setfile=debian10-x64 bundle exec rake beaker ``` You can replace the string `debian10` with any common operating system. @@ -272,11 +246,7 @@ The following strings are known to work: * centos7 * centos8 -The easiest way to debug in a docker container is to open a shell: - -```sh -docker exec -it -u root ${container_id_or_name} bash -``` +For more information and tips & tricks, see [voxpupuli-acceptance's documentation](https://github.com/voxpupuli/voxpupuli-acceptance#running-tests). The source of this file is in our [modulesync_config](https://github.com/voxpupuli/modulesync_config/blob/master/moduleroot/.github/CONTRIBUTING.md.erb) repository. diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b4f47e8..2ce5b05 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,3 +1,7 @@ +--- +# Managed by modulesync - DO NOT EDIT +# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ + name: CI on: pull_request @@ -6,21 +10,23 @@ jobs: setup_matrix: name: 'Setup Test Matrix' runs-on: ubuntu-latest + timeout-minutes: 40 outputs: - beaker_setfiles: ${{ steps.get-outputs.outputs.beaker_setfiles }} - puppet_major_versions: ${{ steps.get-outputs.outputs.puppet_major_versions }} puppet_unit_test_matrix: ${{ steps.get-outputs.outputs.puppet_unit_test_matrix }} + github_action_test_matrix: ${{ steps.get-outputs.outputs.github_action_test_matrix }} env: - BUNDLE_WITHOUT: development:test:release + BUNDLE_WITHOUT: development:system_tests:release steps: - uses: actions/checkout@v2 - name: Setup ruby uses: ruby/setup-ruby@v1 with: - ruby-version: '2.7' + ruby-version: '3.0' bundler-cache: true - - name: Run rake validate - run: bundle exec rake validate + - name: Run static validations + run: bundle exec rake validate lint check + - name: Run rake rubocop + run: bundle exec rake rubocop - name: Setup Test Matrix id: get-outputs run: bundle exec metadata2gha --use-fqdn --pidfile-workaround false @@ -28,6 +34,7 @@ jobs: unit: needs: setup_matrix runs-on: ubuntu-latest + timeout-minutes: 40 strategy: fail-fast: false matrix: @@ -44,7 +51,7 @@ jobs: ruby-version: ${{ matrix.ruby }} bundler-cache: true - name: Run tests - run: bundle exec rake + run: bundle exec rake parallel_spec acceptance: needs: setup_matrix @@ -54,22 +61,26 @@ jobs: strategy: fail-fast: false matrix: - setfile: ${{fromJson(needs.setup_matrix.outputs.beaker_setfiles)}} - puppet: ${{fromJson(needs.setup_matrix.outputs.puppet_major_versions)}} + include: ${{fromJson(needs.setup_matrix.outputs.github_action_test_matrix)}} name: ${{ matrix.puppet.name }} - ${{ matrix.setfile.name }} steps: - - name: Enable IPv6 on docker - run: | - echo '{"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' | sudo tee /etc/docker/daemon.json - sudo service docker restart - uses: actions/checkout@v2 - name: Setup ruby uses: ruby/setup-ruby@v1 with: - ruby-version: '2.7' + ruby-version: '3.0' bundler-cache: true - name: Run tests run: bundle exec rake beaker env: BEAKER_PUPPET_COLLECTION: ${{ matrix.puppet.collection }} BEAKER_setfile: ${{ matrix.setfile.value }} + + tests: + needs: + - unit + - acceptance + runs-on: ubuntu-latest + name: Test suite + steps: + - run: echo Test suite completed diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 68b8528..664ba69 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,3 +1,7 @@ +--- +# Managed by modulesync - DO NOT EDIT +# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ + name: Release on: @@ -12,6 +16,7 @@ jobs: deploy: name: 'deploy to forge' runs-on: ubuntu-latest + if: github.repository_owner == 'voxpupuli' steps: - name: Checkout repository uses: actions/checkout@v2 diff --git a/.gitignore b/.gitignore index e9b3cf4..9b95224 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +# Managed by modulesync - DO NOT EDIT +# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ + pkg/ Gemfile.lock Gemfile.local diff --git a/.msync.yml b/.msync.yml index a0770a8..43966c2 100644 --- a/.msync.yml +++ b/.msync.yml @@ -1,2 +1,5 @@ --- -modulesync_config_version: '4.0.0' +# Managed by modulesync - DO NOT EDIT +# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ + +modulesync_config_version: '4.2.0' diff --git a/.overcommit.yml b/.overcommit.yml index 0af0fdc..d367ada 100644 --- a/.overcommit.yml +++ b/.overcommit.yml @@ -1,4 +1,5 @@ -# Managed by https://github.com/voxpupuli/modulesync_configs +# Managed by modulesync - DO NOT EDIT +# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ # # Hooks are only enabled if you take action. # diff --git a/.pmtignore b/.pmtignore index 33a8c65..65f5051 100644 --- a/.pmtignore +++ b/.pmtignore @@ -1,3 +1,6 @@ +# Managed by modulesync - DO NOT EDIT +# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ + docs/ pkg/ Gemfile diff --git a/.rspec b/.rspec index 8c18f1a..f634583 100644 --- a/.rspec +++ b/.rspec @@ -1,2 +1,5 @@ +# Managed by modulesync - DO NOT EDIT +# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ + --format documentation --color diff --git a/.rspec_parallel b/.rspec_parallel index e4d136b..a9a84f8 100644 --- a/.rspec_parallel +++ b/.rspec_parallel @@ -1 +1,4 @@ +# Managed by modulesync - DO NOT EDIT +# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ + --format progress diff --git a/.rubocop.yml b/.rubocop.yml index 198a359..53ac189 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,3 +1,6 @@ --- +# Managed by modulesync - DO NOT EDIT +# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ + inherit_gem: voxpupuli-test: rubocop.yml diff --git a/.yardopts b/.yardopts deleted file mode 100644 index 3687f51..0000000 --- a/.yardopts +++ /dev/null @@ -1,2 +0,0 @@ ---markup markdown ---output-dir docs/ diff --git a/Dockerfile b/Dockerfile index 6fd6342..e3cf307 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,7 @@ -FROM ruby:2.5.3 +# MANAGED BY MODULESYNC +# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ + +FROM ruby:2.7 WORKDIR /opt/puppet diff --git a/Gemfile b/Gemfile index 0d0a9fb..a39114c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,9 +1,13 @@ +# Managed by modulesync - DO NOT EDIT +# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ + source ENV['GEM_SOURCE'] || "https://rubygems.org" group :test do - gem 'voxpupuli-test', '~> 2.1', :require => false - gem 'coveralls', :require => false - gem 'simplecov-console', :require => false + gem 'voxpupuli-test', '~> 2.5', :require => false + gem 'coveralls', :require => false + gem 'simplecov-console', :require => false + gem 'puppet_metadata', '~> 1.0', :require => false end group :development do @@ -12,22 +16,19 @@ group :development do end group :system_tests do - gem 'puppet_metadata', '~> 0.3.0', :require => false - gem 'voxpupuli-acceptance', :require => false + gem 'voxpupuli-acceptance', '~> 1.0', :require => false end group :release do - gem 'github_changelog_generator', :require => false, :git => 'https://github.com/voxpupuli/github-changelog-generator', :branch => 'voxpupuli_essential_fixes' - gem 'puppet-blacksmith', :require => false - gem 'voxpupuli-release', :require => false - gem 'puppet-strings', '>= 2.2', :require => false + gem 'github_changelog_generator', '>= 1.16.1', :require => false if RUBY_VERSION >= '2.5' + gem 'voxpupuli-release', '>= 1.0.2', :require => false + gem 'puppet-strings', '>= 2.2', :require => false end -gem 'puppetlabs_spec_helper', '~> 2.0', :require => false gem 'rake', :require => false gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test] -puppetversion = ENV['PUPPET_VERSION'] || '~> 6.0' +puppetversion = ENV['PUPPET_VERSION'] || '>= 6.0' gem 'puppet', puppetversion, :require => false, :groups => [:test] # vim: syntax=ruby diff --git a/Rakefile b/Rakefile index d1bf749..80b799d 100644 --- a/Rakefile +++ b/Rakefile @@ -1,9 +1,22 @@ +# Managed by modulesync - DO NOT EDIT +# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ + # Attempt to load voxupuli-test (which pulls in puppetlabs_spec_helper), # otherwise attempt to load it directly. begin require 'voxpupuli/test/rake' rescue LoadError - require 'puppetlabs_spec_helper/rake_tasks' + begin + require 'puppetlabs_spec_helper/rake_tasks' + rescue LoadError + end +end + +# load optional tasks for acceptance +# only available if gem group releases is installed +begin + require 'voxpupuli/acceptance/rake' +rescue LoadError end # load optional tasks for releases @@ -34,14 +47,12 @@ begin require 'github_changelog_generator/task' require 'puppet_blacksmith' GitHubChangelogGenerator::RakeTask.new :changelog do |config| - version = (Blacksmith::Modulefile.new).version - config.future_release = "v#{version}" if version =~ /^\d+\.\d+.\d+$/ + metadata = Blacksmith::Modulefile.new + config.future_release = "v#{metadata.version}" if metadata.version =~ /^\d+\.\d+.\d+$/ config.header = "# Changelog\n\nAll notable changes to this project will be documented in this file.\nEach new release typically also includes the latest modulesync defaults.\nThese should not affect the functionality of the module." config.exclude_labels = %w{duplicate question invalid wontfix wont-fix modulesync skip-changelog} config.user = 'voxpupuli' - metadata_json = File.join(File.dirname(__FILE__), 'metadata.json') - metadata = JSON.load(File.read(metadata_json)) - config.project = metadata['name'] + config.project = metadata.metadata['name'] end # Workaround for https://github.com/github-changelog-generator/github-changelog-generator/issues/715 diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index d266f6b..fb5f0cb 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,6 +1,5 @@ -# This file is managed via modulesync -# https://github.com/voxpupuli/modulesync -# https://github.com/voxpupuli/modulesync_config +# Managed by modulesync - DO NOT EDIT +# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ # puppetlabs_spec_helper will set up coverage if the env variable is set. # We want to do this if lib exists and it hasn't been explicitly set. From b22e05176a2b8c133edeee60a5eb030141498541 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Thu, 26 Aug 2021 12:10:43 +0200 Subject: [PATCH 09/61] add puppet-lint-param-docs --- .sync.yml | 5 +++++ Gemfile | 1 + 2 files changed, 6 insertions(+) create mode 100644 .sync.yml diff --git a/.sync.yml b/.sync.yml new file mode 100644 index 0000000..35424a9 --- /dev/null +++ b/.sync.yml @@ -0,0 +1,5 @@ +--- +Gemfile: + optional: + ':test': + - gem: puppet-lint-param-docs diff --git a/Gemfile b/Gemfile index a39114c..e43173e 100644 --- a/Gemfile +++ b/Gemfile @@ -8,6 +8,7 @@ group :test do gem 'coveralls', :require => false gem 'simplecov-console', :require => false gem 'puppet_metadata', '~> 1.0', :require => false + gem 'puppet-lint-param-docs', :require => false end group :development do From ddc072a3887302cd5c0ee8a3df5b79a9c8d4fb16 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Thu, 26 Aug 2021 12:11:50 +0200 Subject: [PATCH 10/61] rubocop: autofix --- spec/acceptance/standard_spec.rb | 3 +-- spec/classes/repo_spec.rb | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/spec/acceptance/standard_spec.rb b/spec/acceptance/standard_spec.rb index a21679d..7d723bc 100644 --- a/spec/acceptance/standard_spec.rb +++ b/spec/acceptance/standard_spec.rb @@ -1,10 +1,9 @@ require 'spec_helper_acceptance' describe 'hashi_stack::repo class' do - context 'default parameters' do # Using puppet_apply as a helper - it 'should work with no errors based on the example' do + it 'works with no errors based on the example' do pp = <<-EOS include hashi_stack::repo package { 'packer': diff --git a/spec/classes/repo_spec.rb b/spec/classes/repo_spec.rb index 713a14d..c94a49f 100644 --- a/spec/classes/repo_spec.rb +++ b/spec/classes/repo_spec.rb @@ -11,10 +11,10 @@ describe 'hashi_stack::repo' do when 'RedHat' it { is_expected.to contain_yumrepo('HashiCorp').with( - baseurl: 'https://rpm.releases.hashicorp.com/RHEL/$releasever/$basearch/stable', + baseurl: 'https://rpm.releases.hashicorp.com/RHEL/$releasever/$basearch/stable' ) } - context "with custom Yum base url" do + context 'with custom Yum base url' do let(:params) do { rpm_base: 'https://somewhere.else' @@ -23,7 +23,7 @@ describe 'hashi_stack::repo' do it { is_expected.to contain_yumrepo('HashiCorp').with( - baseurl: 'https://somewhere.else/RHEL/$releasever/$basearch/stable', + baseurl: 'https://somewhere.else/RHEL/$releasever/$basearch/stable' ) } end From d17975a535be1edbe773ed109e7363c9d5b30704 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= Date: Thu, 26 Aug 2021 16:13:20 -1000 Subject: [PATCH 11/61] Release 2.0.1 --- CHANGELOG.md | 10 +++++++++- metadata.json | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c4015db..12601dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,15 @@ All notable changes to this project will be documented in this file. Each new release typically also includes the latest modulesync defaults. These should not affect the functionality of the module. -## [v2.0.0](https://github.com/voxpupuli/puppet-hashi_stack/tree/v2.0.0) (2021-05-10) +## [v2.0.1](https://github.com/voxpupuli/puppet-hashi_stack/tree/v2.0.1) (2021-08-27) + +[Full Changelog](https://github.com/voxpupuli/puppet-hashi_stack/compare/v2.0.0...v2.0.1) + +**Merged pull requests:** + +- Allow stdlib 8.0.0 [\#8](https://github.com/voxpupuli/puppet-hashi_stack/pull/8) ([smortex](https://github.com/smortex)) + +## [v2.0.0](https://github.com/voxpupuli/puppet-hashi_stack/tree/v2.0.0) (2021-05-11) [Full Changelog](https://github.com/voxpupuli/puppet-hashi_stack/compare/v1.0.0...v2.0.0) diff --git a/metadata.json b/metadata.json index b9f6fff..1d23854 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppet-hashi_stack", - "version": "2.0.1-rc0", + "version": "2.0.1", "author": "Vox Pupuli", "summary": "This module contains shared code for various HashiCorp modules", "license": "AGPL-3.0", From 918505aea1a2914f5bbe4ffa07a7adc12d1c8528 Mon Sep 17 00:00:00 2001 From: Christos Papageorgiou Date: Fri, 27 Aug 2021 12:49:50 +0300 Subject: [PATCH 12/61] [blacksmith] Bump version to 2.0.2-rc0 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 1d23854..e1f0352 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppet-hashi_stack", - "version": "2.0.1", + "version": "2.0.2-rc0", "author": "Vox Pupuli", "summary": "This module contains shared code for various HashiCorp modules", "license": "AGPL-3.0", From 93f6652b19c999c5c5d965ce461e19cd39da953f Mon Sep 17 00:00:00 2001 From: Tim Date: Sat, 18 Sep 2021 00:05:23 +0200 Subject: [PATCH 13/61] modulesync 4.2.0 --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2ce5b05..d08d05e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,6 +6,10 @@ name: CI on: pull_request +concurrency: + group: ${{ github.head_ref }} + cancel-in-progress: true + jobs: setup_matrix: name: 'Setup Test Matrix' From d920244e2f1ec90d84f394af54167bfd31cd20fc Mon Sep 17 00:00:00 2001 From: Tim Date: Sun, 31 Oct 2021 18:25:49 +0100 Subject: [PATCH 14/61] modulesync 5.0.0 --- .msync.yml | 2 +- Gemfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.msync.yml b/.msync.yml index 43966c2..e1cd81c 100644 --- a/.msync.yml +++ b/.msync.yml @@ -2,4 +2,4 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -modulesync_config_version: '4.2.0' +modulesync_config_version: '5.0.0' diff --git a/Gemfile b/Gemfile index e43173e..2b731b9 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org" group :test do - gem 'voxpupuli-test', '~> 2.5', :require => false + gem 'voxpupuli-test', '~> 4.0', :require => false gem 'coveralls', :require => false gem 'simplecov-console', :require => false gem 'puppet_metadata', '~> 1.0', :require => false @@ -22,7 +22,7 @@ end group :release do gem 'github_changelog_generator', '>= 1.16.1', :require => false if RUBY_VERSION >= '2.5' - gem 'voxpupuli-release', '>= 1.0.2', :require => false + gem 'voxpupuli-release', '>= 1.2.0', :require => false gem 'puppet-strings', '>= 2.2', :require => false end From 41decd6cee372c7d28af8f80a5392f8f05e55ceb Mon Sep 17 00:00:00 2001 From: Tim Date: Sun, 31 Oct 2021 19:04:38 +0100 Subject: [PATCH 15/61] rubocop: autofix --- spec/acceptance/standard_spec.rb | 2 ++ spec/classes/repo_spec.rb | 9 +++++++-- spec/spec_helper.rb | 10 +++++----- spec/spec_helper_acceptance.rb | 2 ++ 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/spec/acceptance/standard_spec.rb b/spec/acceptance/standard_spec.rb index 7d723bc..c2f5690 100644 --- a/spec/acceptance/standard_spec.rb +++ b/spec/acceptance/standard_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper_acceptance' describe 'hashi_stack::repo class' do diff --git a/spec/classes/repo_spec.rb b/spec/classes/repo_spec.rb index c94a49f..8646a4a 100644 --- a/spec/classes/repo_spec.rb +++ b/spec/classes/repo_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' describe 'hashi_stack::repo' do @@ -5,15 +7,18 @@ describe 'hashi_stack::repo' do context "on #{os}" do let(:facts) { os_facts } + it { is_expected.to compile.with_all_deps } + case os_facts[:os]['family'] when 'Debian' it { is_expected.to contain_apt__source('HashiCorp') } when 'RedHat' it { - is_expected.to contain_yumrepo('HashiCorp').with( + expect(subject).to contain_yumrepo('HashiCorp').with( baseurl: 'https://rpm.releases.hashicorp.com/RHEL/$releasever/$basearch/stable' ) } + context 'with custom Yum base url' do let(:params) do { @@ -22,7 +27,7 @@ describe 'hashi_stack::repo' do end it { - is_expected.to contain_yumrepo('HashiCorp').with( + expect(subject).to contain_yumrepo('HashiCorp').with( baseurl: 'https://somewhere.else/RHEL/$releasever/$basearch/stable' ) } diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index fb5f0cb..4d617f3 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,17 +1,17 @@ +# frozen_string_literal: true + # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ # puppetlabs_spec_helper will set up coverage if the env variable is set. # We want to do this if lib exists and it hasn't been explicitly set. -ENV['COVERAGE'] ||= 'yes' if Dir.exist?(File.expand_path('../../lib', __FILE__)) +ENV['COVERAGE'] ||= 'yes' if Dir.exist?(File.expand_path('../lib', __dir__)) require 'voxpupuli/test/spec_helper' if File.exist?(File.join(__dir__, 'default_module_facts.yml')) facts = YAML.safe_load(File.read(File.join(__dir__, 'default_module_facts.yml'))) - if facts - facts.each do |name, value| - add_custom_fact name.to_sym, value - end + facts&.each do |name, value| + add_custom_fact name.to_sym, value end end diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index bec34fd..f3021fa 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # This file is completely managed via modulesync require 'voxpupuli/acceptance/spec_helper_acceptance' From b2e10551645e86966714146446275d236ecdcecd Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 15 Dec 2021 20:22:26 +0100 Subject: [PATCH 16/61] modulesync 5.1.0 --- .msync.yml | 2 +- .puppet-lint.rc | 3 +++ Gemfile | 2 +- Rakefile | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 .puppet-lint.rc diff --git a/.msync.yml b/.msync.yml index e1cd81c..a83abd9 100644 --- a/.msync.yml +++ b/.msync.yml @@ -2,4 +2,4 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -modulesync_config_version: '5.0.0' +modulesync_config_version: '5.1.0' diff --git a/.puppet-lint.rc b/.puppet-lint.rc new file mode 100644 index 0000000..dd8272c --- /dev/null +++ b/.puppet-lint.rc @@ -0,0 +1,3 @@ +--fail-on-warnings +--no-parameter_documentation-check +--no-parameter_types-check diff --git a/Gemfile b/Gemfile index 2b731b9..113a361 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org" group :test do - gem 'voxpupuli-test', '~> 4.0', :require => false + gem 'voxpupuli-test', '~> 5.0', :require => false gem 'coveralls', :require => false gem 'simplecov-console', :require => false gem 'puppet_metadata', '~> 1.0', :require => false diff --git a/Rakefile b/Rakefile index 80b799d..f92f051 100644 --- a/Rakefile +++ b/Rakefile @@ -1,7 +1,7 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -# Attempt to load voxupuli-test (which pulls in puppetlabs_spec_helper), +# Attempt to load voxpupuli-test (which pulls in puppetlabs_spec_helper), # otherwise attempt to load it directly. begin require 'voxpupuli/test/rake' From ea0978356a39440a236105e9d71b6742658abbd6 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Thu, 17 Feb 2022 09:19:45 +0100 Subject: [PATCH 17/61] Fix Ubuntu18/puppet6 CI job Because of odd packaging decisions at Puppet Inc, the lsb_release tool is required on Puppet 6 for the distro facts. It's not in the Ubuntu18 base package. --- spec/setup_acceptance_node.pp | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 spec/setup_acceptance_node.pp diff --git a/spec/setup_acceptance_node.pp b/spec/setup_acceptance_node.pp new file mode 100644 index 0000000..9a67d7d --- /dev/null +++ b/spec/setup_acceptance_node.pp @@ -0,0 +1,6 @@ +# Needed for os.distro.codebase fact on ubuntu 18 on puppet 6 +if $facts['os']['name'] == 'Ubuntu' and $facts['os']['release']['full'] == '18.04' and versioncmp($facts['puppetversion'], '7') <= 0 { + package{'lsb-release': + ensure => present, + } +} From 49edc2e2979be55a61430f36d2085ad7156e6a48 Mon Sep 17 00:00:00 2001 From: hammondr Date: Thu, 27 Jan 2022 09:47:06 -0500 Subject: [PATCH 18/61] Add support for repo_gpgcheck, which should default to 0 since HashiCorp does not sign this repo (vs the RPMs in the repo, which are signed). Without this, RHEL-like nodes with a global `repo_gpgcheck=1` setting will not be able to use this repo. This global setting is required on many hardened systems. --- manifests/repo.pp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/manifests/repo.pp b/manifests/repo.pp index 5c6db88..0683ed0 100644 --- a/manifests/repo.pp +++ b/manifests/repo.pp @@ -25,6 +25,7 @@ class hashi_stack::repo ( Stdlib::HTTPSUrl $key_source = 'https://apt.releases.hashicorp.com/gpg', String $description = 'HashiCorp package repository.', String $rpm_base = 'https://rpm.releases.hashicorp.com', + Integer[0,1] $repo_gpgcheck = 0, ) { case $facts['os']['family'] { 'Debian': { @@ -49,13 +50,14 @@ class hashi_stack::repo ( } 'RedHat': { yumrepo { 'HashiCorp': - descr => $description, - baseurl => "${rpm_base}/RHEL/\$releasever/\$basearch/stable", - gpgcheck => 1, - gpgkey => $key_source, - enabled => 1, - proxy => $proxy, - priority => $priority, + descr => $description, + baseurl => "${rpm_base}/RHEL/\$releasever/\$basearch/stable", + gpgcheck => 1, + gpgkey => $key_source, + repo_gpgcheck => $repo_gpgcheck, + enabled => 1, + proxy => $proxy, + priority => $priority, } } default: { From 4d7fc4f2d48366308d2f88fe947e1e66d3b7afa1 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Sun, 28 Aug 2022 16:34:24 +0200 Subject: [PATCH 19/61] puppetlabs/apt: Allow 9.x --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index e1f0352..df954fa 100644 --- a/metadata.json +++ b/metadata.json @@ -14,7 +14,7 @@ }, { "name": "puppetlabs/apt", - "version_requirement": ">= 6.1.0 < 9.0.0" + "version_requirement": ">= 6.1.0 < 10.0.0" } ], "operatingsystem_support": [ From bed3690c6f1f2b161432ee4f69c31990b57f62f0 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Sun, 28 Aug 2022 17:34:38 +0200 Subject: [PATCH 20/61] Release 2.1.0 --- CHANGELOG.md | 14 ++++++++++++++ REFERENCE.md | 9 +++++++++ metadata.json | 2 +- 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 12601dd..95a2315 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,12 +4,26 @@ All notable changes to this project will be documented in this file. Each new release typically also includes the latest modulesync defaults. These should not affect the functionality of the module. +## [v2.1.0](https://github.com/voxpupuli/puppet-hashi_stack/tree/v2.1.0) (2022-08-28) + +[Full Changelog](https://github.com/voxpupuli/puppet-hashi_stack/compare/v2.0.1...v2.1.0) + +**Implemented enhancements:** + +- Add support for repo\_gpgcheck to the hashicorp yum repo [\#15](https://github.com/voxpupuli/puppet-hashi_stack/pull/15) ([hammondr](https://github.com/hammondr)) + +**Merged pull requests:** + +- puppetlabs/apt: Allow 9.x [\#17](https://github.com/voxpupuli/puppet-hashi_stack/pull/17) ([bastelfreak](https://github.com/bastelfreak)) +- Fix Ubuntu18/puppet6 CI job [\#16](https://github.com/voxpupuli/puppet-hashi_stack/pull/16) ([bastelfreak](https://github.com/bastelfreak)) + ## [v2.0.1](https://github.com/voxpupuli/puppet-hashi_stack/tree/v2.0.1) (2021-08-27) [Full Changelog](https://github.com/voxpupuli/puppet-hashi_stack/compare/v2.0.0...v2.0.1) **Merged pull requests:** +- Release 2.0.1 [\#10](https://github.com/voxpupuli/puppet-hashi_stack/pull/10) ([smortex](https://github.com/smortex)) - Allow stdlib 8.0.0 [\#8](https://github.com/voxpupuli/puppet-hashi_stack/pull/8) ([smortex](https://github.com/smortex)) ## [v2.0.0](https://github.com/voxpupuli/puppet-hashi_stack/tree/v2.0.0) (2021-05-11) diff --git a/REFERENCE.md b/REFERENCE.md index d74ddfd..0f08b44 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -42,6 +42,7 @@ The following parameters are available in the `hashi_stack::repo` class: * [`key_source`](#key_source) * [`description`](#description) * [`rpm_base`](#rpm_base) +* [`repo_gpgcheck`](#repo_gpgcheck) ##### `priority` @@ -91,3 +92,11 @@ Base URL for the Yum repository Default value: `'https://rpm.releases.hashicorp.com'` +##### `repo_gpgcheck` + +Data type: `Integer[0,1]` + + + +Default value: `0` + diff --git a/metadata.json b/metadata.json index df954fa..4bb4b03 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppet-hashi_stack", - "version": "2.0.2-rc0", + "version": "2.1.0", "author": "Vox Pupuli", "summary": "This module contains shared code for various HashiCorp modules", "license": "AGPL-3.0", From 957f1627ba817ccc8a0fd8fdb2766360d5b6cd68 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Sun, 28 Aug 2022 17:43:39 +0200 Subject: [PATCH 21/61] [blacksmith] Bump version to 2.1.1-rc0 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 4bb4b03..a74e953 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppet-hashi_stack", - "version": "2.1.0", + "version": "2.1.1-rc0", "author": "Vox Pupuli", "summary": "This module contains shared code for various HashiCorp modules", "license": "AGPL-3.0", From d1218a729121eb263ca3eec803869a32030ce760 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Sun, 2 Oct 2022 15:29:59 +0200 Subject: [PATCH 22/61] modulesync 5.3.0 --- .github/CONTRIBUTING.md | 7 ++- .github/workflows/ci.yml | 84 +++-------------------------------- .github/workflows/release.yml | 32 +++++-------- .msync.yml | 2 +- Dockerfile | 2 +- Gemfile | 6 +-- Rakefile | 2 +- spec/spec_helper.rb | 2 + 8 files changed, 27 insertions(+), 110 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 048d2b5..8b466cf 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -124,7 +124,7 @@ If you have Ruby 2.x or want a specific version of Puppet, you must set an environment variable such as: ```sh -export PUPPET_VERSION="~> 5.5.6" +export PUPPET_GEM_VERSION="~> 6.1.0" ``` You can install all needed gems for spec tests into the modules directory by @@ -232,17 +232,16 @@ simple tests against it after applying the module. You can run this with: ```sh -BEAKER_setfile=debian10-x64 bundle exec rake beaker +BEAKER_setfile=debian11-64 bundle exec rake beaker ``` You can replace the string `debian10` with any common operating system. The following strings are known to work: -* ubuntu1604 * ubuntu1804 * ubuntu2004 -* debian9 * debian10 +* debian11 * centos7 * centos8 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d08d05e..8a07791 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,84 +7,12 @@ name: CI on: pull_request concurrency: - group: ${{ github.head_ref }} + group: ${{ github.ref_name }} cancel-in-progress: true jobs: - setup_matrix: - name: 'Setup Test Matrix' - runs-on: ubuntu-latest - timeout-minutes: 40 - outputs: - puppet_unit_test_matrix: ${{ steps.get-outputs.outputs.puppet_unit_test_matrix }} - github_action_test_matrix: ${{ steps.get-outputs.outputs.github_action_test_matrix }} - env: - BUNDLE_WITHOUT: development:system_tests:release - steps: - - uses: actions/checkout@v2 - - name: Setup ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: '3.0' - bundler-cache: true - - name: Run static validations - run: bundle exec rake validate lint check - - name: Run rake rubocop - run: bundle exec rake rubocop - - name: Setup Test Matrix - id: get-outputs - run: bundle exec metadata2gha --use-fqdn --pidfile-workaround false - - unit: - needs: setup_matrix - runs-on: ubuntu-latest - timeout-minutes: 40 - strategy: - fail-fast: false - matrix: - include: ${{fromJson(needs.setup_matrix.outputs.puppet_unit_test_matrix)}} - env: - BUNDLE_WITHOUT: development:system_tests:release - PUPPET_VERSION: "~> ${{ matrix.puppet }}.0" - name: Puppet ${{ matrix.puppet }} (Ruby ${{ matrix.ruby }}) - steps: - - uses: actions/checkout@v2 - - name: Setup ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: ${{ matrix.ruby }} - bundler-cache: true - - name: Run tests - run: bundle exec rake parallel_spec - - acceptance: - needs: setup_matrix - runs-on: ubuntu-latest - env: - BUNDLE_WITHOUT: development:test:release - strategy: - fail-fast: false - matrix: - include: ${{fromJson(needs.setup_matrix.outputs.github_action_test_matrix)}} - name: ${{ matrix.puppet.name }} - ${{ matrix.setfile.name }} - steps: - - uses: actions/checkout@v2 - - name: Setup ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: '3.0' - bundler-cache: true - - name: Run tests - run: bundle exec rake beaker - env: - BEAKER_PUPPET_COLLECTION: ${{ matrix.puppet.collection }} - BEAKER_setfile: ${{ matrix.setfile.value }} - - tests: - needs: - - unit - - acceptance - runs-on: ubuntu-latest - name: Test suite - steps: - - run: echo Test suite completed + puppet: + name: Puppet + uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v1 + with: + pidfile_workaround: 'false' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 664ba69..15f1721 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,26 +9,14 @@ on: tags: - '*' -env: - BUNDLE_WITHOUT: development:test:system_tests - jobs: - deploy: - name: 'deploy to forge' - runs-on: ubuntu-latest - if: github.repository_owner == 'voxpupuli' - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - name: Setup Ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: '2.7' - bundler-cache: true - - name: Build and Deploy - env: - # Configure secrets here: - # https://docs.github.com/en/free-pro-team@latest/actions/reference/encrypted-secrets - BLACKSMITH_FORGE_USERNAME: '${{ secrets.PUPPET_FORGE_USERNAME }}' - BLACKSMITH_FORGE_API_KEY: '${{ secrets.PUPPET_FORGE_API_KEY }}' - run: bundle exec rake module:push + release: + name: Release + uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v1 + with: + allowed_owner: 'voxpupuli' + secrets: + # Configure secrets here: + # https://docs.github.com/en/actions/security-guides/encrypted-secrets + username: ${{ secrets.PUPPET_FORGE_USERNAME }} + api_key: ${{ secrets.PUPPET_FORGE_API_KEY }} diff --git a/.msync.yml b/.msync.yml index a83abd9..0235385 100644 --- a/.msync.yml +++ b/.msync.yml @@ -2,4 +2,4 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -modulesync_config_version: '5.1.0' +modulesync_config_version: '5.3.0' diff --git a/Dockerfile b/Dockerfile index e3cf307..8dd82d6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ WORKDIR /opt/puppet # https://github.com/puppetlabs/puppet/blob/06ad255754a38f22fb3a22c7c4f1e2ce453d01cb/lib/puppet/provider/service/runit.rb#L39 RUN mkdir -p /etc/sv -ARG PUPPET_VERSION="~> 6.0" +ARG PUPPET_GEM_VERSION="~> 6.0" ARG PARALLEL_TEST_PROCESSORS=4 # Cache gems diff --git a/Gemfile b/Gemfile index 113a361..e243353 100644 --- a/Gemfile +++ b/Gemfile @@ -1,10 +1,10 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -source ENV['GEM_SOURCE'] || "https://rubygems.org" +source ENV['GEM_SOURCE'] || 'https://rubygems.org' group :test do - gem 'voxpupuli-test', '~> 5.0', :require => false + gem 'voxpupuli-test', '~> 5.4', :require => false gem 'coveralls', :require => false gem 'simplecov-console', :require => false gem 'puppet_metadata', '~> 1.0', :require => false @@ -29,7 +29,7 @@ end gem 'rake', :require => false gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test] -puppetversion = ENV['PUPPET_VERSION'] || '>= 6.0' +puppetversion = ENV['PUPPET_GEM_VERSION'] || '>= 6.0' gem 'puppet', puppetversion, :require => false, :groups => [:test] # vim: syntax=ruby diff --git a/Rakefile b/Rakefile index f92f051..9ceeb78 100644 --- a/Rakefile +++ b/Rakefile @@ -52,7 +52,7 @@ begin config.header = "# Changelog\n\nAll notable changes to this project will be documented in this file.\nEach new release typically also includes the latest modulesync defaults.\nThese should not affect the functionality of the module." config.exclude_labels = %w{duplicate question invalid wontfix wont-fix modulesync skip-changelog} config.user = 'voxpupuli' - config.project = metadata.metadata['name'] + config.project = 'puppet-hashi_stack' end # Workaround for https://github.com/github-changelog-generator/github-changelog-generator/issues/715 diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 4d617f3..6515b7b 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -9,6 +9,8 @@ ENV['COVERAGE'] ||= 'yes' if Dir.exist?(File.expand_path('../lib', __dir__)) require 'voxpupuli/test/spec_helper' +add_mocked_facts! + if File.exist?(File.join(__dir__, 'default_module_facts.yml')) facts = YAML.safe_load(File.read(File.join(__dir__, 'default_module_facts.yml'))) facts&.each do |name, value| From eece189d0e42169f5886f8f79b6ac947fa9999ee Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Tue, 20 Dec 2022 15:56:39 +0100 Subject: [PATCH 23/61] modulesync 5.4.0 --- .msync.yml | 2 +- Gemfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.msync.yml b/.msync.yml index 0235385..f3156d1 100644 --- a/.msync.yml +++ b/.msync.yml @@ -2,4 +2,4 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -modulesync_config_version: '5.3.0' +modulesync_config_version: '5.4.0' diff --git a/Gemfile b/Gemfile index e243353..2125027 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ group :test do gem 'voxpupuli-test', '~> 5.4', :require => false gem 'coveralls', :require => false gem 'simplecov-console', :require => false - gem 'puppet_metadata', '~> 1.0', :require => false + gem 'puppet_metadata', '~> 2.0', :require => false gem 'puppet-lint-param-docs', :require => false end From 283f474dd1c0282a372f9b48a164d02b49be441a Mon Sep 17 00:00:00 2001 From: wimkorevaar Date: Wed, 25 Jan 2023 11:20:19 +0100 Subject: [PATCH 24/61] add toggle for enabling yum repo --- manifests/repo.pp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manifests/repo.pp b/manifests/repo.pp index 0683ed0..e32356c 100644 --- a/manifests/repo.pp +++ b/manifests/repo.pp @@ -26,6 +26,7 @@ class hashi_stack::repo ( String $description = 'HashiCorp package repository.', String $rpm_base = 'https://rpm.releases.hashicorp.com', Integer[0,1] $repo_gpgcheck = 0, + Integer[0,1] $repo_enabled = 1, ) { case $facts['os']['family'] { 'Debian': { @@ -55,7 +56,7 @@ class hashi_stack::repo ( gpgcheck => 1, gpgkey => $key_source, repo_gpgcheck => $repo_gpgcheck, - enabled => 1, + enabled => $repo_enabled, proxy => $proxy, priority => $priority, } From 32ad7df19ee6c0ac5fe7a1be817de62c13fa13e3 Mon Sep 17 00:00:00 2001 From: Benjamin Delacour Date: Thu, 26 Jan 2023 19:24:18 +0100 Subject: [PATCH 25/61] fix: use new gpg key (see https://status.hashicorp.com/incidents/fgkyvr1kwpdh) --- manifests/repo.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/repo.pp b/manifests/repo.pp index 0683ed0..1f01dcb 100644 --- a/manifests/repo.pp +++ b/manifests/repo.pp @@ -21,7 +21,7 @@ class hashi_stack::repo ( Optional[Integer] $priority = undef, String $proxy = 'absent', - String $key_id = 'E8A032E094D8EB4EA189D270DA418C88A3219F7B', + String $key_id = '798AEC654E5C15428C8E42EEAA16FCBCA621E701', Stdlib::HTTPSUrl $key_source = 'https://apt.releases.hashicorp.com/gpg', String $description = 'HashiCorp package repository.', String $rpm_base = 'https://rpm.releases.hashicorp.com', From 1b767380d4d209d13993c4bb4db283d8fb07926e Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Fri, 27 Jan 2023 10:17:20 +0100 Subject: [PATCH 26/61] Release 2.2.0 --- .puppet-lint.rc | 2 -- .sync.yml | 8 ++++---- CHANGELOG.md | 12 ++++++++++++ Gemfile | 9 ++++----- REFERENCE.md | 47 ++++++++++++++++++++++++++++------------------- manifests/repo.pp | 3 +++ metadata.json | 2 +- 7 files changed, 52 insertions(+), 31 deletions(-) diff --git a/.puppet-lint.rc b/.puppet-lint.rc index dd8272c..02a3e71 100644 --- a/.puppet-lint.rc +++ b/.puppet-lint.rc @@ -1,3 +1 @@ --fail-on-warnings ---no-parameter_documentation-check ---no-parameter_types-check diff --git a/.sync.yml b/.sync.yml index 35424a9..130aaeb 100644 --- a/.sync.yml +++ b/.sync.yml @@ -1,5 +1,5 @@ --- -Gemfile: - optional: - ':test': - - gem: puppet-lint-param-docs +.puppet-lint.rc: + enabled_lint_checks: + - parameter_documentation + - parameter_types diff --git a/CHANGELOG.md b/CHANGELOG.md index 95a2315..f50748e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file. Each new release typically also includes the latest modulesync defaults. These should not affect the functionality of the module. +## [v2.2.0](https://github.com/voxpupuli/puppet-hashi_stack/tree/v2.2.0) (2023-01-27) + +[Full Changelog](https://github.com/voxpupuli/puppet-hashi_stack/compare/v2.1.0...v2.2.0) + +**Implemented enhancements:** + +- add toggle for enabling yum repo [\#21](https://github.com/voxpupuli/puppet-hashi_stack/pull/21) ([wimkorevaar](https://github.com/wimkorevaar)) + +**Merged pull requests:** + +- use new gpg key [\#22](https://github.com/voxpupuli/puppet-hashi_stack/pull/22) ([BDelacour](https://github.com/BDelacour)) + ## [v2.1.0](https://github.com/voxpupuli/puppet-hashi_stack/tree/v2.1.0) (2022-08-28) [Full Changelog](https://github.com/voxpupuli/puppet-hashi_stack/compare/v2.0.1...v2.1.0) diff --git a/Gemfile b/Gemfile index 2125027..7cd2f17 100644 --- a/Gemfile +++ b/Gemfile @@ -4,11 +4,10 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org' group :test do - gem 'voxpupuli-test', '~> 5.4', :require => false - gem 'coveralls', :require => false - gem 'simplecov-console', :require => false - gem 'puppet_metadata', '~> 2.0', :require => false - gem 'puppet-lint-param-docs', :require => false + gem 'voxpupuli-test', '~> 5.4', :require => false + gem 'coveralls', :require => false + gem 'simplecov-console', :require => false + gem 'puppet_metadata', '~> 2.0', :require => false end group :development do diff --git a/REFERENCE.md b/REFERENCE.md index 0f08b44..a61d1a8 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -6,11 +6,11 @@ ### Classes -* [`hashi_stack::repo`](#hashi_stackrepo): Set up the package repository for the HashiCorp Stack components +* [`hashi_stack::repo`](#hashi_stack--repo): Set up the package repository for the HashiCorp Stack components ## Classes -### `hashi_stack::repo` +### `hashi_stack::repo` This class installs the hashicorp repository @@ -36,23 +36,24 @@ package { 'packer': The following parameters are available in the `hashi_stack::repo` class: -* [`priority`](#priority) -* [`proxy`](#proxy) -* [`key_id`](#key_id) -* [`key_source`](#key_source) -* [`description`](#description) -* [`rpm_base`](#rpm_base) -* [`repo_gpgcheck`](#repo_gpgcheck) +* [`priority`](#-hashi_stack--repo--priority) +* [`proxy`](#-hashi_stack--repo--proxy) +* [`key_id`](#-hashi_stack--repo--key_id) +* [`key_source`](#-hashi_stack--repo--key_source) +* [`description`](#-hashi_stack--repo--description) +* [`rpm_base`](#-hashi_stack--repo--rpm_base) +* [`repo_gpgcheck`](#-hashi_stack--repo--repo_gpgcheck) +* [`repo_enabled`](#-hashi_stack--repo--repo_enabled) -##### `priority` +##### `priority` Data type: `Optional[Integer]` A numeric priority for the repo, passed to the package management system -Default value: ``undef`` +Default value: `undef` -##### `proxy` +##### `proxy` Data type: `String` @@ -60,15 +61,15 @@ The URL of a HTTP proxy to use for package downloads (YUM only) Default value: `'absent'` -##### `key_id` +##### `key_id` Data type: `String` GPG key to authenticate Apt package signatures. -Default value: `'E8A032E094D8EB4EA189D270DA418C88A3219F7B'` +Default value: `'798AEC654E5C15428C8E42EEAA16FCBCA621E701'` -##### `key_source` +##### `key_source` Data type: `Stdlib::HTTPSUrl` @@ -76,7 +77,7 @@ The location of an existing GPG key file to copy. Default value: `'https://apt.releases.hashicorp.com/gpg'` -##### `description` +##### `description` Data type: `String` @@ -84,7 +85,7 @@ Repository description Default value: `'HashiCorp package repository.'` -##### `rpm_base` +##### `rpm_base` Data type: `String` @@ -92,11 +93,19 @@ Base URL for the Yum repository Default value: `'https://rpm.releases.hashicorp.com'` -##### `repo_gpgcheck` +##### `repo_gpgcheck` Data type: `Integer[0,1]` - +enables gpg validation of packages from the repo Default value: `0` +##### `repo_enabled` + +Data type: `Integer[0,1]` + +enables/disables the repository + +Default value: `1` + diff --git a/manifests/repo.pp b/manifests/repo.pp index 471013c..15d64a4 100644 --- a/manifests/repo.pp +++ b/manifests/repo.pp @@ -18,6 +18,9 @@ # @param key_source The location of an existing GPG key file to copy. # @param description Repository description # @param rpm_base Base URL for the Yum repository +# @param repo_gpgcheck enables gpg validation of packages from the repo +# @param repo_enabled enables/disables the repository +# class hashi_stack::repo ( Optional[Integer] $priority = undef, String $proxy = 'absent', diff --git a/metadata.json b/metadata.json index a74e953..9d7dd8c 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppet-hashi_stack", - "version": "2.1.1-rc0", + "version": "2.2.0", "author": "Vox Pupuli", "summary": "This module contains shared code for various HashiCorp modules", "license": "AGPL-3.0", From df002632847771b0c7540e8a209c90a0c5442454 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Fri, 27 Jan 2023 10:22:57 +0100 Subject: [PATCH 27/61] [blacksmith] Bump version to 2.2.1-rc0 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 9d7dd8c..3e77907 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppet-hashi_stack", - "version": "2.2.0", + "version": "2.2.1-rc0", "author": "Vox Pupuli", "summary": "This module contains shared code for various HashiCorp modules", "license": "AGPL-3.0", From f7b6e2de9db994af076c7af2e9314f794354a7cd Mon Sep 17 00:00:00 2001 From: Massimiliano Adamo Date: Sat, 15 Apr 2023 09:57:27 +0200 Subject: [PATCH 28/61] modulesync 5.5.0 --- .github/SECURITY.md | 3 --- .gitignore | 36 ++++++++++++------------- .msync.yml | 2 +- .pmtignore | 64 ++++++++++++++++++++++----------------------- Gemfile | 11 ++++---- Rakefile | 36 +++---------------------- 6 files changed, 60 insertions(+), 92 deletions(-) delete mode 100644 .github/SECURITY.md diff --git a/.github/SECURITY.md b/.github/SECURITY.md deleted file mode 100644 index cacadf2..0000000 --- a/.github/SECURITY.md +++ /dev/null @@ -1,3 +0,0 @@ -# Vox Pupuli Security Policy - -Our vulnerabilities reporting process is at https://voxpupuli.org/security/ diff --git a/.gitignore b/.gitignore index 9b95224..84fd904 100644 --- a/.gitignore +++ b/.gitignore @@ -1,23 +1,23 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -pkg/ -Gemfile.lock -Gemfile.local -vendor/ -.vendor/ -spec/fixtures/manifests/ -spec/fixtures/modules/ -.vagrant/ -.bundle/ -.ruby-version -coverage/ -log/ -.idea/ -.dependencies/ -.librarian/ -Puppetfile.lock +/pkg/ +/Gemfile.lock +/Gemfile.local +/vendor/ +/.vendor/ +/spec/fixtures/manifests/ +/spec/fixtures/modules/ +/.vagrant/ +/.bundle/ +/.ruby-version +/coverage/ +/log/ +/.idea/ +/.dependencies/ +/.librarian/ +/Puppetfile.lock *.iml .*.sw? -.yardoc/ -Guardfile +/.yardoc/ +/Guardfile diff --git a/.msync.yml b/.msync.yml index f3156d1..a4b0069 100644 --- a/.msync.yml +++ b/.msync.yml @@ -2,4 +2,4 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -modulesync_config_version: '5.4.0' +modulesync_config_version: '5.5.0' diff --git a/.pmtignore b/.pmtignore index 65f5051..58a0408 100644 --- a/.pmtignore +++ b/.pmtignore @@ -1,37 +1,37 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -docs/ -pkg/ -Gemfile -Gemfile.lock -Gemfile.local -vendor/ -.vendor/ -spec/ -Rakefile -.vagrant/ -.bundle/ -.ruby-version -coverage/ -log/ -.idea/ -.dependencies/ -.github/ -.librarian/ -Puppetfile.lock +/docs/ +/pkg/ +/Gemfile +/Gemfile.lock +/Gemfile.local +/vendor/ +/.vendor/ +/spec/ +/Rakefile +/.vagrant/ +/.bundle/ +/.ruby-version +/coverage/ +/log/ +/.idea/ +/.dependencies/ +/.github/ +/.librarian/ +/Puppetfile.lock *.iml -.editorconfig -.fixtures.yml -.gitignore -.msync.yml -.overcommit.yml -.pmtignore -.rspec -.rspec_parallel -.rubocop.yml -.sync.yml +/.editorconfig +/.fixtures.yml +/.gitignore +/.msync.yml +/.overcommit.yml +/.pmtignore +/.rspec +/.rspec_parallel +/.rubocop.yml +/.sync.yml .*.sw? -.yardoc/ -.yardopts -Dockerfile +/.yardoc/ +/.yardopts +/Dockerfile diff --git a/Gemfile b/Gemfile index 7cd2f17..15313c3 100644 --- a/Gemfile +++ b/Gemfile @@ -4,10 +4,10 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org' group :test do - gem 'voxpupuli-test', '~> 5.4', :require => false - gem 'coveralls', :require => false - gem 'simplecov-console', :require => false - gem 'puppet_metadata', '~> 2.0', :require => false + gem 'voxpupuli-test', '~> 5.4', :require => false + gem 'coveralls', :require => false + gem 'simplecov-console', :require => false + gem 'puppet_metadata', '~> 2.0', :require => false end group :development do @@ -21,8 +21,7 @@ end group :release do gem 'github_changelog_generator', '>= 1.16.1', :require => false if RUBY_VERSION >= '2.5' - gem 'voxpupuli-release', '>= 1.2.0', :require => false - gem 'puppet-strings', '>= 2.2', :require => false + gem 'voxpupuli-release', '~> 2.0', :require => false end gem 'rake', :require => false diff --git a/Rakefile b/Rakefile index 9ceeb78..c897f4b 100644 --- a/Rakefile +++ b/Rakefile @@ -24,6 +24,10 @@ end begin require 'voxpupuli/release/rake_tasks' rescue LoadError + # voxpupuli-release not present +else + GCGConfig.user = 'voxpupuli' + GCGConfig.project = 'puppet-hashi_stack' end desc "Run main 'test' task and report merged results to coveralls" @@ -37,36 +41,4 @@ task test_with_coveralls: [:test] do end end -desc 'Generate REFERENCE.md' -task :reference, [:debug, :backtrace] do |t, args| - patterns = '' - Rake::Task['strings:generate:reference'].invoke(patterns, args[:debug], args[:backtrace]) -end - -begin - require 'github_changelog_generator/task' - require 'puppet_blacksmith' - GitHubChangelogGenerator::RakeTask.new :changelog do |config| - metadata = Blacksmith::Modulefile.new - config.future_release = "v#{metadata.version}" if metadata.version =~ /^\d+\.\d+.\d+$/ - config.header = "# Changelog\n\nAll notable changes to this project will be documented in this file.\nEach new release typically also includes the latest modulesync defaults.\nThese should not affect the functionality of the module." - config.exclude_labels = %w{duplicate question invalid wontfix wont-fix modulesync skip-changelog} - config.user = 'voxpupuli' - config.project = 'puppet-hashi_stack' - end - - # Workaround for https://github.com/github-changelog-generator/github-changelog-generator/issues/715 - require 'rbconfig' - if RbConfig::CONFIG['host_os'] =~ /linux/ - task :changelog do - puts 'Fixing line endings...' - changelog_file = File.join(__dir__, 'CHANGELOG.md') - changelog_txt = File.read(changelog_file) - new_contents = changelog_txt.gsub(%r{\r\n}, "\n") - File.open(changelog_file, "w") {|file| file.puts new_contents } - end - end - -rescue LoadError -end # vim: syntax=ruby From d5870ce6f42a553fad2f231ea5ca6e8819464af4 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Fri, 28 Apr 2023 14:00:47 +0200 Subject: [PATCH 29/61] Drop Puppet 6 support --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 3e77907..ee3e55b 100644 --- a/metadata.json +++ b/metadata.json @@ -49,7 +49,7 @@ "requirements": [ { "name": "puppet", - "version_requirement": ">= 6.1.0 < 8.0.0" + "version_requirement": ">= 7.0.0 < 8.0.0" } ] } From 7c499e9af0c547c68cc13e52a20de0a2a9a141ef Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Sat, 1 Jul 2023 15:47:09 +0200 Subject: [PATCH 30/61] puppetlabs/stdlib: Allow 9.x --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index ee3e55b..ceed34d 100644 --- a/metadata.json +++ b/metadata.json @@ -10,7 +10,7 @@ "dependencies": [ { "name": "puppetlabs-stdlib", - "version_requirement": ">= 5.1.0 < 9.0.0" + "version_requirement": ">= 5.1.0 < 10.0.0" }, { "name": "puppetlabs/apt", From 55197bfb6daceb82e56f5fcf7132d9563306eab5 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Fri, 12 May 2023 12:14:13 +0200 Subject: [PATCH 31/61] modulesync 6.0.0 --- .msync.yml | 2 +- Gemfile | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.msync.yml b/.msync.yml index a4b0069..b929160 100644 --- a/.msync.yml +++ b/.msync.yml @@ -2,4 +2,4 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -modulesync_config_version: '5.5.0' +modulesync_config_version: '6.0.0' diff --git a/Gemfile b/Gemfile index 15313c3..98a04cf 100644 --- a/Gemfile +++ b/Gemfile @@ -4,10 +4,10 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org' group :test do - gem 'voxpupuli-test', '~> 5.4', :require => false + gem 'voxpupuli-test', '~> 6.0', :require => false gem 'coveralls', :require => false gem 'simplecov-console', :require => false - gem 'puppet_metadata', '~> 2.0', :require => false + gem 'puppet_metadata', '~> 3.0', :require => false end group :development do @@ -16,18 +16,19 @@ group :development do end group :system_tests do - gem 'voxpupuli-acceptance', '~> 1.0', :require => false + gem 'voxpupuli-acceptance', '~> 2.0', :require => false end group :release do - gem 'github_changelog_generator', '>= 1.16.1', :require => false if RUBY_VERSION >= '2.5' - gem 'voxpupuli-release', '~> 2.0', :require => false + gem 'github_changelog_generator', '>= 1.16.1', :require => false + gem 'voxpupuli-release', '~> 3.0', :require => false + gem 'faraday-retry', '~> 2.1', :require => false end gem 'rake', :require => false gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test] -puppetversion = ENV['PUPPET_GEM_VERSION'] || '>= 6.0' +puppetversion = ENV['PUPPET_GEM_VERSION'] || '~> 7.24' gem 'puppet', puppetversion, :require => false, :groups => [:test] # vim: syntax=ruby From 07e2d9c55ae9bd8e1326b12ab79701ae9cfab513 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Thu, 17 Aug 2023 15:47:50 +0200 Subject: [PATCH 32/61] modulesync 7.0.0 --- .github/CONTRIBUTING.md | 11 +++++++---- .msync.yml | 2 +- Gemfile | 2 +- spec/spec_helper.rb | 1 + 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 8b466cf..6aaa603 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -232,18 +232,21 @@ simple tests against it after applying the module. You can run this with: ```sh -BEAKER_setfile=debian11-64 bundle exec rake beaker +BEAKER_PUPPET_COLLECTION=puppet7 BEAKER_setfile=debian11-64 bundle exec rake beaker ``` -You can replace the string `debian10` with any common operating system. +You can replace the string `debian11` with any common operating system. The following strings are known to work: -* ubuntu1804 * ubuntu2004 -* debian10 +* ubuntu2204 * debian11 * centos7 * centos8 +* centos9 +* almalinux8 +* almalinux9 +* fedora36 For more information and tips & tricks, see [voxpupuli-acceptance's documentation](https://github.com/voxpupuli/voxpupuli-acceptance#running-tests). diff --git a/.msync.yml b/.msync.yml index b929160..dd3e957 100644 --- a/.msync.yml +++ b/.msync.yml @@ -2,4 +2,4 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -modulesync_config_version: '6.0.0' +modulesync_config_version: '7.0.0' diff --git a/Gemfile b/Gemfile index 98a04cf..db21d3b 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org' group :test do - gem 'voxpupuli-test', '~> 6.0', :require => false + gem 'voxpupuli-test', '~> 7.0', :require => false gem 'coveralls', :require => false gem 'simplecov-console', :require => false gem 'puppet_metadata', '~> 3.0', :require => false diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 6515b7b..9efb4ae 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -17,3 +17,4 @@ if File.exist?(File.join(__dir__, 'default_module_facts.yml')) add_custom_fact name.to_sym, value end end +Dir['./spec/support/spec/**/*.rb'].sort.each { |f| require f } From d01ef71f0f23bc63f25675d9ba8c6ef4e4c5bbc5 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Sun, 2 Jul 2023 23:51:59 +0200 Subject: [PATCH 33/61] Add Puppet 8 support --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index ceed34d..cd3a682 100644 --- a/metadata.json +++ b/metadata.json @@ -49,7 +49,7 @@ "requirements": [ { "name": "puppet", - "version_requirement": ">= 7.0.0 < 8.0.0" + "version_requirement": ">= 7.0.0 < 9.0.0" } ] } From a9b8122a4fddb22400df0004e01b9375f65c3d40 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Sat, 19 Aug 2023 22:30:53 +0200 Subject: [PATCH 34/61] Add AlmaLinux/Rocky/OracleLinux support --- metadata.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/metadata.json b/metadata.json index cd3a682..9e0d637 100644 --- a/metadata.json +++ b/metadata.json @@ -25,6 +25,24 @@ "8" ] }, + { + "operatingsystem": "OracleLinux", + "operatingsystemrelease": [ + "8" + ] + }, + { + "operatingsystem": "AlmaLinux", + "operatingsystemrelease": [ + "8" + ] + }, + { + "operatingsystem": "Rocky", + "operatingsystemrelease": [ + "8" + ] + }, { "operatingsystem": "CentOS", "operatingsystemrelease": [ From 90be685aef7593d70b6e36d1194a9f2979543296 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Sat, 19 Aug 2023 22:31:52 +0200 Subject: [PATCH 35/61] Add EL9 support --- metadata.json | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/metadata.json b/metadata.json index 9e0d637..2a3d426 100644 --- a/metadata.json +++ b/metadata.json @@ -22,32 +22,37 @@ "operatingsystem": "RedHat", "operatingsystemrelease": [ "7", - "8" + "8", + "9" ] }, { "operatingsystem": "OracleLinux", "operatingsystemrelease": [ - "8" + "8", + "9" ] }, { "operatingsystem": "AlmaLinux", "operatingsystemrelease": [ - "8" + "8", + "9" ] }, { "operatingsystem": "Rocky", "operatingsystemrelease": [ - "8" + "8", + "9" ] }, { "operatingsystem": "CentOS", "operatingsystemrelease": [ "7", - "8" + "8", + "9" ] }, { From 111a70112ec2062bee708943cb980dfed3b71739 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Sat, 19 Aug 2023 22:33:46 +0200 Subject: [PATCH 36/61] Add Debian 11 support --- metadata.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index cd3a682..5829c9c 100644 --- a/metadata.json +++ b/metadata.json @@ -35,7 +35,8 @@ { "operatingsystem": "Debian", "operatingsystemrelease": [ - "10" + "10", + "11" ] }, { From 2c7397715909dd00dac64e28ceb67be3098e3259 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Sat, 19 Aug 2023 22:34:36 +0200 Subject: [PATCH 37/61] Add Ubuntu 22.04 support --- metadata.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index cd3a682..6dff9f8 100644 --- a/metadata.json +++ b/metadata.json @@ -42,7 +42,8 @@ "operatingsystem": "Ubuntu", "operatingsystemrelease": [ "18.04", - "20.04" + "20.04", + "22.04" ] } ], From f85c0e1c918acfb46bef4a4b6b96ee4309ba6f2c Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Sat, 19 Aug 2023 22:42:43 +0200 Subject: [PATCH 38/61] Release 3.0.0 --- CHANGELOG.md | 17 +++++++++++++++++ metadata.json | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f50748e..b035cbd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,23 @@ All notable changes to this project will be documented in this file. Each new release typically also includes the latest modulesync defaults. These should not affect the functionality of the module. +## [v3.0.0](https://github.com/voxpupuli/puppet-hashi_stack/tree/v3.0.0) (2023-08-19) + +[Full Changelog](https://github.com/voxpupuli/puppet-hashi_stack/compare/v2.2.0...v3.0.0) + +**Breaking changes:** + +- Drop Puppet 6 support [\#28](https://github.com/voxpupuli/puppet-hashi_stack/pull/28) ([bastelfreak](https://github.com/bastelfreak)) + +**Implemented enhancements:** + +- Add Ubuntu 22.04 support [\#32](https://github.com/voxpupuli/puppet-hashi_stack/pull/32) ([bastelfreak](https://github.com/bastelfreak)) +- Add Debian 11 support [\#31](https://github.com/voxpupuli/puppet-hashi_stack/pull/31) ([bastelfreak](https://github.com/bastelfreak)) +- Add EL9 support [\#30](https://github.com/voxpupuli/puppet-hashi_stack/pull/30) ([bastelfreak](https://github.com/bastelfreak)) +- Add AlmaLinux/Rocky/OracleLinux support [\#29](https://github.com/voxpupuli/puppet-hashi_stack/pull/29) ([bastelfreak](https://github.com/bastelfreak)) +- Add Puppet 8 support [\#27](https://github.com/voxpupuli/puppet-hashi_stack/pull/27) ([bastelfreak](https://github.com/bastelfreak)) +- puppetlabs/stdlib: Allow 9.x [\#26](https://github.com/voxpupuli/puppet-hashi_stack/pull/26) ([bastelfreak](https://github.com/bastelfreak)) + ## [v2.2.0](https://github.com/voxpupuli/puppet-hashi_stack/tree/v2.2.0) (2023-01-27) [Full Changelog](https://github.com/voxpupuli/puppet-hashi_stack/compare/v2.1.0...v2.2.0) diff --git a/metadata.json b/metadata.json index 740cefe..625d3dd 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppet-hashi_stack", - "version": "2.2.1-rc0", + "version": "3.0.0", "author": "Vox Pupuli", "summary": "This module contains shared code for various HashiCorp modules", "license": "AGPL-3.0", From 4371c15313957fe928979083d9091517f754d22d Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Sat, 19 Aug 2023 22:49:30 +0200 Subject: [PATCH 39/61] [blacksmith] Bump version to 3.0.1-rc0 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 625d3dd..d6965dc 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppet-hashi_stack", - "version": "3.0.0", + "version": "3.0.1-rc0", "author": "Vox Pupuli", "summary": "This module contains shared code for various HashiCorp modules", "license": "AGPL-3.0", From 51aead9b5b1e0f86a8b3eab622d36389c9d8dcdd Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Sat, 18 Nov 2023 18:48:32 +0100 Subject: [PATCH 40/61] Add Debian 12 support --- metadata.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index d6965dc..3d3699f 100644 --- a/metadata.json +++ b/metadata.json @@ -59,7 +59,8 @@ "operatingsystem": "Debian", "operatingsystemrelease": [ "10", - "11" + "11", + "12" ] }, { From 4e30760edd60e590fefbceb61f0f49f9c2545954 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Sun, 19 Nov 2023 12:36:10 +0100 Subject: [PATCH 41/61] Release 3.1.0 --- CHANGELOG.md | 8 ++++++++ metadata.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b035cbd..7e53465 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file. Each new release typically also includes the latest modulesync defaults. These should not affect the functionality of the module. +## [v3.1.0](https://github.com/voxpupuli/puppet-hashi_stack/tree/v3.1.0) (2023-11-19) + +[Full Changelog](https://github.com/voxpupuli/puppet-hashi_stack/compare/v3.0.0...v3.1.0) + +**Implemented enhancements:** + +- Add Debian 12 support [\#34](https://github.com/voxpupuli/puppet-hashi_stack/pull/34) ([bastelfreak](https://github.com/bastelfreak)) + ## [v3.0.0](https://github.com/voxpupuli/puppet-hashi_stack/tree/v3.0.0) (2023-08-19) [Full Changelog](https://github.com/voxpupuli/puppet-hashi_stack/compare/v2.2.0...v3.0.0) diff --git a/metadata.json b/metadata.json index d6965dc..70119bf 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppet-hashi_stack", - "version": "3.0.1-rc0", + "version": "3.1.0", "author": "Vox Pupuli", "summary": "This module contains shared code for various HashiCorp modules", "license": "AGPL-3.0", From eb19c0ada2ef4cf049e2199009d7707cb09a6f1d Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Sun, 19 Nov 2023 12:40:42 +0100 Subject: [PATCH 42/61] [blacksmith] Bump version to 3.1.1-rc0 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index a2cc333..42a2765 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppet-hashi_stack", - "version": "3.1.0", + "version": "3.1.1-rc0", "author": "Vox Pupuli", "summary": "This module contains shared code for various HashiCorp modules", "license": "AGPL-3.0", From 2e6986a13f5a6e340508e2aa155f8a6795decd1c Mon Sep 17 00:00:00 2001 From: Robert Grizzell Date: Thu, 30 Nov 2023 17:50:15 -0600 Subject: [PATCH 43/61] Add support for AArch64/ARM64 binaries (#36) * Add support for AArch64/ARM64 binaries * Update manifests/repo.pp --------- Co-authored-by: Kenyon Ralph --- manifests/repo.pp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/manifests/repo.pp b/manifests/repo.pp index 15d64a4..58c6a92 100644 --- a/manifests/repo.pp +++ b/manifests/repo.pp @@ -31,13 +31,18 @@ class hashi_stack::repo ( Integer[0,1] $repo_gpgcheck = 0, Integer[0,1] $repo_enabled = 1, ) { + $arch = $facts['os']['architecture'] ? { + 'aarch64' => 'arm64', # 'aarch64' is official, but Hashicorp uses 'arm64' + default => $facts['os']['architecture'], + } + case $facts['os']['family'] { 'Debian': { include apt apt::source { 'HashiCorp': ensure => 'present', - architecture => 'amd64', + architecture => $arch, comment => $description, location => 'https://apt.releases.hashicorp.com', repos => 'main', From 53c5611c172a47765a804cc0c8eedf31140da58a Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Fri, 15 Dec 2023 13:18:01 +0100 Subject: [PATCH 44/61] modulesync 7.2.0 --- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 2 +- .msync.yml | 2 +- .pmtignore | 1 + Gemfile | 8 +++----- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8a07791..b66d8ca 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,6 +13,6 @@ concurrency: jobs: puppet: name: Puppet - uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v1 + uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2 with: pidfile_workaround: 'false' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 15f1721..55324aa 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,7 +12,7 @@ on: jobs: release: name: Release - uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v1 + uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v2 with: allowed_owner: 'voxpupuli' secrets: diff --git a/.msync.yml b/.msync.yml index dd3e957..f818344 100644 --- a/.msync.yml +++ b/.msync.yml @@ -2,4 +2,4 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -modulesync_config_version: '7.0.0' +modulesync_config_version: '7.2.0' diff --git a/.pmtignore b/.pmtignore index 58a0408..10b9830 100644 --- a/.pmtignore +++ b/.pmtignore @@ -35,3 +35,4 @@ /.yardoc/ /.yardopts /Dockerfile +/HISTORY.md diff --git a/Gemfile b/Gemfile index db21d3b..a4a3b20 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ group :test do gem 'voxpupuli-test', '~> 7.0', :require => false gem 'coveralls', :require => false gem 'simplecov-console', :require => false - gem 'puppet_metadata', '~> 3.0', :require => false + gem 'puppet_metadata', '~> 3.5', :require => false end group :development do @@ -16,13 +16,11 @@ group :development do end group :system_tests do - gem 'voxpupuli-acceptance', '~> 2.0', :require => false + gem 'voxpupuli-acceptance', '~> 3.0', :require => false end group :release do - gem 'github_changelog_generator', '>= 1.16.1', :require => false - gem 'voxpupuli-release', '~> 3.0', :require => false - gem 'faraday-retry', '~> 2.1', :require => false + gem 'voxpupuli-release', '~> 3.0', :require => false end gem 'rake', :require => false From 79341805134857cae0ef5a9897c25a2de1d2a98d Mon Sep 17 00:00:00 2001 From: markuszilch Date: Tue, 6 Feb 2024 12:32:37 +0100 Subject: [PATCH 45/61] modulesync 7.3.0 --- .github/workflows/ci.yml | 7 ++++++- .msync.yml | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b66d8ca..7216724 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,7 +4,12 @@ name: CI -on: pull_request +on: + pull_request: {} + push: + branches: + - main + - master concurrency: group: ${{ github.ref_name }} diff --git a/.msync.yml b/.msync.yml index f818344..f46ee02 100644 --- a/.msync.yml +++ b/.msync.yml @@ -2,4 +2,4 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -modulesync_config_version: '7.2.0' +modulesync_config_version: '7.3.0' From b0baa714f95043a7715c4b07d1905019d8f512f5 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Sun, 24 Mar 2024 21:38:24 +0100 Subject: [PATCH 46/61] Release 3.2.0 --- CHANGELOG.md | 8 ++++++++ metadata.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e53465..735795b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file. Each new release typically also includes the latest modulesync defaults. These should not affect the functionality of the module. +## [v3.2.0](https://github.com/voxpupuli/puppet-hashi_stack/tree/v3.2.0) (2024-03-24) + +[Full Changelog](https://github.com/voxpupuli/puppet-hashi_stack/compare/v3.1.0...v3.2.0) + +**Implemented enhancements:** + +- Add support for AArch64/ARM64 binaries [\#36](https://github.com/voxpupuli/puppet-hashi_stack/pull/36) ([rgrizzell](https://github.com/rgrizzell)) + ## [v3.1.0](https://github.com/voxpupuli/puppet-hashi_stack/tree/v3.1.0) (2023-11-19) [Full Changelog](https://github.com/voxpupuli/puppet-hashi_stack/compare/v3.0.0...v3.1.0) diff --git a/metadata.json b/metadata.json index 42a2765..3349e33 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppet-hashi_stack", - "version": "3.1.1-rc0", + "version": "3.2.0", "author": "Vox Pupuli", "summary": "This module contains shared code for various HashiCorp modules", "license": "AGPL-3.0", From edb01d72b18e55466668712d0dae1cfca1ca90b2 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Sun, 24 Mar 2024 21:44:08 +0100 Subject: [PATCH 47/61] [blacksmith] Bump version to 3.2.1-rc0 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 3349e33..3bb6b96 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppet-hashi_stack", - "version": "3.2.0", + "version": "3.2.1-rc0", "author": "Vox Pupuli", "summary": "This module contains shared code for various HashiCorp modules", "license": "AGPL-3.0", From 7073f88b8c5c3b29e8c475ed99749f4eef562d41 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Fri, 12 Apr 2024 13:24:18 +0200 Subject: [PATCH 48/61] modulesync 7.4.0 --- .github/CONTRIBUTING.md | 16 +++++++++++++--- .gitignore | 2 ++ .msync.yml | 2 +- Dockerfile | 24 ------------------------ 4 files changed, 16 insertions(+), 28 deletions(-) delete mode 100644 Dockerfile diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 6aaa603..8809327 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -131,19 +131,29 @@ You can install all needed gems for spec tests into the modules directory by running: ```sh -bundle install --path .vendor/ --without development system_tests release --jobs "$(nproc)" +bundle config set --local path '.vendor/' +bundle config set --local without 'development system_tests release' +bundle install --jobs "$(nproc)" ``` If you also want to run acceptance tests: ```sh -bundle install --path .vendor/ --with system_tests --without development release --jobs "$(nproc)" +bundle config set --local path '.vendor/' +bundle config set --local without 'development release' +bundle config set --local with 'system_tests' +bundle install --jobs "$(nproc)" ``` Our all in one solution if you don't know if you need to install or update gems: ```sh -bundle install --path .vendor/ --with system_tests --without development release --jobs "$(nproc)"; bundle update; bundle clean +bundle config set --local path '.vendor/' +bundle config set --local without 'development release' +bundle config set --local with 'system_tests' +bundle install --jobs "$(nproc)" +bundle update +bundle clean ``` As an alternative to the `--jobs "$(nproc)` parameter, you can set an diff --git a/.gitignore b/.gitignore index 84fd904..adea1b0 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,5 @@ .*.sw? /.yardoc/ /Guardfile +bolt-debug.log +.rerun.json diff --git a/.msync.yml b/.msync.yml index f46ee02..28b61dc 100644 --- a/.msync.yml +++ b/.msync.yml @@ -2,4 +2,4 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -modulesync_config_version: '7.3.0' +modulesync_config_version: '7.4.0' diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 8dd82d6..0000000 --- a/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -# MANAGED BY MODULESYNC -# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ - -FROM ruby:2.7 - -WORKDIR /opt/puppet - -# https://github.com/puppetlabs/puppet/blob/06ad255754a38f22fb3a22c7c4f1e2ce453d01cb/lib/puppet/provider/service/runit.rb#L39 -RUN mkdir -p /etc/sv - -ARG PUPPET_GEM_VERSION="~> 6.0" -ARG PARALLEL_TEST_PROCESSORS=4 - -# Cache gems -COPY Gemfile . -RUN bundle install --without system_tests development release --path=${BUNDLE_PATH:-vendor/bundle} - -COPY . . - -RUN bundle install -RUN bundle exec rake release_checks - -# Container should not saved -RUN exit 1 From 0c133afe4bfba7810e4fb2e9aac3da9888f5797e Mon Sep 17 00:00:00 2001 From: markuszilch Date: Thu, 25 Apr 2024 17:15:50 +0200 Subject: [PATCH 49/61] modulesync 7.5.0 --- .msync.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.msync.yml b/.msync.yml index 28b61dc..ade23f9 100644 --- a/.msync.yml +++ b/.msync.yml @@ -2,4 +2,4 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -modulesync_config_version: '7.4.0' +modulesync_config_version: '7.5.0' From b24a437c8ca6ac48bb10db37076e3be1af47772a Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Mon, 3 Jun 2024 18:43:38 +0200 Subject: [PATCH 50/61] modulesync 8.0.1 --- .github/workflows/ci.yml | 2 -- .msync.yml | 2 +- .overcommit.yml | 8 +++++--- .rspec | 5 ----- .rspec_parallel | 4 ---- Gemfile | 4 ++-- 6 files changed, 8 insertions(+), 17 deletions(-) delete mode 100644 .rspec delete mode 100644 .rspec_parallel diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7216724..1f82c4c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,5 +19,3 @@ jobs: puppet: name: Puppet uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2 - with: - pidfile_workaround: 'false' diff --git a/.msync.yml b/.msync.yml index ade23f9..876cb3b 100644 --- a/.msync.yml +++ b/.msync.yml @@ -2,4 +2,4 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -modulesync_config_version: '7.5.0' +modulesync_config_version: '8.0.1' diff --git a/.overcommit.yml b/.overcommit.yml index d367ada..4ed994c 100644 --- a/.overcommit.yml +++ b/.overcommit.yml @@ -43,10 +43,12 @@ PreCommit: enabled: true description: 'Runs rubocop on modified files only' command: ['bundle', 'exec', 'rubocop'] - PuppetLint: + RakeTarget: enabled: true - description: 'Runs puppet-lint on modified files only' - command: ['bundle', 'exec', 'puppet-lint'] + description: 'Runs lint on modified files only' + targets: + - 'lint' + command: ['bundle', 'exec', 'rake'] YamlSyntax: enabled: true JsonSyntax: diff --git a/.rspec b/.rspec deleted file mode 100644 index f634583..0000000 --- a/.rspec +++ /dev/null @@ -1,5 +0,0 @@ -# Managed by modulesync - DO NOT EDIT -# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ - ---format documentation ---color diff --git a/.rspec_parallel b/.rspec_parallel deleted file mode 100644 index a9a84f8..0000000 --- a/.rspec_parallel +++ /dev/null @@ -1,4 +0,0 @@ -# Managed by modulesync - DO NOT EDIT -# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ - ---format progress diff --git a/Gemfile b/Gemfile index a4a3b20..ec7b4cd 100644 --- a/Gemfile +++ b/Gemfile @@ -4,10 +4,10 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org' group :test do - gem 'voxpupuli-test', '~> 7.0', :require => false + gem 'voxpupuli-test', '~> 7.2', :require => false gem 'coveralls', :require => false gem 'simplecov-console', :require => false - gem 'puppet_metadata', '~> 3.5', :require => false + gem 'puppet_metadata', '~> 4.0', :require => false end group :development do From b6edd3777a1300bfef33051072156a3d38f22f75 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Wed, 12 Jun 2024 11:25:04 +0200 Subject: [PATCH 51/61] modulesync 9.0.0 --- .github/labeler.yml | 3 +++ .msync.yml | 2 +- Gemfile | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 .github/labeler.yml diff --git a/.github/labeler.yml b/.github/labeler.yml new file mode 100644 index 0000000..7899de8 --- /dev/null +++ b/.github/labeler.yml @@ -0,0 +1,3 @@ +--- +skip-changelog: + - head-branch: ['^release-*', 'release'] diff --git a/.msync.yml b/.msync.yml index 876cb3b..3607168 100644 --- a/.msync.yml +++ b/.msync.yml @@ -2,4 +2,4 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -modulesync_config_version: '8.0.1' +modulesync_config_version: '9.0.0' diff --git a/Gemfile b/Gemfile index ec7b4cd..27cdc0d 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org' group :test do - gem 'voxpupuli-test', '~> 7.2', :require => false + gem 'voxpupuli-test', '~> 8.0', :require => false gem 'coveralls', :require => false gem 'simplecov-console', :require => false gem 'puppet_metadata', '~> 4.0', :require => false From f383d32565dd61f922c6c894f1b9378394d138e6 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Tue, 9 Jul 2024 15:14:49 +0200 Subject: [PATCH 52/61] modulesync 9.1.0 --- .github/CONTRIBUTING.md | 12 ++++++++-- .github/labeler.yml | 3 +++ .github/release.yml | 42 +++++++++++++++++++++++++++++++++++ .github/workflows/labeler.yml | 17 ++++++++++++++ .github/workflows/release.yml | 7 ++++++ .msync.yml | 2 +- .puppet-lint.rc | 3 +++ Gemfile | 2 +- spec/spec_helper.rb | 4 ++++ 9 files changed, 88 insertions(+), 4 deletions(-) create mode 100644 .github/release.yml create mode 100644 .github/workflows/labeler.yml diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 8809327..daceb64 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -245,15 +245,23 @@ with: BEAKER_PUPPET_COLLECTION=puppet7 BEAKER_setfile=debian11-64 bundle exec rake beaker ``` +or + +```sh +BEAKER_PUPPET_COLLECTION=none BEAKER_setfile=archlinux-64 bundle exec rake beaker +``` + +This latter example will use the distribution's own version of Puppet. + You can replace the string `debian11` with any common operating system. The following strings are known to work: * ubuntu2004 * ubuntu2204 * debian11 -* centos7 -* centos8 +* debian12 * centos9 +* archlinux * almalinux8 * almalinux9 * fedora36 diff --git a/.github/labeler.yml b/.github/labeler.yml index 7899de8..f2d08d6 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -1,3 +1,6 @@ --- +# Managed by modulesync - DO NOT EDIT +# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ + skip-changelog: - head-branch: ['^release-*', 'release'] diff --git a/.github/release.yml b/.github/release.yml new file mode 100644 index 0000000..f5b5d7a --- /dev/null +++ b/.github/release.yml @@ -0,0 +1,42 @@ +--- +# Managed by modulesync - DO NOT EDIT +# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ + +# https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes + +changelog: + exclude: + labels: + - duplicate + - invalid + - modulesync + - question + - skip-changelog + - wont-fix + - wontfix + + categories: + - title: Breaking Changes 🛠 + labels: + - backwards-incompatible + + - title: New Features 🎉 + labels: + - enhancement + + - title: Bug Fixes 🐛 + labels: + - bug + + - title: Documentation Updates 📚 + labels: + - documentation + - docs + + - title: Dependency Updates ⬆️ + labels: + - dependencies + + - title: Other Changes + labels: + - "*" diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml new file mode 100644 index 0000000..66127cd --- /dev/null +++ b/.github/workflows/labeler.yml @@ -0,0 +1,17 @@ +--- +# Managed by modulesync - DO NOT EDIT +# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ + +name: "Pull Request Labeler" + +on: + pull_request_target: {} + +jobs: + labeler: + permissions: + contents: read + pull-requests: write + runs-on: ubuntu-latest + steps: + - uses: actions/labeler@v5 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 55324aa..93b33c2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,3 +20,10 @@ jobs: # https://docs.github.com/en/actions/security-guides/encrypted-secrets username: ${{ secrets.PUPPET_FORGE_USERNAME }} api_key: ${{ secrets.PUPPET_FORGE_API_KEY }} + + create-github-release: + name: Create GitHub Release + runs-on: ubuntu-latest + steps: + - name: Create GitHub release + uses: voxpupuli/gha-create-a-github-release@v1 diff --git a/.msync.yml b/.msync.yml index 3607168..95e8c97 100644 --- a/.msync.yml +++ b/.msync.yml @@ -2,4 +2,4 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -modulesync_config_version: '9.0.0' +modulesync_config_version: '9.1.0' diff --git a/.puppet-lint.rc b/.puppet-lint.rc index 02a3e71..37817b6 100644 --- a/.puppet-lint.rc +++ b/.puppet-lint.rc @@ -1 +1,4 @@ +# Managed by modulesync - DO NOT EDIT +# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ + --fail-on-warnings diff --git a/Gemfile b/Gemfile index 27cdc0d..7123c66 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org' group :test do - gem 'voxpupuli-test', '~> 8.0', :require => false + gem 'voxpupuli-test', '~> 9.0', :require => false gem 'coveralls', :require => false gem 'simplecov-console', :require => false gem 'puppet_metadata', '~> 4.0', :require => false diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 9efb4ae..58c9b66 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -9,6 +9,10 @@ ENV['COVERAGE'] ||= 'yes' if Dir.exist?(File.expand_path('../lib', __dir__)) require 'voxpupuli/test/spec_helper' +RSpec.configure do |c| + c.facterdb_string_keys = false +end + add_mocked_facts! if File.exist?(File.join(__dir__, 'default_module_facts.yml')) From 0b736b0ef5a314b4a886458f84ed2d3c85799d32 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Fri, 13 Sep 2024 14:41:01 +0200 Subject: [PATCH 53/61] modulesync 9.2.0 --- .github/workflows/ci.yml | 3 ++- .github/workflows/labeler.yml | 1 + .github/workflows/release.yml | 1 + .msync.yml | 2 +- .pmtignore | 1 + Gemfile | 2 +- 6 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1f82c4c..8c32acf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,6 +4,7 @@ name: CI +# yamllint disable-line rule:truthy on: pull_request: {} push: @@ -18,4 +19,4 @@ concurrency: jobs: puppet: name: Puppet - uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2 + uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v3 diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index 66127cd..73be88d 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -4,6 +4,7 @@ name: "Pull Request Labeler" +# yamllint disable-line rule:truthy on: pull_request_target: {} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 93b33c2..1b14775 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,6 +4,7 @@ name: Release +# yamllint disable-line rule:truthy on: push: tags: diff --git a/.msync.yml b/.msync.yml index 95e8c97..8606f6e 100644 --- a/.msync.yml +++ b/.msync.yml @@ -2,4 +2,4 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -modulesync_config_version: '9.1.0' +modulesync_config_version: '9.2.0' diff --git a/.pmtignore b/.pmtignore index 10b9830..a9d37aa 100644 --- a/.pmtignore +++ b/.pmtignore @@ -20,6 +20,7 @@ /.github/ /.librarian/ /Puppetfile.lock +/Puppetfile *.iml /.editorconfig /.fixtures.yml diff --git a/Gemfile b/Gemfile index 7123c66..2ac98f8 100644 --- a/Gemfile +++ b/Gemfile @@ -26,7 +26,7 @@ end gem 'rake', :require => false gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test] -puppetversion = ENV['PUPPET_GEM_VERSION'] || '~> 7.24' +puppetversion = ENV['PUPPET_GEM_VERSION'] || [">= 7.24", "< 9"] gem 'puppet', puppetversion, :require => false, :groups => [:test] # vim: syntax=ruby From a635338303948ca66ae6075b7eecc0ab1202c338 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Mon, 16 Sep 2024 20:46:31 +0200 Subject: [PATCH 54/61] modulesync 9.3.0 --- .github/workflows/release.yml | 2 +- .msync.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1b14775..4adf65c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,7 +13,7 @@ on: jobs: release: name: Release - uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v2 + uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v3 with: allowed_owner: 'voxpupuli' secrets: diff --git a/.msync.yml b/.msync.yml index 8606f6e..ac84b45 100644 --- a/.msync.yml +++ b/.msync.yml @@ -2,4 +2,4 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -modulesync_config_version: '9.2.0' +modulesync_config_version: '9.3.0' From 9076e5e97aeb226631477cef9bbbf0edfb7686e1 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Wed, 5 Feb 2025 10:21:16 +0100 Subject: [PATCH 55/61] modulesync 9.4.0 --- .github/workflows/prepare_release.yml | 23 +++++++++++++++++++++++ .github/workflows/release.yml | 7 ------- .msync.yml | 2 +- 3 files changed, 24 insertions(+), 8 deletions(-) create mode 100644 .github/workflows/prepare_release.yml diff --git a/.github/workflows/prepare_release.yml b/.github/workflows/prepare_release.yml new file mode 100644 index 0000000..01efa1a --- /dev/null +++ b/.github/workflows/prepare_release.yml @@ -0,0 +1,23 @@ +--- +# Managed by modulesync - DO NOT EDIT +# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ + +name: 'Prepare Release' + +on: + workflow_dispatch: + inputs: + version: + description: 'Module version to be released. Must be a valid semver string without leading v. (1.2.3)' + required: false + +jobs: + release_prep: + uses: 'voxpupuli/gha-puppet/.github/workflows/prepare_release.yml@v3' + with: + version: ${{ github.event.inputs.version }} + allowed_owner: 'voxpupuli' + secrets: + # Configure secrets here: + # https://docs.github.com/en/actions/security-guides/encrypted-secrets + github_pat: '${{ secrets.PCCI_PAT_RELEASE_PREP }}' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4adf65c..3db60fb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,10 +21,3 @@ jobs: # https://docs.github.com/en/actions/security-guides/encrypted-secrets username: ${{ secrets.PUPPET_FORGE_USERNAME }} api_key: ${{ secrets.PUPPET_FORGE_API_KEY }} - - create-github-release: - name: Create GitHub Release - runs-on: ubuntu-latest - steps: - - name: Create GitHub release - uses: voxpupuli/gha-create-a-github-release@v1 diff --git a/.msync.yml b/.msync.yml index ac84b45..36e892e 100644 --- a/.msync.yml +++ b/.msync.yml @@ -2,4 +2,4 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -modulesync_config_version: '9.3.0' +modulesync_config_version: '9.4.0' From a734fba3081d15cc741d05b9d450b967fc186ce3 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Tue, 11 Feb 2025 15:46:38 +0100 Subject: [PATCH 56/61] puppetlabs/apt: Allow 10.x --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 3bb6b96..71c3af0 100644 --- a/metadata.json +++ b/metadata.json @@ -14,7 +14,7 @@ }, { "name": "puppetlabs/apt", - "version_requirement": ">= 6.1.0 < 10.0.0" + "version_requirement": ">= 6.1.0 < 11.0.0" } ], "operatingsystem_support": [ From d519ef600db6bd6bd79ba706ed8b18945db392ef Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Tue, 11 Feb 2025 15:53:18 +0100 Subject: [PATCH 57/61] Add Ubuntu 24.04 support --- metadata.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 71c3af0..fb73b76 100644 --- a/metadata.json +++ b/metadata.json @@ -68,7 +68,8 @@ "operatingsystemrelease": [ "18.04", "20.04", - "22.04" + "22.04", + "24.04" ] } ], From 5fee23bff93416be7cbb105f9f8dab8ff07b0602 Mon Sep 17 00:00:00 2001 From: Release Automation Date: Tue, 11 Feb 2025 14:59:51 +0000 Subject: [PATCH 58/61] Release 3.3.0 --- CHANGELOG.md | 9 +++++++++ metadata.json | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 735795b..05414e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file. Each new release typically also includes the latest modulesync defaults. These should not affect the functionality of the module. +## [v3.3.0](https://github.com/voxpupuli/puppet-hashi_stack/tree/v3.3.0) (2025-02-11) + +[Full Changelog](https://github.com/voxpupuli/puppet-hashi_stack/compare/v3.2.0...v3.3.0) + +**Merged pull requests:** + +- Add Ubuntu 24.04 support [\#47](https://github.com/voxpupuli/puppet-hashi_stack/pull/47) ([bastelfreak](https://github.com/bastelfreak)) +- puppetlabs/apt: Allow 10.x [\#45](https://github.com/voxpupuli/puppet-hashi_stack/pull/45) ([bastelfreak](https://github.com/bastelfreak)) + ## [v3.2.0](https://github.com/voxpupuli/puppet-hashi_stack/tree/v3.2.0) (2024-03-24) [Full Changelog](https://github.com/voxpupuli/puppet-hashi_stack/compare/v3.1.0...v3.2.0) diff --git a/metadata.json b/metadata.json index fb73b76..d4ee3a3 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppet-hashi_stack", - "version": "3.2.1-rc0", + "version": "3.3.0", "author": "Vox Pupuli", "summary": "This module contains shared code for various HashiCorp modules", "license": "AGPL-3.0", From 13553def3e16ab6238918ea79d975906de201df9 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Tue, 11 Feb 2025 16:07:42 +0100 Subject: [PATCH 59/61] [blacksmith] Bump version to 3.3.1-rc0 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index d4ee3a3..3af48e2 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppet-hashi_stack", - "version": "3.3.0", + "version": "3.3.1-rc0", "author": "Vox Pupuli", "summary": "This module contains shared code for various HashiCorp modules", "license": "AGPL-3.0", From 4e104e262f26fcee2d06f755f16dc2ecbc1c67bd Mon Sep 17 00:00:00 2001 From: pccibot <12855858+pccibot@users.noreply.github.com> Date: Wed, 19 Mar 2025 13:14:03 +0000 Subject: [PATCH 60/61] modulesync 9.5.0-4-g2cf9dc0 --- .msync.yml | 2 +- Gemfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.msync.yml b/.msync.yml index 36e892e..32df814 100644 --- a/.msync.yml +++ b/.msync.yml @@ -2,4 +2,4 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -modulesync_config_version: '9.4.0' +modulesync_config_version: '9.5.0' diff --git a/Gemfile b/Gemfile index 2ac98f8..ea079b0 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ group :test do gem 'voxpupuli-test', '~> 9.0', :require => false gem 'coveralls', :require => false gem 'simplecov-console', :require => false - gem 'puppet_metadata', '~> 4.0', :require => false + gem 'puppet_metadata', '~> 5.0', :require => false end group :development do @@ -16,7 +16,7 @@ group :development do end group :system_tests do - gem 'voxpupuli-acceptance', '~> 3.0', :require => false + gem 'voxpupuli-acceptance', '~> 3.5', :require => false end group :release do From 5f04b07e9c8488393e3fea47bffc4af1fb9ce595 Mon Sep 17 00:00:00 2001 From: Jason Straw Date: Wed, 19 Mar 2025 14:04:54 -0500 Subject: [PATCH 61/61] Add openvox to metadata.json --- metadata.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/metadata.json b/metadata.json index 3af48e2..6b66a0a 100644 --- a/metadata.json +++ b/metadata.json @@ -77,6 +77,10 @@ { "name": "puppet", "version_requirement": ">= 7.0.0 < 9.0.0" + }, + { + "name": "openvox", + "version_requirement": ">= 7.0.0 < 9.0.0" } ] }