fix: failed to lint

apecloud · Oct 20, 2023 · 309d45a · 309d45a
1 parent 8b1e33c
commit 309d45a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/controllers/apps/configuration/configuration_test.go b/controllers/apps/configuration/configuration_test.go
@@ -159,7 +159,7 @@ func initConfiguration(resourceCtx *intctrlutil.ResourceCtx, synthesizedComponen
 	}).
 		Prepare().
 		UpdateConfiguration(). // reconcile Configuration
-		Configuration(). // sync Configuration
+		Configuration().       // sync Configuration
 		CreateConfigTemplate().
 		UpdateConfigRelatedObject().
 		UpdateConfigurationStatus().

diff --git a/controllers/apps/configuration/reconcile_task.go b/controllers/apps/configuration/reconcile_task.go
@@ -96,15 +96,15 @@ func syncImpl(fetcher *Task,
 		Sync().
 		Complete()
 
-	status.UpdateRevision = revision
 	if err != nil {
 		status.Message = cfgutil.ToPointer(err.Error())
 		status.Phase = appsv1alpha1.CMergeFailedPhase
 	} else {
 		status.Message = nil
 		status.Phase = appsv1alpha1.CMergedPhase
 	}
-	return
+	status.UpdateRevision = revision
+	return err
 }
 
 func syncStatus(configMap *corev1.ConfigMap, status *appsv1alpha1.ConfigurationItemDetailStatus) (err error) {