puppet_metadata 3.7.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28aa43873472b811f5e9cc1fb83463e9cdaf413dc0ffc7b3e30674f7f82e19ba
-  data.tar.gz: b8965851efccac5ffd2045f8cbbc944a7fc5db0df386806ec371af8fc86221ef
+  metadata.gz: de32c4860778531eeabf95f42ff94cfd21efa518384b9870ec2c9e91e982b2ae
+  data.tar.gz: 525f0f24c55dc00e198f52ad3a7708543e646c4d37548b3c0f781d02d6cf499d
 SHA512:
-  metadata.gz: 06df9e652fd704478bc5c95fa86406ea587daf0b21af5bfe5a12a988801c6ee81965713d4e90a484b0e10e2c739147a6b06730ac0ce001be68943598cb5860ce
-  data.tar.gz: 87fb2e005ccfb3ab28808d56113541e3a96d6e4ae05064e60818a6abe18249ff7fb94af34fb517ca296ab15136d503ed9ae57fd19ca68adcf7a3a0d54a2779e6
+  metadata.gz: e8b12b9a07f697156cf081cae45c5480f182468c0e25821472f91c4c684b6e444c31c4ded715f4574007b766099895fda5b066a245889a46a7708bb209e0358c
+  data.tar.gz: 18a41a5b1c2bf722dcbeca24224222013a0316ea454197b2554e81a6bb20d11d05b4cd655718cb7058372c796d6a807a5390e1bc173a9df533e3eaa6bfc2b893

data/bin/metadata2gha

