vanagon 0.36.0 → 0.37.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 102d009c983cce91795427ba4fde405991d1e9fe792a5ca2759332379f5740d8
-  data.tar.gz: 502dfc5b2d6dc0287b2affcc25602988078d7a8695932b38fc6b5bda60e5f44f
+  metadata.gz: 8800b5b2c66ce4ad1539a97f635cbb02d2b70bb7a5ab87a27bc4d01f0bc40d3f
+  data.tar.gz: 2e2ee62e6afbd6046b799f0d4738fbcaebb5308f5057f56b826c02b964e22454
 SHA512:
-  metadata.gz: 32858c83e0925378289ebb567f9410641bfbe10f027dacbf10e6f3371a5431b3c805b17ae2ef7bd5172763c90ba8fa59d81ad04bc4aa720cbcb06bad70f799ad
-  data.tar.gz: 292f6afc7c31255d3055bb93c5a07c68b0fba409618958c19642ce44788dad5d7ba7a0c7ffc011fa5e5e607b6acd243ad52523b0a27c1e70b3a49dff1570b66a
+  metadata.gz: 710f4323b5df300ab73417c7946eadba090a2f5ba7c3b9ac422508ee9bc38ba14d7935b175b65aacd71593eecf94474c7723ee239966db706237760dde378d29
+  data.tar.gz: 0017cd5415da427864b9288533a07248671a81b28ed0eece98f3583571227b621ccf0355677707b731c14bf6fadcbce96077a3b0d31d57544e789249afeaf894

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.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/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,15 +282,22 @@ 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
-        translated(response_body, @saved_job_id)
+
+        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)
@@ -334,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

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

data/lib/vanagon/platform/windows.rb

@@ -317,7 +317,7 @@ class Vanagon
 
         if definition.scheme =~ /^(http|ftp|file)/
           if File.extname(definition.path) == '.ps1'
