Retain resources ID

Previously, when the CR entered a failed state, all IDs were wiped,
causing other functions relying on those IDs from the status to fail. This
commit refactors the status function to retain IDs from the previous state.

Author: tkan145

controllers/capabilities/activedoc_status_reconciler.go

@@ -76,22 +76,22 @@ func (s *ActiveDocStatusReconciler) Reconcile() (reconcile.Result, error) {
 }
 
 func (s *ActiveDocStatusReconciler) calculateStatus() (*capabilitiesv1beta1.ActiveDocStatus, error) {
-	newStatus := &capabilitiesv1beta1.ActiveDocStatus{}
+	newStatus := &capabilitiesv1beta1.ActiveDocStatus{
+		ID:                  s.resource.Status.ID,
+		ProviderAccountHost: s.providerAccountHost,
+		ObservedGeneration:  s.resource.Status.ObservedGeneration,
+	}
 
 	if s.activeDoc != nil {
 		newStatus.ID = s.activeDoc.Element.ID
 	}
 
-	newStatus.ProviderAccountHost = s.providerAccountHost
-
 	productResourceName, err := s.getReferencedProduct()
 	if err != nil {
 		return nil, err
 	}
 	newStatus.ProductResourceName = productResourceName
 
-	newStatus.ObservedGeneration = s.resource.Status.ObservedGeneration
-
 	newStatus.Conditions = s.resource.Status.Conditions.Copy()
 	newStatus.Conditions.SetCondition(s.readyCondition())
 	newStatus.Conditions.SetCondition(s.orphanCondition())

controllers/capabilities/application_status_reconciler.go

@@ -73,7 +73,13 @@ func (s *ApplicationStatusReconciler) Reconcile() (reconcile.Result, error) {
 }
 
 func (s *ApplicationStatusReconciler) calculateStatus() *capabilitiesv1beta1.ApplicationStatus {
-	newStatus := &capabilitiesv1beta1.ApplicationStatus{}
+	newStatus := &capabilitiesv1beta1.ApplicationStatus{
+		ID:                  s.applicationResource.Status.ID,
+		State:               s.applicationResource.Status.State,
+		ProviderAccountHost: s.applicationResource.Status.ProviderAccountHost,
+		ObservedGeneration:  s.applicationResource.Status.ObservedGeneration,
+		Conditions:          s.applicationResource.Status.Conditions.Copy(),
+	}
 
 	if s.entity != nil {
 		tmpID := s.entity.ID()
@@ -84,11 +90,10 @@ func (s *ApplicationStatusReconciler) calculateStatus() *capabilitiesv1beta1.App
 		newStatus.State = s.entity.ApplicationState()
 	}
 
-	newStatus.ProviderAccountHost = s.providerAccountHost
-
-	newStatus.ObservedGeneration = s.applicationResource.Status.ObservedGeneration
+	if s.providerAccountHost != "" {
+		newStatus.ProviderAccountHost = s.providerAccountHost
+	}
 
-	newStatus.Conditions = s.applicationResource.Status.Conditions.Copy()
 	newStatus.Conditions.SetCondition(s.ReadyCondition())
 
 	return newStatus

controllers/capabilities/backend_status_reconciler.go

@@ -72,17 +72,22 @@ func (s *BackendStatusReconciler) Reconcile() (reconcile.Result, error) {
 }
 
 func (s *BackendStatusReconciler) calculateStatus() *capabilitiesv1beta1.BackendStatus {
-	newStatus := &capabilitiesv1beta1.BackendStatus{}
+	newStatus := &capabilitiesv1beta1.BackendStatus{
+		ID:                  s.backendResource.Status.ID,
+		ProviderAccountHost: s.backendResource.Status.ProviderAccountHost,
+		ObservedGeneration:  s.backendResource.Status.ObservedGeneration,
+		Conditions:          s.backendResource.Status.Conditions.Copy(),
+	}
+
 	if s.backendAPIEntity != nil {
 		tmp := s.backendAPIEntity.ID()
 		newStatus.ID = &tmp
 	}
 
-	newStatus.ProviderAccountHost = s.providerAccountHost
-
-	newStatus.ObservedGeneration = s.backendResource.Status.ObservedGeneration
+	if s.providerAccountHost != "" {
+		newStatus.ProviderAccountHost = s.providerAccountHost
+	}
 
-	newStatus.Conditions = s.backendResource.Status.Conditions.Copy()
 	newStatus.Conditions.SetCondition(s.syncCondition())
 	newStatus.Conditions.SetCondition(s.invalidCondition())
 	newStatus.Conditions.SetCondition(s.failedCondition())

controllers/capabilities/custompolicydefinition_status_reconciler.go

@@ -72,17 +72,21 @@ func (s *CustomPolicyDefinitionStatusReconciler) Reconcile() (reconcile.Result,
 }
 
 func (s *CustomPolicyDefinitionStatusReconciler) calculateStatus() *capabilitiesv1beta1.CustomPolicyDefinitionStatus {
-	newStatus := &capabilitiesv1beta1.CustomPolicyDefinitionStatus{}
+	newStatus := &capabilitiesv1beta1.CustomPolicyDefinitionStatus{
+		ID:                  s.resource.Status.ID,
+		ProviderAccountHost: s.resource.Status.ProviderAccountHost,
+		ObservedGeneration:  s.resource.Status.ObservedGeneration,
+		Conditions:          s.resource.Status.Conditions.Copy(),
+	}
 
 	if s.customPolicy != nil {
 		newStatus.ID = s.customPolicy.Element.ID
 	}
 
-	newStatus.ProviderAccountHost = s.providerAccountHost
-
-	newStatus.ObservedGeneration = s.resource.Status.ObservedGeneration
+	if s.providerAccountHost != "" {
+		newStatus.ProviderAccountHost = s.providerAccountHost
+	}
 
-	newStatus.Conditions = s.resource.Status.Conditions.Copy()
 	newStatus.Conditions.SetCondition(s.readyCondition())
 	newStatus.Conditions.SetCondition(s.invalidCondition())
 	newStatus.Conditions.SetCondition(s.failedCondition())

controllers/capabilities/product_status_reconciler.go

@@ -72,17 +72,21 @@ func (s *ProductStatusReconciler) Reconcile() (reconcile.Result, error) {
 }
 
 func (s *ProductStatusReconciler) calculateStatus() *capabilitiesv1beta1.ProductStatus {
-	newStatus := &capabilitiesv1beta1.ProductStatus{}
+	newStatus := &capabilitiesv1beta1.ProductStatus{
+		ID:                  s.resource.Status.ID,
+		ProviderAccountHost: s.resource.Status.ProviderAccountHost,
+		ObservedGeneration:  s.resource.Status.ObservedGeneration,
+		Conditions:          s.resource.Status.Conditions.Copy(),
+	}
 	if s.entity != nil {
 		tmpID := s.entity.ID()
 		newStatus.ID = &tmpID
 	}
 
-	newStatus.ProviderAccountHost = s.providerAccountHost
-
-	newStatus.ObservedGeneration = s.resource.Status.ObservedGeneration
+	if s.providerAccountHost != "" {
+		newStatus.ProviderAccountHost = s.providerAccountHost
+	}
 
-	newStatus.Conditions = s.resource.Status.Conditions.Copy()
 	newStatus.Conditions.SetCondition(s.syncCondition())
 	newStatus.Conditions.SetCondition(s.orphanCondition())
 	newStatus.Conditions.SetCondition(s.invalidCondition())