From 882a40100a1d5a8be860b079983704fa97af75c7 Mon Sep 17 00:00:00 2001 From: pccibot <12855858+pccibot@users.noreply.github.com> Date: Wed, 28 May 2025 15:49:20 +0000 Subject: [PATCH 1/4] modulesync 9.6.0-4-gdb4d91b --- .msync.yml | 2 +- Gemfile | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.msync.yml b/.msync.yml index 32df814c..b86acb82 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.5.0' +modulesync_config_version: '9.7.0' diff --git a/Gemfile b/Gemfile index ea079b08..f08ae17f 100644 --- a/Gemfile +++ b/Gemfile @@ -4,9 +4,7 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org' group :test do - gem 'voxpupuli-test', '~> 9.0', :require => false - gem 'coveralls', :require => false - gem 'simplecov-console', :require => false + gem 'voxpupuli-test', '~> 10.0', :require => false gem 'puppet_metadata', '~> 5.0', :require => false end From c69200ebee35bb299dde9fa1cd65662d44070f00 Mon Sep 17 00:00:00 2001 From: pccibot <12855858+pccibot@users.noreply.github.com> Date: Fri, 13 Jun 2025 07:12:08 +0000 Subject: [PATCH 2/4] modulesync 9.7.0-10-g2151f5f --- .github/workflows/ci.yml | 3 +++ .github/workflows/labeler.yml | 4 ++++ .github/workflows/prepare_release.yml | 4 ++++ .github/workflows/release.yml | 3 +++ .msync.yml | 2 +- Gemfile | 8 +++----- 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8c32acf9..44674150 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,6 +16,9 @@ concurrency: group: ${{ github.ref_name }} cancel-in-progress: true +permissions: + contents: read + jobs: puppet: name: Puppet diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index 73be88dc..eacd0b33 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -8,6 +8,10 @@ name: "Pull Request Labeler" on: pull_request_target: {} +permissions: + contents: read + pull-requests: write + jobs: labeler: permissions: diff --git a/.github/workflows/prepare_release.yml b/.github/workflows/prepare_release.yml index 01efa1a8..2e3cc689 100644 --- a/.github/workflows/prepare_release.yml +++ b/.github/workflows/prepare_release.yml @@ -11,6 +11,10 @@ on: description: 'Module version to be released. Must be a valid semver string without leading v. (1.2.3)' required: false +permissions: + contents: write + pull-requests: write + jobs: release_prep: uses: 'voxpupuli/gha-puppet/.github/workflows/prepare_release.yml@v3' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3db60fbc..0a8b1b18 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,6 +10,9 @@ on: tags: - '*' +permissions: + contents: write + jobs: release: name: Release diff --git a/.msync.yml b/.msync.yml index b86acb82..af9a220d 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.7.0' +modulesync_config_version: '10.0.0' diff --git a/Gemfile b/Gemfile index f08ae17f..fc8cf4d1 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org' group :test do - gem 'voxpupuli-test', '~> 10.0', :require => false + gem 'voxpupuli-test', '~> 11.0', :require => false gem 'puppet_metadata', '~> 5.0', :require => false end @@ -18,13 +18,11 @@ group :system_tests do end group :release do - gem 'voxpupuli-release', '~> 3.0', :require => false + gem 'voxpupuli-release', '~> 4.0', :require => false end gem 'rake', :require => false -gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test] -puppetversion = ENV['PUPPET_GEM_VERSION'] || [">= 7.24", "< 9"] -gem 'puppet', puppetversion, :require => false, :groups => [:test] +gem 'openvox', ENV.fetch('OPENVOX_GEM_VERSION', [">= 7", "< 9"]), :require => false, :groups => [:test] # vim: syntax=ruby From 2f8dcbde065bd2a17159149570cb15ac862e44c3 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Fri, 20 Jun 2025 15:52:37 +0200 Subject: [PATCH 3/4] Gemfile: add mocha --- .sync.yml | 4 ++++ Gemfile | 1 + 2 files changed, 5 insertions(+) diff --git a/.sync.yml b/.sync.yml index c266ecde..977e5ee9 100644 --- a/.sync.yml +++ b/.sync.yml @@ -7,3 +7,7 @@ spec/spec_helper.rb: enabled_lint_checks: - parameter_documentation - parameter_types +Gemfile: + optional: + ':test': + - gem: 'mocha' diff --git a/Gemfile b/Gemfile index fc8cf4d1..dc90537f 100644 --- a/Gemfile +++ b/Gemfile @@ -6,6 +6,7 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org' group :test do gem 'voxpupuli-test', '~> 11.0', :require => false gem 'puppet_metadata', '~> 5.0', :require => false + gem 'mocha', :require => false end group :development do From 4dca258e42e46ccd75cc47f05af9a2bbc976b547 Mon Sep 17 00:00:00 2001 From: Christoph Maser Date: Sat, 21 Jun 2025 18:27:34 +0200 Subject: [PATCH 4/4] fix: add verify_contents spec helper --- spec/support/spec/verify_contents.rb | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 spec/support/spec/verify_contents.rb diff --git a/spec/support/spec/verify_contents.rb b/spec/support/spec/verify_contents.rb new file mode 100644 index 00000000..99d43fe9 --- /dev/null +++ b/spec/support/spec/verify_contents.rb @@ -0,0 +1,6 @@ +# frozen_string_literal: true + +def verify_contents(subject, title, expected_lines) + content = subject.resource('file', title).send(:parameters)[:content] + expect(content.split("\n") & expected_lines).to match_array expected_lines.uniq +end