beaker-puppet 0.13.4 → 0.13.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d322c80a47192acedb35fe134e928ca9fad94f94
-  data.tar.gz: d4dfedaa36a7a51a237388eebee0d8c9e664ee28
+  metadata.gz: cca1d57bd1c5a2a3fa77787a878ab3053ee09516
+  data.tar.gz: 112ffe35c2a225167dcb9595c14a04e1ecd1653c
 SHA512:
-  metadata.gz: 94e08a2ccdd6e9e75f18d28bae39262ab9af24432a65021d07756ececb4651c942ab9069a3243194a25e06cbc9d2ee5c32afd5ca2d63fc0ab540609421e3ebc7
-  data.tar.gz: 3fcb942b149e20a2c46e9cbc2d39f0bc69ff0f4dd734ab52684df47bba1b1f2746d00453a969bd7353cb97c2b255288951cd63277f07d6a442de4b5725beac59
+  metadata.gz: dd6fd41e1779ada512ceaa7f34afb40d93871e533c80d77e298d48ba6d89d505cde488eb864645015dd0dce29ba0f1740f231fbbb77528bdc30f600f019cf6f7
+  data.tar.gz: 50249278eaf41ccad9d7e275fd37ba729021ee686091ef1bea86e76ba29d11cf82e8b8bd9727a38e4ab1c9aa676c4a7e1733f3cf61587fccfc1124fee38b9311

data/lib/beaker-puppet/helpers/puppet_helpers.rb

@@ -633,6 +633,9 @@ module Beaker
         # forge api v1 canonical source is forge.puppetlabs.com
         # forge api v3 canonical source is forgeapi.puppetlabs.com
         #
+        # @deprecated this method should not be used because stubbing the host
+        # breaks TLS validation.
+        #
         # @param machine [String] the host to perform the stub on
         # @param forge_host [String] The URL to use as the forge alias, will default to using :forge_host in the
         #                             global options hash
@@ -654,6 +657,9 @@ module Beaker
         # forge api v1 canonical source is forge.puppetlabs.com
         # forge api v3 canonical source is forgeapi.puppetlabs.com
         #
+        # @deprecated this method should not be used because stubbing the host
+        # breaks TLS validation.
+        #
         # @param host [String] the host to perform the stub on
         # @param forge_host [String] The URL to use as the forge alias, will default to using :forge_host in the
         #                             global options hash
@@ -669,6 +675,9 @@ module Beaker
 
         # This wraps `with_forge_stubbed_on` and provides it the default host
         # @see with_forge_stubbed_on
+        #
+        # @deprecated this method should not be used because stubbing the host
+        # breaks TLS validation.
         def with_forge_stubbed( forge_host = nil, &block )
           with_forge_stubbed_on( default, forge_host, &block )
         end
@@ -676,6 +685,9 @@ module Beaker
         # This wraps the method `stub_hosts` and makes the stub specific to
         # the forge alias.
         #
+        # @deprecated this method should not be used because stubbing the host
+        # breaks TLS validation.
+        #
         # @see #stub_forge_on
         def stub_forge(forge_host = nil)
           #use global options hash

data/lib/beaker-puppet/install_utils/module_utils.rb

@@ -24,9 +24,7 @@ module Beaker
         # @see install_dev_puppet_module
         def install_dev_puppet_module_on( host, opts )
           if options[:forge_host]
-            with_forge_stubbed_on( host ) do
-              install_puppet_module_via_pmt_on( host, opts )
-            end
+            install_puppet_module_via_pmt_on( host, opts )
           else
             copy_module_to( host, opts )
           end
@@ -75,6 +73,14 @@ module Beaker
               puppet_opts = host[:default_module_install_opts].merge( puppet_opts )
             end
 
+            if options[:forge_host]
+              if options[:forge_host] =~ /^http/
+                puppet_opts[:module_repository] = options[:forge_host]
+              else
+                puppet_opts[:module_repository] = "https://#{options[:forge_host]}"
+              end
+            end
+
             on h, puppet("module install #{modname} #{version_info}", puppet_opts)
           end
         end

data/lib/beaker-puppet/version.rb

@@ -1,3 +1,3 @@
 module BeakerPuppet
-  VERSION = '0.13.4'
+  VERSION = '0.13.5'
 end

data/spec/beaker-puppet/install_utils/module_utils_spec.rb

@@ -34,15 +34,12 @@ describe ClassMixedWithDSLInstallUtils do
         master = hosts.first
         allow( subject ).to receive( :options ).and_return( {:forge_host => 'ahost.com'} )
 
-        expect( subject ).to receive( :with_forge_stubbed_on )
-
         subject.install_dev_puppet_module_on( master, {:source => '/module', :module_name => 'test'} )
       end
 
       it 'installs via #install_puppet_module_via_pmt' do
         master = hosts.first
         allow( subject ).to receive( :options ).and_return( {:forge_host => 'ahost.com'} )
-        allow( subject ).to receive( :with_forge_stubbed_on ).and_yield
 
         expect( subject ).to receive( :install_puppet_module_via_pmt_on )
 
@@ -78,6 +75,7 @@ describe ClassMixedWithDSLInstallUtils do
   describe '#install_puppet_module_via_pmt_on' do
     it 'installs module via puppet module tool' do
       allow( subject ).to receive( :hosts ).and_return( hosts )
+      allow( subject ).to receive( :options ).and_return( {} )
       master = hosts.first
 
       allow( subject ).to receive( :on ).once
@@ -88,6 +86,7 @@ describe ClassMixedWithDSLInstallUtils do
 
     it 'takes the trace option and passes it down correctly' do
       allow( subject ).to receive( :hosts ).and_return( hosts )
+      allow( subject ).to receive( :options ).and_return( {} )
       master = hosts.first
       trace_opts = { :trace => nil }
       master['default_module_install_opts'] = trace_opts
@@ -97,6 +96,30 @@ describe ClassMixedWithDSLInstallUtils do
 
       subject.install_puppet_module_via_pmt_on( master, {:module_name => 'test'} )
     end
+
+    it 'takes the forge_host option as a hostname and passes it down correctly' do
+      allow( subject ).to receive( :hosts ).and_return( hosts )
+      allow( subject ).to receive( :options ).and_return( {:forge_host => 'forge.example.com'} )
+      master = hosts.first
+      forge_opts = { :module_repository => 'https://forge.example.com' }
+
+      allow( subject ).to receive( :on ).once
+      expect( subject ).to receive( :puppet ).with('module install test ', forge_opts).once
+
+      subject.install_puppet_module_via_pmt_on( master, {:module_name => 'test'} )
+    end
+
+    it 'takes the forge_host option as a url and passes it down correctly' do
+      allow( subject ).to receive( :hosts ).and_return( hosts )
+      allow( subject ).to receive( :options ).and_return( {:forge_host => 'http://forge.example.com'} )
+      master = hosts.first
+      forge_opts = { :module_repository => 'http://forge.example.com' }
+
+      allow( subject ).to receive( :on ).once
+      expect( subject ).to receive( :puppet ).with('module install test ', forge_opts).once
+
+      subject.install_puppet_module_via_pmt_on( master, {:module_name => 'test'} )
+    end
   end
 
   describe '#install_puppet_module_via_pmt' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet
 version: !ruby/object:Gem::Version
-  version: 0.13.4
+  version: 0.13.5
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-23 00:00:00.000000000 Z
+date: 2018-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec