updates on resolvers

gemmahou · Aug 8, 2024 · 9c40670 · 9c40670
1 parent 2dee76e
commit 9c40670
Show file tree

Hide file tree

Showing 8 changed files with 176 additions and 133 deletions.
diff --git a/apis/refs/v1beta1/computerefs.go b/apis/refs/v1beta1/computerefs.go
diff --git a/...o_v1_customresourcedefinition_cloudbuildworkerpools.cloudbuild.cnrm.cloud.google.com.yaml b/...o_v1_customresourcedefinition_cloudbuildworkerpools.cloudbuild.cnrm.cloud.google.com.yaml
@@ -70,8 +70,8 @@ spec:
                           - external
                         properties:
                           external:
-                            description: The compute network selflink of form "projects/<project>/global/networks/<network>",
-                              when not managed by Config Connector.
+                            description: An external value of a `ComputeNetwork` resource,
+                              when not managed by KCC.
                             type: string
                           name:
                             description: The `name` field of a `ComputeNetwork` resource.
@@ -275,8 +275,8 @@ spec:
                           - external
                         properties:
                           external:
-                            description: The compute network selflink of form "projects/<project>/global/networks/<network>",
-                              when not managed by Config Connector.
+                            description: An external value of a `ComputeNetwork` resource,
+                              when not managed by KCC.
                             type: string
                           name:
                             description: The `name` field of a `ComputeNetwork` resource.

diff --git a/...tworkconnectivityserviceconnectionpolicies.networkconnectivity.cnrm.cloud.google.com.yaml b/...tworkconnectivityserviceconnectionpolicies.networkconnectivity.cnrm.cloud.google.com.yaml
@@ -78,8 +78,8 @@ spec:
                   - external
                 properties:
                   external:
-                    description: The compute network selflink of form "projects/<project>/global/networks/<network>",
-                      when not managed by Config Connector.
+                    description: An external value of a `ComputeNetwork` resource,
+                      when not managed by KCC.
                     type: string
                   name:
                     description: The `name` field of a `ComputeNetwork` resource.
@@ -154,8 +154,8 @@ spec:
                         - external
                       properties:
                         external:
-                          description: The ComputeSubnetwork selflink of form "projects/{{project}}/regions/{{region}}/subnetworks/{{name}}",
-                            when not managed by KCC.
+                          description: An external value a `ComputeSubnetwork`, when
+                            not managed by KCC.
                           type: string
                         name:
                           description: The `name` field of a `ComputeSubnetwork` resource.

diff --git a/...ensions.k8s.io_v1_customresourcedefinition_redisclusters.redis.cnrm.cloud.google.com.yaml b/...ensions.k8s.io_v1_customresourcedefinition_redisclusters.redis.cnrm.cloud.google.com.yaml
@@ -122,8 +122,8 @@ spec:
                         - external
                       properties:
                         external:
-                          description: The compute network selflink of form "projects/<project>/global/networks/<network>",
-                            when not managed by Config Connector.
+                          description: An external value of a `ComputeNetwork` resource,
+                            when not managed by KCC.
                           type: string
                         name:
                           description: The `name` field of a `ComputeNetwork` resource.
@@ -262,9 +262,8 @@ spec:
                                 - external
                               properties:
                                 external:
-                                  description: The compute network selflink of form
-                                    "projects/<project>/global/networks/<network>",
-                                    when not managed by Config Connector.
+                                  description: An external value of a `ComputeNetwork`
+                                    resource, when not managed by KCC.
                                   type: string
                                 name:
                                   description: The `name` field of a `ComputeNetwork`

