Don't update k8s resource in Observe function

Signed-off-by: Daniel Kozlowski <[email protected]>

package/crds/dns.gcp.crossplane.io_managedzones.yaml

@@ -125,6 +125,31 @@ spec:
                   name:
                     description: Name of the referenced object.
                     type: string
+                  policy:
+                    description: Policies for referencing.
+                    properties:
+                      resolution:
+                        default: Required
+                        description: Resolution specifies whether resolution of this
+                          reference is required. The default is 'Required', which
+                          means the reconcile will fail if the reference cannot be
+                          resolved. 'Optional' means this reference will be a no-op
+                          if it cannot be resolved.
+                        enum:
+                        - Required
+                        - Optional
+                        type: string
+                      resolve:
+                        description: Resolve specifies when this reference should
+                          be resolved. The default is 'IfNotPresent', which will attempt
+                          to resolve the reference only when the corresponding field
+                          is not present. Use 'Always' to resolve the reference on
+                          every reconcile.
+                        enum:
+                        - Always
+                        - IfNotPresent
+                        type: string
+                    type: object
                 required:
                 - name
                 type: object
@@ -136,6 +161,31 @@ spec:
                   name:
                     description: Name of the referenced object.
                     type: string
+                  policy:
+                    description: Policies for referencing.
+                    properties:
+                      resolution:
+                        default: Required
+                        description: Resolution specifies whether resolution of this
+                          reference is required. The default is 'Required', which
+                          means the reconcile will fail if the reference cannot be
+                          resolved. 'Optional' means this reference will be a no-op
+                          if it cannot be resolved.
+                        enum:
+                        - Required
+                        - Optional
+                        type: string
+                      resolve:
+                        description: Resolve specifies when this reference should
+                          be resolved. The default is 'IfNotPresent', which will attempt
+                          to resolve the reference only when the corresponding field
+                          is not present. Use 'Always' to resolve the reference on
+                          every reconcile.
+                        enum:
+                        - Always
+                        - IfNotPresent
+                        type: string
+                    type: object
                 required:
                 - name
                 type: object
@@ -155,6 +205,31 @@ spec:
                       name:
                         description: Name of the referenced object.
                         type: string
+                      policy:
+                        description: Policies for referencing.
+                        properties:
+                          resolution:
+                            default: Required
+                            description: Resolution specifies whether resolution of
+                              this reference is required. The default is 'Required',
+                              which means the reconcile will fail if the reference
+                              cannot be resolved. 'Optional' means this reference
+                              will be a no-op if it cannot be resolved.
+                            enum:
+                            - Required
+                            - Optional
+                            type: string
+                          resolve:
+                            description: Resolve specifies when this reference should
+                              be resolved. The default is 'IfNotPresent', which will
+                              attempt to resolve the reference only when the corresponding
+                              field is not present. Use 'Always' to resolve the reference
+                              on every reconcile.
+                            enum:
+                            - Always
+                            - IfNotPresent
+                            type: string
+                        type: object
                     required:
                     - name
                     type: object

pkg/clients/managedzone/managed_zone.go

@@ -104,7 +104,7 @@ func IsUpToDate(name string, spec *v1alpha1.ManagedZoneParameters, observed *dns
 
 // GenerateManagedZoneObservation takes a dns.ManagedZone and returns
 // *ManagedZoneObservation.
-func GenerateManagedZoneObservation(observed *dns.ManagedZone) v1alpha1.ManagedZoneObservation {
+func GenerateManagedZoneObservation(observed dns.ManagedZone) v1alpha1.ManagedZoneObservation {
 	return v1alpha1.ManagedZoneObservation{
 		CreationTime: observed.CreationTime,
 		ID:           observed.Id,

pkg/controller/dns/managed_zone.go

@@ -46,7 +46,6 @@ const (
 	errGetManagedZone      = "cannot get the DNS ManagedZone"
 	errCreateManagedZone   = "cannot create DNS ManagedZone"
 	errDeleteManagedZone   = "cannot delete DNS ManagedZone"
-	errUpdateManagedZone   = "cannot update DNS ManagedZone custom resource"
 	errUpToDateManagedZone = "cannot determine if ManagedZone is up to date"
 )
 
@@ -109,7 +108,7 @@ func (e *managedZoneExternal) Observe(ctx context.Context, mg resource.Managed)
 		return managed.ExternalObservation{}, errors.New(errNotManagedZone)
 	}
 
-	mz, err := e.dns.Get(
+	observed, err := e.dns.Get(
 		e.projectID,
 		meta.GetExternalName(cr),
 	).Context(ctx).Do()
@@ -122,22 +121,19 @@ func (e *managedZoneExternal) Observe(ctx context.Context, mg resource.Managed)
 
 	lateInit := false
 	currentSpec := cr.Spec.ForProvider.DeepCopy()
-	mzclient.LateInitializeSpec(&cr.Spec.ForProvider, *mz)
+	mzclient.LateInitializeSpec(&cr.Spec.ForProvider, *observed)
 	if !cmp.Equal(currentSpec, &cr.Spec.ForProvider) {
-		if err := e.kube.Update(ctx, cr); err != nil {
-			return managed.ExternalObservation{}, errors.Wrap(err, errUpdateManagedZone)
-		}
 		lateInit = true
 	}
 
-	cr.Status.AtProvider = mzclient.GenerateManagedZoneObservation(mz)
+	cr.Status.AtProvider = mzclient.GenerateManagedZoneObservation(*observed)
 
 	cr.SetConditions(xpv1.Available())
 
 	upToDate, err := mzclient.IsUpToDate(
 		meta.GetExternalName(cr),
 		&cr.Spec.ForProvider,
-		mz)
+		observed)
 	if err != nil {
 		return managed.ExternalObservation{}, errors.Wrap(err, errUpToDateManagedZone)
 	}

pkg/controller/dns/managed_zone_test.go

@@ -44,9 +44,8 @@ const (
 )
 
 var (
-	nonManagedZone     resource.Managed
-	errManagedZoneBoom = errors.New("boom")
-	managedZoneLabels  = map[string]string{"foo": "bar"}
+	nonManagedZone    resource.Managed
+	managedZoneLabels = map[string]string{"foo": "bar"}
 )
 
 type ManagedZoneOption func(*v1alpha1.ManagedZone)
@@ -141,32 +140,6 @@ func TestManagedZoneObserve(t *testing.T) {
 				}
 			}),
 		},
-		"UpdateResourceSpecFail": {
-			reason: "Should return an error if the internal update fails",
-			args: args{
-				mg: newManagedZone(),
-			},
-			want: want{
-				e:   managed.ExternalObservation{},
-				err: errors.Wrap(errManagedZoneBoom, errUpdateManagedZone),
-			},
-			handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-				_ = r.Body.Close()
-				if diff := cmp.Diff(http.MethodGet, r.Method); diff != "" {
-					t.Errorf("r: -want, +got:\n%s", diff)
-				}
-				w.WriteHeader(http.StatusOK)
-				cr := newManagedZone(withLabels(managedZoneLabels))
-				mz := &dns.ManagedZone{}
-				mzclient.GenerateManagedZone(meta.GetExternalName(cr), cr.Spec.ForProvider, mz)
-				if err := json.NewEncoder(w).Encode(mz); err != nil {
-					t.Error(err)
-				}
-			}),
-			kube: &test.MockClient{
-				MockUpdate: test.NewMockUpdateFn(errManagedZoneBoom),
-			},
-		},
 		"UpdateResourceSpecSuccess": {
 			reason: "Should not return an error if the internal update succeeds",
 			args: args{