@@ -6,7 +6,6 @@ require 'puppet_metadata'
 PidfileWorkaround = Object.new
 
 options = {
-  beaker_use_fqdn: false,
   beaker_pidfile_workaround: false,
   domain: nil,
   minimum_major_puppet_version: nil,
@@ -28,7 +27,6 @@ OptionParser.new do |opts|
 
   opts.banner = "Usage: #{$0} [options] metadata"
 
-  opts.on('--[no-]use-fqdn', 'Generate beaker setfiles with a FQDN') { |opt| options[:beaker_use_fqdn] = opt }
   opts.on('--pidfile-workaround VALUE', 'Generate the systemd PIDFile workaround to work around a docker bug', PidfileWorkaround) { |opt| options[:beaker_pidfile_workaround] = opt }
   opts.on('-d', '--domain VALUE', 'the domain for the box, only used when --use-fqdn is set to true') { |opt| options[:domain] = opt }
   opts.on('--minimum-major-puppet-version VERSION', "Don't create actions for Puppet versions less than this major version") { |opt| options[:minimum_major_puppet_version] = opt }
@@ -42,12 +40,13 @@ OptionParser.new do |opts|
     end
   end
   opts.on('--beaker-hosts HOSTNAME:ROLES;HOSTNAME:ROLES;...', 'Expand the setfile string to create multiple hosts with custom roles. Roles string; see beaker-hostgenerator') do |opt|
-    options[:beaker_hosts] = {}
     if opt != 'false'
+      beaker_hosts = {}
       opt.split(';').each do |host|
         hostname, roles = host.split(':', 2)
-        options[:beaker_hosts][hostname] = roles
+        beaker_hosts[hostname] = roles
       end
+      options[:beaker_hosts] = beaker_hosts unless beaker_hosts.empty?
     end
   end
 end.parse!

data/lib/puppet_metadata/beaker.rb

@@ -42,8 +42,6 @@ module PuppetMetadata
       #   The Operating System string as metadata.json knows it, which in turn is
       #   based on Facter's operatingsystem fact.
       # @param [String] release The OS release
-      # @param [Boolean] use_fqdn
-      #   Whether or not to use a FQDN, ensuring a domain (deprecated, use domain)
       # @param [Boolean, Array[String]] pidfile_workaround
       #   Whether or not to apply the systemd PIDFile workaround. This is only
       #   needed when the daemon uses PIDFile in its service file and using
@@ -63,13 +61,12 @@ module PuppetMetadata
       #
       # @return [nil] If no setfile is available
       # @return [Array<(String, String)>] The beaker setfile description with a readable name
-      def os_release_to_setfile(os, release, use_fqdn: false, pidfile_workaround: false, domain: nil, puppet_version: nil, hosts: nil)
+      def os_release_to_setfile(os, release, pidfile_workaround: false, domain: nil, puppet_version: nil, hosts: nil)
         return unless os_supported?(os)
 
         aos = adjusted_os(os)
         name = "#{aos}#{release.tr('.', '')}-64"
         human_name = "#{os} #{release}"
-        domain ||= 'example.com' if use_fqdn
 
         hosts_settings = []
         if hosts

data/lib/puppet_metadata/github_actions.rb

@@ -9,14 +9,16 @@ module PuppetMetadata
       @options  = options
     end
 
+    # @param [Date] at
+    #   The date when to generate the outputs. This affects the acceptance test
+    #   matrix, which excludes EOL operating systems. Its primary purpose is
+    #   reliable (unit) tests which don't break over time.
     # @return [Hash[Symbol, Any]] The outputs for Github Actions
-    def outputs
+    def outputs(at = nil)
       {
         puppet_major_versions: puppet_major_versions,
         puppet_unit_test_matrix: puppet_unit_test_matrix,
-        puppet_beaker_test_matrix: puppet_beaker_test_matrix,
-        # Deprecated
-        github_action_test_matrix: github_action_test_matrix,
+        puppet_beaker_test_matrix: puppet_beaker_test_matrix(at),
       }
     end
 
@@ -47,7 +49,7 @@ module PuppetMetadata
       end.compact
     end
 
-    def beaker_os_releases
+    def beaker_os_releases(at = nil)
       majors = puppet_major_versions
 
       distro_puppet_version = {
@@ -62,6 +64,19 @@ module PuppetMetadata
           yield [os, 'rolling', distro_puppet_version]
         else
           releases&.each do |release|
+            if PuppetMetadata::OperatingSystem.eol?(os, release, at)
+              message = "Skipping EOL operating system #{os} #{release}"
+
+              if ENV.key?('GITHUB_ACTIONS')
+                # TODO: determine file and position within the file
+                puts "::warning file=metadata.json::#{message}"
+              else
+                warn message
+              end
+
+              next
+            end
+
             majors.each do |puppet_version|
               if AIO.has_aio_build?(os, release, puppet_version[:value])
                 yield [os, release, puppet_version]
@@ -74,10 +89,10 @@ module PuppetMetadata
       end
     end
 
-    def puppet_beaker_test_matrix
+    def puppet_beaker_test_matrix(at)
       matrix_include = []
 
-      beaker_os_releases do |os, release, puppet_version|
+      beaker_os_releases(at) do |os, release, puppet_version|
         next if puppet_version_below_minimum?(puppet_version[:value])
 
         setfile = os_release_to_beaker_setfile(os, release, puppet_version[:collection])
@@ -108,28 +123,6 @@ module PuppetMetadata
       matrix_include
     end
 
-    def github_action_test_matrix
-      matrix_include = []
-
-      beaker_os_releases do |os, release, puppet_version|
-        next if puppet_version_below_minimum?(puppet_version[:value])
-
-        setfile = os_release_to_beaker_setfile(os, release, puppet_version[:collection])
-        next unless setfile
-
-        matrix_include << {
-          name: "#{puppet_version[:name]} - #{setfile[1]}",
-          setfile: {
-            name: setfile[1],
-            value: setfile[0],
-          },
-          puppet: puppet_version,
-        }
-      end
-
-      matrix_include
-    end
-
     def puppet_version_below_minimum?(version)
       return false unless version && options[:minimum_major_puppet_version]
 
@@ -140,7 +133,6 @@ module PuppetMetadata
       PuppetMetadata::Beaker.os_release_to_setfile(
         os,
         release,
-        use_fqdn: options[:beaker_use_fqdn],
         pidfile_workaround: options[:beaker_pidfile_workaround],
         domain: options[:domain],
         puppet_version: puppet_collection,

data/lib/puppet_metadata/operatingsystem.rb

@@ -50,7 +50,7 @@ module PuppetMetadata
       'OracleLinux' => {
         '9' => '2032-06-30',
         '8' => '2029-07-01',
-        '7' => '2024-07-01',
+        '7' => '2024-12-31',
       },
       # https://endoflife.software/operating-systems/linux/fedora
       'Fedora' => {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet_metadata
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Vox Pupuli
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-25 00:00:00.000000000 Z
+date: 2024-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metadata-json-lint
@@ -170,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.5.9
 signing_key: 
 specification_version: 4
 summary: Data structures for the Puppet Metadata