pdk 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ea7fd13c13423022b2ef3e28275d98860b34b9afe9d4b5ccac56c06a0a29346
-  data.tar.gz: 5025806f00ad6d9b36bb0957d8da65765cc46cd335c11ef75cf3b82f88a61e79
+  metadata.gz: b8d097ab722c6b85e1a3f6bd87790a9d41c3a6de0efef08dbea9d9661ced6275
+  data.tar.gz: de41ce5f8860c34521f4001b4c882f4424b427fb6d85398332eba1b9ef8e324c
 SHA512:
-  metadata.gz: a3b2866a2a221d87d7c87ecc15231b0a97b00bce150cdd97fd6a6a1ee99f36d9ead2fcee2aef644360aaef84e499f1adff1cdb8de9a10ec084ac302743255a6a
-  data.tar.gz: e4fbd9517b238b85d55c59df0a838f831ac1033e84ec2daa96487470f91e1c5954bf96208b223311ab8c8e4c00bc3150570094017576d7e1ffb105c57f2f2eff
+  metadata.gz: 89b14fb73fb9122d4ce879f9260028ea8bc67a50f0e81c9b96a223c2087ed8493051eca0dde8d708ac37ffd984d88a0f19e950e1864395d6db0313364871df4d
+  data.tar.gz: 9d94174c163ebca1f7b16b0da7a51bb0767de7a2c5868cdb7d291f2c8f086dbc12a4ed7f90180c8ccd7c1f44f321119c78cf62e43155ee327d29508e70463b82

data/CHANGELOG.md

