beaker-pe 2.11.15 → 2.11.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 324a9d18893ffc429e8ac5dd4539df131a61b3317c0993ce5c69945d836dea14
-  data.tar.gz: 283b5c762fb1f8918a46f743cd07f0b700cb28c94046a9f1f0b99efeea068c38
+  metadata.gz: 1d1413bb33ad2872c13f73139d7c84890259cc831db06d0d34b93e98f3f86416
+  data.tar.gz: 945f17cf188d4a0eaf282da3db6e0a851397fcd177d74fc43c184a3e5418e9e6
 SHA512:
-  metadata.gz: 07bd5f9ef9c47d1af9c7b2df095ecdcc0e3c190181a9043171428c43685f1d7fe238e02886b120bdb4e950ed483084ea09b95fcd5742c2fc2bb32740ba967823
-  data.tar.gz: dbc42764185aad94c793e0d66c6007a3db6b29e5b71e4e07b853196526132a6cb74ad95565f354a57016e4192a8a7af80684a8f6136c3ca8c3dedf21e0205d2f
+  metadata.gz: f9214eb375767886803d62479a46a86d5dcce7531be74124bac6a3c3f352ab3e59fe67c2b22b77dc6414d959e02562c24eee88f7c208bfea996d1123f9367513
+  data.tar.gz: ca87fd01f4350efc2b5bf7438215b443ee06f2215ed2edbddf6d31f691bbdc22bf7ac85a3a55f31fa6351d58bffc9c250a8b7242220af82173b01e5f3d2dbc96

data/.github/workflows/snyk_merge.yaml

@@ -0,0 +1,30 @@
+---
+name: Snyk Scan
+on: push
+
+# Note: if your workflow involves working from branches
+# on the puppetlabs repos directly rather from a fork
+# you will probably want to use the below for events to
+# reduce the reporting noise.
+# on:
+#   push:
+#     branches:
+#       - main
+
+jobs:
+  security:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: setup ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7
+      - name: create lock
+        run: bundle lock
+      - name: Run Snyk to check for vulnerabilities
+        uses: snyk/actions/ruby@master
+        env:
+          SNYK_TOKEN: ${{ secrets.SNYK_FOSS_KEY }}
+        with:
+          command: monitor

data/CODEOWNERS

@@ -1,5 +1,5 @@
 #This Repository is maintained by both the beaker, installer, and Night's Watch teams, depending on the location of the changes
-* @puppetlabs/beaker
+* @puppetlabs/dio
 /lib/beaker-pe/install @puppetlabs/installer-and-management
 /lib/beaker-pe/pe-client-tools @puppetlabs/night-s-watch
 /spec/beaker-pe/install @puppetlabs/installer-and-management

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

@@ -209,7 +209,7 @@ module Beaker
               protocol_to_use = '[System.Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12'
             end
 
-            cmd = %Q{powershell -c "cd #{host['working_dir']};#{protocol_to_use};#{cert_validator};\\$webClient = New-Object System.Net.WebClient;\\$webClient.DownloadFile('https://#{downloadhost}:8140/packages/current/install.ps1', '#{host['working_dir']}/install.ps1');#{host['working_dir']}/install.ps1 -verbose #{frictionless_install_opts.join(' ')}"}
+            cmd = %Q{powershell -NoProfile -NonInteractive -NoLogo -ExecutionPolicy Bypass -c "cd #{host['working_dir']};#{protocol_to_use};#{cert_validator};\\$webClient = New-Object System.Net.WebClient;\\$webClient.DownloadFile('https://#{downloadhost}:8140/packages/current/install.ps1', '#{host['working_dir']}/install.ps1');#{host['working_dir']}/install.ps1 -verbose #{frictionless_install_opts.join(' ')}"}
           else
             curl_opts = %w{-O}
             if version_is_less(pe_version, '2019.1.0') || require_tlsv1?(host)
@@ -884,6 +884,7 @@ module Beaker
           end
 
           install_hosts.each do |host|
+            solaris_key_chain_fix
 
             if agent_only_check_needed && hosts_agent_only.include?(host) || install_via_msi?(host)
               host['type'] = 'aio'
@@ -1332,6 +1333,60 @@ module Beaker
           answers
         end
 
