Merge pull request #206 from crossplane-contrib/backport-204-to-relea…

…se-0.11 [Backport release-0.11] fix missing ToConnectionSecretKey in conversion
crossplane-contrib · Feb 26, 2024 · 9ddbc34 · 9ddbc34
2 parents 5bfb71a + 92d04ce
commit 9ddbc34
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 2 deletions.
diff --git a/apis/object/v1alpha1/conversion.go b/apis/object/v1alpha1/conversion.go
@@ -43,7 +43,8 @@ func (src *Object) ConvertTo(dstRaw conversion.Hub) error { // nolint:golint //
 	connectionDetails := []v1alpha2.ConnectionDetail{}
 	for _, cd := range src.Spec.ConnectionDetails {
 		connectionDetails = append(connectionDetails, v1alpha2.ConnectionDetail{
-			ObjectReference: cd.ObjectReference,
+			ObjectReference:       cd.ObjectReference,
+			ToConnectionSecretKey: cd.ToConnectionSecretKey,
 		})
 	}
 
@@ -123,7 +124,8 @@ func (dst *Object) ConvertFrom(srcRaw conversion.Hub) error { // nolint:golint,
 	connectionDetails := []ConnectionDetail{}
 	for _, cd := range src.Spec.ConnectionDetails {
 		connectionDetails = append(connectionDetails, ConnectionDetail{
-			ObjectReference: cd.ObjectReference,
+			ObjectReference:       cd.ObjectReference,
+			ToConnectionSecretKey: cd.ToConnectionSecretKey,
 		})
 	}
 

diff --git a/apis/object/v1alpha1/conversion_test.go b/apis/object/v1alpha1/conversion_test.go
@@ -64,7 +64,9 @@ func TestConvertTo(t *testing.T) {
 									APIVersion: "v1",
 									Kind:       "Secret",
 									Name:       "topsecret",
+									FieldPath:  "data.token",
 								},
+								ToConnectionSecretKey: "token",
 							},
 						},
 						ForProvider: v1alpha1.ObjectParameters{
@@ -111,7 +113,9 @@ func TestConvertTo(t *testing.T) {
 									APIVersion: "v1",
 									Kind:       "Secret",
 									Name:       "topsecret",
+									FieldPath:  "data.token",
 								},
+								ToConnectionSecretKey: "token",
 							},
 						},
 						ForProvider: v1alpha2.ObjectParameters{
@@ -196,7 +200,9 @@ func TestConvertTo(t *testing.T) {
 									APIVersion: "v1",
 									Kind:       "Secret",
 									Name:       "topsecret",
+									FieldPath:  "data.token",
 								},
+								ToConnectionSecretKey: "token",
 							},
 						},
 						ForProvider: v1alpha1.ObjectParameters{
@@ -229,7 +235,9 @@ func TestConvertTo(t *testing.T) {
 									APIVersion: "v1",
 									Kind:       "Secret",
 									Name:       "topsecret",
+									FieldPath:  "data.token",
 								},
+								ToConnectionSecretKey: "token",
 							},
 						},
 						ForProvider: v1alpha2.ObjectParameters{
@@ -312,7 +320,9 @@ func TestConvertFrom(t *testing.T) {
 									APIVersion: "v1",
 									Kind:       "Secret",
 									Name:       "topsecret",
+									FieldPath:  "data.token",
 								},
+								ToConnectionSecretKey: "token",
 							},
 						},
 						ForProvider: v1alpha2.ObjectParameters{
@@ -357,7 +367,9 @@ func TestConvertFrom(t *testing.T) {
 									APIVersion: "v1",
 									Kind:       "Secret",
 									Name:       "topsecret",
+									FieldPath:  "data.token",
 								},
+								ToConnectionSecretKey: "token",
 							},
 						},
 						ForProvider: v1alpha1.ObjectParameters{
@@ -407,7 +419,9 @@ func TestConvertFrom(t *testing.T) {
 									APIVersion: "v1",
 									Kind:       "Secret",
 									Name:       "topsecret",
+									FieldPath:  "data.token",
 								},
+								ToConnectionSecretKey: "token",
 							},
 						},
 						ForProvider: v1alpha2.ObjectParameters{
@@ -438,7 +452,9 @@ func TestConvertFrom(t *testing.T) {
 									APIVersion: "v1",
 									Kind:       "Secret",
 									Name:       "topsecret",
+									FieldPath:  "data.token",
 								},
+								ToConnectionSecretKey: "token",
 							},
 						},
 						ForProvider: v1alpha1.ObjectParameters{

diff --git a/examples/object/deprecated/connection-details.yaml b/examples/object/deprecated/connection-details.yaml
@@ -0,0 +1,33 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  namespace: default
+  name: test-sa
+---
+apiVersion: kubernetes.crossplane.io/v1alpha1
+kind: Object
+metadata:
+  name: test-sa
+spec:
+  connectionDetails:
+  - apiVersion: v1
+    fieldPath: data.token
+    kind: Secret
+    name: test-sa-token
+    namespace: default
+    toConnectionSecretKey: token
+  forProvider:
+    manifest:
+      apiVersion: v1
+      kind: Secret
+      metadata:
+        annotations:
+          kubernetes.io/service-account.name: test-sa
+        name: test-sa-token
+        namespace: default
+      type: kubernetes.io/service-account-token
+  providerConfigRef:
+    name: kubernetes-provider
+  writeConnectionSecretToRef:
+    name: test-sa-conn-out
+    namespace: default