From 57d9b2c0a7956306e54234233b8330628ac9f960 Mon Sep 17 00:00:00 2001 From: Piotr Marcinkiewicz Date: Fri, 16 Jul 2021 14:53:14 +0200 Subject: [OOM-K8S-CERT-EXTERNAL-PROVIDER] Refactor provider code - add csr and key params to SignCertificateModel - correct handling error when signing csr fails - create factory for SignCertificateModel Issue-ID: OOM-2753 Signed-off-by: Piotr Marcinkiewicz Change-Id: I9bc296dfc999de0390ec90a00cbaa9dd82c89265 --- .../src/cmpv2provisioner/cmpv2_provisioner_test.go | 25 +++++++++------------- 1 file changed, 10 insertions(+), 15 deletions(-) (limited to 'certServiceK8sExternalProvider/src/cmpv2provisioner/cmpv2_provisioner_test.go') diff --git a/certServiceK8sExternalProvider/src/cmpv2provisioner/cmpv2_provisioner_test.go b/certServiceK8sExternalProvider/src/cmpv2provisioner/cmpv2_provisioner_test.go index 1a066657..e0b0c2e9 100644 --- a/certServiceK8sExternalProvider/src/cmpv2provisioner/cmpv2_provisioner_test.go +++ b/certServiceK8sExternalProvider/src/cmpv2provisioner/cmpv2_provisioner_test.go @@ -21,7 +21,6 @@ package cmpv2provisioner import ( - "context" "testing" "time" @@ -77,19 +76,17 @@ func Test_shouldReturnCorrectSignedPemsWhenParametersAreCorrectForCertificateReq testdata.VerifyThatConditionIsTrue(ok, "Provisioner could not be loaded", t) - ctx := context.Background() request := createCertificateRequest() privateKeyBytes := getPrivateKeyBytes() signCertificateModel := model.SignCertificateModel{ - CertificateRequest: request, - PrivateKeyBytes: privateKeyBytes, - IsUpdateRevision: false, - OldCertificate: "", - OldPrivateKey: "", + CertificateRequest: request, + PrivateKeyBytes: privateKeyBytes, + OldCertificateBytes: []byte{}, + OldPrivateKeyBytes: []byte{}, } - signedPEM, trustedCAs, err := provisioner.Sign(ctx, signCertificateModel) + signedPEM, trustedCAs, err := provisioner.Sign(signCertificateModel) assert.Nil(t, err) @@ -108,19 +105,17 @@ func Test_shouldReturnCorrectSignedPemsWhenParametersAreCorrectForUpdateCertific testdata.VerifyThatConditionIsTrue(ok, "Provisioner could not be loaded", t) - ctx := context.Background() request := createCertificateRequest() privateKeyBytes := getPrivateKeyBytes() signCertificateModel := model.SignCertificateModel{ - CertificateRequest: request, - PrivateKeyBytes: privateKeyBytes, - IsUpdateRevision: true, - OldCertificate: testdata.OldCertificateEncoded, - OldPrivateKey: testdata.OldPrivateKeyEncoded, + CertificateRequest: request, + PrivateKeyBytes: privateKeyBytes, + OldCertificateBytes: testdata.OldCertificateBytes, + OldPrivateKeyBytes: testdata.OldPrivateKeyBytes, } - signedPEM, trustedCAs, err := provisioner.Sign(ctx, signCertificateModel) + signedPEM, trustedCAs, err := provisioner.Sign(signCertificateModel) assert.Nil(t, err) -- cgit 1.2.3-korg