Merge remote-tracking branch 'upstream/main'

.github/workflows/mend.yml

@@ -1,10 +1,9 @@
 name: "mend"
 
 on:
-  pull_request_target:
-    types:
-      - opened
-      - synchronize
+  pull_request:
+    branches:
+      - "main"
   schedule:
     - cron: "0 0 * * *"
   workflow_dispatch:

.gitignore

@@ -20,6 +20,7 @@
 /spec/fixtures/modules/
 /tmp/
 /vendor/
+/.vendor/
 /convert_report.txt
 # Rubocop profile builder temporary files
 /rubocop/.rubocop.yml

CHANGELOG.md

@@ -3,6 +3,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## 2024-09-28
+
+### Changes
+
+* Merge upstream 3.3.0.1
+
 ## 2024-04-02
 
 ### Changes

config_defaults.yml

@@ -31,13 +31,20 @@ common:
     - '/spec/fixtures/modules/*'
     - '/tmp/'
     - '/vendor/'
+    - '/.vendor/'
     - '/convert_report.txt'
     - '/update_report.txt'
     - '.DS_Store'
     - '.project'
     - '.envrc'
     - '/inventory.yaml'
     - '/spec/fixtures/litmus_inventory.yaml'
+    - '.resource_types'
+    - '.modules'
+    - '.task_cache.json'
+    - '.plan_cache.json'
+    - '.rerun.json'
+    - 'bolt-debug.log'
     - '*.bak'
     - '.rbenv*'
     - '.rvmrc*'
@@ -514,14 +521,16 @@ Gemfile:
       - gem: racc
         version: '~> 1.4.0'
         condition: "Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))"
+      - gem: deep_merge
+        version: '~> 1.2.2'
       - gem: 'voxpupuli-puppet-lint-plugins'
         version: '~> 5.0'
       - gem: 'facterdb'
-        version: '~> 1.18'
+        version: '~> 2.1'
       - gem: 'metadata-json-lint'
         version: '~> 4.0'
       - gem: 'rspec-puppet-facts'
-        version: '~> 2.0'
+        version: '~> 4.0'
       - gem: 'dependency_checker'
         version: '~> 1.0.0'
       - gem: 'parallel_tests'
@@ -544,20 +553,27 @@ Gemfile:
           - mswin
           - mingw
           - x64_mingw
+      # Temporary Pin
+      - gem: 'rexml'
+        version: 
+          - '>= 3.0.0'
+          - '< 3.2.7'
     ':development, :release_prep':
       - gem: 'puppet-strings'
         version: '~> 4.0'
       - gem: 'puppetlabs_spec_helper'
-        version: '~> 6.0'
+        version: '~> 8.0'
+      - gem: 'puppet-blacksmith'
+        version: '~> 7.0'
     ':system_tests':
       - gem: 'puppet_litmus'
-        version: 
+        version:
         - '~> 1.0'
-        platforms: 
+        platforms:
           - ruby
           - x64_mingw
       - gem: 'CFPropertyList'
-        version: 
+        version:
         - '< 3.0.7'
         platforms:
           - mswin

moduleroot/Rakefile.erb

@@ -41,3 +41,7 @@ PuppetLint.configuration.send('<%= option %>')
 <% if @configs['linter_exclusions'] -%>
 PuppetLint.configuration.ignore_paths = <%= @configs['linter_exclusions']%>
 <% end -%>
+
+<%- [@configs['extras']].flatten.compact.each do |line| -%>
+<%= line %>
+<%- end -%>

moduleroot/spec/spec_helper.rb.erb

@@ -27,15 +27,16 @@ default_fact_files.each do |f|
   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
 end
 
 # 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|