From 56e010c9b1b090dba72d0e43a0594cffd3f766a9 Mon Sep 17 00:00:00 2001 From: Daniel Parks Date: Tue, 3 Sep 2024 20:57:50 -0700 Subject: [PATCH 1/2] CI: Switch macOS runner to 13 instead of latest For some reason CI fails on macOS 14 (see PR #91). --- .github/workflows/pr-checks.yaml | 2 +- .sync.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr-checks.yaml b/.github/workflows/pr-checks.yaml index 646322e..92d75a3 100644 --- a/.github/workflows/pr-checks.yaml +++ b/.github/workflows/pr-checks.yaml @@ -61,7 +61,7 @@ jobs: puppet: 7 - os: ubuntu-latest puppet: 8 - - os: macos-latest + - os: macos-13 puppet: 8 runs-on: ${{ matrix.os }} diff --git a/.sync.yml b/.sync.yml index 6321a57..d21a5f0 100644 --- a/.sync.yml +++ b/.sync.yml @@ -8,4 +8,4 @@ --- .github/workflows/pr-checks.yaml: additional-platforms: - - macos-latest + - macos-13 From 880638bb110a6f6589d7b4fa555d0c67066768d4 Mon Sep 17 00:00:00 2001 From: Daniel Parks Date: Tue, 3 Sep 2024 21:04:26 -0700 Subject: [PATCH 2/2] PDK update. --- .gitignore | 7 +++++++ .pdkignore | 7 +++++++ .rubocop.yml | 2 -- .vscode/extensions.json | 2 +- CHANGELOG.md | 4 ++++ Gemfile | 21 +++++++++++---------- metadata.json | 4 ++-- spec/spec_helper.rb | 5 +++-- 8 files changed, 35 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 3f15512..2803e56 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ /spec/fixtures/modules/* /tmp/ /vendor/ +/.vendor/ /convert_report.txt /update_report.txt .DS_Store @@ -26,3 +27,9 @@ .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 e40a357..425a91a 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 /.fixtures.yml /Gemfile /.gitattributes diff --git a/.rubocop.yml b/.rubocop.yml index 1c74bb3..41800ad 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -76,10 +76,8 @@ Style/SymbolArray: Description: Using percent style obscures symbolic intent of array's contents. EnforcedStyle: brackets Style/GuardClause: - Description: Postfix conditionals are sometimes ambiguous and often harder to read. Enabled: false Style/Next: - Description: Using next instead of if often makes things harder to read. Enabled: false Layout/MultilineMethodCallIndentation: Description: aligned is awkward and hard to read. diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 2f1e4f7..6da8d47 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,6 +1,6 @@ { "recommendations": [ "puppet.puppet-vscode", - "rebornix.Ruby" + "Shopify.ruby-lsp" ] } diff --git a/CHANGELOG.md b/CHANGELOG.md index 6545956..d67e8f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. ## main branch +* Synced with [PDK][]. + +[PDK]: https://www.puppet.com/docs/pdk/latest/pdk.html + ## Release 0.2.5 * Fixed initial installation on macOS to always use the native architecture… for diff --git a/Gemfile b/Gemfile index 3672520..8e9f845 100644 --- a/Gemfile +++ b/Gemfile @@ -20,11 +20,11 @@ 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.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 gem "metadata-json-lint", '~> 4.0', require: false - gem "puppetlabs_spec_helper", '~> 6.0', require: false - gem "rspec-puppet-facts", '~> 2.0', require: false + gem "rspec-puppet-facts", '~> 4.0', require: false gem "dependency_checker", '~> 1.0.0', require: false gem "parallel_tests", '= 3.12.1', require: false gem "pry", '~> 0.10', require: false @@ -33,16 +33,17 @@ group :development do gem "rubocop", '~> 1.50.0', require: false gem "rubocop-performance", '= 1.16.0', require: false gem "rubocop-rspec", '= 2.19.0', require: false - gem "puppet-strings", '~> 4.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 end -group :system_tests do - gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw] - gem "serverspec", '~> 2.41', require: false -end -group :release_prep do +group :development, :release_prep do gem "puppet-strings", '~> 4.0', require: false - gem "puppetlabs_spec_helper", '~> 6.0', require: false + gem "puppetlabs_spec_helper", '~> 7.0', require: false +end +group :system_tests do + gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw] + gem "CFPropertyList", '< 3.0.7', require: false, platforms: [:mswin, :mingw, :x64_mingw] + gem "serverspec", '~> 2.41', require: false end puppet_version = ENV['PUPPET_GEM_VERSION'] diff --git a/metadata.json b/metadata.json index 18a5cb7..a5c4b82 100644 --- a/metadata.json +++ b/metadata.json @@ -80,7 +80,7 @@ "rustlang", "rustup" ], - "pdk-version": "3.0.1", + "pdk-version": "3.2.0", "template-url": "https://github.com/danielparks/pdk-templates#main", - "template-ref": "heads/main-0-gde8efe4" + "template-ref": "heads/main-0-g49046f1" } diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 6820ceb..ae7c1f6 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -25,7 +25,8 @@ next unless File.exist?(f) && File.readable?(f) && File.size?(f) begin - default_facts.merge!(YAML.safe_load(File.read(f), permitted_classes: [], permitted_symbols: [], aliases: true)) + require 'deep_merge' + default_facts.deep_merge!(YAML.safe_load(File.read(f), permitted_classes: [], permitted_symbols: [], aliases: true)) rescue StandardError => e RSpec.configuration.reporter.message "WARNING: Unable to load #{f}: #{e}" end @@ -33,7 +34,7 @@ # read default_facts and merge them over what is provided by facterdb default_facts.each do |fact, value| - add_custom_fact fact, value + add_custom_fact fact, value, merge_facts: true end RSpec.configure do |c|