From 8ea00723f4fd55aafda941e6db7ddcc07f2d323f Mon Sep 17 00:00:00 2001 From: Dan Gibbs Date: Sat, 19 Apr 2025 15:54:54 +0100 Subject: [PATCH 1/3] "Update PDK to ${PDK_TEMPLATE_REF}" --- .puppet-lint.rc | 8 ++++++++ .sync.yml | 2 -- Gemfile | 12 +++++++----- Rakefile | 8 ++++++++ metadata.json | 6 +++--- 5 files changed, 26 insertions(+), 10 deletions(-) diff --git a/.puppet-lint.rc b/.puppet-lint.rc index cc96ece..9e15c6e 100644 --- a/.puppet-lint.rc +++ b/.puppet-lint.rc @@ -1 +1,9 @@ +--fail-on-warnings --relative +--no-80chars-check +--no-140chars-check +--no-class_inherits_from_params_class-check +--no-autoloader_layout-check +--no-documentation-check +--no-single_quote_string_with_variables-check +--ignore-paths=.vendor/**/*.pp,.bundle/**/*.pp,pkg/**/*.pp,spec/**/*.pp,tests/**/*.pp,types/**/*.pp,vendor/**/*.pp diff --git a/.sync.yml b/.sync.yml index 6ecb24a..d5d972b 100644 --- a/.sync.yml +++ b/.sync.yml @@ -124,8 +124,6 @@ Gemfile: ':test': - gem: 'puppet_metadata' version: '~> 4.0' - - gem: 'puppet-blacksmith' - require: false - gem: 'ed25519' version: - '>= 1.2' diff --git a/Gemfile b/Gemfile index 1548a70..b1cc24e 100644 --- a/Gemfile +++ b/Gemfile @@ -22,9 +22,12 @@ group :development do gem "racc", '~> 1.4.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) gem "deep_merge", '~> 1.2.2', require: false gem "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false - gem "facterdb", '~> 2.1', require: false + gem "facterdb", '~> 2.1', require: false if Gem::Requirement.create(['< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) + gem "facterdb", '~> 3.0', require: false if Gem::Requirement.create(['>= 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) gem "metadata-json-lint", '~> 4.0', require: false - gem "rspec-puppet-facts", '~> 4.0', require: false + gem "json-schema", '< 5.1.1', require: false + gem "rspec-puppet-facts", '~> 4.0', require: false if Gem::Requirement.create(['< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) + gem "rspec-puppet-facts", '~> 5.0', require: false if Gem::Requirement.create(['>= 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) gem "dependency_checker", '~> 1.0.0', require: false gem "parallel_tests", '= 3.12.1', require: false gem "pry", '~> 0.10', require: false @@ -34,7 +37,6 @@ group :development do gem "rubocop-performance", '= 1.16.0', require: false gem "rubocop-rspec", '= 2.19.0', require: false gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw] - gem "rexml", '>= 3.0.0', '< 3.2.7', require: false gem "github_changelog_generator", '~> 1.15', require: false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.3.0') gem "puppet-lint-file_ensure-check", require: false gem "puppet-lint-manifest_whitespace-check", require: false @@ -43,7 +45,8 @@ group :development do end group :development, :release_prep do gem "puppet-strings", '~> 4.0', require: false - gem "puppetlabs_spec_helper", '~> 7.0', require: false + gem "puppetlabs_spec_helper", '~> 8.0', require: false + gem "puppet-blacksmith", '~> 7.0', require: false end group :system_tests do gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw] @@ -52,7 +55,6 @@ group :system_tests do end group :test do gem "puppet_metadata", '~> 4.0', require: false - gem "puppet-blacksmith", require: false gem "ed25519", '>= 1.2', '< 2.0', require: false gem "bcrypt_pbkdf", '>= 1.0', '< 2.0', require: false end diff --git a/Rakefile b/Rakefile index d4165a7..08f3439 100644 --- a/Rakefile +++ b/Rakefile @@ -9,6 +9,14 @@ require 'puppet_blacksmith/rake_tasks' if Gem.loaded_specs.key? 'puppet-blacksmi require 'github_changelog_generator/task' if Gem.loaded_specs.key? 'github_changelog_generator' PuppetLint.configuration.send('disable_relative') +PuppetLint.configuration.send('disable_80chars') +PuppetLint.configuration.send('disable_140chars') +PuppetLint.configuration.send('disable_class_inherits_from_params_class') +PuppetLint.configuration.send('disable_autoloader_layout') +PuppetLint.configuration.send('disable_documentation') +PuppetLint.configuration.send('disable_single_quote_string_with_variables') +PuppetLint.configuration.fail_on_warnings = true +PuppetLint.configuration.ignore_paths = [".vendor/**/*.pp", ".bundle/**/*.pp", "pkg/**/*.pp", "spec/**/*.pp", "tests/**/*.pp", "types/**/*.pp", "vendor/**/*.pp"] def changelog_user return unless Rake.application.top_level_tasks.include? "changelog" diff --git a/metadata.json b/metadata.json index 81b2662..c82961a 100644 --- a/metadata.json +++ b/metadata.json @@ -65,7 +65,7 @@ "version_requirement": ">= 7.0.0 < 9.0.0" } ], - "pdk-version": "3.3.0", - "template-url": "https://github.com/puppetlabs/pdk-templates#3.3.0", - "template-ref": "tags/3.3.0-0-g5d17ec1" + "pdk-version": "3.4.0", + "template-url": "https://github.com/puppetlabs/pdk-templates#3.4.0.3", + "template-ref": "tags/3.4.0.3-0-g8fb22fc" } From 63c4b9847021f98768cc95fad855a70303dd5b66 Mon Sep 17 00:00:00 2001 From: Dan Gibbs Date: Sat, 19 Apr 2025 17:50:09 +0100 Subject: [PATCH 2/3] Update workflow Ubuntu version --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aef626a..e856606 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ concurrency: jobs: setup_matrix: name: Setup Test Matrix - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 40 outputs: puppet_unit_test_matrix: ${{ steps.get-outputs.outputs.puppet_unit_test_matrix }} @@ -39,7 +39,7 @@ jobs: unit: needs: setup_matrix - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 40 strategy: fail-fast: false @@ -61,7 +61,7 @@ jobs: acceptance: name: Litmus Acceptance needs: unit - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 env: BOLT_GEM: true CI: true @@ -89,7 +89,7 @@ jobs: needs: - unit - acceptance - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 name: Test suite steps: - run: echo Test suite completed From e234fcdd906141df3e2e2987ec3b5cc86a94d3ec Mon Sep 17 00:00:00 2001 From: Dan Gibbs Date: Sat, 19 Apr 2025 17:55:22 +0100 Subject: [PATCH 3/3] Fix: Space before arrow --- manifests/package.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/package.pp b/manifests/package.pp index 5f78e57..b5e4387 100644 --- a/manifests/package.pp +++ b/manifests/package.pp @@ -53,6 +53,6 @@ } package { $osquery::package_name: - ensure => $osquery::package_ensure, + ensure => $osquery::package_ensure, } }