Backfill unit tests for peering dialler

- Clean up some of the logic in peering dialler and acceptor - Rename handler -> connectWebhook
hashicorp · Jun 8, 2022 · de51d6c · de51d6c
1 parent a12db71
commit de51d6c
Show file tree

Hide file tree

Showing 20 changed files with 1,204 additions and 498 deletions.
diff --git a/control-plane/api/v1alpha1/peeringacceptor_types.go b/control-plane/api/v1alpha1/peeringacceptor_types.go
@@ -76,12 +76,15 @@ type ReconcileErrorStatus struct {
 }
 
 type SecretRefStatus struct {
-	// Name is the name of the secret generated.
-	Name string `json:"name,omitempty"`
-	// Key is the key of the secret generated.
-	Key string `json:"key,omitempty"`
-	// Backend is where the generated secret is stored. Currently supports the value: "kubernetes".
-	Backend string `json:"backend,omitempty"`
+	Secret `json:",inline"`
 	// ResourceVersion is the resource version for the secret.
 	ResourceVersion string `json:"latestHash,omitempty"`
 }
+
+func (pa *PeeringAcceptor) Secret() *Secret {
+	return pa.Spec.Peer.Secret
+}
+
+func (pa *PeeringAcceptor) SecretRef() *SecretRefStatus {
+	return pa.Status.SecretRef
+}
diff --git a/control-plane/api/v1alpha1/peeringdialer_types.go b/control-plane/api/v1alpha1/peeringdialer_types.go
@@ -53,3 +53,14 @@ type PeeringDialerStatus struct {
 	// +optional
 	SecretRef *SecretRefStatus `json:"secret,omitempty"`
 }
