vanagon 0.35.1 → 0.37.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0e47adaef0a7b1631ea3cfa95cc9bce3c32fd2fe7b8a2dc199e242efeb8c8c8
-  data.tar.gz: 525c694918d53d4c01bfc49bdc313f5cd4097c7b69d4285597508d2457ee489f
+  metadata.gz: 4b569137b6d209bf5bd4caa5d17063aa6779fb72b92dc33eb77acc35c47779de
+  data.tar.gz: 6b305a0234d8e5b68ee1a0c9ef46c1396f6ee43af941a60e3bf192fc1ab4c7f4
 SHA512:
-  metadata.gz: 03ce3c524acaddc76e4a98eb8e5cb353a76e99a0daa67ebd640a94a19027ae4c711d149592e90df413029fd9d3b704cc04dce9208580ce1066c893935adecf38
-  data.tar.gz: cfe7808f4138b2de2e4f5c197e9d63c131604079c315a65e85674be18725d0dbc32be0115a49faddf450b8e872c672ec77e5d2737a9d41dd22c983da7adf975e
+  metadata.gz: 948f95345c029e5ff95212741a3d58e0c8b0bafe807996dcfb655ebf18374c7ed7b608edc88aac00b74ede53f20bb92d5a7c07214a1242c5c1d32e515144c79b
+  data.tar.gz: c555fad2d59dbe124168443ca5ec327bb9558d61c29cf96c07865bdd598fcc6f03c05cd69c0ab4dff3a040cc2883c69c9dca3ccc518e37d716cefafe94735d7b

data/lib/makefile.rb

@@ -60,7 +60,7 @@ class Makefile
     def compounded_recipe
       Array(recipe)
         .compact
-        .map { |line| "\t" + line.gsub("\n", "\n\t") + "\n" }
+        .map { |line| "\t#{line.gsub("\n", "\n\t")}\n" }
         .join
     end
 

data/lib/vanagon/cli/build.rb

@@ -61,7 +61,7 @@ class Vanagon
         translations = {
           '--verbose' => :verbose,
           '--workdir' => :workdir,
-          '--remote-workdir' => :"remote-workdir",
+          '--remote-workdir' => :'remote-workdir',
           '--configdir' => :configdir,
           '--engine' => :engine,
           '--skipcheck' => :skipcheck,
@@ -78,8 +78,7 @@ class Vanagon
         # Handle --preserve option checking
         valid_preserves = %w[always never on-failure]
         unless valid_preserves.include? options[:preserve]
-          raise InvalidArgument, "--preserve option can only be one of: " +
-                                 valid_preserves.join(', ')
+          raise InvalidArgument, "--preserve option can only be one of: #{valid_preserves.join(', ')}"
         end
         options[:preserve] = options[:preserve].to_sym
         return options

data/lib/vanagon/cli/dependencies.rb

@@ -28,29 +28,9 @@ class Vanagon
         exit 1
       end
 
-      def run(options) # rubocop:disable Metrics/AbcSize
-        platforms_directory = File.join(options[:configdir], 'platforms')
-        projects_directory = File.join(options[:configdir], 'projects')
-
-        unless Dir.exist?(projects_directory) && Dir.exist?(platforms_directory)
-          VanagonLogger.error "Path to #{platforms_directory} or #{projects_directory} not found."
-          exit 1
-        end
-
-        projects = [options[:project_name]]
-        if projects.include?('all')
-          projects = Dir.children(projects_directory).map do |project|
-            File.basename(project, File.extname(project))
-          end
-        end
-
-        platforms = options[:platforms].split(',')
-        if platforms.include?('all')
-          platforms = Dir.children(platforms_directory).map do |platform|
-            File.basename(platform, File.extname(platform))
-          end
-        end
-
+      def run(options)
+        projects = get_projects(options)
+        platforms = get_platforms(options)
         failures = []
 
         projects.each do |project|
@@ -74,6 +54,36 @@ class Vanagon
         VanagonLogger.info "Finished generating dependencies"
       end
 
+      def get_projects(options)
+        platforms_directory = File.join(options[:configdir], 'platforms')
+        projects_directory = File.join(options[:configdir], 'projects')
+
+        unless Dir.exist?(projects_directory) && Dir.exist?(platforms_directory)
+          VanagonLogger.error "Path to #{platforms_directory} or #{projects_directory} not found."
+          exit 1
+        end
+
+        projects = [options[:project_name]]
+        if projects.include?('all')
+          Dir.children(projects_directory).map do |project|
+            File.basename(project, File.extname(project))
+          end
+        else
+          projects
+        end
+      end
+
+      def get_platforms(options)
+        platforms = options[:platforms].split(',')
+        if platforms.include?('all')
+          Dir.children(platforms_directory).map do |platform|
+            File.basename(platform, File.extname(platform))
+          end
+        else
+          platforms
+        end
+      end
+
       def options_translate(docopt_options)
         translations = {
           '--verbose' => :verbose,

data/lib/vanagon/cli/inspect.rb

@@ -63,8 +63,7 @@ class Vanagon
         # Handle --preserve option checking
         valid_preserves = %w[always never on-failure]
         unless valid_preserves.include? options[:preserve]
-          raise InvalidArgument, "--preserve option can only be one of: " +
-                                 valid_preserves.join(', ')
+          raise InvalidArgument, "--preserve option can only be one of: #{valid_preserves.join(', ')}"
         end
         options[:preserve] = options[:preserve].to_sym
         return options

data/lib/vanagon/cli/list.rb

@@ -30,24 +30,11 @@ class Vanagon
       end
 
       def run(options) # rubocop:disable Metrics/AbcSize
-        if Dir.exist?(File.join(options[:configdir], 'platforms')) == false ||
-           Dir.exist?(File.join(options[:configdir], 'projects')) == false
+        check_directories(options)
 
-          VanagonLogger.error "Path to #{File.join(options[:configdir], 'platforms')} or #{File.join(options[:configdir], 'projects')} not found."
-          exit 1
-        end
-
-        default_list = Dir.children(File.join(File.dirname(__FILE__), '..', 'platform', 'defaults')).map do |platform|
-          File.basename(platform, File.extname(platform))
-        end.sort
-
-        platform_list = Dir.children(File.join(options[:configdir], 'platforms')).map do |platform|
-          File.basename(platform, File.extname(platform))
-        end.sort
-
-        project_list = Dir.children(File.join(options[:configdir], 'projects')).map do |project|
-          File.basename(project, File.extname(project))
-        end.sort
+        default_list = topic_list(File.dirname(__FILE__), '..', 'platform', 'defaults')
+        platform_list = topic_list(options[:configdir], 'platforms')
+        project_list = topic_list(options[:configdir], 'projects')
 
         if options[:defaults]
           puts "- Defaults", output(default_list, options[:use_spaces])
@@ -55,7 +42,8 @@ class Vanagon
         end
 
         if options[:projects] == options[:platforms]
-          puts "- Projects", output(project_list, options[:use_spaces]), "\n", "- Platforms", output(platform_list, options[:use_spaces])
+          puts "- Projects", output(project_list, options[:use_spaces]), "\n",
+               "- Platforms", output(platform_list, options[:use_spaces])
           return
         end
 
@@ -70,6 +58,27 @@ class Vanagon
         end
       end
 
+      def check_directories(options)
+        platforms_directory = File.join(options[:configdir], 'platforms')
+        projects_directory = File.join(options[:configdir], 'projects')
+
+        unless Dir.exist?(platforms_directory)
+          VanagonLogger.error "Platforms directory \"#{platforms_directory}\" does not exist."
+          exit 1
+        end
+
+        unless Dir.exist?(projects_directory)
+          VanagonLogger.error "Projectss directory \"#{projects_directory}\" does not exist."
+          exit 1
+        end
+      end
+
+      def topic_list(*topic_path_items)
+        Dir.children(File.join(topic_path_items)).map do |t|
+          File.basename(t, File.extname(t))
+        end.sort
+      end
+
       def options_translate(docopt_options)
         translations = {
           '--configdir' => :configdir,

data/lib/vanagon/common/user.rb

@@ -2,6 +2,7 @@ class Vanagon
   class Common
     class User
       attr_accessor :name, :group, :shell, :is_system, :homedir
+
       def initialize(name, group = nil, shell = nil, is_system = false, homedir = nil)
         @name = name
         @group = group ? group : @name

data/lib/vanagon/component/dsl.rb

@@ -103,7 +103,7 @@ class Vanagon
       # @raise [RuntimeError] exceptions are raised if there is no file,
       #   if it refers to methods that don't exist, or if it does not contain a Hash
       def load_from_json(file)
-        if File.exists?(file)
+        if File.exist?(file)
           data = JSON.parse(File.read(file))
           raise "Hash required. Got '#{data.class}' when parsing '#{file}'" unless data.is_a?(Hash)
           data.each do |key, value|
@@ -203,10 +203,10 @@ class Vanagon
           # Return here because there is no file to install, just a string read in
           return
         when "windows"
-          @component.service << OpenStruct.new(\
+          @component.service << OpenStruct.new( \
             :bindir_id => "#{service_name.gsub(/[^A-Za-z0-9]/, '').upcase}BINDIR", \
             :service_file => service_file, \
-            :component_group_id => "#{service_name.gsub(/[^A-Za-z0-9]/, '')}Component"\
+            :component_group_id => "#{service_name.gsub(/[^A-Za-z0-9]/, '')}Component" \
           )
           # return here as we are just collecting the name of the service file to put into the harvest filter list.
           return
@@ -392,15 +392,15 @@ class Vanagon
         end
       end
 
-
       # This will add a source to the project and put it in the workdir alongside the other sources
       #
       # @param uri [String] uri of the source
       # @param [Hash] options optional keyword arguments used to instatiate a new source
       #   @option opts [String] :sum
       #   @option opts [String] :ref
-      #   @option opts [Bool] :erb set to 'true' to specify that the source file should be translated by erb
-      def add_source(uri, **options)
+      #   @option opts [Bool] :erb set to 'true' to specify that the source file should be
+      #     translated by erb
+      def add_source(uri, options = {})
         @component.sources << OpenStruct.new(options.merge({ url: uri }))
       end
 

data/lib/vanagon/component/source/git.rb

@@ -18,8 +18,7 @@ class Vanagon
 
         class << self
           # Attempt to connect to whatever URL is provided and
-          # return true or false depending on whether or not
-          # `git` thinks it's a valid Git repo.
+          # return true or false base on a number of guesses of whether it's a valid Git repo.
           #
           # @param url [#to_s] A URI::HTTPS, URI:HTTP, or String with the the URL of the
           #        remote git repository.
@@ -27,21 +26,18 @@ class Vanagon
           #        git command has failed. Useful in instances where a URL
           #        prompts for credentials despite not being a git remote
           # @return [Boolean] whether #url is a valid Git repo or not
-
-          # [RE-13837] This ought to be the way to do this. Unfortunately,
-          # there's a bug in Git.ls_remote that when ssh prints something like
-          #  Warning: Permanently added 'github.com,192.30.255.113' (RSA)
-          # Git.ls_remote attempts to parse it as actual git output and fails
-          # with: NoMethodError: undefined method `split' for nil:NilClass
-          #
-          # We'll work around that case by calling 'git ls-remote' directly ourselves.
-
           def valid_remote?(url, timeout = 0)
             # RE-15209. To relieve github rate-limiting, if the URL starts with
             # https://github.com/... just accept it rather than ping github over and over.
-            return true if url.to_s.start_with?('https://github.com/')
+            return github_remote?(url) if url.to_s.start_with?(github_url_prefix)
 
             begin
+              # [RE-13837] there's a bug in Git.ls_remote that when ssh prints something like
+              #  Warning: Permanently added 'github.com,192.30.255.113' (RSA)
+              # Git.ls_remote attempts to parse it as actual git output and fails
+              # with: NoMethodError: undefined method `split' for nil:NilClass
+              #
+              # Work around it by calling 'git ls-remote' directly ourselves.
               Timeout.timeout(timeout) do
                 Vanagon::Utilities.local_command("git ls-remote --heads #{url} > /dev/null 2>&1")
                 $?.exitstatus.zero?
@@ -52,6 +48,41 @@ class Vanagon
               false
             end
           end
+
+          def github_url_prefix
+            'https://github.com/'
+          end
+
+          def github_remote?(url)
+            github_source_type(url) == :github_remote
+          end
+
+          # VANAGON-227 We need to be careful when guessing whether a https://github.com/...
+          # URL is actually a true git repo. Make some rules around it based on the github API.
+          # Decide that anything with a documented media_type is just an http url.
+          # See:
+          # https://docs.github.com/en/repositories/working-with-files/using-files/downloading-source-code-archives
+          # https://docs.github.com/en/rest/repos/contents?apiVersion=2022-11-28#download-a-repository-archive-tar
+          # https://docs.github.com/en/rest/repos/contents?apiVersion=2022-11-28#download-a-repository-archive-zip
+          def github_source_type(url)
+            url_directory = url.to_s.delete_prefix(github_url_prefix)
+            url_components = url_directory.split('/')
+
+            return :github_remote if url_directory.end_with?('.git')
+
+            # Find cases of supported github media types.
+            # [ owner, repo, media_type, ref ]
+            case url_components[2]
+            when 'archive'
+              :github_archive
+            when 'tarball'
+              :github_tarball
+            when 'zipball'
+              :github_zipball
+            else
+              :github_remote
+            end
+          end
         end
 
         # Default options used when cloning; this may expand

data/lib/vanagon/component/source/http.rb

@@ -17,7 +17,7 @@ class Vanagon
         CHECKSUM_TYPES = %w[md5 sha1 sha256 sha512].freeze
 
         class << self
-          def valid_url?(target_url) # rubocop:disable Metrics/AbcSize
+          def valid_url?(target_url)
             uri = URI.parse(target_url.to_s)
             return false unless ['http', 'https'].include? uri.scheme
 
@@ -49,7 +49,7 @@ class Vanagon
         # @param workdir [String] working directory to download into
         # @param sum_type [String] type of sum we are verifying
         # @raise [RuntimeError] an exception is raised is sum is nil
-        def initialize(url, sum:, workdir:, sum_type:, **options) # rubocop:disable Metrics/AbcSize
+        def initialize(url, sum:, workdir:, sum_type:, **options)
           unless sum
             fail "sum is required to validate the http source"
           end
@@ -93,7 +93,7 @@ class Vanagon
         # Verify the downloaded file matches the provided sum
         #
         # @raise [RuntimeError] an exception is raised if the sum does not match the sum of the file
-        def verify # rubocop:disable Metrics/AbcSize
+        def verify
           VanagonLogger.info "Verifying file: #{file} against sum: '#{sum}'"
           actual = get_sum(File.join(workdir, file), sum_type)
           return true if sum == actual

data/lib/vanagon/component/source.rb

@@ -10,18 +10,18 @@ class Vanagon
       SUPPORTED_PROTOCOLS = %w[file http https git].freeze
 
       class << self
-        # Basic factory to hand back the correct {Vanagon::Component::Source} subtype to the component
+        # Factory to hand back the correct {Vanagon::Component::Source} subtype to the component
         #
-        # @param url [String] URI of the source file (includes git@... style links)
+        # @param uri_instance [#to_s] URI of the source file (includes git@... style links)
         # @param options [Hash] hash of the options needed for the subtype
         # @param workdir [String] working directory to fetch the source into
         # @return [Vanagon::Component::Source] the correct subtype for the given source
-        def source(uri, **options) # rubocop:disable Metrics/AbcSize
+        def source(uri_instance, **options) # rubocop:disable Metrics/AbcSize
           # Sometimes the uri comes in as a string, but sometimes it's already been
           # coerced into a URI object. The individual source providers will turn
           # the passed uri into a URI object if needed, but for this method we
           # want to work with the uri as a string.
-          uri = uri.to_s
+          uri = uri_instance.to_s
           if uri.start_with?('git')
             source_type = :git
             # when using an http(s) source for a git repo, you should prefix the
@@ -68,7 +68,8 @@ class Vanagon
           timeout = 5
           if Vanagon::Component::Source::Git.valid_remote?(uri, timeout)
             if uri =~ /^http/
-              VanagonLogger.info "Passing git URLs as http(s) addresses is deprecated! Please prefix your source URL with `git:`"
+              VanagonLogger.warn "Using http(s) URIs for github is deprecated. " \
+                                 "Use `git:` URI scheme instead."
             end
             return :git
           end

data/lib/vanagon/driver.rb

@@ -42,7 +42,7 @@ class Vanagon
       end
       loginit('vanagon_hosts.log')
 
-      @remote_workdir = options[:"remote-workdir"]
+      @remote_workdir = options[:'remote-workdir']
 
       engine = pick_engine(options)
       load_engine_object(engine, @platform, options[:target])
@@ -58,7 +58,7 @@ class Vanagon
       end
     end
 
-    def pick_engine(options) # rubocop:disable Metrics/PerceivedComplexity
+    def pick_engine(options)
       if options[:engine] && !options[:target]
         options[:engine]
       elsif @platform.build_hosts
@@ -133,7 +133,7 @@ class Vanagon
       # whole makefile. Instead just perform the installation.
       make_target = ''
       if @project.no_packaging
-        make_target = @project.name + '-project'
+        make_target = "#{@project.name}-project"
       end
 
       @engine.startup(workdir)
@@ -171,7 +171,7 @@ class Vanagon
       end
     end
 
-    def render # rubocop:disable Metrics/AbcSize
+    def render
       # Simple sanity check for the project
       if @project.version.nil? || @project.version.empty?
         raise Vanagon::Error, "Project requires a version set, all is lost."

data/lib/vanagon/engine/always_be_scheduling.rb

@@ -223,13 +223,15 @@ class Vanagon
       end
       private :read_vmfloaty_token
 
-      # This method is used to obtain a vm to build upon using Puppet's internal
-      # ABS (https://github.com/puppetlabs/always-be-scheduling) which is a level of abstraction for other
-      # engines using similar APIs
+      # Used to obtain a vm to build upon using Puppet's internal ABS
+      # (https://github.com/puppetlabs/always-be-scheduling) which is
+      # a level of abstraction for other engines using similar APIs
       # @raise [Vanagon::Error] if a target cannot be obtained
       def select_target
         @pooler = select_target_from(@available_abs_endpoint)
-        raise Vanagon::Error, "Something went wrong getting a target vm to build on" if @pooler.empty?
+        if @pooler.empty?
+          raise Vanagon::Error, "No available ABS machine from #{@available_abs_endpoint}"
+        end
       end
 
       # Attempt to provision a host from a specific pooler.
@@ -264,7 +266,8 @@ class Vanagon
       # main loop where the status of the request is checked, to see if the request
       # has been allocated
       def check_queue(pooler, request_object)
-        retries = 360 # ~ one hour
+        # 360 retries takes about an hour
+        retries = 360
         response_body = nil
         begin
           (1..retries).each do |i|
@@ -279,28 +282,32 @@ class Vanagon
 
             sleep_seconds = 10 if i >= 10
             sleep_seconds = i if i < 10
-            VanagonLogger.info "Waiting #{sleep_seconds} seconds to check if ABS request has been filled. (x#{i})"
+            VanagonLogger.info "Waiting #{sleep_seconds} seconds to fill ABS request (x#{i})"
 
             sleep(sleep_seconds)
           end
         rescue SystemExit, Interrupt
-          VanagonLogger.error "\nVanagon interrupted during mains ABS polling. Make sure you delete the requested job_id #{@saved_job_id}"
+          VanagonLogger.error "\nVanagon interrupted during mains ABS polling. " \
+                              "Remember to delete the requested job_id #{@saved_job_id}"
           raise
         end
-        response_body = translated(response_body, @saved_job_id)
-        response_body
+
+        if response_body
+          translated(response_body, @saved_job_id)
+        else
+          VanagonLogger.error "ABS timed out after #{retries} retries."
+          { 'retry-failure': retries }
+        end
       end
 
       def validate_queue_status_response(status_code, body)
         case status_code
         when "200"
           return JSON.parse(body) unless body.empty? || !valid_json?(body)
-        when "202"
+        when "202", "503"
           return nil
         when "401"
           raise Vanagon::Error, "HTTP #{status_code}: The token provided could not authenticate.\n#{body}"
-        when "503"
-          return nil
         else
           raise Vanagon::Error, "HTTP #{status_code}: request to ABS failed!\n#{body}"
         end
@@ -309,7 +316,7 @@ class Vanagon
       # This method is used to tell the ABS to delete the job_id requested
       # otherwise the resources will eventually get allocated asynchronously
       # and will keep running until the end of their lifetime.
-      def teardown # rubocop:disable Metrics/AbcSize
+      def teardown
         request_object = {
             'job_id' => @saved_job_id,
         }
@@ -337,7 +344,8 @@ class Vanagon
       def translated(response_body, job_id)
         vmpooler_formatted_body = { 'job_id' => job_id }
 
-        response_body.each do |host| # in this context there should be only one host
+        # in this context there should be only one host
+        response_body.each do |host|
           vmpooler_formatted_body[host['type']] = { 'hostname' => host['hostname'] }
         end
         vmpooler_formatted_body['ok'] = true
@@ -348,7 +356,7 @@ class Vanagon
       def build_request_object
         user = ENV['USER'] || ENV['USERNAME'] || 'vanagon'
 
-        @saved_job_id = user + "-" + DateTime.now.strftime('%Q')
+        @saved_job_id = "#{user}-#{DateTime.now.strftime('%Q')}"
         request_object = {
             :resources => { build_host_name => 1 },
             :job       => {

data/lib/vanagon/engine/ec2.rb

@@ -10,7 +10,7 @@ class Vanagon
       attr_accessor :ami, :key_name, :userdata, :key, :shutdown_behavior
       attr_accessor :subnet_id, :instance_type
 
-      def initialize(platform, target = nil, **opts) # rubocop:disable Metrics/AbcSize
+      def initialize(platform, target = nil, **opts)
         super
 
         @ami = @platform.aws_ami

data/lib/vanagon/engine/pooler.rb

@@ -97,11 +97,11 @@ class Vanagon
 
       # Attempt to provision a host from a specific pooler.
       #
-      def select_target_from(pooler) # rubocop:disable Metrics/AbcSize
+      def select_target_from(pooler)
         response = Vanagon::Utilities.http_request(
           "#{pooler}/vm",
           'POST',
-          '{"' + build_host_name + '":"1"}',
+          "{\"#{build_host_name}\":\"1\"}",
           { 'X-AUTH-TOKEN' => @token }
         )
         if response["ok"]
@@ -110,7 +110,7 @@ class Vanagon
           # in the future we should make the two APIs the same in this sense, but for now, just check
           # if 'domain' is a thing and use it if so.
           if response['domain']
-            @target += '.' + response['domain']
+            @target += ".#{response['domain']}"
           end
           Vanagon::Driver.logger.info "Reserving #{@target} (#{build_host_name}) [#{@token ? 'token used' : 'no token used'}]"
           add_tags_to_target(pooler, response[build_host_name]['hostname'])

data/lib/vanagon/environment.rb

@@ -176,21 +176,22 @@ class Vanagon
     # @param key [Object]
     # @raise [ArgumentError] if key is not a String, if key contains invalid
     #   characters, or if key begins with a digit
-    def validate_key(str)
-      str = str.to_s
+    def validate_key(key)
+      environment_string = key.to_s
 
-      if str[0] =~ /\d/
-        raise ArgumentError,
-              'environment variable Name cannot begin with a digit'
+      if environment_string[0] =~ /\d/
+        raise ArgumentError, 'environment variable Name cannot begin with a digit'
       end
 
-      invalid_chars = str.scan(/[^\w]/).uniq
-      unless invalid_chars.empty?
-        raise ArgumentError,
-              'environment variable Name contains invalid characters: ' +
-              invalid_chars.map { |char| %("#{char}") }.join(', ')
-      end
-      str
+      invalid_characters = environment_string
+        .scan(/[^\w]/)
+        .uniq
+        .map { |char| %("#{char}") }
+        .join(', ')
+
+      return environment_string if invalid_characters.empty?
+      raise ArgumentError,
+            "environment variable Name contains invalid characters: #{invalid_characters}"
     end
     private :validate_key
 

data/lib/vanagon/errors.rb

@@ -16,12 +16,5 @@ class Vanagon
         e.original = original
       end
     end
-
-    # @overload initialize(mesg)
-    #   @param mesg [String] The exception mesg
-    #
-    def initialize(mesg)
-      super(mesg)
-    end
   end
 end

data/lib/vanagon/logger.rb

@@ -1,12 +1,12 @@
 require 'logger'
 
-class VanagonLogger < ::Logger
+class VanagonLogger < Logger
   def self.logger
     @@logger ||= VanagonLogger.new
   end
 
   def self.debug_logger
-    @@debug_logger ||= VanagonLogger.new(STDERR)
+    @@debug_logger ||= VanagonLogger.new($stderr)
   end
 
   def self.info(msg)
@@ -21,7 +21,7 @@ class VanagonLogger < ::Logger
     VanagonLogger.logger.error msg
   end
 
-  def initialize(output = STDOUT)
+  def initialize(output = $stdout)
     super(output)
     self.level = ::Logger::INFO
     self.formatter = proc do |severity, datetime, progname, msg|

data/lib/vanagon/platform/deb.rb

@@ -21,7 +21,7 @@ class Vanagon
         "cat file-list >> debian/install",
         "cp -pr debian $(tempdir)/#{project.name}-#{project.version}",
         "gunzip -c #{project.name}-#{project.version}.tar.gz | '#{@tar}' -C '$(tempdir)/#{project.name}-#{project.version}' --strip-components 1 -xf -",
-        "#{sed} -i 's/\ /?/g' $(tempdir)/#{project.name}-#{project.version}/debian/install",
+        "#{sed} -i 's/ /?/g' $(tempdir)/#{project.name}-#{project.version}/debian/install",
         "(cd $(tempdir)/#{project.name}-#{project.version}; debuild --no-lintian #{pkg_arch_opt} -uc -us)",
         "cp $(tempdir)/#{copy_extensions} ./output/#{target_dir}"]
       end
@@ -125,7 +125,7 @@ class Vanagon
       end
 
       def version_munger(version_string, default: '=')
-        operator, version = super.split(' ')
+        operator, version = super.split
         if operator =~ /^[<>]$/
           operator = "#{operator}#{operator}"
         end

data/lib/vanagon/platform/defaults/ubuntu-22.04-amd64.rb

@@ -6,6 +6,7 @@ platform "ubuntu-22.04-amd64" do |plat|
 
   packages = %w(build-essential devscripts make quilt pkg-config debhelper rsync fakeroot cmake)
   plat.provision_with "export DEBIAN_FRONTEND=noninteractive; apt-get update -qq; apt-get install -qy --no-install-recommends #{packages.join(' ')}"
+  plat.provision_with "curl https://apt.puppet.com/DEB-GPG-KEY-puppet-20250406 | apt-key add -"
   plat.install_build_dependencies_with "DEBIAN_FRONTEND=noninteractive; apt-get install -qy --no-install-recommends "
   plat.vmpooler_template "ubuntu-2204-x86_64"
 end