-            commands << %(powershell.exe -NoProfile -ExecutionPolicy Bypass -Command 'iex ((new-object net.webclient).DownloadString("#{definition}"))')
+            commands << %(powershell.exe -NoProfile -ExecutionPolicy Bypass -Command '[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12;iex ((new-object net.webclient).DownloadString("#{definition}"))')
           else
             commands << %(C:/ProgramData/chocolatey/bin/choco.exe source add -n #{definition.host}-#{definition.path.tr('/', '-')} -s "#{definition}" --debug || echo "Oops, it seems that you don't have chocolatey installed on this system. Please ensure it's there by adding something like 'plat.add_repository 'https://chocolatey.org/install.ps1'' to your platform definition.")
           end

data/lib/vanagon/utilities.rb

@@ -290,7 +290,7 @@ class Vanagon
     # @return [String] the evaluated template
     def erb_string(erbfile, b = binding)
       template = File.read(erbfile)
-      message  = ERB.new(template, nil, "-")
+      message  = ERB.new(template, trim_mode: "-")
       message.result(b)
         .gsub(/[\n]+{3,}/, "\n\n")
         .squeeze("\s")

data/spec/lib/vanagon/component/source/git_spec.rb

@@ -1,7 +1,6 @@
 require 'vanagon/component/source/git'
 
 describe "Vanagon::Component::Source::Git" do
-  # before(:all) blocks are run once before all of the examples in a group
   before :all do
     @klass = Vanagon::Component::Source::Git
     # This repo will not be cloned over the network
@@ -12,106 +11,136 @@ describe "Vanagon::Component::Source::Git" do
     @workdir = nil
   end
 
-  # before(:each) blocks are run before each example
-  before :each do
-    allow(Vanagon::Component::Source::Git)
-      .to receive(:valid_remote?)
-            .and_return(true)
-
-    allow(File).to receive(:realpath).and_return(@workdir)
-  end
-
-  describe "#initialize" do
-    it "raises error on initialization with an invalid repo" do
-      # Ensure initializing a repo fails without calling over the network
-      allow(Vanagon::Component::Source::Git)
-        .to receive(:valid_remote?)
-              .and_return(false)
-
-      expect { @klass.new(@url, ref: @ref_tag, workdir: @workdir) }
-        .to raise_error(Vanagon::InvalidRepo)
+  context 'with a github https: URI' do
+    let(:github_archive_uri) do
+      'https://github.com/2ndQuadrant/pglogical/archive/a_file_name.tar.gz'
     end
-
-    it "uses the realpath of the workdir if we're in a symlinked dir" do
-      expect(File).to receive(:realpath).and_return("/tmp/bar")
-      git_source = @klass.new(@local_url, ref: @ref_tag, workdir: "/tmp/foo")
-      expect(git_source.workdir)
-        .to eq('/tmp/bar')
+    let(:github_tarball_uri) do
+      'https://github.com/Baeldung/kotlin-tutorials/tarball/main'
     end
-
-    it "with no clone options should be empty" do
-      git_source = @klass.new(@local_url, ref: @ref_tag, workdir: "/tmp/foo")
-      expect(git_source.clone_options)
-          .to be {}
+    let(:github_zipball_uri) do
+      'https://github.com/Baeldung/kotlin-tutorials/zipball/master'
+    end
+    let(:github_repo_uri) do
+      'https://github.com/cameronmcnz/rock-paper-scissors'
+    end
+    let(:github_repo_dotgit_uri) do
+      'https://github.com/cameronmcnz/rock-paper-scissors.git'
     end
 
-    it "add clone options depth and branch" do
-      expected_clone_options = {:branch => "bar", :depth => 50 }
-      git_source = @klass.new(@local_url, ref: @ref_tag, workdir: "/tmp/foo", :clone_options => expected_clone_options)
-      expect(git_source.clone_options)
-          .to  be(expected_clone_options)
+    it "flags github archive uris as not valid repos" do
+      expect(Vanagon::Component::Source::Git.valid_remote?(github_archive_uri)).to be false
     end
-  end
 
-  describe "#clone" do
-    before :each do
-      clone = double(Git::Base)
-      @file_path = "/tmp/foo"
-      allow(::Git).to receive(:clone).and_return(clone)
-      expect(File).to receive(:realpath).and_return(@file_path)
+    it "flags github tarball uris as not valid repos" do
+      expect(Vanagon::Component::Source::Git.valid_remote?(github_tarball_uri)).to be false
     end
 
-    it "repository" do
-      git_source = @klass.new(@url, ref: @ref_tag, workdir: "/tmp/foo")
-      expect(::Git).to receive(:clone).with(git_source.url, git_source.dirname, path: @file_path)
-      git_source.clone
+    it "flags git zipball uris as not valid repos" do
+      expect(Vanagon::Component::Source::Git.valid_remote?(github_zipball_uri)).to be false
     end
 
-    it "a particular branch with a depth" do
-      expected_clone_options = {:branch => "foo", :depth => 50 }
-      git_source = @klass.new(@url, ref: @ref_tag, workdir: "/tmp/foo", :clone_options => expected_clone_options)
-      expect(::Git).to receive(:clone).with(git_source.url, git_source.dirname, path: @file_path, **expected_clone_options)
-      git_source.clone
+    it "identifies git generic uris as valid repos" do
+      expect(Vanagon::Component::Source::Git.valid_remote?(github_repo_uri)).to be true
     end
 
-    it 'uses a custom dirname' do
-      git_source = @klass.new(@url, ref: @ref_tag, workdir: "/tmp/foo", dirname: 'facter-ng')
-      expect(::Git).to receive(:clone).with(git_source.url, 'facter-ng', path: @file_path)
-      git_source.clone
+    it "identifies .git repo uris as valid repos" do
+      expect(Vanagon::Component::Source::Git.valid_remote?(github_repo_dotgit_uri)).to be true
     end
   end
 
-  describe "#dirname" do
-    it "returns the name of the repo" do
-      git_source = @klass.new(@local_url, ref: @ref_tag, workdir: @workdir)
-      expect(git_source.dirname)
-        .to eq('puppet-agent')
+  context 'with other non-github URIs' do
+    before :each do
+      allow(Vanagon::Component::Source::Git).to receive(:valid_remote?).and_return(true)
+      allow(File).to receive(:realpath).and_return(@workdir)
     end
 
-    it "returns the name of the repo and strips .git" do
-      git_source = @klass.new(@url, ref: @ref_tag, workdir: @workdir)
-      expect(git_source.dirname)
-        .to eq('facter')
+    describe "#initialize" do
+      it "raises error on initialization with an invalid repo" do
+        # Ensure initializing a repo fails without calling over the network
+        allow(Vanagon::Component::Source::Git).to receive(:valid_remote?).and_return(false)
+
+        expect { @klass.new(@url, ref: @ref_tag, workdir: @workdir) }
+          .to raise_error(Vanagon::InvalidRepo)
+      end
+
+      it "uses the realpath of the workdir if we're in a symlinked dir" do
+        expect(File).to receive(:realpath).and_return("/tmp/bar")
+        git_source = @klass.new(@local_url, ref: @ref_tag, workdir: "/tmp/foo")
+        expect(git_source.workdir).to eq('/tmp/bar')
+      end
+
+      it "with no clone options should be empty" do
+        git_source = @klass.new(@local_url, ref: @ref_tag, workdir: "/tmp/foo")
+        expect(git_source.clone_options).to be {}
+      end
+
+      it "add clone options depth and branch" do
+        expected_clone_options = {branch: 'bar', depth: 50 }
+        git_source = @klass.new(@local_url, ref: @ref_tag,
+                                workdir: "/tmp/foo", clone_options: expected_clone_options)
+        expect(git_source.clone_options).to  be(expected_clone_options)
+      end
     end
 
-    it "returns @dirname if is set" do
-      git_source = @klass.new(@url, ref: @ref_tag, workdir: @workdir, dirname: 'facter-ng')
-      expect(git_source.dirname)
-          .to eq('facter-ng')
+    describe "#clone" do
+      before :each do
+        clone = double(Git::Base)
+        @file_path = "/tmp/foo"
+        allow(Git).to receive(:clone).and_return(clone)
+        expect(File).to receive(:realpath).and_return(@file_path)
+      end
+
+      it "repository" do
+        git_source = @klass.new(@url, ref: @ref_tag, workdir: "/tmp/foo")
+        expect(Git).to receive(:clone).with(git_source.url, git_source.dirname, path: @file_path)
+        git_source.clone
+      end
+
+      it "a particular branch with a depth" do
+        expected_clone_options = {:branch => "foo", :depth => 50 }
+        git_source = @klass.new(@url, ref: @ref_tag, workdir: "/tmp/foo",
+                                clone_options: expected_clone_options)
+        expect(Git)
+          .to receive(:clone)
+          .with(git_source.url, git_source.dirname, path: @file_path, **expected_clone_options)
+        git_source.clone
+      end
+
+      it 'uses a custom dirname' do
+        git_source = @klass.new(@url, ref: @ref_tag, workdir: "/tmp/foo", dirname: 'facter-ng')
+        expect(Git).to receive(:clone).with(git_source.url, 'facter-ng', path: @file_path)
+        git_source.clone
+      end
     end
-  end
 
-  describe "#ref" do
-    it "returns a default value of HEAD when no explicit Git reference is provided" do
-      git_source = @klass.new(@url, workdir: @workdir)
-      expect(git_source.ref)
-        .to eq('HEAD')
+    describe "#dirname" do
+      it "returns the name of the repo" do
+        git_source = @klass.new(@local_url, ref: @ref_tag, workdir: @workdir)
+        expect(git_source.dirname).to eq('puppet-agent')
+      end
+
+      it "returns the name of the repo and strips .git" do
+        git_source = @klass.new(@url, ref: @ref_tag, workdir: @workdir)
+        expect(git_source.dirname).to eq('facter')
+      end
+
+      it "returns @dirname if is set" do
+        git_source = @klass.new(@url, ref: @ref_tag, workdir: @workdir, dirname: 'facter-ng')
+        expect(git_source.dirname).to eq('facter-ng')
+      end
     end
 
-    it "returns a default value of HEAD when Git reference is nil" do
-      git_source = @klass.new(@url, ref: nil, workdir: @workdir)
-      expect(git_source.ref)
-        .to eq('HEAD')
+    describe "#ref" do
+      it "returns a default value of HEAD when no explicit Git reference is provided" do
+        git_source = @klass.new(@url, workdir: @workdir)
+        expect(git_source.ref).to eq('HEAD')
+      end
+
+      it "returns a default value of HEAD when Git reference is nil" do
+        git_source = @klass.new(@url, ref: nil, workdir: @workdir)
+        expect(git_source.ref).to eq('HEAD')
+      end
     end
   end
 end

data/spec/lib/vanagon/component/source_spec.rb

@@ -36,7 +36,7 @@ describe "Vanagon::Component::Source" do
         .to raise_error(URI::InvalidURIError)
     end
 
-    context "takes a Git repo" do
+    context "with a Git repo" do
       before do
         allow_any_instance_of(Vanagon::Component::Source::Git)
           .to receive(:valid_remote?)
@@ -64,12 +64,16 @@ describe "Vanagon::Component::Source" do
 
       it "returns a Git object for git:http:// repositories" do
         component_source = klass.source(git_prefixed_http, ref: ref, workdir: workdir)
-        expect(component_source.url.to_s).to eq 'http://github.com/abcd/things'
         expect(component_source.class).to eq Vanagon::Component::Source::Git
       end
+
+      it "returns a Git url for git:http:// repositories" do
+        component_source = klass.source(git_prefixed_http, ref: ref, workdir: workdir)
+        expect(component_source.url.to_s).to eq 'http://github.com/abcd/things'
+      end
     end
 
-    context "takes a HTTP/HTTPS file" do
+    context "with a HTTP/HTTPS file" do
       before do
         allow(Vanagon::Component::Source::Http)
           .to receive(:valid_url?)
@@ -96,7 +100,7 @@ describe "Vanagon::Component::Source" do
       end
     end
 
-    context "takes a local file" do
+    context "with a local file" do
       before do
         allow_any_instance_of(Vanagon::Component::Source::Local)
           .to receive(:valid_file?)
@@ -113,4 +117,74 @@ describe "Vanagon::Component::Source" do
       end
     end
   end
+
+  describe "#determine_source_type" do
+    context 'with a github https: URI' do
+
+      let(:github_archive_uri) do
+        'https://github.com/2ndQuadrant/pglogical/archive/a_file_name.tar.gz'
+      end
+      let(:github_tarball_uri) do
+        'https://github.com/Baeldung/kotlin-tutorials/tarball/main'
+      end
+      let(:github_zipball_uri) do
+        'https://github.com/Baeldung/kotlin-tutorials/zipball/master'
+      end
+      let(:github_repo_uri) do
+        'https://github.com/cameronmcnz/rock-paper-scissors'
+      end
+      let(:github_repo_dotgit_uri) do
+        'https://github.com/cameronmcnz/rock-paper-scissors.git'
+      end
+
+      it "identifies github archive uris" do
+        stub_request(:head, github_archive_uri).with(
+          headers: {
+       	    'Accept' => '*/*',
+       	    'Host' => 'github.com',
+       	    'User-Agent' => 'Ruby'
+          }
+        ).to_return(status: 200, body: "", headers: {})
+
+        expect(Vanagon::Component::Source.determine_source_type(github_archive_uri))
+          .to eq(:http)
+      end
+
+      it "identifies github tarball uris" do
+        stub_request(:head, github_tarball_uri).with(
+          headers: {
+       	    'Accept' => '*/*',
+       	    'Host' => 'github.com',
+       	    'User-Agent' => 'Ruby'
+          }
+        ).to_return(status: 200, body: "", headers: {})
+
+        expect(Vanagon::Component::Source.determine_source_type(github_tarball_uri))
+          .to eq(:http)
+      end
+
+      it "identifies github zipball uris" do
+        stub_request(:head, github_zipball_uri).with(
+          headers: {
+       	    'Accept' => '*/*',
+       	    'Host' => 'github.com',
+       	    'User-Agent' => 'Ruby'
+          }
+        ).to_return(status: 200, body: "", headers: {})
+
+        expect(Vanagon::Component::Source.determine_source_type(github_zipball_uri))
+          .to eq(:http)
+      end
+
+      it "identifies github generic repo uris" do
+        expect(Vanagon::Component::Source.determine_source_type(github_repo_uri))
+          .to eq(:git)
+      end
+
+      it "identifies github .git repo uris" do
+        expect(Vanagon::Component::Source.determine_source_type(github_repo_dotgit_uri))
+          .to eq(:git)
+      end
+    end
+  end
 end

data/spec/lib/vanagon/engine/always_be_scheduling_spec.rb

@@ -128,75 +128,133 @@ describe 'Vanagon::Engine::AlwaysBeScheduling' do
 
     end
     token_value = 'decade'
-    it %(reads a token from '~/.vmfloaty.yml at the top level') do
+
+    it 'reads a token from "~/.vmfloaty.yml" at the top level' do
       allow(YAML).to receive(:load_file)
-                         .with(floaty_config)
-                         .and_return({'token' => token_value})
-      allow(ENV).to receive(:[])
+        .with(floaty_config)
+        .and_return({ 'token' => token_value })
       allow(ENV).to receive(:[])
-                         .with('VMPOOLER_TOKEN')
-                         .and_return(nil)
-
+      allow(ENV).to receive(:[]).with('VMPOOLER_TOKEN').and_return(nil)
       abs_service = Vanagon::Engine::AlwaysBeScheduling.new(platform, nil)
       expect(abs_service.token).to eq(token_value)
-      expect(abs_service.token_vmpooler).to eq(nil)
     end
-    it %(reads a token from '~/.vmfloaty.yml in the abs service') do
+
+    it 'reads a token from "~/.vmfloaty.yml" in the abs service' do
+      vmp_token_value = 'deecade'
       allow(YAML).to receive(:load_file)
-                         .with(floaty_config)
-                         .and_return({'services' =>
-                                          {'MYabs' => {'type'=>'abs', 'token'=>token_value, 'url'=>'foo'}}
-                                     })
-      allow(ENV).to receive(:[])
-      allow(ENV).to receive(:[])
-                         .with('VMPOOLER_TOKEN')
-                         .and_return(nil)
+        .with(floaty_config)
+        .and_return(
+          {
+            'services' => {
+              'MYabs' => {
+                'type' => 'abs',
+                'token' => token_value,
+                'url' => 'foo',
+                'vmpooler_fallback' => 'myvmp'
+              },
+              'myvmp' => { 'token' => vmp_token_value, 'url' => 'bar' }
+            }
+          }
+        )
 
       abs_service = Vanagon::Engine::AlwaysBeScheduling.new(platform, nil)
       expect(abs_service.token).to eq(token_value)
-      expect(abs_service.token_vmpooler).to eq(nil)
     end
-    it %(reads a token from '~/.vmfloaty.yml in the abs service and includes the vmpooler token') do
+
+    it 'reads a token from "~/.vmfloaty.yml" and includes the vmpooler token' do
       vmp_token_value = 'deecade'
       allow(YAML).to receive(:load_file)
-                         .with(floaty_config)
-                         .and_return({'services' =>
-                                          {'MYabs' => {'type'=>'abs', 'token'=>token_value, 'url'=>'foo', 'vmpooler_fallback' => 'myvmp'},
-                                           'myvmp' => {'token'=>vmp_token_value, 'url'=>'bar'}}
-                                     })
+        .with(floaty_config)
+        .and_return(
+          {
+            'services' => {
+              'MYabs' => {
+                'type' => 'abs',
+                'token' => token_value,
+                'url' => 'foo',
+                'vmpooler_fallback' => 'myvmp'
+              },
+              'myvmp' => { 'token' => vmp_token_value, 'url' => 'bar' }
+            }
+          }
+        )
 
       abs_service = Vanagon::Engine::AlwaysBeScheduling.new(platform, nil)
-      expect(abs_service.token).to eq(token_value)
       expect(abs_service.token_vmpooler).to eq(vmp_token_value)
     end
   end
+
   describe '#select_target_from' do
     it 'runs successfully' do
       hostname = 'faint-whirlwind.puppet.com'
-      stub_request(:post, "https://foobar/request").
-          to_return({status: 202, body: "", headers: {}},{status: 200, body: '[{"hostname":"'+hostname+'","type":"aix-6.1-ppc","engine":"nspooler"}]', headers: {}})
+      stub_request(:post, 'https://foobar/request')
+        .to_return(
+          { status: 202, body: "", headers: {} },
+          {
+            status: 200,
+            body: [{ 'hostname' => hostname, 'type' => 'aix-6.1-ppc', 'engine' => 'nspooler' }]
+              .to_json,
+            headers: {}
+          }
+        )
       abs_service = Vanagon::Engine::AlwaysBeScheduling.new(platform, nil)
       abs_service.select_target_from("https://foobar")
       expect(abs_service.target).to eq(hostname)
     end
+
     it 'returns a warning if the first request is not a 202' do
       hostname = 'fainter-whirlwind.puppet.com'
-      stub_request(:post, "https://foobar/request").
-          to_return({status: 404, body: "", headers: {}},{status: 200, body: '[{"hostname":"'+hostname+'","type":"aix-6.1-ppc","engine":"nspooler"}]', headers: {}})
-      allow_any_instance_of(VanagonLogger).to receive(:info)
-      expect_any_instance_of(VanagonLogger).to receive(:info).with("failed to request ABS with code 404")
+      stub_request(:post, "https://foobar/request")
+        .to_return(
+          { status: 404, body: "", headers: {} },
+          {
+            status: 200,
+            body:
+              [{ 'hostname' => hostname, 'type' => 'aix-6.1-ppc', 'engine' => 'nspooler' }].to_json,
+            headers: {}
+          }
+        )
+      allow(VanagonLogger).to receive(:info)
+      expect(VanagonLogger).to receive(:info).with('failed to request ABS with code 404')
       abs_service = Vanagon::Engine::AlwaysBeScheduling.new(platform, nil)
-      pooler = abs_service.select_target_from("https://foobar")
-      expect(pooler).to eq('')
+      abs_service.select_target_from('https://foobar')
     end
-    it 'returns a warning and retries until request is a 200' do
+
+    it 'retries until request is a 200' do
+      hostname = 'faintest-whirlwind.puppet.com'
+      stub_request(:post, 'https://foobar/request')
+        .to_return(
+          { status: 202, body: "", headers: {} },
+          { status: 503, body: "", headers: {} },
+          {
+            status: 200,
+            body: [{
+                     'hostname' => hostname, 'type' => 'aix-6.1-ppc', 'engine' => "nspooler"
+                   }].to_json,
+            headers: {}
+          }
+        )
+      allow(VanagonLogger).to receive(:info)
+      expect(VanagonLogger).to receive(:info).with(/^Waiting 1 second.*to fill/)
+      abs_service = Vanagon::Engine::AlwaysBeScheduling.new(platform, nil)
+      abs_service.select_target_from("https://foobar")
+    end
+
+    it 'sets a service target when request is a 200' do
       hostname = 'faintest-whirlwind.puppet.com'
-      stub_request(:post, "https://foobar/request").
-          to_return({status: 202, body: "", headers: {}},
-                    {status: 503, body: "", headers: {}},
-                    {status: 200, body: '[{"hostname":"'+hostname+'","type":"aix-6.1-ppc","engine":"nspooler"}]', headers: {}})
-      allow_any_instance_of(VanagonLogger).to receive(:info)
-      expect_any_instance_of(VanagonLogger).to receive(:info).with(/Waiting 1 seconds to check if ABS request has been filled/)
+      stub_request(:post, 'https://foobar/request')
+        .to_return(
+          { status: 202, body: "", headers: {} },
+          { status: 503, body: "", headers: {} },
+          {
+            status: 200,
+            body: [{
+                     'hostname' => hostname, 'type' => 'aix-6.1-ppc', 'engine' => "nspooler"
+                   }].to_json,
+            headers: {}
+          }
+        )
+      allow(VanagonLogger).to receive(:info)
       abs_service = Vanagon::Engine::AlwaysBeScheduling.new(platform, nil)
       abs_service.select_target_from("https://foobar")
       expect(abs_service.target).to eq(hostname)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.36.0
+  version: 0.37.1
 platform: ruby
 authors:
 - Puppet By Perforce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-19 00:00:00.000000000 Z
+date: 2023-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -162,7 +162,6 @@ files:
 - lib/vanagon/platform/defaults/debian-8-i386.rb
 - lib/vanagon/platform/defaults/el-6-i386.rb
 - lib/vanagon/platform/defaults/el-6-x86_64.rb
-- lib/vanagon/platform/defaults/el-7-aarch64.rb
 - lib/vanagon/platform/defaults/el-7-x86_64.rb
 - lib/vanagon/platform/defaults/el-8-aarch64.rb
 - lib/vanagon/platform/defaults/el-8-ppc64le.rb
@@ -170,7 +169,6 @@ files:
 - lib/vanagon/platform/defaults/el-9-aarch64.rb
 - lib/vanagon/platform/defaults/el-9-x86_64.rb
 - lib/vanagon/platform/defaults/fedora-36-x86_64.rb
-- lib/vanagon/platform/defaults/osx-10.15-x86_64.rb
 - lib/vanagon/platform/defaults/osx-11-arm64.rb
 - lib/vanagon/platform/defaults/osx-11-x86_64.rb
 - lib/vanagon/platform/defaults/osx-12-arm64.rb

data/lib/vanagon/platform/defaults/el-7-aarch64.rb

@@ -1,13 +0,0 @@
-platform "el-7-aarch64" do |plat|
-  plat.servicedir "/usr/lib/systemd/system"
-  plat.defaultdir "/etc/sysconfig"
-  plat.servicetype "systemd"
-
-  plat.add_build_repository "http://pl-build-tools.delivery.puppetlabs.net/yum/el/7/aarch64/pl-build-tools-aarch64.repo"
-  plat.add_build_repository "http://pl-build-tools.delivery.puppetlabs.net/yum/el/7/x86_64/pl-build-tools-x86_64.repo"
-  packages = %w(autoconf automake createrepo rsync gcc make rpmdevtools rpm-libs yum-utils rpm-sign)
-  plat.provision_with "yum install --assumeyes #{packages.join(' ')}"
-  plat.install_build_dependencies_with "yum install --assumeyes"
-  plat.cross_compiled true
-  plat.vmpooler_template "redhat-7-x86_64"
-end

data/lib/vanagon/platform/defaults/osx-10.15-x86_64.rb

@@ -1,23 +0,0 @@
-platform "osx-10.15-x86_64" do |plat|
-  plat.servicetype "launchd"
-  plat.servicedir "/Library/LaunchDaemons"
-  plat.codename "catalina"
-
-  plat.provision_with "export HOMEBREW_NO_EMOJI=true"
-  plat.provision_with "export HOMEBREW_VERBOSE=true"
-  plat.provision_with "export HOMEBREW_NO_ANALYTICS=1"
-
-  plat.provision_with "sudo dscl . -create /Users/test"
-  plat.provision_with "sudo dscl . -create /Users/test UserShell /bin/bash"
-  plat.provision_with "sudo dscl . -create /Users/test UniqueID 1001"
-  plat.provision_with "sudo dscl . -create /Users/test PrimaryGroupID 1000"
-  plat.provision_with "sudo dscl . -create /Users/test NFSHomeDirectory /Users/test"
-  plat.provision_with "sudo dscl . -passwd /Users/test password"
-  plat.provision_with "sudo dscl . -merge /Groups/admin GroupMembership test"
-  plat.provision_with "echo 'test ALL=(ALL:ALL) NOPASSWD: ALL' > /etc/sudoers.d/username"
-  plat.provision_with "mkdir -p /etc/homebrew"
-  plat.provision_with "cd /etc/homebrew"
-  plat.provision_with "createhomedir -c -u test"
-  plat.provision_with %Q(su test -c 'echo | /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"')
-  plat.vmpooler_template "osx-1015-x86_64"
-end