+
+func (pd *PeeringDialer) Secret() *Secret {
+	if pd.Spec.Peer == nil {
+		return nil
+	}
+	return pd.Spec.Peer.Secret
+}
+
+func (pd *PeeringDialer) SecretRef() *SecretRefStatus {
+	return pd.Status.SecretRef
+}
diff --git a/control-plane/api/v1alpha1/zz_generated.deepcopy.go b/control-plane/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/control-plane/connect-inject/handler.go → ...l-plane/connect-inject/connect_webhook.go b/control-plane/connect-inject/handler.go → ...l-plane/connect-inject/connect_webhook.go
diff --git a/...-plane/connect-inject/handler_ent_test.go → ...onnect-inject/connect_webhook_ent_test.go b/...-plane/connect-inject/handler_ent_test.go → ...onnect-inject/connect_webhook_ent_test.go
@@ -42,13 +42,13 @@ func TestHandler_MutateWithNamespaces(t *testing.T) {
 
 	cases := []struct {
 		Name               string
-		Handler            Handler
+		Handler            ConnectWebhook
 		Req                admission.Request
 		ExpectedNamespaces []string
 	}{
 		{
 			Name: "single destination namespace 'default' from k8s 'default'",
-			Handler: Handler{
+			Handler: ConnectWebhook{
 				Log:                        logrtest.TestLogger{T: t},
 				AllowK8sNamespacesSet:      mapset.NewSet("*"),
 				DenyK8sNamespacesSet:       mapset.NewSet(),
@@ -70,7 +70,7 @@ func TestHandler_MutateWithNamespaces(t *testing.T) {
 
 		{
 			Name: "single destination namespace 'default' from k8s 'non-default'",
-			Handler: Handler{
+			Handler: ConnectWebhook{
 				Log:                        logrtest.TestLogger{T: t},
 				AllowK8sNamespacesSet:      mapset.NewSet("*"),
 				DenyK8sNamespacesSet:       mapset.NewSet(),
@@ -92,7 +92,7 @@ func TestHandler_MutateWithNamespaces(t *testing.T) {
 
 		{
 			Name: "single destination namespace 'dest' from k8s 'default'",
-			Handler: Handler{
+			Handler: ConnectWebhook{
 				Log:                        logrtest.TestLogger{T: t},
 				AllowK8sNamespacesSet:      mapset.NewSet("*"),
 				DenyK8sNamespacesSet:       mapset.NewSet(),
@@ -114,7 +114,7 @@ func TestHandler_MutateWithNamespaces(t *testing.T) {
 
 		{
 			Name: "single destination namespace 'dest' from k8s 'non-default'",
-			Handler: Handler{
+			Handler: ConnectWebhook{
 				Log:                        logrtest.TestLogger{T: t},
 				AllowK8sNamespacesSet:      mapset.NewSet("*"),
 				DenyK8sNamespacesSet:       mapset.NewSet(),
@@ -136,7 +136,7 @@ func TestHandler_MutateWithNamespaces(t *testing.T) {
 
 		{
 			Name: "mirroring from k8s 'default'",
-			Handler: Handler{
+			Handler: ConnectWebhook{
 				Log:                        logrtest.TestLogger{T: t},
 				AllowK8sNamespacesSet:      mapset.NewSet("*"),
 				DenyK8sNamespacesSet:       mapset.NewSet(),
@@ -159,7 +159,7 @@ func TestHandler_MutateWithNamespaces(t *testing.T) {
 
 		{
 			Name: "mirroring from k8s 'dest'",
-			Handler: Handler{
+			Handler: ConnectWebhook{
 				Log:                        logrtest.TestLogger{T: t},
 				AllowK8sNamespacesSet:      mapset.NewSet("*"),
 				DenyK8sNamespacesSet:       mapset.NewSet(),
@@ -182,7 +182,7 @@ func TestHandler_MutateWithNamespaces(t *testing.T) {
 
 		{
 			Name: "mirroring with prefix from k8s 'default'",
-			Handler: Handler{
+			Handler: ConnectWebhook{
 				Log:                        logrtest.TestLogger{T: t},
 				AllowK8sNamespacesSet:      mapset.NewSet("*"),
 				DenyK8sNamespacesSet:       mapset.NewSet(),
@@ -206,7 +206,7 @@ func TestHandler_MutateWithNamespaces(t *testing.T) {
 
 		{
 			Name: "mirroring with prefix from k8s 'dest'",
-			Handler: Handler{
+			Handler: ConnectWebhook{
 				Log:                        logrtest.TestLogger{T: t},
 				AllowK8sNamespacesSet:      mapset.NewSet("*"),
 				DenyK8sNamespacesSet:       mapset.NewSet(),
@@ -298,13 +298,13 @@ func TestHandler_MutateWithNamespaces_ACLs(t *testing.T) {
 
 	cases := []struct {
 		Name               string
-		Handler            Handler
+		Handler            ConnectWebhook
 		Req                admission.Request
 		ExpectedNamespaces []string
 	}{
 		{
 			Name: "acls + single destination namespace 'default' from k8s 'default'",
-			Handler: Handler{
+			Handler: ConnectWebhook{
 				Log:                        logrtest.TestLogger{T: t},
 				AllowK8sNamespacesSet:      mapset.NewSet("*"),
 				DenyK8sNamespacesSet:       mapset.NewSet(),
@@ -327,7 +327,7 @@ func TestHandler_MutateWithNamespaces_ACLs(t *testing.T) {
 
 		{
 			Name: "acls + single destination namespace 'default' from k8s 'non-default'",
-			Handler: Handler{
+			Handler: ConnectWebhook{
 				Log:                        logrtest.TestLogger{T: t},
 				AllowK8sNamespacesSet:      mapset.NewSet("*"),
 				DenyK8sNamespacesSet:       mapset.NewSet(),
@@ -350,7 +350,7 @@ func TestHandler_MutateWithNamespaces_ACLs(t *testing.T) {
 
 		{
 			Name: "acls + single destination namespace 'dest' from k8s 'default'",
-			Handler: Handler{
+			Handler: ConnectWebhook{
 				Log:                        logrtest.TestLogger{T: t},
 				AllowK8sNamespacesSet:      mapset.NewSet("*"),
 				DenyK8sNamespacesSet:       mapset.NewSet(),
@@ -373,7 +373,7 @@ func TestHandler_MutateWithNamespaces_ACLs(t *testing.T) {
 
 		{
 			Name: "acls + single destination namespace 'dest' from k8s 'non-default'",
-			Handler: Handler{
+			Handler: ConnectWebhook{
 				Log:                        logrtest.TestLogger{T: t},
 				AllowK8sNamespacesSet:      mapset.NewSet("*"),
 				DenyK8sNamespacesSet:       mapset.NewSet(),
@@ -396,7 +396,7 @@ func TestHandler_MutateWithNamespaces_ACLs(t *testing.T) {
 
 		{
 			Name: "acls + mirroring from k8s 'default'",
-			Handler: Handler{
+			Handler: ConnectWebhook{
 				Log:                        logrtest.TestLogger{T: t},
 				AllowK8sNamespacesSet:      mapset.NewSet("*"),
 				DenyK8sNamespacesSet:       mapset.NewSet(),
@@ -420,7 +420,7 @@ func TestHandler_MutateWithNamespaces_ACLs(t *testing.T) {
 
 		{
 			Name: "acls + mirroring from k8s 'dest'",
-			Handler: Handler{
+			Handler: ConnectWebhook{
 				Log:                        logrtest.TestLogger{T: t},
 				AllowK8sNamespacesSet:      mapset.NewSet("*"),
 				DenyK8sNamespacesSet:       mapset.NewSet(),
@@ -444,7 +444,7 @@ func TestHandler_MutateWithNamespaces_ACLs(t *testing.T) {
 
 		{
 			Name: "acls + mirroring with prefix from k8s 'default'",
-			Handler: Handler{
+			Handler: ConnectWebhook{
 				Log:                        logrtest.TestLogger{T: t},
 				AllowK8sNamespacesSet:      mapset.NewSet("*"),
 				DenyK8sNamespacesSet:       mapset.NewSet(),
@@ -469,7 +469,7 @@ func TestHandler_MutateWithNamespaces_ACLs(t *testing.T) {
 
 		{
 			Name: "acls + mirroring with prefix from k8s 'dest'",
-			Handler: Handler{
+			Handler: ConnectWebhook{
 				Log:                        logrtest.TestLogger{T: t},
 				AllowK8sNamespacesSet:      mapset.NewSet("*"),
 				DenyK8sNamespacesSet:       mapset.NewSet(),
@@ -640,7 +640,7 @@ func TestHandler_MutateWithNamespaces_Annotation(t *testing.T) {
 			})
 			require.NoError(err)
 
-			handler := Handler{
+			handler := ConnectWebhook{
 				Log:                        logrtest.TestLogger{T: t},
 				AllowK8sNamespacesSet:      mapset.NewSet("*"),
 				DenyK8sNamespacesSet:       mapset.NewSet(),