Backfill unit tests for peering dialler (#1265)

- Clean up some of the logic in peering dialler and acceptor - Rename handler -> connectWebhook
hashicorp · Jun 13, 2022 · 047ce59 · 047ce59
1 parent 95c25c7
commit 047ce59
Show file tree

Hide file tree

Showing 25 changed files with 1,223 additions and 515 deletions.
diff --git a/charts/consul/templates/crd-peeringacceptors.yaml b/charts/consul/templates/crd-peeringacceptors.yaml
@@ -94,12 +94,12 @@ spec:
                   key:
                     description: Key is the key of the secret generated.
                     type: string
-                  latestHash:
-                    description: ResourceVersion is the resource version for the secret.
-                    type: string
                   name:
                     description: Name is the name of the secret generated.
                     type: string
+                  resourceVersion:
+                    description: ResourceVersion is the resource version for the secret.
+                    type: string
                 type: object
             type: object
         type: object

diff --git a/charts/consul/templates/crd-peeringdialers.yaml b/charts/consul/templates/crd-peeringdialers.yaml
@@ -94,12 +94,12 @@ spec:
                   key:
                     description: Key is the key of the secret generated.
                     type: string
-                  latestHash:
-                    description: ResourceVersion is the resource version for the secret.
-                    type: string
                   name:
                     description: Name is the name of the secret generated.
                     type: string
+                  resourceVersion:
+                    description: ResourceVersion is the resource version for the secret.
+                    type: string
                 type: object
             type: object
         type: object

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"`
+	ResourceVersion string `json:"resourceVersion,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/config/crd/bases/consul.hashicorp.com_peeringacceptors.yaml b/control-plane/config/crd/bases/consul.hashicorp.com_peeringacceptors.yaml
@@ -87,12 +87,12 @@ spec:
                   key:
                     description: Key is the key of the secret generated.
                     type: string
-                  latestHash:
-                    description: ResourceVersion is the resource version for the secret.
-                    type: string
                   name:
                     description: Name is the name of the secret generated.
                     type: string
+                  resourceVersion:
+                    description: ResourceVersion is the resource version for the secret.
+                    type: string
                 type: object
             type: object
         type: object

diff --git a/control-plane/config/crd/bases/consul.hashicorp.com_peeringdialers.yaml b/control-plane/config/crd/bases/consul.hashicorp.com_peeringdialers.yaml
@@ -87,12 +87,12 @@ spec:
                   key:
                     description: Key is the key of the secret generated.
                     type: string
-                  latestHash:
-                    description: ResourceVersion is the resource version for the secret.
-                    type: string
                   name:
                     description: Name is the name of the secret generated.
                     type: string
+                  resourceVersion:
+                    description: ResourceVersion is the resource version for the secret.
+                    type: string
                 type: object
             type: object
         type: object