Merge pull request #187 from crossplane-contrib/backport-186-to-relea…

…se-0.11 [Backport release-0.11] fix missing ToFieldPath in conversion
crossplane-contrib · Jan 29, 2024 · ee428bf · ee428bf
2 parents d1fa685 + 4e303c9
commit ee428bf
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 0 deletions.
diff --git a/apis/object/v1alpha1/conversion.go b/apis/object/v1alpha1/conversion.go
@@ -69,6 +69,7 @@ func (src *Object) ConvertTo(dstRaw conversion.Hub) error { // nolint:golint //
 				FieldPath: r.PatchesFrom.FieldPath,
 			}
 		}
+		ref.ToFieldPath = r.ToFieldPath
 		references = append(references, ref)
 	}
 
@@ -148,6 +149,7 @@ func (dst *Object) ConvertFrom(srcRaw conversion.Hub) error { // nolint:golint,
 				FieldPath: r.PatchesFrom.FieldPath,
 			}
 		}
+		ref.ToFieldPath = r.ToFieldPath
 		references = append(references, ref)
 	}
 

diff --git a/apis/object/v1alpha1/conversion_test.go b/apis/object/v1alpha1/conversion_test.go
@@ -88,6 +88,7 @@ func TestConvertTo(t *testing.T) {
 									},
 									FieldPath: pointer.String("data.password"),
 								},
+								ToFieldPath: pointer.String("data"),
 							},
 						},
 						Readiness: v1alpha1.Readiness{Policy: v1alpha1.ReadinessPolicySuccessfulCreate},
@@ -133,6 +134,7 @@ func TestConvertTo(t *testing.T) {
 									},
 									FieldPath: pointer.String("data.password"),
 								},
+								ToFieldPath: pointer.String("data"),
 							},
 						},
 						Readiness: v1alpha2.Readiness{Policy: v1alpha2.ReadinessPolicySuccessfulCreate},
@@ -333,6 +335,7 @@ func TestConvertFrom(t *testing.T) {
 									},
 									FieldPath: pointer.String("data.password"),
 								},
+								ToFieldPath: pointer.String("data"),
 							},
 						},
 						Readiness: v1alpha2.Readiness{Policy: v1alpha2.ReadinessPolicySuccessfulCreate},
@@ -378,6 +381,7 @@ func TestConvertFrom(t *testing.T) {
 									},
 									FieldPath: pointer.String("data.password"),
 								},
+								ToFieldPath: pointer.String("data"),
 							},
 						},
 						Readiness: v1alpha1.Readiness{Policy: v1alpha1.ReadinessPolicySuccessfulCreate},

diff --git a/examples/object/deprecated/patches-from-resource.yaml b/examples/object/deprecated/patches-from-resource.yaml
@@ -0,0 +1,33 @@
+---
+apiVersion: kubernetes.crossplane.io/v1alpha1
+kind: Object
+metadata:
+  name: foo
+spec:
+  references:
+  # Use patchesFrom to patch field from other k8s resource to this object
+  - patchesFrom:
+      apiVersion: v1
+      kind: ConfigMap
+      name: bar
+      namespace: default
+      fieldPath: data.sample-key
+    toFieldPath: data.sample-key-from-bar
+  forProvider:
+    manifest:
+      apiVersion: v1
+      kind: ConfigMap
+      metadata:
+        namespace: default
+      data:
+        sample-key: sample-value
+  providerConfigRef:
+    name: kubernetes-provider
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: bar
+  namespace: default
+data:
+  sample-key: sample-value