Merge pull request #18 from github/update-puppet

Update puppet to 6.25.1
github · Jan 31, 2024 · f189a70 · f189a70
2 parents 5ad6cf2 + bfedf70
commit f189a70
Show file tree

Hide file tree

Showing 55 changed files with 24 additions and 20 deletions.
diff --git a/Gemfile b/Gemfile
@@ -14,6 +14,6 @@ group :development do
   gem "simplecov-json", "~> 0.2"
 
   # Integration test
-  gem "puppet", ">= #{ENV['PUPPET_VERSION'] || '4.10.4'}"
+  gem "puppet", "~> #{ENV['PUPPET_VERSION'] || '6.25.1'}"
   gem "rspec-puppet", "~> #{ENV['RSPEC_PUPPET_VERSION'] || '2.6.2'}"
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -23,39 +23,35 @@ GEM
     base64 (0.2.0)
     coderay (1.1.3)
     concurrent-ruby (1.2.2)
+    deep_merge (1.2.2)
     diff-lcs (1.5.0)
     diffy (3.4.2)
     docile (1.1.5)
-    facter (2.5.7)
-      multipart-post (>= 1.2, < 3)
+    facter (4.5.2)
+      hocon (~> 1.3)
+      thor (>= 1.0.1, < 2.0)
     faraday (2.7.12)
       base64
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
-    fast_gettext (1.1.2)
-    gettext (3.2.9)
-      locale (>= 2.0.5)
-      text (>= 1.3.0)
-    gettext-setup (0.34)
-      fast_gettext (~> 1.1.0)
-      gettext (>= 3.0.2, < 3.3.0)
-      locale
+    fast_gettext (1.8.0)
     hashdiff (1.0.1)
     hiera (3.12.0)
+    hocon (1.4.0)
     httparty (0.21.0)
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
+    httpclient (2.8.3)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     json (2.6.1)
-    json_pure (1.8.6)
     locale (2.1.3)
     method_source (1.0.0)
     mini_mime (1.1.5)
     minitest (5.20.0)
+    multi_json (1.15.0)
     multi_xml (0.6.0)
-    multipart-post (2.1.1)
     net-ssh (7.2.0)
     octocatalog-diff (2.1.0)
       diffy (>= 3.1.0)
@@ -74,12 +70,19 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (5.0.4)
-    puppet (4.10.12)
-      facter (> 2.0, < 4)
-      gettext-setup (>= 0.10, < 1)
-      hiera (>= 2.0, < 4)
-      json_pure (~> 1.8)
+    puppet (6.25.1)
+      concurrent-ruby (~> 1.0)
+      deep_merge (~> 1.0)
+      facter (> 2.0.1, < 5)
+      fast_gettext (~> 1.1)
+      hiera (>= 3.2.1, < 4)
+      httpclient (~> 2.8)
       locale (~> 2.1)
+      multi_json (~> 1.10)
+      puppet-resource_api (~> 1.5)
+      semantic_puppet (~> 1.0)
+    puppet-resource_api (1.9.0)
+      hocon (>= 1.0)
     racc (1.7.3)
     rack (3.0.8)
     rainbow (3.1.1)
@@ -130,6 +133,7 @@ GEM
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
+    semantic_puppet (1.0.4)
     simplecov (0.14.1)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
@@ -138,7 +142,7 @@ GEM
     simplecov-json (0.2.3)
       json
       simplecov
