[OOM-K8S-CERT-EXTERNAL-PROVIDER] Refactor provider code

[oom/platform/cert-service.git] / certServiceK8sExternalProvider / src / cmpv2controller / util / certificate_update_util_test.go

diff --git a/certServiceK8sExternalProvider/src/cmpv2controller/util/certificate_update_util_test.go b/certServiceK8sExternalProvider/src/cmpv2controller/util/certificate_update_util_test.go
index 7dbbbe7..f900527 100644 (file)
--- a/certServiceK8sExternalProvider/src/cmpv2controller/util/certificate_update_util_test.go
+++ b/certServiceK8sExternalProvider/src/cmpv2controller/util/certificate_update_util_test.go
@@ -25,20 +25,16 @@
 package util
 
 import (
-       "encoding/base64"
        "fmt"
        "testing"
 
        cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1"
        "github.com/stretchr/testify/assert"
-       v1 "k8s.io/api/core/v1"
-       metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
        "onap.org/oom-certservice/k8s-external-provider/src/testdata"
        "sigs.k8s.io/controller-runtime/pkg/client/fake"
 )
 
 const (
-       oldCertificateConfig = "{\"apiVersion\":\"cert-manager.io/v1\",\"kind\":\"Certificate\",\"metadata\":{\"annotations\":{},\"name\":\"cert-test\",\"namespace\":\"onap\"},\"spec\":{\"commonName\":\"certissuer.onap.org\",\"dnsNames\":[\"localhost\",\"certissuer.onap.org\"],\"emailAddresses\":[\"onap@onap.org\"],\"ipAddresses\":[\"127.0.0.1\"],\"issuerRef\":{\"group\":\"certmanager.onap.org\",\"kind\":\"CMPv2Issuer\",\"name\":\"cmpv2-issuer-onap\"},\"secretName\":\"cert-test-secret-name\",\"subject\":{\"countries\":[\"US\"],\"localities\":[\"San-Francisco\"],\"organizationalUnits\":[\"ONAP\"],\"organizations\":[\"Linux-Foundation\"],\"provinces\":[\"California\"]},\"uris\":[\"onap://cluster.local/\"]}}\n"
        testPrivateKeyData   = "test-private-key"
        testCertificateData  = "test-certificate"
 )
