Merge pull request #110 from Sashwat-K/Sashwat-K-6

feat: update provider, contract schema and encryption cert for REV 15 release
ibm-hyper-protect · Mar 15, 2024 · a1195eb · a1195eb
2 parents 2bde2d1 + 2e83186
commit a1195eb
Show file tree

Hide file tree

Showing 7 changed files with 8,169 additions and 8 deletions.
diff --git a/data/data.go b/data/data.go
@@ -17,8 +17,8 @@ import (
 	_ "embed"
 )
 
-//go:embed ibm-hyper-protect-container-runtime-1-0-s390x-13-encrypt.crt
+//go:embed ibm-hyper-protect-container-runtime-1-0-s390x-15-encrypt.crt
 var DefaultCertificate string
 
-//go:embed hpse-contract-schema-1.0.51.json
+//go:embed hpse-contract-schema-1.0.56.json
 var ContractSchema string
diff --git a/data/hpse-contract-schema-1.0.56.json b/data/hpse-contract-schema-1.0.56.json
diff --git a/data/ibm-hyper-protect-container-runtime-1-0-s390x-15-encrypt.crt b/data/ibm-hyper-protect-container-runtime-1-0-s390x-15-encrypt.crt
@@ -0,0 +1,40 @@
+-----BEGIN CERTIFICATE-----
+MIIHGzCCBQOgAwIBAgIRAOUeQLnztZgcFo6vOEzC9CEwDQYJKoZIhvcNAQENBQAw
+gZ0xCzAJBgNVBAYTAlVTMREwDwYDVQQIEwhOZXcgWW9yazEPMA0GA1UEBxMGQXJt
+b25rMTQwMgYDVQQKEytJbnRlcm5hdGlvbmFsIEJ1c2luZXNzIE1hY2hpbmVzIENv
+cnBvcmF0aW9uMTQwMgYDVQQDEytJbnRlcm5hdGlvbmFsIEJ1c2luZXNzIE1hY2hp
+bmVzIENvcnBvcmF0aW9uMB4XDTI0MDMwODEwMTQwMFoXDTI1MDMwODEwMTQxMFow
+ga4xCzAJBgNVBAYTAklOMQswCQYDVQQIEwJLQTESMBAGA1UEBxMJQmFuZ2Fsb3Jl
+MRowGAYDVQQKExFJQk0gSW5kaWEgUHZ0IEx0ZDEkMCIGA1UECxMbSUJNIFogSHli
+cmlkIENsb3VkIFBsYXRmb3JtMTwwOgYDVQQDEzNIeXBlciBQcm90ZWN0IENvbnRh
+aW5lciBSdW50aW1lIENvbnRyYWN0IEVuY3J5cHRpb24wggIiMA0GCSqGSIb3DQEB
+AQUAA4ICDwAwggIKAoICAQCubgd30MRwRlCtjkKnda+6qJcCnUlWpQM+bR+s3rGX
+cXy3RtLHUHnfJ27LcusNyxK25mx+sAF6ecNyE4YSvwY+boF69lcAV4X1/t4ONPS9
+f0jSPvY5v6dEyFgCwvF3sDks/5eOel1gcdG31pfLBays1ZgZtE9cedOHtvoHpzsX
+UccL9FaCQL+l7Ixp2bGaodNuvKu+YPqVTKbWkNwAo5dxJ8yN2kGmW1pP25ZFKba9
+S/nU2ume1Ls3JMI2r0AJl4mz7B1i/Gy3s638Rt29zDnkuJCpdEnbFMB/IGzf1VMo
+wt0UTfwDHxbCb86ilZFNqwvkUOSHGt0hpr8C3SyzLl1kxyZrbgApWrFMINTjWFS0
+S0Ux8WNlMPxr6MttkwFTGDI2vznaRGAPop2uITZpyisEaqLaDOBRpz1iNG8V1QAX
+Tv2SQr/hTNZSlS1qGEE3DU84AHNV570i79/gvORYZ/jsydW1/JMP1I8MulIL/rh8
+XGMIln+JxiZGfNYjsmnNsbjEjheBEamnZIUCzivDn+y93fOezRYrABEBEC29mp6G
+ZQYmTNHFzzD0AnYF8FFqSsbIrqYvPawSYgNPfbku1jgCArsPaE1UvCW/zAZp9mUj
+1Om9EYLgxRqAlKYtiRSy5d7svLVqPK1HdUjinXgb/IFnf9iMb2gYMx+Kj1VJ8ORG
+BQIDAQABo4IBQTCCAT0wgZMGA1UdHwSBizCBiDBCoECgPoY8aHR0cHM6Ly9pYm0u
+Yml6L2h5cGVyLXByb3RlY3QtY29udGFpbmVyLXJ1bnRpbWUtMDIzQkM5LWNybC0x
+MEKgQKA+hjxodHRwczovL2libS5iaXovaHlwZXItcHJvdGVjdC1jb250YWluZXIt
+cnVudGltZS0wMjNCQzktY3JsLTIwgaQGCCsGAQUFBwEBBIGXMIGUMEgGCCsGAQUF
+BzAChjxodHRwczovL2libS5iaXovaHlwZXItcHJvdGVjdC1jb250YWluZXItcnVu
+dGltZS0wMjNCQzktY3J0LTEwSAYIKwYBBQUHMAKGPGh0dHBzOi8vaWJtLmJpei9o
+eXBlci1wcm90ZWN0LWNvbnRhaW5lci1ydW50aW1lLTAyM0JDOS1jcnQtMjANBgkq
+hkiG9w0BAQ0FAAOCAgEAM7OJYBtUCMvWaN2PnK4D4hQF2OVkpZmbvPZbsEg1QGw8
+lzPg2I/QofFYV0d3zbAQWqkLM+KyGIsijIOhHyW5PfznhX06AeSou6BCEh7mxUaB
+aW0fUCR3o8bQgVEn8HYGcIpIhIKNsscRnLF4q7pepNb2K36krN/PISMK06wUh3qs
+wShR81xJ1LiIsfX8BpzUQzBNVNHSpeFmA4keC1NZNW8LSLKZrcPlImmZXfCVj7dM
+k9jwc1gCDfo2ivEnVZEq+CURa2P6yF6CAIRo1l0AJJyim55BfwtK4Pt3An1cAcT5
+zcBjfPB9EPpQwZFekw5uSMGFzbmQs1oveZ9xbpB0DX2qA4Bhw38OKJq4u3RssY/i
+FnWEHSsrTu4BR+bpj88oSHWix7Vm2CkK8TISn/1ljZLoASqo/WkpMq9Nk7SHvYZ2
+88Uw9QM3umhLcmLynhe2dU3TfskXyMxsInCf9c/BKhRA5YsEjccwUMx/Ua7Lj3CL
+s62AObcktyotMYx3CtpTO7ysYmwwVsHLcgj4dqqYKdJU0vaD8bJNx2MYS7kZYBBt
+c+oVkm6HnUEqN1jsyBE65Gpb6oa1hugRZNXqDK5UXR9bXWE2PrN/+eMIJGqNg7oW
+V+HUbd7EwRhTbFtr/yaUrAJjX3Qlgf7aNQ8GfUDU+hj/Hh0GIY0Vtpm6BGB3F+Y=
+-----END CERTIFICATE-----
diff --git a/datasource/datasource_image.go b/datasource/datasource_image.go
@@ -87,7 +87,7 @@ var (
 	)
 
 	// reHyperProtectOS tests if this is a hyper protect image
-	reHyperProtectOS = regexp.MustCompile(`^hyper-protect-[\w-]+-s390x$`)
+	reHyperProtectOS = regexp.MustCompile(`^hyper-protect-[\w-]+-s390x-hpcr$`)
 
 	// reHyperProtectVersion tests if the name references a valid hyper protect version
 	reHyperProtectName = regexp.MustCompile(`^ibm-hyper-protect-container-runtime-(\d+)-(\d+)-s390x-(\d+)$`)

diff --git a/datasource/datasource_image_test.go b/datasource/datasource_image_test.go
@@ -38,7 +38,7 @@ func TestParseImages(t *testing.T) {
 }
 
 func TestReHyperProtectOS(t *testing.T) {
-	assert.True(t, reHyperProtectOS.MatchString("hyper-protect-1-0-s390x"))
+	assert.True(t, reHyperProtectOS.MatchString("hyper-protect-1-0-s390x-hpcr"))
 }
 
 func TestReHyperProtectName(t *testing.T) {

diff --git a/datasource/samples/images.json b/datasource/samples/images.json
@@ -14,7 +14,7 @@
         "encryption_key": "",
         "id": "r042-45544dce-eff3-42dc-b149-6a33c2764e2d",
         "name": "ibm-hyper-protect-container-runtime-1-0-s390x-8",
-        "os": "hyper-protect-1-0-s390x",
+        "os": "hyper-protect-1-0-s390x-hpcr",
         "source_volume": "",
         "status": "available",
         "visibility": "public"
@@ -34,7 +34,7 @@
         "encryption_key": "",
         "id": "r042-ce1852ed-6e1c-49f2-bf60-5822ac27501e",
         "name": "ibm-hyper-protect-container-runtime-1-0-s390x-7",
-        "os": "hyper-protect-1-0-s390x",
+        "os": "hyper-protect-1-0-s390x-hpcr",
         "source_volume": "",
         "status": "available",
         "visibility": "public"

diff --git a/example/images.json b/example/images.json
@@ -14,7 +14,7 @@
         "encryption_key": "",
         "id": "r042-45544dce-eff3-42dc-b149-6a33c2764e2d",
         "name": "ibm-hyper-protect-container-runtime-1-0-s390x-8",
-        "os": "hyper-protect-1-0-s390x",
+        "os": "hyper-protect-1-0-s390x-hpcr",
         "source_volume": "",
         "status": "available",
         "visibility": "public"
@@ -34,7 +34,7 @@
         "encryption_key": "",
         "id": "r042-ce1852ed-6e1c-49f2-bf60-5822ac27501e",
         "name": "ibm-hyper-protect-container-runtime-1-0-s390x-7",
-        "os": "hyper-protect-1-0-s390x",
+        "os": "hyper-protect-1-0-s390x-hpcr",
         "source_volume": "",
         "status": "available",
         "visibility": "public"