From 9a876a34481b9641317030492806e78511b8589f Mon Sep 17 00:00:00 2001
From: mikpe74 <mika.perala@liu.se>
Date: Wed, 9 Apr 2025 12:17:50 +0200
Subject: [PATCH] PDK update
---
.editorconfig | 13 +++++++++----
.gitignore | 7 +++++++
.pdkignore | 7 +++++++
.puppet-lint.rc | 3 +++
.vscode/extensions.json | 3 +--
Gemfile | 12 ++++++++----
Rakefile | 5 +++++
metadata.json | 4 ++--
8 files changed, 42 insertions(+), 12 deletions(-)
diff --git a/.editorconfig b/.editorconfig
index 6e1faa7..c181ad3 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -31,9 +31,14 @@ indent_size = 4
[Makefile]
indent_style = tab
-; The JSON files contain newlines inconsistently
-[*.json]
-insert_final_newline = ignore
-
[*.{ps1,psm1}]
indent_size = 4
+
+# Ignore paths
+[{LICENSE,REFERENCE.md}]
+charset = unset
+end_of_line = unset
+insert_final_newline = unset
+trim_trailing_whitespace = unset
+indent_style = unset
+indent_size = unset
diff --git a/.gitignore b/.gitignore
index c817477..d108e84 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@
/spec/fixtures/modules/*
/tmp/
/vendor/
+/.vendor/
/convert_report.txt
/update_report.txt
.DS_Store
@@ -26,6 +27,12 @@
.envrc
/inventory.yaml
/spec/fixtures/litmus_inventory.yaml
+.resource_types
+.modules
+.task_cache.json
+.plan_cache.json
+.rerun.json
+bolt-debug.log
*~
\#*\#
.\#*
diff --git a/.pdkignore b/.pdkignore
index 8bbed40..eff5820 100644
--- a/.pdkignore
+++ b/.pdkignore
@@ -19,6 +19,7 @@
/spec/fixtures/modules/*
/tmp/
/vendor/
+/.vendor/
/convert_report.txt
/update_report.txt
.DS_Store
@@ -26,6 +27,12 @@
.envrc
/inventory.yaml
/spec/fixtures/litmus_inventory.yaml
+.resource_types
+.modules
+.task_cache.json
+.plan_cache.json
+.rerun.json
+bolt-debug.log
*~
\#*\#
.\#*
diff --git a/.puppet-lint.rc b/.puppet-lint.rc
index cc96ece..b0d8b00 100644
--- a/.puppet-lint.rc
+++ b/.puppet-lint.rc
@@ -1 +1,4 @@
--relative
+--no-80chars-check
+--no-lookup_in_parameter-check
+--ignore-paths=.vendor/**/*.pp,.bundle/**/*.pp,pkg/**/*.pp,spec/**/*.pp,tests/**/*.pp,types/**/*.pp,vendor/**/*.pp
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 902e5f8..655b72c 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,10 +1,9 @@
{
"recommendations": [
"puppet.puppet-vscode",
- "rebornix.Ruby",
"ms-vscode.powershell",
"EditorConfig.EditorConfig",
- "glenbuktenica.unicode-substitutions"
+ "glenbuktenica.unicode-substitutions",
"Shopify.ruby-lsp"
]
}
diff --git a/Gemfile b/Gemfile
index 7a9ef2e..dc6cbe0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,11 +20,14 @@ group :development do
gem "json", '= 2.6.1', require: false if Gem::Requirement.create(['>= 3.1.0', '< 3.1.3']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
gem "json", '= 2.6.3', require: false if Gem::Requirement.create(['>= 3.2.0', '< 4.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
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.0', require: false
+ gem "deep_merge", '~> 1.2.2', require: false
gem "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false
- gem "facterdb", '~> 1.18', 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", '~> 3.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
@@ -37,7 +40,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]
diff --git a/Rakefile b/Rakefile
index 77590fe..cdbb93f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -7,3 +7,8 @@ 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_lookup_in_parameter')
+PuppetLint.configuration.fail_on_warnings = false
+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 fcabc24..47223bc 100644
--- a/metadata.json
+++ b/metadata.json
@@ -61,7 +61,7 @@
"version_requirement": ">= 6.21.0 < 8.0.0"
}
],
- "pdk-version": "3.2.0",
+ "pdk-version": "3.4.0",
"template-url": "https://gitlab.it.liu.se/puppet-infra/pdk-templates.git#liu",
- "template-ref": "heads/liu-0-g4d4e981"
+ "template-ref": "heads/liu-0-g967906f"
}
--
GitLab