cleanup tests

Signed-off-by: Wantong Jiang <[email protected]>

Author: jwtty

CLAUDE.md

@@ -154,4 +154,8 @@ All controllers follow standard Kubernetes controller patterns:
 - Controllers should be thoroughly tested with integration tests
 - New scheduler plugins should implement both Filter and Score interfaces
 - Use existing patterns from similar controllers when adding new functionality
-- Property providers should implement the `PropertyProvider` interface
+- Property providers should implement the `PropertyProvider` interface
+
+## Coding Style
+- When writing comments, capitalize the first character (unless it starts with the function name) and end with a period
+_ When writing tests, use keyword `want` instead of `expected`

tools/fleet/cmd/approve/approve.go

@@ -38,6 +38,8 @@ type approveOptions struct {
 	hubClusterContext string
 	kind              string
 	name              string
+
+	hubClient client.Client
 }
 
 func NewCmdApprove() *cobra.Command {
@@ -56,14 +58,17 @@ Currently supported kinds:
 		Args: cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			o.kind = args[0]
+			if err := o.setupClient(); err != nil {
+				return err
+			}
 			return o.run(cmd.Context())
 		},
 	}
 
 	cmd.Flags().StringVar(&o.hubClusterContext, "hubClusterContext", "", "The name of the kubeconfig context to use for the hub cluster")
 	cmd.Flags().StringVar(&o.name, "name", "", "The name of the resource to approve")
 
-	// Mark required flags
+	// Mark required flags.
 	_ = cmd.MarkFlagRequired("hubClusterContext")
 	_ = cmd.MarkFlagRequired("name")
 
@@ -78,24 +83,19 @@ func (o *approveOptions) run(ctx context.Context) error {
 		return fmt.Errorf("resource name is required")
 	}
 
-	// Validate that we only support clusterapprovalrequest for now
+	// Validate that we only support clusterapprovalrequest for now.
 	if o.kind != "clusterapprovalrequest" {
 		return fmt.Errorf("unsupported resource kind %q, only 'clusterapprovalrequest' is supported", o.kind)
 	}
 
-	_, hubClient, err := o.setupClient()
-	if err != nil {
-		return err
-	}
-
-	// Patch the ClusterApprovalRequest status with approved condition
-	err = retry.RetryOnConflict(retry.DefaultRetry, func() error {
+	// Patch the ClusterApprovalRequest status with approved condition.
+	err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
 		var car placementv1beta1.ClusterApprovalRequest
-		if err := hubClient.Get(ctx, types.NamespacedName{Name: o.name}, &car); err != nil {
-			return err
+		if err := o.hubClient.Get(ctx, types.NamespacedName{Name: o.name}, &car); err != nil {
+			return fmt.Errorf("failed to get ClusterApprovalRequest %q: %w", o.name, err)
 		}
 
-		// Add the Approved condition
+		// Add the Approved condition.
 		approvedCondition := metav1.Condition{
 			Type:               string(placementv1beta1.ApprovalRequestConditionApproved),
 			Status:             metav1.ConditionTrue,
@@ -104,35 +104,36 @@ func (o *approveOptions) run(ctx context.Context) error {
 			ObservedGeneration: car.Generation,
 		}
 
-		// Update or add the condition
+		// Update or add the condition.
 		meta.SetStatusCondition(&car.Status.Conditions, approvedCondition)
 
-		return hubClient.Status().Update(ctx, &car)
+		return o.hubClient.Status().Update(ctx, &car)
 	})
 
 	if err != nil {
 		return fmt.Errorf("failed to approve ClusterApprovalRequest %q: %w", o.name, err)
 	}
 
-	fmt.Printf("ClusterApprovalRequest %q approved successfully\n", o.name)
+	log.Printf("ClusterApprovalRequest %q approved successfully\n", o.name)
 	return nil
 }
 
 // setupClient creates and configures the Kubernetes client
-func (o *approveOptions) setupClient() (*runtime.Scheme, client.Client, error) {
+func (o *approveOptions) setupClient() error {
 	scheme := runtime.NewScheme()
 
 	if err := clusterv1beta1.AddToScheme(scheme); err != nil {
-		log.Fatalf("failed to add custom APIs (cluster) to the runtime scheme: %v", err)
+		return fmt.Errorf("failed to add custom APIs (cluster) to the runtime scheme: %v", err)
 	}
 	if err := placementv1beta1.AddToScheme(scheme); err != nil {
-		log.Fatalf("failed to add custom APIs (placement) to the runtime scheme: %v", err)
+		return fmt.Errorf("failed to add custom APIs (placement) to the runtime scheme: %v", err)
 	}
 
 	hubClient, err := toolsutils.GetClusterClientFromClusterContext(o.hubClusterContext, scheme)
 	if err != nil {
-		log.Fatalf("failed to create hub cluster client: %v", err)
+		return fmt.Errorf("failed to create hub cluster client: %v", err)
 	}
 
-	return scheme, hubClient, nil
+	o.hubClient = hubClient
+	return nil
 }