Merge pull request GoogleCloudPlatform#2955 from justinsb/refactor_ssm_instance_controller

chore: refactor SecureSourceManagerInstance to work in proto

Author: google-oss-prow[bot]

pkg/controller/direct/protoutils.go

@@ -14,7 +14,9 @@
 
 package direct
 
-import "google.golang.org/protobuf/proto"
+import (
+	"google.golang.org/protobuf/proto"
+)
 
 // ProtoClone is a type-safe wrapper around proto.Clone
 func ProtoClone[T proto.Message](t T) T {

pkg/controller/direct/securesourcemanager/instance_controller.go

@@ -27,8 +27,6 @@ import (
 	"github.com/GoogleCloudPlatform/k8s-config-connector/pkg/controller/direct/registry"
 
 	gcp "cloud.google.com/go/securesourcemanager/apiv1"
-
-	"cloud.google.com/go/securesourcemanager/apiv1/securesourcemanagerpb"
 	pb "cloud.google.com/go/securesourcemanager/apiv1/securesourcemanagerpb"
 	"google.golang.org/api/option"
 
@@ -76,6 +74,12 @@ func (m *secureSourceManagerInstanceModel) AdapterForObject(ctx context.Context,
 		return nil, err
 	}
 
+	mapCtx := &direct.MapContext{}
+	desired := SecureSourceManagerInstanceSpec_ToProto(mapCtx, &obj.Spec)
+	if mapCtx.Err() != nil {
+		return nil, mapCtx.Err()
+	}
+
 	// Get securesourcemanager GCP client
 	gcpClient, err := m.client(ctx)
 	if err != nil {
@@ -84,7 +88,7 @@ func (m *secureSourceManagerInstanceModel) AdapterForObject(ctx context.Context,
 	return &secureSourceManagerInstanceAdapter{
 		id:        id,
 		gcpClient: gcpClient,
-		desired:   obj,
+		desired:   desired,
 	}, nil
 }
 
@@ -113,8 +117,8 @@ func (m *secureSourceManagerInstanceModel) AdapterForURL(ctx context.Context, ur
 type secureSourceManagerInstanceAdapter struct {
 	id        *krm.SecureSourceManagerInstanceRef
 	gcpClient *gcp.Client
-	desired   *krm.SecureSourceManagerInstance
-	actual    *securesourcemanagerpb.Instance
+	desired   *pb.Instance
+	actual    *pb.Instance
 }
 
 var _ directbase.Adapter = &secureSourceManagerInstanceAdapter{}
@@ -139,13 +143,8 @@ func (a *secureSourceManagerInstanceAdapter) Find(ctx context.Context) (bool, er
 func (a *secureSourceManagerInstanceAdapter) Create(ctx context.Context, createOp *directbase.CreateOperation) error {
 	log := klog.FromContext(ctx)
 	log.V(2).Info("creating Instance", "name", a.id.External)
-	mapCtx := &direct.MapContext{}
 
-	desired := a.desired.DeepCopy()
-	resource := SecureSourceManagerInstanceSpec_ToProto(mapCtx, &desired.Spec)
-	if mapCtx.Err() != nil {
-		return mapCtx.Err()
-	}
+	instance := direct.ProtoClone(a.desired)
 
 	parent, err := a.id.Parent()
 	if err != nil {
@@ -159,7 +158,7 @@ func (a *secureSourceManagerInstanceAdapter) Create(ctx context.Context, createO
 
 	req := &pb.CreateInstanceRequest{
 		Parent:     parent.String(),
-		Instance:   resource,
+		Instance:   instance,
 		InstanceId: instanceID,
 	}
 	op, err := a.gcpClient.CreateInstance(ctx, req)
@@ -173,6 +172,7 @@ func (a *secureSourceManagerInstanceAdapter) Create(ctx context.Context, createO
 	log.V(2).Info("successfully created Instance", "name", a.id.External)
 
 	status := &krm.SecureSourceManagerInstanceStatus{}
+	mapCtx := &direct.MapContext{}
 	status.ObservedState = SecureSourceManagerInstanceObservedState_FromProto(mapCtx, created)
 	if mapCtx.Err() != nil {
 		return mapCtx.Err()