From 459ac2dbdae4304bcc1e504faad7cf90d309818f Mon Sep 17 00:00:00 2001 From: Gemma Hou Date: Tue, 10 Sep 2024 18:38:16 +0000 Subject: [PATCH] Update acronyms --- apis/compute/v1beta1/computeforwardingrule_types.go | 2 +- apis/compute/v1beta1/zz_generated.deepcopy.go | 4 ++-- ..._computeforwardingrules.compute.cnrm.cloud.google.com.yaml | 2 +- kubebuilder_2.3.1__.tar.gz | 1 - .../apis/compute/v1beta1/computeforwardingrule_types.go | 2 +- .../generated/apis/compute/v1beta1/zz_generated.deepcopy.go | 4 ++-- pkg/controller/direct/compute/forwardingrule_controller.go | 2 +- pkg/controller/direct/compute/mapper.go | 4 ++-- ...rated_object_globalforwardingrulepscgoogleapis.golden.yaml | 2 +- .../globalforwardingrulepscgoogleapis/create.yaml | 2 +- .../globalforwardingrulepscgoogleapis/update.yaml | 2 +- .../generated/resource-docs/compute/computeforwardingrule.md | 4 ++-- tests/apichecks/testdata/exceptions/acronyms.txt | 1 - 13 files changed, 15 insertions(+), 17 deletions(-) delete mode 100644 kubebuilder_2.3.1__.tar.gz diff --git a/apis/compute/v1beta1/computeforwardingrule_types.go b/apis/compute/v1beta1/computeforwardingrule_types.go index 3ef6a5e395..552f68831c 100644 --- 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 index c5c20d00c3..ba0c039954 100644 --- a/apis/compute/v1beta1/zz_generated.deepcopy.go +++ b/apis/compute/v1beta1/zz_generated.deepcopy.go @@ -358,8 +358,8 @@ func (in *ForwardingruleServiceDirectoryRegistrations) DeepCopy() *Forwardingrul // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ForwardingruleTarget) DeepCopyInto(out *ForwardingruleTarget) { *out = *in - if in.GoogleApiBundle != nil { - in, out := &in.GoogleApiBundle, &out.GoogleApiBundle + if in.GoogleAPIBundle != nil { + in, out := &in.GoogleAPIBundle, &out.GoogleAPIBundle *out = new(string) **out = **in } diff --git a/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_computeforwardingrules.compute.cnrm.cloud.google.com.yaml b/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_computeforwardingrules.compute.cnrm.cloud.google.com.yaml index c51af877dc..7961b607bf 100644 --- a/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_computeforwardingrules.compute.cnrm.cloud.google.com.yaml +++ b/config/crds/resources/apiextensions.k8s.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 deleted file mode 100644 index 8537307691..0000000000 --- a/kubebuilder_2.3.1__.tar.gz +++ /dev/null @@ -1 +0,0 @@ -Not Found \ No newline at end of file diff --git a/pkg/clients/generated/apis/compute/v1beta1/computeforwardingrule_types.go b/pkg/clients/generated/apis/compute/v1beta1/computeforwardingrule_types.go index 0c96422dda..c87da6e277 100644 --- a/pkg/clients/generated/apis/compute/v1beta1/computeforwardingrule_types.go +++ b/pkg/clients/generated/apis/compute/v1beta1/computeforwardingrule_types.go @@ -80,7 +80,7 @@ type ForwardingruleServiceDirectoryRegistrations struct { type ForwardingruleTarget struct { // +optional - GoogleApiBundle *string `json:"googleApiBundle,omitempty"` + GoogleAPIBundle *string `json:"googleAPIBundle,omitempty"` // +optional ServiceAttachmentRef *v1alpha1.ResourceRef `json:"serviceAttachmentRef,omitempty"` diff --git a/pkg/clients/generated/apis/compute/v1beta1/zz_generated.deepcopy.go b/pkg/clients/generated/apis/compute/v1beta1/zz_generated.deepcopy.go index 7d54baecb3..5c14d28da5 100644 --- a/pkg/clients/generated/apis/compute/v1beta1/zz_generated.deepcopy.go +++ b/pkg/clients/generated/apis/compute/v1beta1/zz_generated.deepcopy.go @@ -10610,8 +10610,8 @@ func (in *ForwardingruleServiceDirectoryRegistrations) DeepCopy() *Forwardingrul // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ForwardingruleTarget) DeepCopyInto(out *ForwardingruleTarget) { *out = *in - if in.GoogleApiBundle != nil { - in, out := &in.GoogleApiBundle, &out.GoogleApiBundle + if in.GoogleAPIBundle != nil { + in, out := &in.GoogleAPIBundle, &out.GoogleAPIBundle *out = new(string) **out = **in } diff --git a/pkg/controller/direct/compute/forwardingrule_controller.go b/pkg/controller/direct/compute/forwardingrule_controller.go index 915e51dcfc..8e1083d8ba 100644 --- 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 index 4823647ea7..8075f78c69 100644 --- 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/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalforwardingrulepscgoogleapis/_generated_object_globalforwardingrulepscgoogleapis.golden.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalforwardingrulepscgoogleapis/_generated_object_globalforwardingrulepscgoogleapis.golden.yaml index 48d60951ed..7728a7326c 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalforwardingrulepscgoogleapis/_generated_object_globalforwardingrulepscgoogleapis.golden.yaml +++ b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalforwardingrulepscgoogleapis/_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/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalforwardingrulepscgoogleapis/create.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalforwardingrulepscgoogleapis/create.yaml index f47d9efcb6..8a8a2bfd9d 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalforwardingrulepscgoogleapis/create.yaml +++ b/pkg/test/resourcefixture/testdata/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/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalforwardingrulepscgoogleapis/update.yaml b/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalforwardingrulepscgoogleapis/update.yaml index 2b6477605f..c13ea8658b 100644 --- a/pkg/test/resourcefixture/testdata/basic/compute/v1beta1/computeforwardingrule/globalforwardingrulepscgoogleapis/update.yaml +++ b/pkg/test/resourcefixture/testdata/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/scripts/generate-google3-docs/resource-reference/generated/resource-docs/compute/computeforwardingrule.md b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/compute/computeforwardingrule.md index 5f5fe916a6..217d010d58 100644 --- a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/compute/computeforwardingrule.md +++ b/scripts/generate-google3-docs/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 %}

-

target.googleApiBundle

+

target.googleAPIBundle

Optional

diff --git a/tests/apichecks/testdata/exceptions/acronyms.txt b/tests/apichecks/testdata/exceptions/acronyms.txt index 06794b02bd..8af2ab2b82 100644 --- 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[]"