beaker-pe 1.22.0 → 1.23.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGY2NDk1YjBkNjNhNTgxNzMxMmUzNzdmODQwZWVmMzJlZWJkYWQ5Ng==
+    MjlmYWQxODA1M2Q3NzI3ZTM0YWNkNzk0Y2E4MDI1YWJmMzVmNTc4ZA==
   data.tar.gz: !binary |-
-    MmY3YWU0M2E5YzUyMGU0ZjU1MDc5ZWIwODRhYzc5ZWI4ODZmZTIwNA==
+    YWFiNmVkMTJiNDM1YTk1ODQ2MTk1ZDRlZWI3ZDJmYzM4MzQ3YjcxYg==
 SHA512:
   metadata.gz: !binary |-
-    NmRmN2FkYjg2MTk0NTVhMWY4Yjk4YTYwN2UyYTI4NzEwYmRmYzVhNDg5MmIy
-    MTE3NjlmOGI3ODBkZTg1YTdmMjFmNmJiMjg5NDgxOTBkOWNlZmMzODAwMzZl
-    NmQwNmIzYWZjODMyMjg1Y2M0ZTUxM2FmYjczYWNiMGM0YTc0ZTg=
+    MTg4NTllZTMzNjBiMTZiZTM4YmUyYzQxNDllNDM4OTU4Yjg3ZDc0NzI0ODA0
+    MTRjOTA3N2Y1ZDg2YWM1ZmU1NGRiYjY1ZDFmYjY2ZGVjZjZlYjMyMTRkNGEy
+    MmZjNzkwNzcyYjIzYmI4ZjUxNjhmNGI1NmRjMjAxNmNkZGI2MTU=
   data.tar.gz: !binary |-
-    NmI2ODYyOTE0ZDkyNTQ3Y2MxODYxOGQ4ZmVjMTRjODgwOWM0M2U1MTI1OTJh
-    NDFkYmNlMjliNGJmNTVmNGUzZTVhZDgyNTVlMTQwNTA1ZDgyZTNmYjVmN2Mx
-    YTg5OThhMGZjMWNhMDQyNDJlNTliYjhjOGMyM2FiYzRmNDM3NGU=
+    YTJkOWVkYzc4ZjhhYWRkZmRlZWFkOTM2OTY1NmVjMjA1ZWRmYmUzODkzOWU2
+    MThkYzYxOTJkMmM2MTc0NDk1NzE0ODhhMmNiNDkyNjVmN2EzZjZjNTJkMjFh
+    ZmE0NzJiYmIwNWM4OTJkYzEwZGM0MmE1ZTE4ZTllOTc2N2Y0MTE=

data/README.md

@@ -37,6 +37,11 @@ things:
 2. put a `require 'beaker-pe'` statement in your tests/code that need
   beaker-pe-specific functionality
 
+# Gem Installing
+Spec tests require a version of scooter that is private. Execute
+`export GEM_SOURCE=http://rubygems.delivery.puppetlabs.net` prior to running
+`bundle install --path .bundle/gems/`.
+
 # Spec Testing
 
 Spec tests all live under the `spec` folder.  These are the default rake task, &

data/lib/beaker-pe/install/pe_utils.rb

@@ -92,11 +92,11 @@ module Beaker
             @cert_cache_dir ||= Dir.mktmpdir("master_ca_cert")
             local_cert_copy = "#{@cert_cache_dir}/ca.pem"
             step "Copying master ca.pem to agent for secure frictionless install" do
-              ca_pem_dir = '/etc/puppetlabs/puppet/ssl/certs'
-              ca_pem_path = "#{ca_pem_dir}/ca.pem"
-              scp_from(master, ca_pem_path , @cert_cache_dir) unless File.exist?(local_cert_copy)
-              on(host, "mkdir -p #{ca_pem_dir}")
-              scp_to(host, local_cert_copy, ca_pem_dir)
+              agent_ca_pem_dir = "#{host['puppetpath']}/ssl/certs"
+              master_ca_pem_path = "/etc/puppetlabs/puppet/ssl/certs/ca.pem"
+              scp_from(master, master_ca_pem_path , @cert_cache_dir) unless File.exist?(local_cert_copy)
+              on(host, "mkdir -p #{agent_ca_pem_dir}")
+              scp_to(host, local_cert_copy, agent_ca_pem_dir)
             end
           end
         end
@@ -128,7 +128,14 @@ module Beaker
           use_puppet_ca_cert = host[:use_puppet_ca_cert] || opts[:use_puppet_ca_cert]
 
           if host['platform'] =~ /windows/ then