diff --git a/mockgcp/mockcompute/networksv1.go b/mockgcp/mockcompute/networksv1.go
@@ -43,9 +43,6 @@ func (s *NetworksV1) Get(ctx context.Context, req *pb.GetNetworkRequest) (*pb.Ne
 
 	obj := &pb.Network{}
 	if err := s.storage.Get(ctx, fqn, obj); err != nil {
-		if status.Code(err) == codes.NotFound {
-			return nil, status.Errorf(codes.NotFound, "The resource '%s' was not found", fqn)
-		}
 		return nil, err
 	}
 

diff --git a/pkg/controller/direct/cloudbuild/workerpool_controller.go b/pkg/controller/direct/cloudbuild/workerpool_controller.go
@@ -128,12 +128,12 @@ func (m *model) AdapterForObject(ctx context.Context, reader client.Reader, u *u
 
 	// Get computeNetwork
 	if obj.Spec.PrivatePoolConfig.NetworkConfig != nil {
-		networkRef, err := refs.ResolveComputeNetwork(ctx, reader, obj, &obj.Spec.PrivatePoolConfig.NetworkConfig.PeeredNetworkRef)
+		networkRef, err := refs.ResolveComputeNetwork(ctx, reader, obj, &obj.Spec.PrivatePoolConfig.NetworkConfig.PeeredNetworkRef, "id")
 		if err != nil {
 			return nil, err
 
 		}
-		obj.Spec.PrivatePoolConfig.NetworkConfig.PeeredNetworkRef.External = networkRef.String()
+		obj.Spec.PrivatePoolConfig.NetworkConfig.PeeredNetworkRef.External = networkRef.External
 	}
 
 	// Get CloudBuild GCP client

diff --git a/pkg/controller/direct/networkconnectivity/refs.go b/pkg/controller/direct/networkconnectivity/refs.go
@@ -53,17 +53,15 @@ func (r *refNormalizer) VisitField(path string, v any) error {
 	}
 
 	if networkRef, ok := v.(*refs.ComputeNetworkRef); ok {
-		resolved, err := refs.ResolveComputeNetwork(r.ctx, r.kube, r.src, networkRef)
+		resolved, err := refs.ResolveComputeNetwork(r.ctx, r.kube, r.src, networkRef, "id")
 		if err != nil {
 			return err
 		}
-		*networkRef = refs.ComputeNetworkRef{
-			External: resolved.String(),
-		}
+		*networkRef = *resolved
 	}
 
 	if subnetworkRef, ok := v.(*refs.ComputeSubnetworkRef); ok {
-		resolved, err := refs.ResolveComputeSubnetwork(r.ctx, r.kube, r.src, subnetworkRef)
+		resolved, err := refs.ResolveComputeSubnetwork(r.ctx, r.kube, r.src, subnetworkRef, "id")
 		if err != nil {
 			return err
 		}
@@ -73,7 +71,7 @@ func (r *refNormalizer) VisitField(path string, v any) error {
 	if subnetworkRefs, ok := v.([]refs.ComputeSubnetworkRef); ok {
 		for i := range subnetworkRefs {
 			subnetworkRef := &subnetworkRefs[i]
-			resolved, err := refs.ResolveComputeSubnetwork(r.ctx, r.kube, r.src, subnetworkRef)
+			resolved, err := refs.ResolveComputeSubnetwork(r.ctx, r.kube, r.src, subnetworkRef, "id")
 			if err != nil {
 				return err
 			}

diff --git a/...s/resource-reference/generated/resource-docs/cloudbuild/cloudbuildworkerpool.md b/...s/resource-reference/generated/resource-docs/cloudbuild/cloudbuildworkerpool.md
@@ -168,7 +168,7 @@ resourceID: string
         </td>
         <td>
             <p><code class="apitype">string</code></p>
-            <p>{% verbatim %}The compute network selflink of form "projects/<project>/global/networks/<network>", when not managed by Config Connector.{% endverbatim %}</p>
+            <p>{% verbatim %}An external value of a `ComputeNetwork` resource, when not managed by KCC.{% endverbatim %}</p>
         </td>
     </tr>
     <tr>
-Original file line number
+Diff line change
@@ Expand Up / @@ -168,7 +168,7 @@ resourceID: string @@
             </td>
             <td>
                 <p><code class="apitype">string</code></p>
-                <p>{% verbatim %}The compute network selflink of form "projects/<project>/global/networks/<network>", when not managed by Config Connector.{% endverbatim %}</p>
+                <p>{% verbatim %}An external value of a `ComputeNetwork` resource, when not managed by KCC.{% endverbatim %}</p>
             </td>
         </tr>
         <tr>
@@ Expand Down @@