no parent; mockgcp with StartLRO

apis/cloudbuild/v1beta1/workerpool_types.go

@@ -28,16 +28,13 @@ type CloudBuildWorkerPoolSpec struct {
 	DisplayName string  `json:"displayName,omitempty"`
 	ResourceID  *string `json:"resourceID,omitempty"`
 	// +required
-	Parent Parent `json:"parent,omitempty"`
+	ProjectRef *refv1beta1.ProjectRef `json:"projectRef"`
+	// +required
+	Location string `json:"location"`
 	// +required
 	PrivatePoolConfig *PrivatePoolV1Config `json:"privatePoolV1Config,omitempty"`
 }
 
-type Parent struct {
-	ProjectRef *refv1beta1.ProjectRef `json:"projectRef"`
-	Location   string                 `json:"location"`
-}
-
 type PrivatePoolV1Config struct {
 	// +required
 	WorkerConfig *WorkerConfig `json:"workerConfig,omitempty"`
@@ -103,7 +100,7 @@ type NetworkConfigFromGCP struct {
 	PeeredNetworkIpRange string `json:"peeredNetworkIpRange,omitempty"`
 }
 
-// +kubebuilder:metadata:labels="cnrm.cloud.google.com/managed-by-kcc=true";"cnrm.cloud.google.com/directcrd=true";"cnrm.cloud.google.com/stability-level=beta"
+// +kubebuilder:metadata:labels="cnrm.cloud.google.com/managed-by-kcc=true";"cnrm.cloud.google.com/stability-level=beta"
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // CloudBuildWorkerPool is the Schema for the CloudBuild WorkerPool API
 // +kubebuilder:subresource:status

config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_cloudbuildworkerpools.cloudbuild.cnrm.cloud.google.com.yaml

@@ -5,7 +5,6 @@ metadata:
     cnrm.cloud.google.com/version: 0.0.0-dev
   creationTimestamp: null
   labels:
-    cnrm.cloud.google.com/directcrd: "true"
     cnrm.cloud.google.com/managed-by-kcc: "true"
     cnrm.cloud.google.com/stability-level: beta
   name: cloudbuildworkerpools.cloudbuild.cnrm.cloud.google.com
@@ -42,51 +41,10 @@ spec:
             properties:
               displayName:
                 type: string
+              location:
+                type: string
               name:
                 type: string
-              parent:
-                properties:
-                  location:
-                    type: string
-                  projectRef:
-                    description: The Project that this resource belongs to.
-                    oneOf:
-                    - not:
-                        required:
-                        - external
-                      required:
-                      - name
-                      - kind
-                    - not:
-                        anyOf:
-                        - required:
-                          - name
-                        - required:
-                          - namespace
-                        - required:
-                          - kind
-                      required:
-                      - external
-                    properties:
-                      external:
-                        description: The `projectID` field of a project, when not
-                          managed by KCC.
-                        type: string
-                      kind:
-                        description: The kind of the Project resource; optional but
-                          must be `Project` if provided.
-                        type: string
-                      name:
-                        description: The `name` field of a `Project` resource.
-                        type: string
-                      namespace:
-                        description: The `namespace` field of a `Project` resource.
-                        type: string
-                    type: object
-                required:
-                - location
-                - projectRef
-                type: object
               privatePoolV1Config:
                 properties:
                   networkConfig:
@@ -137,11 +95,44 @@ spec:
                 required:
                 - workerConfig
                 type: object
+              projectRef:
+                description: The Project that this resource belongs to.
+                oneOf:
+                - not:
+                    required:
+                    - external
+                  required:
+                  - name
+                - not:
+                    anyOf:
+                    - required:
+                      - name
+                    - required:
+                      - namespace
+                  required:
+                  - external
+                properties:
+                  external:
+                    description: The `projectID` field of a project, when not managed
+                      by KCC.
+                    type: string
+                  kind:
+                    description: The kind of the Project resource; optional but must
+                      be `Project` if provided.
+                    type: string
+                  name:
+                    description: The `name` field of a `Project` resource.
+                    type: string
+                  namespace:
+                    description: The `namespace` field of a `Project` resource.
+                    type: string
+                type: object
               resourceID:
                 type: string
             required:
-            - parent
+            - location
             - privatePoolV1Config
+            - projectRef
             type: object
           status:
             description: CloudBuildWorkerPoolStatus defines the observed state of

mockgcp/mockcloudbuild/service.go

@@ -56,7 +56,8 @@ func (s *MockService) Register(grpcServer *grpc.Server) {
 }
 
 func (s *MockService) NewHTTPMux(ctx context.Context, conn *grpc.ClientConn) (http.Handler, error) {
-	mux, err := httpmux.NewServeMux(ctx, conn, httpmux.Options{}, pb.RegisterCloudBuildHandler)
+	mux, err := httpmux.NewServeMux(ctx, conn, httpmux.Options{}, pb.RegisterCloudBuildHandler,
+		s.operations.RegisterOperationsPath("/v1/{prefix=**}/operations/{name}"))
 	if err != nil {
 		return nil, err
 	}

mockgcp/mockcloudbuild/workerpool.go

@@ -63,18 +63,22 @@ func (s *CloudBuildV1) CreateWorkerPool(ctx context.Context, req *pb.CreateWorke
 
 	obj := proto.Clone(req.GetWorkerPool()).(*pb.WorkerPool)
 	obj.Name = fqn
-	obj.CreateTime = now
-	obj.UpdateTime = now
 	if err := s.storage.Create(ctx, fqn, obj); err != nil {
 		return nil, err
 	}
-	obj.State = pb.WorkerPool_RUNNING
 	metadata := &pb.CreateWorkerPoolOperationMetadata{
 		WorkerPool:   fqn,
 		CreateTime:   now,
 		CompleteTime: now,
 	}
-	return s.operations.DoneLRO(ctx, name.String(), metadata, obj)
+	return s.operations.StartLRO(ctx, name.String(), metadata, func() (proto.Message, error) {
+		// Many fields are not populated in the LRO result
+		result := proto.Clone(obj).(*pb.WorkerPool)
+		result.CreateTime = now
+		result.UpdateTime = now
+		result.State = pb.WorkerPool_RUNNING
+		return result, nil
+	})
 }
 
 func (s *CloudBuildV1) UpdateWorkerPool(ctx context.Context, req *pb.UpdateWorkerPoolRequest) (*longrunningpb.Operation, error) {
@@ -109,11 +113,17 @@ func (s *CloudBuildV1) UpdateWorkerPool(ctx context.Context, req *pb.UpdateWorke
 		return nil, err
 	}
 	metadata := &pb.UpdateWorkerPoolOperationMetadata{
-		WorkerPool:   fqn,
+		WorkerPool:   name.String(),
 		CreateTime:   now,
 		CompleteTime: now,
 	}
-	return s.operations.DoneLRO(ctx, name.String(), metadata, obj)
+	return s.operations.StartLRO(ctx, name.String(), metadata, func() (proto.Message, error) {
+		// Many fields are not populated in the LRO result
+		result := proto.Clone(obj).(*pb.WorkerPool)
+		result.UpdateTime = now
+		result.State = pb.WorkerPool_RUNNING
+		return result, nil
+	})
 }
 
 func (s *CloudBuildV1) DeleteWorkerPool(ctx context.Context, req *pb.DeleteWorkerPoolRequest) (*longrunningpb.Operation, error) {
@@ -153,6 +163,10 @@ func (n *workerPoolName) String() string {
 	return "projects/" + n.Project.ID + "/locations/" + n.Location + "/workerPools/" + n.WorkerPoolName
 }
 
+func (n *workerPoolName) GetParent() string {
+	return "projects/" + n.Project.ID + "/locations/" + n.Location
+}
+
 func (s *MockService) parseWorkerPoolName(name string) (*workerPoolName, error) {
 	tokens := strings.Split(name, "/")
 

pkg/controller/direct/cloudbuild/workerpool_controller.go

@@ -92,7 +92,7 @@ func (m *model) AdapterForObject(ctx context.Context, reader client.Reader, u *u
 	}
 
 	// Get GCP Project
-	projectRef, err := references.ResolveProject(ctx, reader, obj, obj.Spec.Parent.ProjectRef)
+	projectRef, err := references.ResolveProject(ctx, reader, obj, obj.Spec.ProjectRef)
 	if err != nil {
 		return nil, err
 	}
@@ -102,7 +102,7 @@ func (m *model) AdapterForObject(ctx context.Context, reader client.Reader, u *u
 	}
 
 	// Get location
-	location := obj.Spec.Parent.Location
+	location := obj.Spec.Location
 
 	// Get computeNetwork
 	if obj.Spec.PrivatePoolConfig.NetworkConfig != nil {

pkg/test/resourcefixture/testdata/basic/cloudbuild/v1beta1/cloudbuildworkerpool/_generated_object_cloudbuildworkerpool.golden.yaml

@@ -11,10 +11,7 @@ metadata:
   namespace: ${uniqueId}
 spec:
   displayName: New CloudBuild WorkerPool
-  parent:
-    location: us-central1
-    projectRef:
-      external: projects/${projectId}
+  location: us-central1
   privatePoolV1Config:
     networkConfig:
       egressOption: NO_PUBLIC_EGRESS
@@ -24,6 +21,8 @@ spec:
     workerConfig:
       diskSizeGb: 150
       machineType: e2-medium
+  projectRef:
+    external: projects/${projectId}
 status:
   conditions:
   - lastTransitionTime: "1970-01-01T00:00:00Z"