post-rebase fixes

On-behalf-of: @SAP [email protected]

Author: xrstf

internal/controller/apiresourceschema/controller.go

@@ -179,7 +179,7 @@ func (r *Reconciler) reconcile(ctx context.Context, log *zap.SugaredLogger, pubR
 
 		log.With("name", arsName).Info("Creating APIResourceSchema…")
 
-		if err := r.kcpClient.Create(wsCtx, ars); err != nil {
+		if err := r.kcpClient.Create(ctx, ars); err != nil {
 			return nil, fmt.Errorf("failed to create APIResourceSchema: %w", err)
 		}
 	} else if err != nil {

internal/controller/sync/controller.go

@@ -220,9 +220,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, request mcreconcile.Request)
 	}
 
 	// sync main object
-	mutator := mutation.NewMutator(r.pubRes.Spec.Mutation)
-
-	syncer, err := sync.NewResourceSyncer(log, r.localClient, vwClient, r.pubRes, r.localCRD, mutator, r.stateNamespace, r.agentName)
+	syncer, err := sync.NewResourceSyncer(log, r.localClient, vwClient, r.pubRes, r.localCRD, mutation.NewMutator, r.stateNamespace, r.agentName)
 	if err != nil {
 		return reconcile.Result{}, fmt.Errorf("failed to create syncer: %w", err)
 	}

test/e2e/sync/primary_test.go

@@ -299,7 +299,7 @@ spec:
 
 		utils.WaitForBoundAPI(t, ctx, teamClient, crontabsGVR)
 
-		if err := teamClient.Create(ctx, yamlToUnstructured(t, crontabYAML)); err != nil {
+		if err := teamClient.Create(ctx, utils.YAMLToUnstructured(t, crontabYAML)); err != nil {
 			t.Fatalf("Failed to create %s's CronTab in kcp: %v", team, err)
 		}
 	}

test/e2e/sync/related_test.go

@@ -595,7 +595,7 @@ func TestSyncRelatedMultiObjects(t *testing.T) {
 		// the name of this testcase
 		name string
 		// the org workspace everything should happen in
-		workspace logicalcluster.Name
+		workspace string
 		// the configuration for the related resource
 		relatedConfig syncagentv1alpha1.RelatedResourceSpec
 		// the primary object created by the user in kcp
@@ -853,25 +853,24 @@ func TestSyncRelatedMultiObjects(t *testing.T) {
 			}
 
 			// fake operator: create credential Secrets
-			teamCtx := kontext.WithCluster(ctx, logicalcluster.Name(fmt.Sprintf("root:%s:team-1", testcase.workspace)))
-			kcpClient := utils.GetKcpAdminClusterClient(t)
+			kcpClusterClient := utils.GetKcpAdminClusterClient(t)
+
+			teamClusterPath := logicalcluster.NewPath("root").Join(testcase.workspace).Join("team-1")
+			teamClient := kcpClusterClient.Cluster(teamClusterPath)
 
 			originClient := envtestClient
-			originContext := ctx
-			destClient := kcpClient
-			destContext := teamCtx
+			destClient := teamClient
 
 			if testcase.relatedConfig.Origin == syncagentv1alpha1.RelatedResourceOriginKcp {
 				originClient, destClient = destClient, originClient
-				originContext, destContext = destContext, originContext
 			}
 
 			for _, relatedObject := range testcase.sourceRelatedObjects {
 				t.Logf("Creating credential Secret on the %s side…", testcase.relatedConfig.Origin)
 
-				ensureNamespace(t, originContext, originClient, relatedObject.Namespace)
+				ensureNamespace(t, ctx, originClient, relatedObject.Namespace)
 
-				if err := originClient.Create(originContext, &relatedObject); err != nil {
+				if err := originClient.Create(ctx, &relatedObject); err != nil {
 					t.Fatalf("Failed to create Secret %s: %v", relatedObject.Name, err)
 				}
 			}
@@ -880,7 +879,7 @@ func TestSyncRelatedMultiObjects(t *testing.T) {
 			utils.RunAgent(ctx, t, "bob", orgKubconfig, envtestKubeconfig, apiExportName)
 
 			// wait until the API is available
-			utils.WaitForBoundAPI(t, teamCtx, kcpClient, schema.GroupVersionResource{
+			utils.WaitForBoundAPI(t, ctx, teamClient, schema.GroupVersionResource{
 				Group:    apiExportName,
 				Version:  "v1",
 				Resource: "backups",
@@ -893,7 +892,7 @@ func TestSyncRelatedMultiObjects(t *testing.T) {
 			remoteBackup.SetAPIVersion("kcp.example.com/v1")
 			remoteBackup.SetKind("Backup")
 
-			if err := kcpClient.Create(teamCtx, remoteBackup); err != nil {
+			if err := teamClient.Create(ctx, remoteBackup); err != nil {
 				t.Fatalf("Failed to create Backup in kcp: %v", err)
 			}
 
@@ -912,7 +911,7 @@ func TestSyncRelatedMultiObjects(t *testing.T) {
 				return nil
 			}
 
-			err := wait.PollUntilContextTimeout(destContext, 2*time.Second, 30*time.Second, false, func(ctx context.Context) (done bool, err error) {
+			err := wait.PollUntilContextTimeout(ctx, 2*time.Second, 30*time.Second, false, func(ctx context.Context) (done bool, err error) {
 				var errs []string
 
 				for _, expectedObj := range testcase.expectedSyncedRelatedObjects {