-            cmd = %Q{powershell -c "cd #{host['working_dir']};[Net.ServicePointManager]::ServerCertificateValidationCallback = {\\$true};\\$webClient = New-Object System.Net.WebClient;\\$webClient.DownloadFile('https://#{master}:8140/packages/current/install.ps1', '#{host['working_dir']}/install.ps1');#{host['working_dir']}/install.ps1 -verbose #{frictionless_install_opts.join(' ')}"}
+            if use_puppet_ca_cert
+              frictionless_install_opts << '-UsePuppetCA'
+              cert_validator = %Q{\\$callback = {param(\\$sender,[System.Security.Cryptography.X509Certificates.X509Certificate]\\$certificate,[System.Security.Cryptography.X509Certificates.X509Chain]\\$chain,[System.Net.Security.SslPolicyErrors]\\$sslPolicyErrors);\\$CertificateType=[System.Security.Cryptography.X509Certificates.X509Certificate2];\\$CACert=\\$CertificateType::CreateFromCertFile('#{host['puppetpath']}/ssl/certs/ca.pem') -as \\$CertificateType;\\$chain.ChainPolicy.ExtraStore.Add(\\$CACert);return \\$chain.Build(\\$certificate)};[Net.ServicePointManager]::ServerCertificateValidationCallback = \\$callback}
+            else
+              cert_validator = '[Net.ServicePointManager]::ServerCertificateValidationCallback = {\\$true}'
+            end
+
+            cmd = %Q{powershell -c "cd #{host['working_dir']};#{cert_validator};\\$webClient = New-Object System.Net.WebClient;\\$webClient.DownloadFile('https://#{master}:8140/packages/current/install.ps1', '#{host['working_dir']}/install.ps1');#{host['working_dir']}/install.ps1 -verbose #{frictionless_install_opts.join(' ')}"}
           else
             curl_opts = %w{--tlsv1 -O}
             if use_puppet_ca_cert

data/lib/beaker-pe/pe-client-tools/executable_helper.rb

@@ -61,6 +61,15 @@ module Beaker
           Private.new.tool(:query, *args, &block)
         end
 
+        # puppet-task helper win/lin/osx
+        # @param [BEAKER::Host] host The SUT that should run the puppet-task command
+        # @param [String] args The arguments to puppet-task
+        # @param [Hash] opts options hash to the Beaker Command
+        # @param [Block] &block optional block
+        def puppet_task_on(*args, &block)
+          Private.new.tool(:task, *args, &block)
+        end
+
         # Logs a user in on a SUT with puppet-access/RBAC API (windows)
         # @param [Beaker::Host] host The SUT to perform the login on
         # @param [Scooter::HttpDispatchers::ConsoleDispatcher] credentialed_dispatcher A Scooter dispatcher that has credentials for the user

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '1.22.0'
+        STRING = '1.23.0'
       end
 
     end

data/spec/beaker-pe/install/pe_utils_spec.rb

@@ -200,22 +200,70 @@ describe ClassMixedWithDSLInstallUtils do
     end
 
     it 'generates a unix PE frictionless install command without cert verification' do
-      expect( subject.frictionless_agent_installer_cmd( host, {}, '2016.4.0' ) ).to eq("FRICTIONLESS_TRACE='true'; export FRICTIONLESS_TRACE; cd /tmp && curl --tlsv1 -O -k https://testmaster:8140/packages/current/install.bash && bash install.bash")
+      expecting = [
+        "FRICTIONLESS_TRACE='true'",
+        "export FRICTIONLESS_TRACE",
+        "cd /tmp && curl --tlsv1 -O -k https://testmaster:8140/packages/current/install.bash && bash install.bash"
+      ].join("; ")
+
+      expect( subject.frictionless_agent_installer_cmd( host, {}, '2016.4.0' ) ).to eq(expecting)
     end
 
     it 'generates a unix PE frictionless install command with cert verification' do
       host['use_puppet_ca_cert'] = true
-      expect( subject.frictionless_agent_installer_cmd( host, {}, '2016.4.0' ) ).to eq("FRICTIONLESS_TRACE='true'; export FRICTIONLESS_TRACE; cd /tmp && curl --tlsv1 -O --cacert /etc/puppetlabs/puppet/ssl/certs/ca.pem https://testmaster:8140/packages/current/install.bash && bash install.bash")
+      expecting = [
+        "FRICTIONLESS_TRACE='true'",
+        "export FRICTIONLESS_TRACE",
+        "cd /tmp && curl --tlsv1 -O --cacert /etc/puppetlabs/puppet/ssl/certs/ca.pem https://testmaster:8140/packages/current/install.bash && bash install.bash"
+      ].join("; ")
+
+      expect( subject.frictionless_agent_installer_cmd( host, {}, '2016.4.0' ) ).to eq(expecting)
     end
 
     it 'generates a unix PE frictionless install command without cert verification on aix' do
       host['platform'] = 'aix-61-power'
