From 362c0355f4d8cc07ce9c7d946dfcf4f21dfa2425 Mon Sep 17 00:00:00 2001 From: Ryan Rotter Date: Fri, 13 Dec 2024 16:17:43 -0500 Subject: [PATCH] upgrade to PDK 3.4.0 set pdk version to '~> 3.4', so we can get any releases until 4.0 without a change to Gemfile or .sync.yml --- .sync.yml | 2 +- Gemfile | 5 +++-- Rakefile | 9 +++++++++ metadata.json | 6 +++--- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.sync.yml b/.sync.yml index c7a03399b..40a4a700e 100644 --- a/.sync.yml +++ b/.sync.yml @@ -13,7 +13,7 @@ Gemfile: - gem: faker - gem: librarian-puppet - gem: pdk - version: 3.3.0 + version: '~> 3.4' spec/default_facts.yml: extra_facts: ec2_tag_role: nebula::role::aws diff --git a/Gemfile b/Gemfile index 0cd2dfe08..9c3363989 100644 --- a/Gemfile +++ b/Gemfile @@ -37,11 +37,12 @@ group :development do gem "rexml", '>= 3.0.0', '< 3.2.7', require: false gem "faker", require: false gem "librarian-puppet", require: false - gem "pdk", '3.3.0', require: false + gem "pdk", '~> 3.4', require: false 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] diff --git a/Rakefile b/Rakefile index 77590fe6f..31b593053 100644 --- a/Rakefile +++ b/Rakefile @@ -7,3 +7,12 @@ require 'puppet-syntax/tasks/puppet-syntax' require 'puppet-strings/tasks' if Gem.loaded_specs.key? 'puppet-strings' 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"] + diff --git a/metadata.json b/metadata.json index 8effbd299..3be805a8f 100644 --- a/metadata.json +++ b/metadata.json @@ -49,7 +49,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", + "template-ref": "tags/3.4.0-0-gd3cc13f" }