@@ -48,36 +44,33 @@ func Test_CheckIfCertificateUpdateAndRetrieveOldCertificateAndPk_revisionOne(t *
        request.ObjectMeta.Annotations = map[string]string{
                revisionAnnotation: "2",
        }
-       isUpdate, certificate, privateKey := CheckIfCertificateUpdateAndRetrieveOldCertificateAndPk(nil, request, nil)
-       assert.False(t, isUpdate)
-       assert.Equal(t, "", certificate)
-       assert.Equal(t, "", privateKey)
+       certificate, privateKey := RetrieveOldCertificateAndPkForCertificateUpdate(nil, request, nil)
+       assert.Equal(t, []byte{}, certificate)
+       assert.Equal(t, []byte{}, privateKey)
 }
 
 func Test_CheckIfCertificateUpdateAndRetrieveOldCertificateAndPk_revisionTwoSecretPresent(t *testing.T) {
        request := new(cmapi.CertificateRequest)
        request.ObjectMeta.Annotations = map[string]string{
                revisionAnnotation:                 "2",
-               certificateConfigurationAnnotation: oldCertificateConfig,
+               certificateConfigurationAnnotation: testdata.OldCertificateConfig,
        }
-       fakeClient := fake.NewFakeClientWithScheme(testdata.GetScheme(), getValidCertificateSecret())
-       isUpdate, certificate, privateKey := CheckIfCertificateUpdateAndRetrieveOldCertificateAndPk(fakeClient, request, nil)
-       assert.True(t, isUpdate)
-       assert.Equal(t, base64.StdEncoding.EncodeToString([]byte(testCertificateData)), certificate)
-       assert.Equal(t, base64.StdEncoding.EncodeToString([]byte(testPrivateKeyData)), privateKey)
+       fakeClient := fake.NewFakeClientWithScheme(testdata.GetScheme(), testdata.GetValidCertificateSecret())
+       certificate, privateKey := RetrieveOldCertificateAndPkForCertificateUpdate(fakeClient, request, nil)
+       assert.Equal(t, []byte(testCertificateData), certificate)
+       assert.Equal(t, []byte(testPrivateKeyData), privateKey)
 }
 
 func Test_CheckIfCertificateUpdateAndRetrieveOldCertificateAndPk_revisionTwoSecretNotPresent(t *testing.T) {
        request := new(cmapi.CertificateRequest)
        request.ObjectMeta.Annotations = map[string]string{
                revisionAnnotation:                 "2",
-               certificateConfigurationAnnotation: oldCertificateConfig,
+               certificateConfigurationAnnotation: testdata.OldCertificateConfig,
        }
        fakeClient := fake.NewFakeClientWithScheme(testdata.GetScheme())
-       isUpdate, certificate, privateKey := CheckIfCertificateUpdateAndRetrieveOldCertificateAndPk(fakeClient, request, nil)
-       assert.False(t, isUpdate)
-       assert.Equal(t, "", certificate)
-       assert.Equal(t, "", privateKey)
+       certificate, privateKey := RetrieveOldCertificateAndPkForCertificateUpdate(fakeClient, request, nil)
+       assert.Equal(t, []byte{}, certificate)
+       assert.Equal(t, []byte{}, privateKey)
 }
 
 func Test_IsUpdateCertificateRevision(t *testing.T) {
@@ -109,45 +102,30 @@ func testIsUpdateCertificateRevision(t *testing.T, revision string, expected boo
 func Test_RetrieveOldCertificateAndPk_shouldSucceedWhenSecretPresent(t *testing.T) {
        request := new(cmapi.CertificateRequest)
        request.ObjectMeta.Annotations = map[string]string{
-               certificateConfigurationAnnotation: oldCertificateConfig,
+               certificateConfigurationAnnotation: testdata.OldCertificateConfig,
        }
-       fakeClient := fake.NewFakeClientWithScheme(testdata.GetScheme(), getValidCertificateSecret())
+       fakeClient := fake.NewFakeClientWithScheme(testdata.GetScheme(), testdata.GetValidCertificateSecret())
        certificate, privateKey := RetrieveOldCertificateAndPk(fakeClient, request, nil)
-       assert.Equal(t, base64.StdEncoding.EncodeToString([]byte(testCertificateData)), certificate)
-       assert.Equal(t, base64.StdEncoding.EncodeToString([]byte(testPrivateKeyData)), privateKey)
+       assert.Equal(t, []byte(testCertificateData), certificate)
+       assert.Equal(t, []byte(testPrivateKeyData), privateKey)
 }
 
-func Test_RetrieveOldCertificateAndPk_shouldReturnEmptyStringsWhenSecretNotPresent(t *testing.T) {
+func Test_RetrieveOldCertificateAndPk_shouldBeEmptyWhenSecretNotPresent(t *testing.T) {
        request := new(cmapi.CertificateRequest)
        request.ObjectMeta.Annotations = map[string]string{
-               certificateConfigurationAnnotation: oldCertificateConfig,
+               certificateConfigurationAnnotation: testdata.OldCertificateConfig,
        }
        fakeClient := fake.NewFakeClientWithScheme(testdata.GetScheme())
        certificate, privateKey := RetrieveOldCertificateAndPk(fakeClient, request, nil)
-       assert.Equal(t, "", certificate)
-       assert.Equal(t, "", privateKey)
+       assert.Equal(t, []byte{}, certificate)
+       assert.Equal(t, []byte{}, privateKey)
 }
 
-func Test_RetrieveOldCertificateAndPk_shouldReturnEmptyStringsWhenOldCertificateCannotBeUnmarshalled(t *testing.T) {
+func Test_RetrieveOldCertificateAndPk_shouldBeEmptyWhenOldCertificateCannotBeUnmarshalled(t *testing.T) {
        request := new(cmapi.CertificateRequest)
        fakeClient := fake.NewFakeClientWithScheme(testdata.GetScheme())
        certificate, privateKey := RetrieveOldCertificateAndPk(fakeClient, request, nil)
-       assert.Equal(t, "", certificate)
-       assert.Equal(t, "", privateKey)
+       assert.Equal(t, []byte{}, certificate)
+       assert.Equal(t, []byte{}, privateKey)
 }
 
-func getValidCertificateSecret() *v1.Secret {
-       const privateKeySecretKey = "tls.key"
-       const certificateSecretKey = "tls.crt"
-
-       return &v1.Secret{
-               Data: map[string][]byte{
-                       privateKeySecretKey:  []byte("test-private-key"),
-                       certificateSecretKey: []byte("test-certificate"),
-               },
-               ObjectMeta: metav1.ObjectMeta{
-                       Name:      "cert-test-secret-name",
-                       Namespace: "onap",
-               },
-       }
-}