beaker-pe 2.11.14 → 2.11.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e9b569e250c94eb451c24254d071bb6fef6894f8a88c2935ce971fff81fe67b
-  data.tar.gz: abcf48ef49c6ce13258c4228ffc01ec4b53edac71a05617f5e35da6f0c3d28fe
+  metadata.gz: c2f1158ec22a1984b9cc1169e67201c868534857f11c243ae59a1d337e2abfb5
+  data.tar.gz: abc9ef3725fe4a305a3edbb503a5c48d28934b2539ac1c2cf32a95538059589f
 SHA512:
-  metadata.gz: edd113d5a18fadcba0f7eb2a9e01bd4bd3335973cc2eca1a649e32cf52e1e7936c76430d8b5b27dda0b1ab2d0122d4d97baa4ed1869f902515e4e9f68b07f433
-  data.tar.gz: 7074073427dc6118f5e706eaf600dc8d72b15b8488cb12cc8515e4f52da20a1431fc7b8e7b314e2015e286c7c3d867ea28b7b25e2a3c8de3a25833b9945a7412
+  metadata.gz: 2700a7024284981d6697b97c40b9885ae76616a310ad080eb22e108c9115da6ffd4205071524044023e15bc3cc3ceecc06d2025df5de061c26168a529dfbf2ce
+  data.tar.gz: 782e10c4809d2f81438f06fc653dd94d420f1c6f34a9a00e9cce1c4ad453ba521e79a49574111fbd3585083e7461c97f2c3476f707b4f84388c5285bc1a940b2

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

@@ -422,12 +422,12 @@ module Beaker
           end
 
           if (host['roles'].include?('master') || host['roles'].include?('pe_postgres')) && version_is_less(host[:pe_ver], '2019.8.5') && hosts.any? {|agent| agent['platform'] =~ /(debian)|(ubuntu)|(sles)/}
-            on(master, "rm -f #{path_to_gpg_key}")
-            on(master, "curl #{gpg_url} --output #{path_to_gpg_key}")
+            on(host, "rm -f #{path_to_gpg_key}")
+            on(host, "curl #{gpg_url} --output #{path_to_gpg_key}")
             if location == 'pe_repo'
               gpg_key_overwrite(host, 'pe_repo_env')
             elsif location == 'pe_repo_env'
-              on master, puppet('agent -t'), :acceptable_exit_codes => [0,2]
+              on host, puppet('agent -t'), :acceptable_exit_codes => [0,2]
             end
           end
         end
@@ -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,7 +2085,15 @@ module Beaker
                end
              end
 
-             gpg_key_overwrite(master, 'pe_repo')
+            # 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.14'
+        STRING = '2.11.17'
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 2.11.14
+  version: 2.11.17
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-20 00:00:00.000000000 Z
+date: 2022-03-16 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!