@@ -5,21 +5,44 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
-## [v3.3.0](https://github.com/puppetlabs/pdk/tree/v3.3.0) - 2024-09-10
+## [v3.4.0](https://github.com/puppetlabs/pdk/tree/v3.4.0) - 2024-11-25
+
+[Full Changelog](https://github.com/puppetlabs/pdk/compare/v3.3.0...v3.4.0)
+
+### Added
+
+- (CAT-2141) Update `json-schema` dependency [#1412](https://github.com/puppetlabs/pdk/pull/1412) ([david22swan](https://github.com/david22swan))
+- (CAT-643) Add forge gem upload functionality [#1403](https://github.com/puppetlabs/pdk/pull/1403) ([danadoherty639](https://github.com/danadoherty639))
+
+### Fixed
+
+- (CAT-2162) Remove support for SLES 12 [#1418](https://github.com/puppetlabs/pdk/pull/1418) ([david22swan](https://github.com/david22swan))
+- (CAT-2155) Remove metadata_syntax_validator parser swap to `JSON::Pure` [#1415](https://github.com/puppetlabs/pdk/pull/1415) ([david22swan](https://github.com/david22swan))
+- (CAT-2128) Remove `json_pure` dependency [#1411](https://github.com/puppetlabs/pdk/pull/1411) ([david22swan](https://github.com/david22swan))
+- (maint) Fix Gem::Platform.match() deprecation warning  [#1408](https://github.com/puppetlabs/pdk/pull/1408) ([jhbuchanan45](https://github.com/jhbuchanan45))
+- (CAT-2007) Update http setting cert to setting ca_file [#1398](https://github.com/puppetlabs/pdk/pull/1398) ([david22swan](https://github.com/david22swan))
+- (CAT-2007) Use vendored cert files and VERIFY_PEER wth NET::HTTP on Windows [#1396](https://github.com/puppetlabs/pdk/pull/1396) ([david22swan](https://github.com/david22swan))
+- (CAT-2040) pdk spinner inconsistent on windows [#1394](https://github.com/puppetlabs/pdk/pull/1394) ([alex501212](https://github.com/alex501212))
+
+## [v3.3.0](https://github.com/puppetlabs/pdk/tree/v3.3.0) - 2024-09-11
 
 [Full Changelog](https://github.com/puppetlabs/pdk/compare/v3.2.0...v3.3.0)
 
-## Added
+### Added
 
+- (CAT-1928) Update Supported OS on new module to match what is expected [#1381](https://github.com/puppetlabs/pdk/pull/1381) ([david22swan](https://github.com/david22swan))
+- (CAT-1896) - Use puppet-modulebuilder for `PDK build` [#1374](https://github.com/puppetlabs/pdk/pull/1374) ([jordanbreen28](https://github.com/jordanbreen28))
 - Skip 'name' validation when in a controlrepo context [#1352](https://github.com/puppetlabs/pdk/pull/1352) ([garrettrowell](https://github.com/garrettrowell))
-- (CAT-1896) - Use puppet-modulebuilder for PDK build [#1374](https://github.com/puppetlabs/pdk/pull/1374) ([jordanbreen28](https://github.com/jordanbreen28))
 
 ### Fixed
 
+- (CAT-2026) Update how `pdk test unit --list` detects an error [#1388](https://github.com/puppetlabs/pdk/pull/1388) ([david22swan](https://github.com/david22swan))
+- Support executable templates on filesystems mounted with `noexec` [#1383](https://github.com/puppetlabs/pdk/pull/1383) ([nabertrand](https://github.com/nabertrand))
+- (CAT-1786) Remove Fedora 36 from the and add Fedora 40 to the PDK README [#1379](https://github.com/puppetlabs/pdk/pull/1379) ([LukasAud](https://github.com/LukasAud))
+- (CAT-648) - Mark release*.rb files as non-executable [#1378](https://github.com/puppetlabs/pdk/pull/1378) ([jordanbreen28](https://github.com/jordanbreen28))
 - (CAT-1643) Update childprocess and remove patch [#1356](https://github.com/puppetlabs/pdk/pull/1356) ([david22swan](https://github.com/david22swan))
-- (CAT-2026) Update how pdk test unit --list detects an error [#1388](https://github.com/puppetlabs/pdk/pull/1388) ([david22swan](https://github.com/david22swan))
 
-## [v3.2.0](https://github.com/puppetlabs/pdk/tree/v3.2.0) - 2024-05-02
+## [v3.2.0](https://github.com/puppetlabs/pdk/tree/v3.2.0) - 2024-05-08
 
 [Full Changelog](https://github.com/puppetlabs/pdk/compare/v3.1.0...v3.2.0)
 
@@ -57,6 +80,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 [Full Changelog](https://github.com/puppetlabs/pdk/compare/v2.7.1...v3.0.0)
 
 ### Changed
+
 - (CONT-1134) Bump PDK Templates REF [#1264](https://github.com/puppetlabs/pdk/pull/1264) ([chelnak](https://github.com/chelnak))
 - (CONT-1154) Disable console command [#1263](https://github.com/puppetlabs/pdk/pull/1263) ([chelnak](https://github.com/chelnak))
 - (CONT-1130) Bump PDK gem version [#1260](https://github.com/puppetlabs/pdk/pull/1260) ([chelnak](https://github.com/chelnak))

data/lib/pdk/cli/exec/command.rb

@@ -80,7 +80,7 @@ module PDK
 
           require 'pdk/cli/util/spinner'
 
-          @spinner = TTY::Spinner.new("[:spinner] #{message}", opts.merge(PDK::CLI::Util.spinner_opts_for_platform))
+          @spinner = TTY::Spinner.new("[:spinner] #{message}")
         end
 
         def update_environment(additional_env)

data/lib/pdk/cli/util.rb

@@ -28,18 +28,6 @@ module PDK
       end
       module_function :ensure_in_module!
 
-      def spinner_opts_for_platform
-        windows_opts = {
-          success_mark: '*',
-          error_mark: 'X'
-        }
-
-        return windows_opts if Gem.win_platform?
-
-        {}
-      end
-      module_function :spinner_opts_for_platform
-
       def prompt_for_yes(question_text, opts = {})
         require 'tty/prompt'
 

data/lib/pdk/module/release.rb

@@ -147,28 +147,16 @@ module PDK
         validate_publish_options!
         raise PDK::CLI::ExitWithError, format('Module tarball %{tarball_path} does not exist', tarball_path: tarball_path) unless PDK::Util::Filesystem.file?(tarball_path)
 
-        # TODO: Replace this code when the upload functionality is added to the forge ruby gem
-        require 'base64'
-        file_data = Base64.encode64(PDK::Util::Filesystem.read_file(tarball_path, open_args: 'rb'))
-
         PDK.logger.info 'Uploading tarball to puppet forge...'
-        uri = URI(forge_upload_url)
-        require 'net/http'
-        request = Net::HTTP::Post.new(uri.path)
-        request['Authorization'] = "Bearer #{forge_token}"
-        request['Content-Type'] = 'application/json'
-        data = { file: file_data }
-
-        request.body = data.to_json
-
-        require 'openssl'
-        use_ssl = uri.instance_of?(URI::HTTPS)
-        response = Net::HTTP.start(uri.host, uri.port, use_ssl: use_ssl) do |http|
-          http.request(request)
+        begin
+          require 'puppet_forge'
+          PuppetForge.host = forge_upload_url
+          PuppetForge::Connection.authorization = forge_token
+          PuppetForge::V3::Release.upload(tarball_path)
+        rescue StandardError => e
+          raise PDK::CLI::ExitWithError, format('Error uploading to Puppet Forge: %{result}', result: e.message)
         end
 
-        raise PDK::CLI::ExitWithError, format('Error uploading to Puppet Forge: %{result}', result: response.body) unless response.is_a?(Net::HTTPSuccess)
-
         PDK.logger.info 'Publish to Forge was successful'
       end
 

data/lib/pdk/util/puppet_version.rb

@@ -182,7 +182,7 @@ module PDK
         @rubygems_puppet_versions ||= begin
           fetcher = Gem::SpecFetcher.fetcher
           puppet_tuples = fetcher.detect(:released) do |spec_tuple|
-            spec_tuple.name == 'puppet' && Gem::Platform.match(spec_tuple.platform)
+            spec_tuple.name == 'puppet' && Gem::Platform.match_spec?(spec_tuple)
           end
           puppet_versions = puppet_tuples.map { |name, _| name.version }.uniq
           puppet_versions.sort.reverse

data/lib/pdk/util/vendored_file.rb

@@ -51,8 +51,10 @@ module PDK
         uri = URI.parse(url)
         http = Net::HTTP.new(uri.host, uri.port)
         http.use_ssl = true
-        # TODO: Get rid of this
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE if Gem.win_platform?
+        if Gem.win_platform?
+          http.ca_file = 'C:/Program Files/Puppet Labs/DevelopmentKit/ssl/cert.pem'
+          http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        end
         request = Net::HTTP::Get.new(uri.request_uri)
         response = http.request(request)
 

data/lib/pdk/validate/external_command_validator.rb

@@ -161,9 +161,9 @@ module PDK
               if parent_validator.nil? || parent_validator.spinner.nil? || !parent_validator.spinner.is_a?(TTY::Spinner::Multi)
                 c.add_spinner(spinner_text_for_targets(invokation_targets))
               else
-                spinner = TTY::Spinner.new("[:spinner] #{spinner_text_for_targets(invokation_targets)}", PDK::CLI::Util.spinner_opts_for_platform)
+                spinner = TTY::Spinner.new("[:spinner] #{spinner_text_for_targets(invokation_targets)}")
                 parent_validator.spinner.register(spinner)
-                c.register_spinner(spinner, PDK::CLI::Util.spinner_opts_for_platform)
+                c.register_spinner(spinner)
               end
             end
           end

data/lib/pdk/validate/invokable_validator.rb

@@ -138,7 +138,7 @@ module PDK
 
         require 'pdk/cli/util/spinner'
 
-        @spinner = TTY::Spinner.new("[:spinner] #{spinner_text}", PDK::CLI::Util.spinner_opts_for_platform)
+        @spinner = TTY::Spinner.new("[:spinner] #{spinner_text}")
       end
 
       # Process any targets that were skipped by the validator and add the events to the validation report

data/lib/pdk/validate/metadata/metadata_syntax_validator.rb

@@ -22,15 +22,6 @@ module PDK
           JSON.parser = JSON::Ext::Parser if defined?(JSON::Ext::Parser)
         end
 
-        def before_validation
-          # The pure ruby JSON parser gives much nicer parse error messages than
-          # the C extension at the cost of slightly slower parsing. We require it
-          # here and restore the C extension at the end of the method (if it was
-          # being used).
-          require 'json/pure'
-          JSON.parser = JSON::Pure::Parser
-        end
-
         def validate_target(report, target)
           unless PDK::Util::Filesystem.readable?(target)
             report.add_event(
@@ -56,9 +47,7 @@ module PDK
           rescue JSON::ParserError => e
             # Because the message contains a raw segment of the file, we use
             # String#dump here to unescape any escape characters like newlines.
-            # We then strip out the surrounding quotes and the exclaimation
-            # point that json_pure likes to put in exception messages.
-            sane_message = e.message.dump[/\A"(.+?)!?"\Z/, 1]
+            sane_message = e.message.dump
 
             report.add_event(
               file: target,

data/lib/pdk/validate/validator_group.rb

@@ -42,7 +42,7 @@ module PDK
 
         require 'pdk/cli/util/spinner'
 
-        @spinner = TTY::Spinner::Multi.new("[:spinner] #{spinner_text}", PDK::CLI::Util.spinner_opts_for_platform)
+        @spinner = TTY::Spinner::Multi.new("[:spinner] #{spinner_text}")
 
         # Register the child spinners
         validator_instances.each do |instance|

data/lib/pdk/version.rb

@@ -1,4 +1,4 @@
 module PDK
-  VERSION = '3.3.0'.freeze
-  TEMPLATE_REF = '3.3.0'.freeze
+  VERSION = '3.4.0'.freeze
+  TEMPLATE_REF = '3.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pdk
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Puppet, Inc.
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-09-10 00:00:00.000000000 Z
+date: 2024-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -154,14 +154,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: puppet-modulebuilder
   requirement: !ruby/object:Gem::Requirement
@@ -205,33 +205,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.5.0
 - !ruby/object:Gem::Dependency
-  name: json_pure
+  name: pathspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.3
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.3
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: pathspec
+  name: puppet_forge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '5.0'
 description: A CLI to facilitate easy, unified development workflows for Puppet modules.
 email:
 - pdk-maintainers@puppet.com
@@ -383,7 +383,7 @@ homepage: https://github.com/puppetlabs/pdk
 licenses: []
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -398,8 +398,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.17
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: A key part of the Puppet Development Kit, the shortest path to better modules
 test_files: []