-    text (1.3.1)
+    thor (1.3.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
@@ -152,7 +156,7 @@ DEPENDENCIES
   octofacts-updater!
   parallel (= 1.12.0)
   pry (~> 0.14)
-  puppet (~> 4.10.4)
+  puppet (~> 6.25.1)
   rake (~> 12.3)
   rspec-puppet (~> 2.6.2)
   rubocop-github (~> 0.20.0)

diff --git a/vendor/cache/ast-2.3.0.gem b/vendor/cache/ast-2.3.0.gem
diff --git a/vendor/cache/coderay-1.1.1.gem b/vendor/cache/coderay-1.1.1.gem
diff --git a/vendor/cache/coderay-1.1.3.gem b/vendor/cache/coderay-1.1.3.gem
diff --git a/vendor/cache/deep_merge-1.2.2.gem b/vendor/cache/deep_merge-1.2.2.gem
diff --git a/vendor/cache/diff-lcs-1.3.gem b/vendor/cache/diff-lcs-1.3.gem
diff --git a/vendor/cache/diff-lcs-1.5.0.gem b/vendor/cache/diff-lcs-1.5.0.gem
diff --git a/vendor/cache/facter-2.5.7.gem b/vendor/cache/facter-2.5.7.gem
diff --git a/vendor/cache/facter-4.5.2.gem b/vendor/cache/facter-4.5.2.gem
diff --git a/vendor/cache/fast_gettext-1.1.2.gem b/vendor/cache/fast_gettext-1.1.2.gem
diff --git a/vendor/cache/fast_gettext-1.8.0.gem b/vendor/cache/fast_gettext-1.8.0.gem
diff --git a/vendor/cache/gettext-3.2.9.gem b/vendor/cache/gettext-3.2.9.gem
diff --git a/vendor/cache/gettext-setup-0.34.gem b/vendor/cache/gettext-setup-0.34.gem
diff --git a/vendor/cache/hocon-1.4.0.gem b/vendor/cache/hocon-1.4.0.gem
diff --git a/vendor/cache/httpclient-2.8.3.gem b/vendor/cache/httpclient-2.8.3.gem
diff --git a/vendor/cache/json-2.5.1.gem b/vendor/cache/json-2.5.1.gem
diff --git a/vendor/cache/json-2.6.1.gem b/vendor/cache/json-2.6.1.gem
diff --git a/vendor/cache/json_pure-1.8.6.gem b/vendor/cache/json_pure-1.8.6.gem
diff --git a/vendor/cache/method_source-0.8.2.gem b/vendor/cache/method_source-0.8.2.gem
diff --git a/vendor/cache/method_source-1.0.0.gem b/vendor/cache/method_source-1.0.0.gem
diff --git a/vendor/cache/multi_json-1.15.0.gem b/vendor/cache/multi_json-1.15.0.gem
diff --git a/vendor/cache/multipart-post-2.1.1.gem b/vendor/cache/multipart-post-2.1.1.gem
diff --git a/vendor/cache/parser-2.4.0.0.gem b/vendor/cache/parser-2.4.0.0.gem
diff --git a/vendor/cache/powerpack-0.1.1.gem b/vendor/cache/powerpack-0.1.1.gem
diff --git a/vendor/cache/pry-0.10.4.gem b/vendor/cache/pry-0.10.4.gem
diff --git a/vendor/cache/pry-0.14.2.gem b/vendor/cache/pry-0.14.2.gem
diff --git a/vendor/cache/puppet-4.10.12.gem b/vendor/cache/puppet-4.10.12.gem
diff --git a/vendor/cache/puppet-6.25.1.gem b/vendor/cache/puppet-6.25.1.gem
diff --git a/vendor/cache/puppet-resource_api-1.9.0.gem b/vendor/cache/puppet-resource_api-1.9.0.gem
diff --git a/vendor/cache/rainbow-2.2.2.gem b/vendor/cache/rainbow-2.2.2.gem
diff --git a/vendor/cache/rspec-3.12.0.gem b/vendor/cache/rspec-3.12.0.gem
diff --git a/vendor/cache/rspec-3.6.0.gem b/vendor/cache/rspec-3.6.0.gem
diff --git a/vendor/cache/rspec-core-3.12.2.gem b/vendor/cache/rspec-core-3.12.2.gem
diff --git a/vendor/cache/rspec-core-3.6.0.gem b/vendor/cache/rspec-core-3.6.0.gem
diff --git a/vendor/cache/rspec-expectations-3.12.3.gem b/vendor/cache/rspec-expectations-3.12.3.gem
diff --git a/vendor/cache/rspec-expectations-3.6.0.gem b/vendor/cache/rspec-expectations-3.6.0.gem
diff --git a/vendor/cache/rspec-mocks-3.12.6.gem b/vendor/cache/rspec-mocks-3.12.6.gem
diff --git a/vendor/cache/rspec-mocks-3.6.0.gem b/vendor/cache/rspec-mocks-3.6.0.gem
diff --git a/vendor/cache/rspec-puppet-2.6.15.gem b/vendor/cache/rspec-puppet-2.6.15.gem
diff --git a/vendor/cache/rspec-puppet-2.6.2.gem b/vendor/cache/rspec-puppet-2.6.2.gem
diff --git a/vendor/cache/rspec-support-3.12.1.gem b/vendor/cache/rspec-support-3.12.1.gem
diff --git a/vendor/cache/rspec-support-3.6.0.gem b/vendor/cache/rspec-support-3.6.0.gem
diff --git a/vendor/cache/rubocop-0.49.1.gem b/vendor/cache/rubocop-0.49.1.gem
diff --git a/vendor/cache/rubocop-github-0.5.0.gem b/vendor/cache/rubocop-github-0.5.0.gem
diff --git a/vendor/cache/ruby-progressbar-1.8.1.gem b/vendor/cache/ruby-progressbar-1.8.1.gem
diff --git a/vendor/cache/semantic_puppet-1.0.4.gem b/vendor/cache/semantic_puppet-1.0.4.gem
diff --git a/vendor/cache/simplecov-html-0.10.1.gem b/vendor/cache/simplecov-html-0.10.1.gem
diff --git a/vendor/cache/simplecov-html-0.10.2.gem b/vendor/cache/simplecov-html-0.10.2.gem
diff --git a/vendor/cache/simplecov-json-0.2.3.gem b/vendor/cache/simplecov-json-0.2.3.gem
diff --git a/vendor/cache/simplecov-json-0.2.gem b/vendor/cache/simplecov-json-0.2.gem
diff --git a/vendor/cache/slop-3.6.0.gem b/vendor/cache/slop-3.6.0.gem
diff --git a/vendor/cache/text-1.3.1.gem b/vendor/cache/text-1.3.1.gem
diff --git a/vendor/cache/thor-1.3.0.gem b/vendor/cache/thor-1.3.0.gem
diff --git a/vendor/cache/unicode-display_width-1.3.0.gem b/vendor/cache/unicode-display_width-1.3.0.gem