+        # If installing older versions of solaris, make sure the DigiCert cert is added to the keychain
+        def solaris_key_chain_fix
+digicert = <<-EOM
+-----BEGIN CERTIFICATE-----
+MIIFkDCCA3igAwIBAgIQBZsbV56OITLiOQe9p3d1XDANBgkqhkiG9w0BAQwFADBi
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSEwHwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3Qg
+RzQwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1MTIwMDAwWjBiMQswCQYDVQQGEwJV
+UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQu
+Y29tMSEwHwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwggIiMA0GCSqG
+SIb3DQEBAQUAA4ICDwAwggIKAoICAQC/5pBzaN675F1KPDAiMGkz7MKnJS7JIT3y
+ithZwuEppz1Yq3aaza57G4QNxDAf8xukOBbrVsaXbR2rsnnyyhHS5F/WBTxSD1If
+xp4VpX6+n6lXFllVcq9ok3DCsrp1mWpzMpTREEQQLt+C8weE5nQ7bXHiLQwb7iDV
+ySAdYyktzuxeTsiT+CFhmzTrBcZe7FsavOvJz82sNEBfsXpm7nfISKhmV1efVFiO
+DCu3T6cw2Vbuyntd463JT17lNecxy9qTXtyOj4DatpGYQJB5w3jHtrHEtWoYOAMQ
+jdjUN6QuBX2I9YI+EJFwq1WCQTLX2wRzKm6RAXwhTNS8rhsDdV14Ztk6MUSaM0C/
+CNdaSaTC5qmgZ92kJ7yhTzm1EVgX9yRcRo9k98FpiHaYdj1ZXUJ2h4mXaXpI8OCi
+EhtmmnTK3kse5w5jrubU75KSOp493ADkRSWJtppEGSt+wJS00mFt6zPZxd9LBADM
+fRyVw4/3IbKyEbe7f/LVjHAsQWCqsWMYRJUadmJ+9oCw++hkpjPRiQfhvbfmQ6QY
+uKZ3AeEPlAwhHbJUKSWJbOUOUlFHdL4mrLZBdd56rF+NP8m800ERElvlEFDrMcXK
+chYiCd98THU/Y+whX8QgUWtvsauGi0/C1kVfnSD8oR7FwI+isX4KJpn15GkvmB0t
+9dmpsh3lGwIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
+hjAdBgNVHQ4EFgQU7NfjgtJxXWRM3y5nP+e6mK4cD08wDQYJKoZIhvcNAQEMBQAD
+ggIBALth2X2pbL4XxJEbw6GiAI3jZGgPVs93rnD5/ZpKmbnJeFwMDF/k5hQpVgs2
+SV1EY+CtnJYYZhsjDT156W1r1lT40jzBQ0CuHVD1UvyQO7uYmWlrx8GnqGikJ9yd
++SeuMIW59mdNOj6PWTkiU0TryF0Dyu1Qen1iIQqAyHNm0aAFYF/opbSnr6j3bTWc
+fFqK1qI4mfN4i/RN0iAL3gTujJtHgXINwBQy7zBZLq7gcfJW5GqXb5JQbZaNaHqa
+sjYUegbyJLkJEVDXCLG4iXqEI2FCKeWjzaIgQdfRnGTZ6iahixTXTBmyUEFxPT9N
+cCOGDErcgdLMMpSEDQgJlxxPwO5rIHQw0uA5NBCFIRUBCOhVMt5xSdkoF1BN5r5N
+0XWs0Mr7QbhDparTwwVETyw2m+L64kW4I1NsBm9nVX9GtUw/bihaeSbSpKhil9Ie
+4u1Ki7wb/UdKDd9nZn6yW0HQO+T0O/QEY+nvwlQAUaCKKsnOeMzV6ocEGLPOr0mI
+r/OSmbaz5mEP0oUA51Aa5BuVnRmhuZyxm7EAHu/QD09CbMkKvO5D+jpxpchNJqU1
+/YldvIViHTLSoCtU7ZpXwdv6EM8Zt4tKG48BtieVU+i2iW1bvGjUI+iLUaJW+fCm
+gKDWHrO8Dw9TdSmq6hN35N6MgSGtBxBHEa2HPQfRdbzP82Z+
+-----END CERTIFICATE-----
+EOM
+          hosts.each do |host|
+            if host.platform=~ /solaris-11(\.2)?-(i386|sparc)/
+              create_remote_file(host, "DigiCertTrustedRootG4.crt.pem", digicert)
+              on(host, 'chmod a+r /root/DigiCertTrustedRootG4.crt.pem')
+              on(host, 'cp -p /root/DigiCertTrustedRootG4.crt.pem /etc/certs/CA/')
+              on(host, 'rm /root/DigiCertTrustedRootG4.crt.pem')
+              on(host, '/usr/sbin/svcadm restart /system/ca-certificates')
+              timeout = 60
+              counter = 0
+              while on(host, 'svcs -x ca-certificates').output !~ /State: online/ do
+                raise 'ca-certificates services failed start up' if counter > timeout
+                sleep 5
+                counter = counter + 5
+              end
+            end
+          end
+        end
+
         # Builds the agent_only and not_agent_only arrays needed for installation.
         #
         # @param [Array<Host>]          hosts hosts to split up into the arrays
