vanagon 0.15.36 → 0.17.0

data/resources/rpm/project.spec.erb

@@ -36,6 +36,9 @@
 # This breaks on el8. This is a hack to unblock development.
 <%- if @platform.is_el8? %>
 %undefine __debug_package
+
+# Build el-8 packages without build-id files to prevent collision
+%define _build_id_links none
 <% end -%>
 
 

data/spec/lib/vanagon/cli_spec.rb

@@ -0,0 +1,80 @@
+require 'vanagon/cli'
+
+##
+## Ignore the CLI calling 'exit'
+##
+RSpec.configure do |rspec|
+  rspec.around(:example) do |ex|
+    begin
+      ex.run
+    rescue SystemExit => e
+      puts "Got SystemExit: #{e.inspect}. Ignoring"
+    end
+  end
+end
+
+describe Vanagon::CLI do
+  describe "options that don't take a value" do
+    [:skipcheck, :verbose].each do |flag|
+      it "can create an option parser that accepts the #{flag} flag" do
+        subject = described_class.new
+        expect(subject.parse(%W[build --#{flag} project platform])).to have_key(flag)
+      end
+    end
+
+    describe "short options" do
+      [["v", :verbose]].each do |short, long|
+        it "maps the short option #{short} to #{long}" do
+          subject = described_class.new
+          expect(subject.parse(%W[build -#{short} project platform])).to include(long => true)
+        end
+      end
+    end
+  end
+
+  describe "options that only allow limited values" do
+    [[:preserve, ["always", "never", "on-failure"]]].each do |option, values|
+      values.each do |value|
+        it "can create a parser that accepts \"--#{option} #{value}\"" do
+          subject = described_class.new
+          expect(subject.parse(%W[build --#{option} #{value} project platform]))
+            .to include(option => value.to_sym)
+        end
+      end
+    end
+    [[:preserve, ["bad-argument"]]].each do |option, values|
+      values.each do |value|
+        it "rejects the bad argument \"--#{option} #{value}\"" do
+          subject = described_class.new
+          expect{subject.parse(%W[build --#{option} #{value} project platform])}
+            .to raise_error(Vanagon::InvalidArgument)
+        end
+      end
+    end
+    it "preserve defaults to :on-failure" do
+      subject = described_class.new
+      expect(subject.parse([])).to include(:preserve => :'on-failure')
+    end
+  end
+
+
+  describe "options that take a value" do
+    [:workdir, :configdir, :engine].each do |option|
+      it "can create an option parser that accepts the #{option} option" do
+        subject = described_class.new
+        expect(subject.parse(%W[build --#{option} hello project platform]))
+          .to include(option => "hello")
+      end
+    end
+
+    describe "short options" do
+      [["w", :workdir], ["c", :configdir], ["e", :engine]].each do |short, long|
+        it "maps the short option #{short} to #{long}" do
+          subject = described_class.new
+          expect(subject.parse(%W[build -#{short} hello project platform]))
+            .to include(long => "hello")
+        end
+      end
+    end
+  end
+end

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

@@ -2,6 +2,7 @@ require 'vanagon/engine/always_be_scheduling'
 require 'vanagon/driver'
 require 'vanagon/platform'
 require 'logger'
+require 'spec_helper'
 
 class Vanagon
   class Driver
@@ -45,6 +46,8 @@ describe 'Vanagon::Engine::AlwaysBeScheduling' do
                     end")
     plat._platform
   }
+  let(:pooler_token_file) { File.expand_path('~/.vanagon-token') }
+  let(:floaty_config) { File.expand_path('~/.vmfloaty.yml') }
 
   describe '#validate_platform' do
     it 'returns true if the platform has the required attributes' do
@@ -81,4 +84,113 @@ describe 'Vanagon::Engine::AlwaysBeScheduling' do
         .to eq('always_be_scheduling')
     end
   end
-end
+
+  describe '#read_vanagon_token' do
+    it 'takes the first line for abs token, second line is optional' do
+      token_value = 'decade'
+      allow(File).to receive(:exist?)
+                         .with(pooler_token_file)
+                         .and_return(true)
+
+      allow(File).to receive(:read)
+                         .with(pooler_token_file)
+                         .and_return(token_value)
+
+      abs_service = Vanagon::Engine::AlwaysBeScheduling.new(platform, nil)
+      expect(abs_service.token).to eq('decade')
+      expect(abs_service.token_vmpooler).to eq(nil)
+    end
+    it 'takes the second line as vmpooler token' do
+      token_value = "decade\nanddaycade"
+      allow(File).to receive(:exist?)
+                         .with(pooler_token_file)
+                         .and_return(true)
+
+      allow(File).to receive(:read)
+                         .with(pooler_token_file)
+                         .and_return(token_value)
+
+      abs_service = Vanagon::Engine::AlwaysBeScheduling.new(platform, nil)
+      expect(abs_service.token).to eq('decade')
+      expect(abs_service.token_vmpooler).to eq('anddaycade')
+    end
+  end
+
+  describe '#read_vmfloaty_token' do
+    before :each do
+      allow(File).to receive(:exist?)
+                         .with(pooler_token_file)
+                         .and_return(false)
+
+      allow(File).to receive(:exist?)
+                         .with(floaty_config)
+                         .and_return(true)
+    end
+    token_value = 'decade'
+    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})
+
+      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
+      allow(YAML).to receive(:load_file)
+                         .with(floaty_config)
+                         .and_return({'services' =>
+                                          {'MYabs' => {'type'=>'abs', 'token'=>token_value, 'url'=>'foo'}}
+                                     })
+
+      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
+      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'}}
+                                     })
+
+      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: {}})
+      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(Object).to receive(:warn)
+      expect_any_instance_of(Object).to receive(:warn).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('')
+    end
+    it 'returns a warning and 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"}]', headers: {}})
+      allow_any_instance_of(Object).to receive(:warn)
+      expect_any_instance_of(Object).to receive(:warn).with(/Waiting 1 seconds to check if ABS request has been filled/)
+      abs_service = Vanagon::Engine::AlwaysBeScheduling.new(platform, nil)
+      abs_service.select_target_from("https://foobar")
+      expect(abs_service.target).to eq(hostname)
+    end
+  end
+end

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

@@ -1,21 +1,36 @@
 require 'vanagon/engine/docker'
 require 'vanagon/platform'
 
-describe 'Vanagon::Engine::Docker' do
-  let (:platform_with_docker_image) {
-    plat = Vanagon::Platform::DSL.new('debian-6-i386')
-    plat.instance_eval("platform 'debian-6-i386' do |plat|
-                      plat.docker_image 'debian-6-i386'
-                    end")
+describe Vanagon::Engine::Docker do
+  let (:platform_with_docker_image) do
+    plat = Vanagon::Platform::DSL.new('debian-10-amd64')
+    plat.instance_eval(<<~EOF)
+      platform 'debian-10-amd64' do |plat|
+        plat.docker_image 'debian:10-slim'
+      end
+    EOF
     plat._platform
-  }
+  end
 
-  let (:platform_without_docker_image) {
-    plat = Vanagon::Platform::DSL.new('debian-6-i386')
-    plat.instance_eval("platform 'debian-6-i386' do |plat|
-                    end")
+  let (:platform_without_docker_image) do
+    plat = Vanagon::Platform::DSL.new('debian-10-amd64')
+    plat.instance_eval(<<~EOF)
+      platform 'debian-10-amd64' do |plat|
+      end
+    EOF
+    plat._platform
+  end
+
+  let(:platform_with_docker_exec) do
+    plat = Vanagon::Platform::DSL.new('debian-10-amd64')
+    plat.instance_eval(<<~EOF)
+      platform 'debian-10-amd64' do |plat|
+        plat.docker_image 'debian:10-slim'
+        plat.use_docker_exec true
+      end
+    EOF
     plat._platform
-  }
+  end
 
   describe '#initialize' do
     it 'fails without docker installed' do
@@ -23,24 +38,67 @@ describe 'Vanagon::Engine::Docker' do
         expect(FileTest).to receive(:executable?).with(File.join(path_elem, 'docker')).and_return(false)
       end
 
-      expect { Vanagon::Engine::Docker.new(platform_with_docker_image) }.to raise_error(RuntimeError)
+      expect { described_class.new(platform_with_docker_image) }.to raise_error(RuntimeError)
     end
   end
 
   describe "#validate_platform" do
     it 'raises an error if the platform is missing a required attribute' do
       expect(Vanagon::Utilities).to receive(:find_program_on_path).with('docker').and_return('/usr/bin/docker')
-      expect { Vanagon::Engine::Docker.new(platform_without_docker_image).validate_platform }.to raise_error(Vanagon::Error)
+      expect { described_class.new(platform_without_docker_image).validate_platform }.to raise_error(Vanagon::Error)
     end
 
     it 'returns true if the platform has the required attributes' do
       expect(Vanagon::Utilities).to receive(:find_program_on_path).with('docker').and_return('/usr/bin/docker')
-      expect(Vanagon::Engine::Docker.new(platform_with_docker_image).validate_platform).to be(true)
+      expect(described_class.new(platform_with_docker_image).validate_platform).to be(true)
     end
   end
 
   it 'returns "docker" name' do
     expect(Vanagon::Utilities).to receive(:find_program_on_path).with('docker').and_return('/usr/bin/docker')
-    expect(Vanagon::Engine::Docker.new(platform_with_docker_image).name).to eq('docker')
+    expect(described_class.new(platform_with_docker_image).name).to eq('docker')
+  end
+
+  describe '#dispatch' do
+    context 'when platform has use_docker_exec set' do
+      subject { described_class.new(platform_with_docker_exec) }
+
+      it 'uses docker exec' do
+        expect(Vanagon::Utilities).to receive(:remote_ssh_command).never
+        expect(subject).to receive(:docker_exec)
+
+        subject.dispatch('true', true)
+      end
+    end
+  end
+
+  describe '#ship_workdir' do
+    context 'when platform has use_docker_exec set' do
+      subject { described_class.new(platform_with_docker_exec) }
+
+      it 'uses docker cp' do
+        expect(Vanagon::Utilities).to receive(:rsync_to).never
+        expect(subject).to receive(:docker_cp_globs_to)
+
+        subject.ship_workdir('foo/')
+      end
+    end
+  end
+
+  describe '#retrieve_built_artifact' do
+    context 'when platform has use_docker_exec set' do
+      subject { described_class.new(platform_with_docker_exec) }
+
+      before(:each) do
+        allow(FileUtils).to receive(:mkdir_p)
+      end
+
+      it 'uses docker cp' do
+        expect(Vanagon::Utilities).to receive(:rsync_from).never
+        expect(subject).to receive(:docker_cp_globs_from)
+
+        subject.retrieve_built_artifact('output/*', false)
+      end
+    end
   end
 end

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

@@ -27,6 +27,8 @@ if defined? ::Aws
     end
 
     it 'returns "ec2" name' do
+      stub_request(:get, "http://169.254.169.254/latest/meta-data/iam/security-credentials/").
+          to_return(status: 200, body: "", headers: {})
       expect(Vanagon::Engine::Ec2.new(platform_ec2).name).to eq('ec2')
     end
   end

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

@@ -6,7 +6,7 @@ describe 'Vanagon::Engine::Pooler' do
   let (:platform_with_vcloud_name) {
     plat = Vanagon::Platform::DSL.new('debian-6-i386')
     plat.instance_eval("platform 'debian-6-i386' do |plat|
-                      plat.vcloud_name 'debian-6-i386'
+                      plat.vmpooler_template 'debian-6-i386'
                     end")
     plat._platform
   }

data/spec/spec_helper.rb

@@ -19,6 +19,7 @@ end
 
 require 'tmpdir'
 require 'vanagon'
+require 'webmock/rspec'
 
 RSpec.configure do |c|
   c.before do

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.15.36
+  version: 0.17.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-29 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: docopt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -70,6 +84,7 @@ description: Vanagon is a tool to build a single package out of a project, which
   itself contain one or more components.
 email: info@puppet.com
 executables:
+- vanagon
 - build
 - inspect
 - ship
@@ -91,10 +106,19 @@ files:
 - bin/repo
 - bin/ship
 - bin/sign
+- bin/vanagon
 - lib/git/basic_submodules.rb
 - lib/git/rev_list.rb
 - lib/makefile.rb
 - lib/vanagon.rb
+- lib/vanagon/cli.rb
+- lib/vanagon/cli/build.rb
+- lib/vanagon/cli/build_host_info.rb
+- lib/vanagon/cli/build_requirements.rb
+- lib/vanagon/cli/inspect.rb
+- lib/vanagon/cli/render.rb
+- lib/vanagon/cli/ship.rb
+- lib/vanagon/cli/sign.rb
 - lib/vanagon/common.rb
 - lib/vanagon/common/pathname.rb
 - lib/vanagon/common/user.rb
@@ -120,7 +144,6 @@ files:
 - lib/vanagon/extensions/ostruct/json.rb
 - lib/vanagon/extensions/set/json.rb
 - lib/vanagon/extensions/string.rb
-- lib/vanagon/optparse.rb
 - lib/vanagon/patch.rb
 - lib/vanagon/platform.rb
 - lib/vanagon/platform/deb.rb
@@ -204,6 +227,7 @@ files:
 - spec/fixtures/wix/resources/windows/wix/ui/ui-sample-1.wxs
 - spec/lib/git/rev_list_spec.rb
 - spec/lib/makefile_spec.rb
+- spec/lib/vanagon/cli_spec.rb
 - spec/lib/vanagon/common/pathname_spec.rb
 - spec/lib/vanagon/common/user_spec.rb
 - spec/lib/vanagon/component/dsl_spec.rb
@@ -226,7 +250,6 @@ files:
 - spec/lib/vanagon/extensions/ostruct/json_spec.rb
 - spec/lib/vanagon/extensions/set/json_spec.rb
 - spec/lib/vanagon/extensions/string_spec.rb
-- spec/lib/vanagon/optparse_spec.rb
 - spec/lib/vanagon/platform/deb_spec.rb
 - spec/lib/vanagon/platform/dsl_spec.rb
 - spec/lib/vanagon/platform/osx_spec.rb
@@ -265,41 +288,41 @@ signing_key:
 specification_version: 3
 summary: All of your packages will fit into this van with this one simple trick.
 test_files:
-- spec/lib/makefile_spec.rb
-- spec/lib/vanagon/utilities/shell_utilities_spec.rb
-- spec/lib/vanagon/platform_spec.rb
-- spec/lib/vanagon/project_spec.rb
-- spec/lib/vanagon/component_spec.rb
-- spec/lib/vanagon/extensions/set/json_spec.rb
+- spec/lib/vanagon/project/dsl_spec.rb
 - spec/lib/vanagon/extensions/string_spec.rb
 - spec/lib/vanagon/extensions/ostruct/json_spec.rb
-- spec/lib/vanagon/engine/ec2_spec.rb
-- spec/lib/vanagon/engine/hardware_spec.rb
-- spec/lib/vanagon/engine/pooler_spec.rb
-- spec/lib/vanagon/engine/always_be_scheduling_spec.rb
-- spec/lib/vanagon/engine/docker_spec.rb
-- spec/lib/vanagon/engine/base_spec.rb
-- spec/lib/vanagon/engine/local_spec.rb
-- spec/lib/vanagon/environment_spec.rb
-- spec/lib/vanagon/utilities_spec.rb
-- spec/lib/vanagon/driver_spec.rb
-- spec/lib/vanagon/component/rules_spec.rb
-- spec/lib/vanagon/component/dsl_spec.rb
+- spec/lib/vanagon/extensions/set/json_spec.rb
+- spec/lib/vanagon/platform/solaris_11_spec.rb
+- spec/lib/vanagon/platform/dsl_spec.rb
+- spec/lib/vanagon/platform/rpm/aix_spec.rb
+- spec/lib/vanagon/platform/windows_spec.rb
+- spec/lib/vanagon/platform/osx_spec.rb
+- spec/lib/vanagon/platform/solaris_10_spec.rb
+- spec/lib/vanagon/platform/rpm_spec.rb
+- spec/lib/vanagon/platform/deb_spec.rb
+- spec/lib/vanagon/project_spec.rb
 - spec/lib/vanagon/component/source/rewrite_spec.rb
 - spec/lib/vanagon/component/source/git_spec.rb
-- spec/lib/vanagon/component/source/http_spec.rb
 - spec/lib/vanagon/component/source/local_spec.rb
+- spec/lib/vanagon/component/source/http_spec.rb
+- spec/lib/vanagon/component/rules_spec.rb
+- spec/lib/vanagon/component/dsl_spec.rb
 - spec/lib/vanagon/component/source_spec.rb
-- spec/lib/vanagon/project/dsl_spec.rb
-- spec/lib/vanagon/optparse_spec.rb
 - spec/lib/vanagon/common/user_spec.rb
 - spec/lib/vanagon/common/pathname_spec.rb
-- spec/lib/vanagon/platform/dsl_spec.rb
-- spec/lib/vanagon/platform/windows_spec.rb
-- spec/lib/vanagon/platform/solaris_10_spec.rb
-- spec/lib/vanagon/platform/deb_spec.rb
-- spec/lib/vanagon/platform/solaris_11_spec.rb
-- spec/lib/vanagon/platform/rpm/aix_spec.rb
-- spec/lib/vanagon/platform/osx_spec.rb
-- spec/lib/vanagon/platform/rpm_spec.rb
+- spec/lib/vanagon/component_spec.rb
+- spec/lib/vanagon/engine/hardware_spec.rb
+- spec/lib/vanagon/engine/ec2_spec.rb
+- spec/lib/vanagon/engine/local_spec.rb
+- spec/lib/vanagon/engine/docker_spec.rb
+- spec/lib/vanagon/engine/pooler_spec.rb
+- spec/lib/vanagon/engine/base_spec.rb
+- spec/lib/vanagon/engine/always_be_scheduling_spec.rb
+- spec/lib/vanagon/environment_spec.rb
+- spec/lib/vanagon/cli_spec.rb
+- spec/lib/vanagon/driver_spec.rb
+- spec/lib/vanagon/utilities_spec.rb
+- spec/lib/vanagon/platform_spec.rb
+- spec/lib/vanagon/utilities/shell_utilities_spec.rb
+- spec/lib/makefile_spec.rb
 - spec/lib/git/rev_list_spec.rb