From d1ffb0ad0de4fab2edc1915e8bd4e8e7e1ae817d Mon Sep 17 00:00:00 2001
From: joshvanl <vleeuwenjoshua@gmail.com>
Date: Mon, 7 Feb 2022 14:16:33 +0000
Subject: [PATCH] Adds roundtrip tests for issuer and cluster issuer serialize

Signed-off-by: joshvanl <vleeuwenjoshua@gmail.com>
---
 internal/controller/issuers/apply_test.go     | 11 ++++++
 test/integration/issuers/BUILD.bazel          | 34 +++++++++----------
 ...issuers.go => condition_list_type_test.go} | 10 +++---
 3 files changed, 32 insertions(+), 23 deletions(-)
 rename test/integration/issuers/{issuers.go => condition_list_type_test.go} (96%)

diff --git a/internal/controller/issuers/apply_test.go b/internal/controller/issuers/apply_test.go
index 414a6eb90..82d3270b4 100644
--- a/internal/controller/issuers/apply_test.go
+++ b/internal/controller/issuers/apply_test.go
@@ -17,6 +17,7 @@ limitations under the License.
 package issuers
 
 import (
+	"encoding/json"
 	"strconv"
 	"sync"
 	"testing"
@@ -52,6 +53,11 @@ func Test_serializeApplyIssuerStatus(t *testing.T) {
 					assert.NoError(t, err)
 					assert.Regexp(t, expReg, string(issuerData))
 
+					// Test round trip preserves the status.
+					var rtIssuer cmapi.Issuer
+					assert.NoError(t, json.Unmarshal(issuerData, &rtIssuer))
+					assert.Equal(t, issuer.Status, rtIssuer.Status)
+
 					// String match on empty status.
 					issuer.Status = cmapi.IssuerStatus{}
 					issuerData, err = serializeApplyIssuerStatus(&issuer)
@@ -95,6 +101,11 @@ func Test_serializeApplyClusterIssuerStatus(t *testing.T) {
 					assert.NoError(t, err)
 					assert.Regexp(t, expReg, string(issuerData))
 
+					// Test round trip preserves the status.
+					var rtIssuer cmapi.ClusterIssuer
+					assert.NoError(t, json.Unmarshal(issuerData, &rtIssuer))
+					assert.Equal(t, issuer.Status, rtIssuer.Status)
+
 					// String match on empty status.
 					issuer.Status = cmapi.IssuerStatus{}
 					issuerData, err = serializeApplyClusterIssuerStatus(&issuer)
diff --git a/test/integration/issuers/BUILD.bazel b/test/integration/issuers/BUILD.bazel
index 60e640b2e..82e5d2b38 100644
--- a/test/integration/issuers/BUILD.bazel
+++ b/test/integration/issuers/BUILD.bazel
@@ -1,21 +1,4 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_library")
-
-go_library(
-    name = "go_default_library",
-    srcs = ["issuers.go"],
-    importpath = "github.com/jetstack/cert-manager/test/integration/issuers",
-    visibility = ["//visibility:public"],
-    deps = [
-        "//internal/controller/issuers:go_default_library",
-        "//pkg/apis/certmanager/v1:go_default_library",
-        "//pkg/apis/meta/v1:go_default_library",
-        "//pkg/util:go_default_library",
-        "//test/integration/framework:go_default_library",
-        "@com_github_stretchr_testify//assert:go_default_library",
-        "@io_k8s_api//core/v1:go_default_library",
-        "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library",
-    ],
-)
+load("@io_bazel_rules_go//go:def.bzl", "go_test")
 
 filegroup(
     name = "package-srcs",
@@ -30,3 +13,18 @@ filegroup(
     tags = ["automanaged"],
     visibility = ["//visibility:public"],
 )
+
+go_test(
+    name = "go_default_test",
+    srcs = ["condition_list_type_test.go"],
+    deps = [
+        "//internal/controller/issuers:go_default_library",
+        "//pkg/apis/certmanager/v1:go_default_library",
+        "//pkg/apis/meta/v1:go_default_library",
+        "//pkg/util:go_default_library",
+        "//test/integration/framework:go_default_library",
+        "@com_github_stretchr_testify//assert:go_default_library",
+        "@io_k8s_api//core/v1:go_default_library",
+        "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library",
+    ],
+)
diff --git a/test/integration/issuers/issuers.go b/test/integration/issuers/condition_list_type_test.go
similarity index 96%
rename from test/integration/issuers/issuers.go
rename to test/integration/issuers/condition_list_type_test.go
index 28c4f7240..06ec869a1 100644
--- a/test/integration/issuers/issuers.go
+++ b/test/integration/issuers/condition_list_type_test.go
@@ -25,11 +25,11 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	internalissuers "github.com/jetstack/cert-manager/internal/controller/issuers"
-	cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1"
-	cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1"
-	"github.com/jetstack/cert-manager/pkg/util"
-	"github.com/jetstack/cert-manager/test/integration/framework"
+	internalissuers "github.com/cert-manager/cert-manager/internal/controller/issuers"
+	cmapi "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
+	cmmeta "github.com/cert-manager/cert-manager/pkg/apis/meta/v1"
+	"github.com/cert-manager/cert-manager/pkg/util"
+	"github.com/cert-manager/cert-manager/test/integration/framework"
 )
 
 func Test_ConditionsListType_Issuers(t *testing.T) {