@@ -2016,6 +2071,7 @@ module Beaker
         # @param [Array] agent only nodes from Beaker hosts
         # @param [Hash] opts The Beaker options hash
         def install_agents_only_on(agent_nodes, opts)
+          solaris_key_chain_fix
           unless agent_nodes.empty?
             configure_type_defaults_on(agent_nodes)
 
@@ -2029,9 +2085,15 @@ module Beaker
                end
              end
 
-             if hosts.any? {|host| host['roles'].include?('pe_postgres')}
-               gpg_key_overwrite(pe_postgres, 'pe_repo')
-             end
+            # pe_postgres node needs new gpg key
+            if hosts.any? {|host| host['roles'].include?('pe_postgres')}
+              gpg_key_overwrite(pe_postgres, 'pe_repo')
+            end
+
+            # pe_repo needs updated with gpg key if sles/ubuntu/debian agent will be used
+            if hosts.any? {|host| host['platform'] =~ /(sles)|(ubuntu)|(debian)/}
+              gpg_key_overwrite(master, 'pe_repo')
+            end
 
              step "Install agents" do
                block_on(agent_nodes, {:run_in_parallel => true}) do |host|

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '2.11.15'
+        STRING = '2.11.18'
       end
 
     end

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

@@ -272,7 +272,7 @@ describe ClassMixedWithDSLInstallUtils do
     it 'generates a PS1 frictionless install command for windows' do
       host['platform'] = 'windows-2012-64'
       protocol = ''
-      expecting = "powershell -c \"" +
+      expecting = "powershell -NoProfile -NonInteractive -NoLogo -ExecutionPolicy Bypass -c \"" +
                   [
                     "cd /tmp",
                     "#{protocol}",
@@ -290,7 +290,7 @@ describe ClassMixedWithDSLInstallUtils do
       host['puppetpath'] = '/PuppetLabs/puppet/etc'
       host['use_puppet_ca_cert'] = true
       protocol = ''
-      expecting = "powershell -c \"" +
+      expecting = "powershell -NoProfile -NonInteractive -NoLogo -ExecutionPolicy Bypass -c \"" +
       [
         "cd /tmp",
         "#{protocol}",
@@ -311,7 +311,7 @@ describe ClassMixedWithDSLInstallUtils do
     it 'generates a PS1 frictionless install command for windows with Tls12 protocol' do
       host['platform'] = 'windows-20012-64'
       protocol = '[System.Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12'
-      expecting = "powershell -c \"" +
+      expecting = "powershell -NoProfile -NonInteractive -NoLogo -ExecutionPolicy Bypass -c \"" +
                   [
                     "cd /tmp",
                     "#{protocol}",
@@ -327,7 +327,7 @@ describe ClassMixedWithDSLInstallUtils do
     it 'generates a PS1 frictionless install command for windows-2008 without Tls12 protocol' do
       host['platform'] = 'windows-2008-64'
       protocol = ''
-      expecting = "powershell -c \"" +
+      expecting = "powershell -NoProfile -NonInteractive -NoLogo -ExecutionPolicy Bypass -c \"" +
                   [
                     "cd /tmp",
                     "#{protocol}",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 2.11.15
+  version: 2.11.18
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-20 00:00:00.000000000 Z
+date: 2022-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -249,6 +249,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/dependabot.yml"
+- ".github/workflows/snyk_merge.yaml"
 - ".gitignore"
 - ".rspec"
 - ".simplecov"
@@ -307,7 +308,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.9
 signing_key: 
 specification_version: 4
 summary: Beaker PE DSL Helpers!