refactor ApplyCurrentDecorations ApplyUpdatedDecorations

Author: ColdsteelRail

xset/api/xset_controller_types.go

@@ -105,10 +105,12 @@ type DecorationAdapter interface {
 	WatchDecoration(c controller.Controller) error
 	// GetDecorationGroupVersionKind returns decoration gvk.
 	GetDecorationGroupVersionKind() metav1.GroupVersionKind
-	// ApplyDecoration returns patcher for decoration from target.
-	ApplyDecoration(ctx context.Context, c client.Client, target client.Object) error
-	// ApplyDecorationFromRevisions returns patcher for decoration from revisions.
-	ApplyDecorationFromRevisions(ctx context.Context, c client.Client, target client.Object, revision string) error
+	// ApplyCurrentDecorations returns patcher for decoration from target.
+	ApplyCurrentDecorations(ctx context.Context, c client.Client, target client.Object) error
+	// ApplyUpdatedDecorations returns patcher for decoration from target.
+	ApplyUpdatedDecorations(ctx context.Context, c client.Client, target client.Object) error
+	// ApplyDecorationByRevisions returns patcher for decoration from revisions.
+	ApplyDecorationByRevisions(ctx context.Context, c client.Client, target client.Object, revision string) error
 	// GetDecorationRevisionFromTarget returns decoration revision on target.
 	GetDecorationRevisionFromTarget(ctx context.Context, c client.Client, target client.Object) (string, error)
 	// IsTargetDecorationChanged returns true if decoration on target is changed.

xset/synccontrols/sync_control.go

@@ -522,10 +522,10 @@ func (r *RealSyncControl) Scale(ctx context.Context, xsetObject api.XSetObject,
 									return err
 								}
 								r.resourceContextControl.Put(availableIDContext, api.EnumTargetDecorationRevisionKey, revisions)
-								return decorationAdapter.ApplyDecoration(ctx, r.Client, object)
+								return decorationAdapter.ApplyCurrentDecorations(ctx, r.Client, object)
 							} else {
 								// upgrade by recreate target case
-								return decorationAdapter.ApplyDecorationFromRevisions(ctx, r.Client, object, revisionsInfo)
+								return decorationAdapter.ApplyDecorationByRevisions(ctx, r.Client, object, revisionsInfo)
 							}
 						}
 						return nil

xset/synccontrols/x_replace.go

@@ -136,7 +136,7 @@ func (r *RealSyncControl) replaceOriginTargets(
 			r.xsetController.GetXSetTemplatePatcher(instance),
 			func(object client.Object) error {
 				if decorationAdapter, ok := r.xsetController.(api.DecorationAdapter); ok {
-					return decorationAdapter.ApplyDecoration(ctx, r.Client, originTarget)
+					return decorationAdapter.ApplyCurrentDecorations(ctx, r.Client, originTarget)
 				}
 				return nil
 			},