Update acronyms

gemmahou · Sep 10, 2024 · 459ac2d · 459ac2d
1 parent 71620f3
commit 459ac2d
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 17 deletions.
diff --git a/apis/compute/v1beta1/computeforwardingrule_types.go b/apis/compute/v1beta1/computeforwardingrule_types.go
@@ -88,7 +88,7 @@ type ForwardingruleServiceDirectoryRegistrations struct {
 
 type ForwardingruleTarget struct {
 	// +optional
-	GoogleApiBundle *string `json:"googleApiBundle,omitempty"`
+	GoogleAPIBundle *string `json:"googleAPIBundle,omitempty"`
 
 	// +optional
 	ServiceAttachmentRef *refs.ComputeServiceAttachmentRef `json:"serviceAttachmentRef,omitempty"`

diff --git a/apis/compute/v1beta1/zz_generated.deepcopy.go b/apis/compute/v1beta1/zz_generated.deepcopy.go
diff --git a/....io_v1_customresourcedefinition_computeforwardingrules.compute.cnrm.cloud.google.com.yaml b/....io_v1_customresourcedefinition_computeforwardingrules.compute.cnrm.cloud.google.com.yaml
@@ -473,7 +473,7 @@ spec:
                   For INTERNAL_SELF_MANAGED load balancing, only HTTP and HTTPS targets
                   are valid.
                 properties:
-                  googleApiBundle:
+                  googleAPIBundle:
                     type: string
                   serviceAttachmentRef:
                     oneOf:

diff --git a/kubebuilder_2.3.1__.tar.gz b/kubebuilder_2.3.1__.tar.gz
diff --git a/pkg/clients/generated/apis/compute/v1beta1/computeforwardingrule_types.go b/pkg/clients/generated/apis/compute/v1beta1/computeforwardingrule_types.go
diff --git a/pkg/clients/generated/apis/compute/v1beta1/zz_generated.deepcopy.go b/pkg/clients/generated/apis/compute/v1beta1/zz_generated.deepcopy.go
diff --git a/pkg/controller/direct/compute/forwardingrule_controller.go b/pkg/controller/direct/compute/forwardingrule_controller.go
@@ -286,7 +286,7 @@ func (a *forwardingRuleAdapter) Create(ctx context.Context, createOp *directbase
 	target := direct.ValueOf(forwardingRule.Target)
 
 	// API restriction: Labels are invalid in Private Service Connect Forwarding Rule.
-	// TF workaround: https://github.com/GoogleCloudPlatform/k8s-config-connector/pull/944
+	// Config Connector workaround on TF-based resource: https://github.com/GoogleCloudPlatform/k8s-config-connector/pull/944
 	if target != "all-apis" && target != "vpc-sc" && !strings.Contains(target, "/serviceAttachments/") {
 		forwardingRule.Labels = desired.Labels
 	}

diff --git a/pkg/controller/direct/compute/mapper.go b/pkg/controller/direct/compute/mapper.go
@@ -115,8 +115,8 @@ func ComputeForwardingRuleSpec_Target_ToProto(mapCtx *direct.MapContext, in *krm
 	}
 
 	var out *string
-	if oneof := in.GoogleApiBundle; oneof != nil {
-		out = in.GoogleApiBundle
+	if oneof := in.GoogleAPIBundle; oneof != nil {
+		out = in.GoogleAPIBundle
 	}
 	if oneof := in.ServiceAttachmentRef; oneof != nil {
 		if oneof.External == "" {

diff --git a/...rwardingrulepscgoogleapis/_generated_object_globalforwardingrulepscgoogleapis.golden.yaml b/...rwardingrulepscgoogleapis/_generated_object_globalforwardingrulepscgoogleapis.golden.yaml
@@ -23,7 +23,7 @@ spec:
   networkRef:
     name: default
   target:
-    googleApiBundle: all-apis
+    googleAPIBundle: all-apis
 status:
   conditions:
   - lastTransitionTime: "1970-01-01T00:00:00Z"

diff --git a/...basic/compute/v1beta1/computeforwardingrule/globalforwardingrulepscgoogleapis/create.yaml b/...basic/compute/v1beta1/computeforwardingrule/globalforwardingrulepscgoogleapis/create.yaml
@@ -23,7 +23,7 @@ spec:
   location: global
   target:
     # a supported Google API bundle (global-only)
-    googleApiBundle: "all-apis"
+    googleAPIBundle: "all-apis"
   loadBalancingScheme: ""
   ipAddress:
     addressRef:

diff --git a/...basic/compute/v1beta1/computeforwardingrule/globalforwardingrulepscgoogleapis/update.yaml b/...basic/compute/v1beta1/computeforwardingrule/globalforwardingrulepscgoogleapis/update.yaml
@@ -23,7 +23,7 @@ spec:
   location: global
   target:
     # a supported Google API bundle (global-only)
-    googleApiBundle: "all-apis"
+    googleAPIBundle: "all-apis"
   loadBalancingScheme: ""
   ipAddress:
     addressRef:

diff --git a/...ocs/resource-reference/generated/resource-docs/compute/computeforwardingrule.md b/...ocs/resource-reference/generated/resource-docs/compute/computeforwardingrule.md
@@ -131,7 +131,7 @@ subnetworkRef:
   name: string
   namespace: string
 target:
-  googleApiBundle: string
+  googleAPIBundle: string
   serviceAttachmentRef:
     external: string
     name: string
@@ -810,7 +810,7 @@ subnetwork must be specified.{% endverbatim %}</p>
     </tr>
     <tr>
         <td>
-            <p><code>target.googleApiBundle</code></p>
+            <p><code>target.googleAPIBundle</code></p>
             <p><i>Optional</i></p>
         </td>
         <td>

diff --git a/tests/apichecks/testdata/exceptions/acronyms.txt b/tests/apichecks/testdata/exceptions/acronyms.txt
@@ -114,7 +114,6 @@
 [acronyms] crd=computefirewallpolicies.compute.cnrm.cloud.google.com version=v1beta1: field ".status.selfLinkWithId" should be ".status.selfLinkWithID"
 [acronyms] crd=computeforwardingrules.compute.cnrm.cloud.google.com version=v1beta1: field ".spec.sourceIpRanges" should be ".spec.sourceIPRanges"
 [acronyms] crd=computeforwardingrules.compute.cnrm.cloud.google.com version=v1beta1: field ".spec.sourceIpRanges[]" should be ".spec.sourceIPRanges[]"
-[acronyms] crd=computeforwardingrules.compute.cnrm.cloud.google.com version=v1beta1: field ".spec.target.googleApiBundle" should be ".spec.target.googleAPIBundle"
 [acronyms] crd=computeforwardingrules.compute.cnrm.cloud.google.com version=v1beta1: field ".status.pscConnectionId" should be ".status.pscConnectionID"
 [acronyms] crd=computeimages.compute.cnrm.cloud.google.com version=v1beta1: field ".spec.guestOsFeatures" should be ".spec.guestOSFeatures"
 [acronyms] crd=computeimages.compute.cnrm.cloud.google.com version=v1beta1: field ".spec.guestOsFeatures[]" should be ".spec.guestOSFeatures[]"