summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn <john.mccrae@progress.com>2023-04-24 09:02:44 -0700
committerJohn <john.mccrae@progress.com>2023-04-24 14:39:04 -0700
commit2749b5622433e19b83cfafeddf35ba697de31ab5 (patch)
treeb07966b5d697343947f3bfec5cab2717bbd1f31e
parent071f1cd943c1651a5eba039d53f5ea68450b6cd6 (diff)
downloadchef-2749b5622433e19b83cfafeddf35ba697de31ab5.tar.gz
Updated opscode.com cert now too, taken from the recent update to Chef-16
Signed-off-by: John <john.mccrae@progress.com>
-rw-r--r--.github/workflows/kitchen.yml2
-rw-r--r--kitchen-tests/cookbooks/end_to_end/recipes/_chef_client_trusted_certificate.rb42
-rw-r--r--spec/data/trusted_certs/opscode.pem2
3 files changed, 27 insertions, 19 deletions
diff --git a/.github/workflows/kitchen.yml b/.github/workflows/kitchen.yml
index 6ef05c8b35..63b192f1e3 100644
--- a/.github/workflows/kitchen.yml
+++ b/.github/workflows/kitchen.yml
@@ -49,6 +49,8 @@ jobs:
If ($lastexitcode -ne 0) { Exit $lastexitcode }
- name: 'Run end_to_end::default recipe'
id: run
+ with:
+ bundler-cache: false
run: |
cd kitchen-tests
$env:PATH = "C:\opscode\chef\bin;C:\opscode\chef\embedded\bin;" + $env:PATH
diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/_chef_client_trusted_certificate.rb b/kitchen-tests/cookbooks/end_to_end/recipes/_chef_client_trusted_certificate.rb
index 617f480a44..ecd5ef7aea 100644
--- a/kitchen-tests/cookbooks/end_to_end/recipes/_chef_client_trusted_certificate.rb
+++ b/kitchen-tests/cookbooks/end_to_end/recipes/_chef_client_trusted_certificate.rb
@@ -1,25 +1,31 @@
chef_client_trusted_certificate "self-signed.badssl.com" do
certificate <<~CERT
-----BEGIN CERTIFICATE-----
-MIIDeTCCAmGgAwIBAgIJAK31pnMwlr+TMA0GCSqGSIb3DQEBCwUAMGIxCzAJBgNV
+MIIEnTCCAoWgAwIBAgIJAI7EiWecd+VOMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNV
BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp
-c2NvMQ8wDQYDVQQKDAZCYWRTU0wxFTATBgNVBAMMDCouYmFkc3NsLmNvbTAeFw0y
-MzAzMjgyMjExMjlaFw0yNTAzMjcyMjExMjlaMGIxCzAJBgNVBAYTAlVTMRMwEQYD
-VQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2NvMQ8wDQYDVQQK
-DAZCYWRTU0wxFTATBgNVBAMMDCouYmFkc3NsLmNvbTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAMIE7PiM7gTCs9hQ1XBYzJMY61yoaEmwIrX5lZ6xKyx2
-PmzAS2BMTOqytMAPgLaw+XLJhgL5XEFdEyt/ccRLvOmULlA3pmccYYz2QULFRtMW
-hyefdOsKnRFSJiFzbIRMeVXk0WvoBj1IFVKtsyjbqv9u/2CVSndrOfEk0TG23U3A
-xPxTuW1CrbV8/q71FdIzSOciccfCFHpsKOo3St/qbLVytH5aohbcabFXRNsKEqve
-ww9HdFxBIuGa+RuT5q0iBikusbpJHAwnnqP7i/dAcgCskgjZjFeEU4EFy+b+a1SY
-QCeFxxC7c3DvaRhBB0VVfPlkPz0sw6l865MaTIbRyoUCAwEAAaMyMDAwCQYDVR0T
-BAIwADAjBgNVHREEHDAaggwqLmJhZHNzbC5jb22CCmJhZHNzbC5jb20wDQYJKoZI
-hvcNAQELBQADggEBAB0wBgQ+U7ULnZd0JOxTUDUPtnUYQhKLx02yhCBuvSBfM+t0
-NYBk00hgzrzdJrr2mpn35y7hfKBzYztaADPqiE/n52D1D/aYbUv+VFJYPYJbsokT
-0ECaNk0uiW5cPm/ylW+oAA+o15ninMQUJJn/93ZhlkNj8ISP2awHXN9dSUfXBAbh
-jA+0SBJ7szXha0sElaPEFkieLhETR+CzSt311U8h1sGVMdkGqamwuj/TqlHhW8Np
-8F1Nk4DGHmJVoYDzHr+dgdpSUMfrvfWyegr1IOYZQBSxNnVjWvsS8EK5i1/EAqIt
-tSaKKu926MPPIQT/EX9tB8epAtTbyqgBABmAU6Y=
+c2NvMQ8wDQYDVQQKDAZCYWRTU0wxMTAvBgNVBAMMKEJhZFNTTCBDbGllbnQgUm9v
+dCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMjMwNDI0MDAwMTQ0WhcNMjUwNDIz
+MDAwMTQ0WjBvMQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQG
+A1UEBwwNU2FuIEZyYW5jaXNjbzEPMA0GA1UECgwGQmFkU1NMMSIwIAYDVQQDDBlC
+YWRTU0wgQ2xpZW50IENlcnRpZmljYXRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAxzdfEeseTs/rukjly6MSLHM+Rh0enA3Ai4Mj2sdl31x3SbPoen08
+utVhjPmlxIUdkiMG4+ffe7N+JtDLG75CaxZp9CxytX7kywooRBJsRnQhmQPca8MR
+WAJBIz+w/L+3AFkTIqWBfyT+1VO8TVKPkEpGdLDovZOmzZAASi9/sj+j6gM7AaCi
+DeZTf2ES66abA5pOp60Q6OEdwg/vCUJfarhKDpi9tj3P6qToy9Y4DiBUhOct4MG8
+w5XwmKAC+Vfm8tb7tMiUoU0yvKKOcL6YXBXxB2kPcOYxYNobXavfVBEdwSrjQ7i/
+s3o6hkGQlm9F7JPEuVgbl/Jdwa64OYIqjQIDAQABoy0wKzAJBgNVHRMEAjAAMBEG
+CWCGSAGG+EIBAQQEAwIHgDALBgNVHQ8EBAMCBeAwDQYJKoZIhvcNAQELBQADggIB
+ACa+9LOj2+z3iKIxJDoKxwPu0oUjQCHI2Gj7Kk5pdh7r1Lc8R9gusKbkMNjuRXmq
+S1XI516A4iccw5riZXLSo/tiVJGyQySbXmtKbvRfIHCQ9NttZc8fPXf2Y85k1h/B
+nGxzmNI+iEBi1FJ55W9dNC6EBXb2DTj8e2+FwRrH7B4yfcLWXhj2mufoZasiSjtY
+LRKIh8NPH9FdJp9kWeRIEtm7dFBBfRGrPdB8QuBq00n3YYBU/aIegHUPYAVxcXdE
+CTVIAPtkvyh7XzB9h4/3Sc9pL6z8vmNR1DCzM2X3ojkFFEgTjHR5vpMyIWWE49y5
+FMU9yHQD14P9URTtAaeESmw46/+2SbQisNkl7lhxzKRf5Wlza2QMS28G9FY4tEsv
+l/aM+rW8FXkP7uWDY0TPOlR9LQoz4oqWYuZCwD9Q4PcCWqR1CfQ74Geo4j7OFqJj
+XkVN10jurG9m1xG7rqOVmNRFoVhgDlFeao+5LySXG+rJl//0FVKHoR9VeX/52nhs
+OPTL5EbpWvDmIoBGus7jHE04YSOMAJ7/9H88EjH5Qusf+c1MlUXbDGkcub5NG8S6
+eyoz/w+I2xeAmd5llIj5hA34W1YHkT5mHNa4ekJCvLHxyaNrCACd0mzizSKOBxcw
+Ea8zQ5JbgtfAfJ5Arikxey3B3qFtHxkJ7rgSIH4+kohL
-----END CERTIFICATE-----
CERT
end
diff --git a/spec/data/trusted_certs/opscode.pem b/spec/data/trusted_certs/opscode.pem
index 3f2b029ec7..61f53b8952 100644
--- a/spec/data/trusted_certs/opscode.pem
+++ b/spec/data/trusted_certs/opscode.pem
@@ -33,4 +33,4 @@ guRFa7LrJf2AXh05kL5bQvbOkWDj+aBWDEgQzjNoe82Tq/Bqy09YD7l7XRsEgZ6n
IuJXSSfukpMIvmkIUwI6Ll3IGfRQgE4C2bBdkbSTh/mWloFVQI5m7YLYuyhf7Uxh
7QZYKBlTEUS8RyApsgRs2IlUmTt122d4LB6SeMZVPVgSETJuvUMMTTTbe8ZC2+y+
q5thTAaS447fISpQVwTAYKI11SSeZjcJSc/V+GWz4OJuwg==
------END CERTIFICATE----- \ No newline at end of file
+-----END CERTIFICATE-----