-      expect( subject.frictionless_agent_installer_cmd( host, {}, '2016.4.0' ) ).to eq("FRICTIONLESS_TRACE='true'; export FRICTIONLESS_TRACE; cd /tmp && curl --tlsv1 -O https://testmaster:8140/packages/current/install.bash && bash install.bash")
+      expecting = [
+        "FRICTIONLESS_TRACE='true'",
+        "export FRICTIONLESS_TRACE",
+        "cd /tmp && curl --tlsv1 -O https://testmaster:8140/packages/current/install.bash && bash install.bash"
+      ].join("; ")
+
+      expect( subject.frictionless_agent_installer_cmd( host, {}, '2016.4.0' ) ).to eq(expecting)
+    end
+
+    it 'generates a PS1 frictionless install command for windows' do
+      host['platform'] = 'windows-2012-64'
+      expecting = "powershell -c \"" +
+                  [
+                    "cd /tmp",
+                    "[Net.ServicePointManager]::ServerCertificateValidationCallback = {\\$true}",
+                    "\\$webClient = New-Object System.Net.WebClient",
+                    "\\$webClient.DownloadFile('https://testmaster:8140/packages/current/install.ps1', '/tmp/install.ps1')",
+                    "/tmp/install.ps1 -verbose "
+                  ].join(";") +
+                  "\""
+      expect( subject.frictionless_agent_installer_cmd( host, {}, '2016.4.0' ) ).to eq(expecting)
     end
 
     it 'generates a PS1 frictionless install command for windows' do
       host['platform'] = 'windows-2012-64'
-      expect( subject.frictionless_agent_installer_cmd( host, {}, '2016.4.0' ) ).to eq(%q{powershell -c "cd /tmp;[Net.ServicePointManager]::ServerCertificateValidationCallback = {\\$true};\\$webClient = New-Object System.Net.WebClient;\\$webClient.DownloadFile('https://testmaster:8140/packages/current/install.ps1', '/tmp/install.ps1');/tmp/install.ps1 -verbose "})
+      host['puppetpath'] = '/PuppetLabs/puppet/etc'
+      host['use_puppet_ca_cert'] = true
+      expecting = "powershell -c \"" +
+      [
+        "cd /tmp",
+        "\\$callback = {param(\\$sender,[System.Security.Cryptography.X509Certificates.X509Certificate]\\$certificate,[System.Security.Cryptography.X509Certificates.X509Chain]\\$chain,[System.Net.Security.SslPolicyErrors]\\$sslPolicyErrors)",
+        "\\$CertificateType=[System.Security.Cryptography.X509Certificates.X509Certificate2]",
+        "\\$CACert=\\$CertificateType::CreateFromCertFile('/PuppetLabs/puppet/etc/ssl/certs/ca.pem') -as \\$CertificateType",
+        "\\$chain.ChainPolicy.ExtraStore.Add(\\$CACert)",
+        "return \\$chain.Build(\\$certificate)}",
+        "[Net.ServicePointManager]::ServerCertificateValidationCallback = \\$callback",
+        "\\$webClient = New-Object System.Net.WebClient",
+        "\\$webClient.DownloadFile('https://testmaster:8140/packages/current/install.ps1', '#{host['working_dir']}/install.ps1')",
+        "/tmp/install.ps1 -verbose -UsePuppetCA"
+      ].join(";") +
+      "\""
+      expect( subject.frictionless_agent_installer_cmd( host, {}, '2016.4.0' ) ).to eq(expecting)
     end
   end
 
@@ -232,6 +280,7 @@ describe ClassMixedWithDSLInstallUtils do
 
     it 'installs ca.pem if use_puppet_ca_cert is true' do
       host['use_puppet_ca_cert'] = true
+      host['puppetpath'] = '/etc/puppetlabs/puppet'
       expect(Dir).to receive(:mktmpdir).with('master_ca_cert').and_return('/tmp/master_ca_cert_random')
       expect(subject).to receive(:on).with(host, 'mkdir -p /etc/puppetlabs/puppet/ssl/certs')
       expect(subject).to receive(:scp_from).with('testmaster', '/etc/puppetlabs/puppet/ssl/certs/ca.pem', %r{/tmp/master_ca_cert_random})

data/spec/beaker-pe/pe-client-tools/executable_helper_spec.rb

@@ -52,6 +52,12 @@ describe MixedWithExecutableHelper do
     it_behaves_like 'pe-client-tool'
   end
 
+  context 'puppet-task' do
+    let(:tool) {'task'}
+
+    it_behaves_like 'pe-client-tool'
+  end
+
   it 'has a method to login with puppet access' do
     expect(subject.respond_to?('login_with_puppet_access_on')).not_to be(false)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 1.22.0
+  version: 1.23.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-01 00:00:00.000000000 Z
+date: 2017-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec