beaker-hostgenerator 1.18.0 → 2.0.0

data/lib/beaker-hostgenerator/exceptions.rb

@@ -1,7 +1,9 @@
 module BeakerHostGenerator
   module Exceptions
-    class Error < RuntimeError ; end
-    class InvalidNodeSpecError < BeakerHostGenerator::Exceptions::Error ; end
-    class SafeEarlyExit < SystemExit ; end
+    class Error < RuntimeError; end
+
+    class InvalidNodeSpecError < BeakerHostGenerator::Exceptions::Error; end
+
+    class SafeEarlyExit < SystemExit; end
   end
 end

data/lib/beaker-hostgenerator/generator.rb

@@ -13,7 +13,7 @@ module BeakerHostGenerator
     # specification and optional configuration.
     #
     # @param layout [String] The raw hosts specification user input.
-    #                        For example `"centos6-64m-redhat7-64a"`.
+    #                        For example `"centos9-64m-redhat7-64a"`.
     # @param options [Hash] Global, optional configuration such as the default
     #                       hypervisor or OS info version.
     #
@@ -32,6 +32,7 @@ module BeakerHostGenerator
           if nodeid[ostype] == 1 and ostype != nil
             raise "Error: no nodes generated for #{ostype}"
           end
+
           ostype = token
           next
         end

data/lib/beaker-hostgenerator/hypervisor/docker.rb

@@ -10,38 +10,31 @@ module BeakerHostGenerator
       def generate_node(node_info, base_config, bhg_version)
         base_config['docker_cmd'] = ['/sbin/init']
         base_config['image'] = node_info['ostype'].sub(/(\d)/, ':\1')
-        base_config['image'].sub!(/\w+/, 'oraclelinux') if node_info['ostype'] =~ /^oracle/
-        base_config['image'].sub!(/(\w+)/, '\1/leap') if node_info['ostype'] =~ /^opensuse/
-        base_config['image'].sub!(/(\d{2})/, '\1.') if node_info['ostype'] =~ /^ubuntu/
+        case node_info['ostype']
+        when /^oracle/
+          base_config['image'].sub!(/\w+/, 'oraclelinux')
+        when /^opensuse/
+          base_config['image'].sub!(/(\w+)/, '\1/leap')
+        when /^ubuntu/
+          base_config['image'].sub!(/(\d{2})/, '\1.')
+        when /^rocky/
+          base_config['image'].sub!(/(\w+)/, 'rockylinux')
+        when /^alma/
+          base_config['image'].sub!(/(\w+)/, 'almalinux')
+        end
+
         if node_info['bits'] == '64'
           base_config['image'] = "amd64/#{base_config['image']}"
         end
 
-        docker_commands = []
-
         case node_info['ostype']
         when /^ubuntu/
-          docker_commands << 'cp /bin/true /sbin/agetty'
-
-          if node_info['ostype'] =~ /1404/
-            docker_commands << 'rm /usr/sbin/policy-rc.d'
-            docker_commands << 'rm /sbin/initctl; dpkg-divert --rename --remove /sbin/initctl'
-          end
-
-          extra_packages_to_install = case node_info['ostype']
-                                      when /1404/
-                                        ['apt-transport-https']
-                                      when /1604/
-                                        ['locales']
-                                      else
-                                        ['locales', 'iproute2', 'gnupg']
-                                      end
-
-          docker_commands << "apt-get install -y net-tools wget #{extra_packages_to_install.join(' ')}"
-          docker_commands << 'locale-gen en_US.UTF-8'
-          docker_commands << 'echo LANG=en_US.UTF-8 > /etc/default/locale'
-
-          base_config['docker_image_commands'] = docker_commands
+          base_config['docker_image_commands'] = [
+            'cp /bin/true /sbin/agetty',
+            'apt-get install -y net-tools wget locales iproute2 gnupg',
+            'locale-gen en_US.UTF-8',
+            'echo LANG=en_US.UTF-8 > /etc/default/locale',
+          ]
         end
 
         return base_generate_node(node_info, base_config, bhg_version, :docker)

data/lib/beaker-hostgenerator/hypervisor/hcloud.rb

@@ -3,7 +3,6 @@ require 'beaker-hostgenerator/hypervisor'
 
 module BeakerHostGenerator
   module Hypervisor
-
     class Hcloud < BeakerHostGenerator::Hypervisor::Interface
       include BeakerHostGenerator::Data
 
@@ -13,7 +12,7 @@ module BeakerHostGenerator
         os, version = node_info['ostype'].split(/(\D+)/).reject!(&:empty?)
         base_config['image'] = case os
         when 'ubuntu'
-          "#{os}-#{version[0, 2]}.#{version[2,2]}"
+          "#{os}-#{version[0, 2]}.#{version[2, 2]}"
         when 'centos'
           version.to_i == 7 ? "#{os}-#{version}" : "#{os}-stream-#{version}"
         else

data/lib/beaker-hostgenerator/hypervisor/vmpooler.rb

@@ -10,7 +10,7 @@ module BeakerHostGenerator
       # default global configuration keys
       def global_config
         {
-          'pooling_api' => 'https://vmpooler-prod.k8s.infracore.puppet.net/'
+          'pooling_api' => 'https://vmpooler-prod.k8s.infracore.puppet.net/',
         }
       end
 
@@ -35,10 +35,6 @@ module BeakerHostGenerator
           base_config['template'] ||= "#{node_info['ostype'].sub('ubuntu', 'ubuntu-')}-#{arch}" if arch
         end
 
-        # Some vmpooler/vsphere platforms have special requirements.
-        # We munge the node host config here if that is necessary.
-        fixup_node base_config
-
         return base_config
       end
     end

data/lib/beaker-hostgenerator/hypervisor.rb

@@ -1,5 +1,4 @@
 module BeakerHostGenerator
-
   # Defines an Interface for the implementation of a hypervisor, and provides
   # a static module function `create(node_info, options)` for instantiating
   # the appropriate hypervisor implementation.
@@ -13,7 +12,6 @@ module BeakerHostGenerator
   # Generator will instantiate the appropriate hypervisor via
   # `BeakerHostGenerator::Hypervisor.create`.
   module Hypervisor
-
     # Static factory method to instantiate the appropriate hypervisor for the
     # given node. If no hypervisor is specified in the node info, then the
     # hypervisor specified in the options will be created. If the hypervisor is

data/lib/beaker-hostgenerator/parser.rb

@@ -15,7 +15,6 @@ module BeakerHostGenerator
   # into tokens via `tokenize_layout`, and then for each token you would call
   # `is_ostype_token?` and/or `parse_node_info_token`.
   module Parser
-
     # Parses a single node definition into the following components:
     #
     #   * bits             Uppercase-only alphanumeric
@@ -63,7 +62,7 @@ module BeakerHostGenerator
     #   * agent
     #   * database
     #
-    NODE_REGEX=/\A(?<bits>[A-Z0-9]+|\d+)((?<arbitrary_roles>([[:lower:]_]*|\,)*)\.)?(?<roles>[uacldfm]*)(?<host_settings>\{[[:print:]]*\})?\Z/
+    NODE_REGEX = /\A(?<bits>[A-Z0-9]+|\d+)((?<arbitrary_roles>([[:lower:]_]*|\,)*)\.)?(?<roles>[uacldfm]*)(?<host_settings>\{[[:print:]]*\})?\Z/
 
     module_function
 
@@ -86,25 +85,25 @@ module BeakerHostGenerator
     # which are used to define arbitrary key-values on a node.
     #
     # @param spec [String] Well-formatted string specification of the hosts to
-    #                      generate. For example `"centos6-64m-debian8-32a"`.
+    #                      generate. For example `"centos9-64m-debian11-64a"`.
     # @returns [Array<String>] Input string split into substrings suitable for
     #                          processing by the generator. For example
-    #                          `["centos6", "64m", "debian8", "32a"]`.
+    #                          `["centos9", "64m", "debian11", "64a"]`.
     def tokenize_layout(layout_spec)
       # Here we allow dashes in certain parts of the spec string
-      # i.e. "centos6-64m{hostname=foo-bar}-debian8-32"
+      # i.e. "centos9-64m{hostname=foo-bar}-debian11-64"
       # by first replacing all occurrences of - with | that exist within
       # the braces {...}.
       #
       # So we'd end up with:
-      #   "centos6-64m{hostname=foo|bar}-debian8-32"
+      #   "centos9-64m{hostname=foo|bar}-debian11-64"
       #
       # Which we can then simply split on - into:
-      #   ["centos6", "64m{hostname=foo|bar}", "debian8", "32"]
+      #   ["centos9", "64m{hostname=foo|bar}", "debian11", "64"]
       #
       # And then finally turn the | back into - now that we've
       # properly decomposed the spec string:
-      #   ["centos6", "64m{hostname=foo-bar}", "debian8", "32"]
+      #   ["centos9", "64m{hostname=foo-bar}", "debian11", "64"]
       #
       # NOTE we've specifically chosen to use the pipe character |
       # due to its unlikely occurrence in the user input string.
@@ -124,8 +123,8 @@ module BeakerHostGenerator
       tokens.map { |t| t.gsub('|', '-') }
     end
 
-    # Tests if a string token represents an OS platform (i.e. "centos6" or
-    # "debian8") and not another part of the host specification like the
+    # Tests if a string token represents an OS platform (i.e. "centos9" or
+    # "debian11") and not another part of the host specification like the
     # architecture bit (i.e. "32" or "64").
     #
     # This is used when parsing the host generator input string to determine
@@ -133,7 +132,7 @@ module BeakerHostGenerator
     # host for a current platform.
     #
     # @param [String] token A piece of the host generator input that might refer
-    #                 to an OS platform. For example `"centos6"` or `"debian8"`.
+    #                 to an OS platform. For example `"centos9"` or `"debian11"`.
     #
     # @param [Integer] bhg_version The version of OS info to use when testing
     #                  for whether the token represent an OS platform.
@@ -169,7 +168,7 @@ module BeakerHostGenerator
       node_info = NODE_REGEX.match(token)
 
       if node_info
-        node_info = Hash[ node_info.names.zip( node_info.captures ) ]
+        node_info = Hash[node_info.names.zip(node_info.captures)]
       else
         raise BeakerHostGenerator::Exceptions::InvalidNodeSpecError.new,
               "Invalid node_info token: #{token}"
@@ -209,7 +208,6 @@ module BeakerHostGenerator
     #
     # @returns [Hash{String=>String|Array|Hash}] The host_settings string as a map.
     def settings_string_to_map(host_settings)
-
       stringscan = StringScanner.new(host_settings)
       object = nil
       object_depth = []
@@ -253,8 +251,6 @@ module BeakerHostGenerator
           next
         end
 
-
-
         if blob == ']' or blob == '}'
           object_depth.pop
           current_depth = current_depth.pred
@@ -265,7 +261,8 @@ module BeakerHostGenerator
         # corresponding data structure, add it to the object depth, and
         # then change the current depth
         if blob[-2] == '='
-          raise Beaker::HostGenerator::Exceptions::InvalidNodeSpecError unless blob.end_with?('{','[')
+          raise Beaker::HostGenerator::Exceptions::InvalidNodeSpecError unless blob.end_with?('{', '[')
+
           if blob[-1] == '{'
             current_object[blob[0..-3]] = {}
           else
@@ -278,8 +275,10 @@ module BeakerHostGenerator
 
         if blob[-1] == '}'
           raise Beaker::HostGenerator::Exceptions::InvalidNodeSpecError if blob.count('=') != 1
+
           key_pair = blob[0..-2].split('=')
           raise Beaker::HostGenerator::Exceptions::InvalidNodeSpecError if key_pair.size != 2
+
           key_pair.each do |element|
             raise Beaker::HostGenerator::Exceptions::InvalidNodeSpecError if element.empty?
           end
@@ -297,6 +296,7 @@ module BeakerHostGenerator
           if current_type == Hash
             key_pair = blob[0..-2].split('=')
             raise Beaker::HostGenerator::Exceptions::InvalidNodeSpecError if key_pair.size != 2
+
             key_pair.each do |element|
               raise Beaker::HostGenerator::Exceptions::InvalidNodeSpecError if element.empty?
             end
@@ -317,10 +317,9 @@ module BeakerHostGenerator
       end
 
       object
-    rescue Exception => e
+    rescue Exception
       raise BeakerHostGenerator::Exceptions::InvalidNodeSpecError,
         "Malformed host settings: #{host_settings}"
     end
-
   end
 end

data/lib/beaker-hostgenerator/roles.rb

@@ -1,6 +1,5 @@
 module BeakerHostGenerator
   module Roles
-
     ROLES = {
       'a' => 'agent',
       'u' => 'ca',
@@ -14,7 +13,7 @@ module BeakerHostGenerator
     CM_CONFIG = { 'main' => {
                     'dns_alt_names' => 'puppet',
                     'environmentpath' => '/etc/puppetlabs/puppet/environments',
-                  }
+                  },
                 }
 
     ROLE_CONFIG = {

data/lib/beaker-hostgenerator/util.rb

@@ -11,10 +11,6 @@ module BeakerHostGenerator
       BeakerHostGenerator::Data.pe_dir(version)
     end
 
-    def fixup_node(cfg)
-      BeakerHostGenerator::Data.fixup_node(cfg)
-    end
-
     def dump_hosts(hosts, path)
       vmpooler_hypervisor = BeakerHostGenerator::Hypervisor::Vmpooler.new
       config = {}
@@ -34,7 +30,7 @@ module BeakerHostGenerator
       end
     end
 
-    def get_platforms(hypervisor_type='vmpooler', bhg_version=0)
+    def get_platforms(hypervisor_type = 'vmpooler', bhg_version = 0)
       BeakerHostGenerator::Data.get_platforms(bhg_version)
     end
 

data/lib/beaker-hostgenerator/version.rb

@@ -1,5 +1,5 @@
 module BeakerHostGenerator
   module Version
-    STRING = '1.18.0'
+    STRING = '2.0.0'
   end
 end

metadata

@@ -1,47 +1,40 @@
 --- !ruby/object:Gem::Specification
 name: beaker-hostgenerator
 version: !ruby/object:Gem::Version
-  version: 1.18.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Branan Purvine-Riley
 - Wayne Warren
 - Nate Wolfe
+- Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-12 00:00:00.000000000 Z
+date: 2023-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '0.6'
+    - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.6'
+    - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rspec-its
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -55,25 +48,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fakefs
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.6'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.6'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -89,21 +76,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -130,6 +117,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: deep_merge
   requirement: !ruby/object:Gem::Requirement
@@ -149,10 +150,9 @@ description: |
   its first positional argument and use that to generate a Beaker host
   configuration file.
 email:
-- qe-team@puppet.com
+- pmc@voxpupuli.org
 executables:
 - beaker-hostgenerator
-- genconfig2
 extensions: []
 extra_rdoc_files: []
 files:
@@ -161,6 +161,8 @@ files:
 - ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".simplecov"
 - CHANGELOG.md
 - CODEOWNERS
@@ -172,7 +174,6 @@ files:
 - Rakefile
 - beaker-hostgenerator.gemspec
 - bin/beaker-hostgenerator
-- bin/genconfig2
 - lib/beaker-hostgenerator.rb
 - lib/beaker-hostgenerator/abs_support.rb
 - lib/beaker-hostgenerator/cli.rb
@@ -202,7 +203,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/bin/genconfig2

@@ -1,14 +0,0 @@
-#! /usr/bin/env ruby
-
-lib_dir = File.expand_path(File.dirname(File.dirname(__FILE__)), 'lib')
-$LOAD_PATH.unshift(lib_dir)
-
-require 'beaker-hostgenerator'
-
-$stderr.puts("Warning: 'genconfig2' is deprecated and will be removed in beaker-hostgenerator 1.x\n\n")
-
-begin
-  cli = BeakerHostGenerator::CLI.new
-  cli.execute!
-rescue BeakerHostGenerator::Exceptions::SafeEarlyExit
-end