diff --git a/config/samples/resources/dlpjobtrigger/cloud-storage-job-trigger/dlp_v1beta1_dlpstoredinfotype.yaml b/config/samples/resources/dlpjobtrigger/cloud-storage-job-trigger/dlp_v1beta1_dlpstoredinfotype.yaml index f381655095..6358091f53 100644 --- a/config/samples/resources/dlpjobtrigger/cloud-storage-job-trigger/dlp_v1beta1_dlpstoredinfotype.yaml +++ b/config/samples/resources/dlpjobtrigger/cloud-storage-job-trigger/dlp_v1beta1_dlpstoredinfotype.yaml @@ -20,6 +20,6 @@ spec: projectRef: # Replace "${PROJECT_ID?}" with your project ID external: "projects/${PROJECT_ID?}" - loction: "us-west2" + location: "us-west2" regex: pattern: ".*" diff --git a/dev/tasks/build-cli-bundle b/dev/tasks/build-cli-bundle index a5ff33d51d..a6b498ea30 100755 --- a/dev/tasks/build-cli-bundle +++ b/dev/tasks/build-cli-bundle @@ -56,7 +56,7 @@ rm -rf "${BUILD}/lib" cp "${REPO_ROOT}/dev/metadata/licenses-config-connector.txt" "${BUILD}/LICENSES.txt" -# build a binary for each CPU architecture on linux, osx, and windows +# build a binary for each CPU architecture on Linux, macOS, and Windows # list of dist we support: # linux_amd64/linux_arm64/darwin_amd64/darwin_arm64/windows_amd64 for GODIST in $(go tool dist list | grep "linux\|darwin\|windows" | grep "amd64\|arm64" | grep -v "windows/arm64"); do diff --git a/dev/tools/controllerbuilder/pkg/commands/updatetypes/updatetypescommand.go b/dev/tools/controllerbuilder/pkg/commands/updatetypes/updatetypescommand.go index 2b819c7b9f..242997e3e7 100644 --- a/dev/tools/controllerbuilder/pkg/commands/updatetypes/updatetypescommand.go +++ b/dev/tools/controllerbuilder/pkg/commands/updatetypes/updatetypescommand.go @@ -238,7 +238,7 @@ func (u *TypeUpdater) generate() error { for _, msg := range u.dependentMessages { var buf bytes.Buffer - klog.Infof("generate Go code for messge %s", msg.FullName()) + klog.Infof("generate Go code for message %s", msg.FullName()) codegen.WriteMessage(&buf, msg) u.generatedGoStructs = append(u.generatedGoStructs, generatedGoStruct{ diff --git a/docs/releasenotes/release-1.120.md b/docs/releasenotes/release-1.120.md index eab21a643e..4cd337391b 100644 --- a/docs/releasenotes/release-1.120.md +++ b/docs/releasenotes/release-1.120.md @@ -16,7 +16,7 @@ * `CloudBuildWorkerPool` * `CloudIDSEndpoint` -* `ComputeMangedSSLCertificate` +* `ComputeManagedSSLCertificate` ## New Fields: diff --git a/experiments/compositions/composition/tests/cluster/configcontroller/cluster.go b/experiments/compositions/composition/tests/cluster/configcontroller/cluster.go index 2295fc602d..7b88fa2d30 100644 --- a/experiments/compositions/composition/tests/cluster/configcontroller/cluster.go +++ b/experiments/compositions/composition/tests/cluster/configcontroller/cluster.go @@ -292,7 +292,7 @@ func (c *ccCluster) ClusterUp() error { return fmt.Errorf("Error Waiting for Deloyments. err: %v", err) } - // HACK - Ties this lib to Composition. Shall figure out callback lateron. + // HACK - Ties this lib to Composition. Shall figure out callback later on. // May be parameterize manifests with context contextObj := utils.GetContextObj(c.Context()) err = c.Client.Create(context.Background(), contextObj) diff --git a/experiments/compositions/expanders/cel-expander/main_test.go b/experiments/compositions/expanders/cel-expander/main_test.go index fe63acb139..1034b2b913 100644 --- a/experiments/compositions/expanders/cel-expander/main_test.go +++ b/experiments/compositions/expanders/cel-expander/main_test.go @@ -41,7 +41,7 @@ metadata: namespace: config-control spec: ` - emptyCELRenderedManifets = "" + emptyCELRenderedManifests = "" // Simple chart with a static template file (no templating) staticSimpleChart = `apiVersion: composition.google.com/v1alpha1 @@ -61,7 +61,7 @@ spec: foo: "3" bar: "interface" ` - staticSimpleChartRenderedManifets = ` + staticSimpleChartRenderedManifests = ` --- apiVersion: v1 data: @@ -89,7 +89,7 @@ spec: foo: ${sqls.spec.foo} car: ${sqls.spec.car} ` - simpleCELConfigRenderedManifets = ` + simpleCELConfigRenderedManifests = ` --- apiVersion: v1 data: @@ -247,8 +247,8 @@ func TestEvaluateNoResourcesConfig(t *testing.T) { if r.GetStatus() != pb.Status_SUCCESS { t.Fatalf("want SUCCESS, got: %s", r.GetStatus()) } - if string(r.Manifests) != emptyCELRenderedManifets { - t.Fatalf("\nexpected: %s\n got: %s", emptyCELRenderedManifets, r.Manifests) + if string(r.Manifests) != emptyCELRenderedManifests { + t.Fatalf("\nexpected: %s\n got: %s", emptyCELRenderedManifests, r.Manifests) } } @@ -270,8 +270,8 @@ func TestEvaluateEmptyContext(t *testing.T) { t.Fatalf("want SUCCESS, got: %s", r.GetStatus()) } t.Logf("status returned: %s, %s", r.GetStatus(), r.GetError()) - if string(r.Manifests) != emptyCELRenderedManifets { - t.Fatalf("\nexpected: %s\n got: %s", emptyCELRenderedManifets, r.Manifests) + if string(r.Manifests) != emptyCELRenderedManifests { + t.Fatalf("\nexpected: %s\n got: %s", emptyCELRenderedManifests, r.Manifests) } } @@ -313,8 +313,8 @@ func TestEvaluateEmptyValue(t *testing.T) { t.Fatalf("want SUCCESS, got: %s", r.GetStatus()) } t.Logf("status returned: %s, %s", r.GetStatus(), r.GetError()) - if string(r.Manifests) != emptyCELRenderedManifets { - t.Fatalf("\nexpected: %s\n got: %s", emptyCELRenderedManifets, r.Manifests) + if string(r.Manifests) != emptyCELRenderedManifests { + t.Fatalf("\nexpected: %s\n got: %s", emptyCELRenderedManifests, r.Manifests) } } @@ -335,8 +335,8 @@ func TestEvaluateStaticConfig(t *testing.T) { if r.GetStatus() != pb.Status_SUCCESS { t.Fatalf("want SUCCESS, got: %s", r.GetStatus()) } - if string(r.Manifests) != staticSimpleChartRenderedManifets { - t.Fatalf("\nexpected: %s\n got: %s", staticSimpleChartRenderedManifets, r.Manifests) + if string(r.Manifests) != staticSimpleChartRenderedManifests { + t.Fatalf("\nexpected: %s\n got: %s", staticSimpleChartRenderedManifests, r.Manifests) } } @@ -357,8 +357,8 @@ func TestEvaluateUsingFacade(t *testing.T) { if r.GetStatus() != pb.Status_SUCCESS { t.Fatalf("want SUCCESS, got: %s", r.GetStatus()) } - if string(r.Manifests) != simpleCELConfigRenderedManifets { - t.Fatalf("\nexpected: %s\n got: %s", simpleCELConfigRenderedManifets, r.Manifests) + if string(r.Manifests) != simpleCELConfigRenderedManifests { + t.Fatalf("\nexpected: %s\n got: %s", simpleCELConfigRenderedManifests, r.Manifests) } } @@ -410,8 +410,8 @@ func TestEvaluateTemplateUsesValues(t *testing.T) { t.Fatalf("want SUCCESS , got: %s", r.GetStatus()) } - if string(r.Manifests) != simpleCELConfigRenderedManifets { - t.Fatalf("\nexpected: %s\ngot: %s", simpleCELConfigRenderedManifets, r.Manifests) + if string(r.Manifests) != simpleCELConfigRenderedManifests { + t.Fatalf("\nexpected: %s\ngot: %s", simpleCELConfigRenderedManifests, r.Manifests) } } diff --git a/experiments/compositions/expanders/helm-expander/main_test.go b/experiments/compositions/expanders/helm-expander/main_test.go index f8cfba747f..08c43dbaad 100644 --- a/experiments/compositions/expanders/helm-expander/main_test.go +++ b/experiments/compositions/expanders/helm-expander/main_test.go @@ -46,7 +46,7 @@ spec: description: sample chart version: 0.1.0 ` - emptyChartRenderedManifets = "\n" + emptyChartRenderedManifests = "\n" // Simple chart with a static template file (no templating) staticSimpleChart = `apiVersion: composition.google.com/v1alpha1 @@ -71,7 +71,7 @@ spec: foo: "3" bar: "interface" ` - staticSimpleChartRenderedManifets = `--- + staticSimpleChartRenderedManifests = `--- # Source: hello-world/templates/configmap.yaml apiVersion: v1 data: @@ -104,7 +104,7 @@ spec: foo: "{{ .Values.sqls.spec.foo }}" car: "{{ .Values.sqls.spec.car }}" ` - simpleChartRenderedManifets = `--- + simpleChartRenderedManifests = `--- # Source: hello-world/templates/configmap.yaml apiVersion: v1 data: @@ -138,7 +138,7 @@ spec: car: "{{ .Values.sqls.spec.car }}" {{ if eq .Values.sqls.spec.car "sedan" }}trunk: "true"{{ end }} ` - simpleTemplateChartRenderedManifets = `--- + simpleTemplateChartRenderedManifests = `--- # Source: hello-world/templates/configmap.yaml apiVersion: v1 kind: ConfigMap @@ -334,8 +334,8 @@ func TestEvaluateNoTemplateConfig(t *testing.T) { if r.GetStatus() != pb.Status_SUCCESS { t.Fatalf("want SUCCESS, got: %s", r.GetStatus()) } - if string(r.Manifests) != emptyChartRenderedManifets { - t.Fatalf("\nexpected: %s\n got: %s", emptyChartRenderedManifets, r.Manifests) + if string(r.Manifests) != emptyChartRenderedManifests { + t.Fatalf("\nexpected: %s\n got: %s", emptyChartRenderedManifests, r.Manifests) } } @@ -357,8 +357,8 @@ func TestEvaluateEmptyContext(t *testing.T) { t.Fatalf("want SUCCESS, got: %s", r.GetStatus()) } t.Logf("status returned: %s, %s", r.GetStatus(), r.GetError()) - if string(r.Manifests) != emptyChartRenderedManifets { - t.Fatalf("\nexpected: %s\n got: %s", emptyChartRenderedManifets, r.Manifests) + if string(r.Manifests) != emptyChartRenderedManifests { + t.Fatalf("\nexpected: %s\n got: %s", emptyChartRenderedManifests, r.Manifests) } } @@ -400,8 +400,8 @@ func TestEvaluateEmptyValue(t *testing.T) { t.Fatalf("want SUCCESS, got: %s", r.GetStatus()) } t.Logf("status returned: %s, %s", r.GetStatus(), r.GetError()) - if string(r.Manifests) != emptyChartRenderedManifets { - t.Fatalf("\nexpected: %s\n got: %s", emptyChartRenderedManifets, r.Manifests) + if string(r.Manifests) != emptyChartRenderedManifests { + t.Fatalf("\nexpected: %s\n got: %s", emptyChartRenderedManifests, r.Manifests) } } @@ -422,8 +422,8 @@ func TestEvaluateStaticConfig(t *testing.T) { if r.GetStatus() != pb.Status_SUCCESS { t.Fatalf("want SUCCESS, got: %s", r.GetStatus()) } - if string(r.Manifests) != staticSimpleChartRenderedManifets { - t.Fatalf("\nexpected: %s\n got: %s", staticSimpleChartRenderedManifets, r.Manifests) + if string(r.Manifests) != staticSimpleChartRenderedManifests { + t.Fatalf("\nexpected: %s\n got: %s", staticSimpleChartRenderedManifests, r.Manifests) } } @@ -444,8 +444,8 @@ func TestEvaluateUsingFacade(t *testing.T) { if r.GetStatus() != pb.Status_SUCCESS { t.Fatalf("want SUCCESS, got: %s", r.GetStatus()) } - if string(r.Manifests) != simpleChartRenderedManifets { - t.Fatalf("\nexpected: %s\n got: %s", simpleChartRenderedManifets, r.Manifests) + if string(r.Manifests) != simpleChartRenderedManifests { + t.Fatalf("\nexpected: %s\n got: %s", simpleChartRenderedManifests, r.Manifests) } } @@ -466,8 +466,8 @@ func TestEvaluateTemplateUsingFacade(t *testing.T) { if r.GetStatus() != pb.Status_SUCCESS { t.Fatalf("want SUCCESS, got: %s", r.GetStatus()) } - if string(r.Manifests) != simpleTemplateChartRenderedManifets { - t.Fatalf("\nexpected: %s\ngot: %s", simpleTemplateChartRenderedManifets, r.Manifests) + if string(r.Manifests) != simpleTemplateChartRenderedManifests { + t.Fatalf("\nexpected: %s\ngot: %s", simpleTemplateChartRenderedManifests, r.Manifests) } } @@ -532,8 +532,8 @@ func TestEvaluateTemplateUsesValues(t *testing.T) { t.Fatalf("want SUCCESS , got: %s", r.GetStatus()) } - if string(r.Manifests) != simpleTemplateChartRenderedManifets { - t.Fatalf("\nexpected: %s\ngot: %s", simpleTemplateChartRenderedManifets, r.Manifests) + if string(r.Manifests) != simpleTemplateChartRenderedManifests { + t.Fatalf("\nexpected: %s\ngot: %s", simpleTemplateChartRenderedManifests, r.Manifests) } } diff --git a/mockgcp/mockgkehub/gkehubfeature.go b/mockgcp/mockgkehub/gkehubfeature.go index 1aa4d97c29..486989fb30 100644 --- a/mockgcp/mockgkehub/gkehubfeature.go +++ b/mockgcp/mockgkehub/gkehubfeature.go @@ -67,7 +67,7 @@ func (s *GKEHubFeature) CreateFeature(ctx context.Context, req *pb.CreateFeature acmSpec := spec.GetConfigmanagement() if acmSpec != nil { if acmSpec.GetConfigSync() == nil && acmSpec.GetHierarchyController() == nil && acmSpec.GetPolicyController() == nil { - return nil, fmt.Errorf("none of configsync or hierarchycontroller or policycontroller is specified under configmanagement for memebership %s", id) + return nil, fmt.Errorf("none of configsync or hierarchycontroller or policycontroller is specified under configmanagement for membership %s", id) } } } diff --git a/operator/pkg/manifest/manifest_loader_test.go b/operator/pkg/manifest/manifest_loader_test.go index 34fa1e89a4..a4ac7815e6 100644 --- a/operator/pkg/manifest/manifest_loader_test.go +++ b/operator/pkg/manifest/manifest_loader_test.go @@ -83,7 +83,7 @@ func TestManifestLoader_ResolveManifest(t *testing.T) { t.Parallel() manifestStr, err := ml.ResolveManifest(context.TODO(), tc.cc) if err != nil { - t.Fatalf("unexpected error while loadding the manifest for namespaced components: %v", err) + t.Fatalf("unexpected error while loading the manifest for namespaced components: %v", err) } if !reflect.DeepEqual(manifestStr, tc.result) { t.Fatalf("unexpected diff: %v", cmp.Diff(manifestStr, tc.result)) diff --git a/operator/pkg/manifest/per_namespace_manifest_loader_test.go b/operator/pkg/manifest/per_namespace_manifest_loader_test.go index 313df20c09..401edaf0ab 100644 --- a/operator/pkg/manifest/per_namespace_manifest_loader_test.go +++ b/operator/pkg/manifest/per_namespace_manifest_loader_test.go @@ -55,7 +55,7 @@ func TestManifestLoader_ResolveNamespacedComponents(t *testing.T) { ctx := context.TODO() m, err := ml.ResolveManifest(ctx, tc.ccc) if err != nil { - t.Fatalf("unexpected error while loadding the manifest for namespaced components: %v", err) + t.Fatalf("unexpected error while loading the manifest for namespaced components: %v", err) } if !reflect.DeepEqual(m, tc.result) { diff --git a/operator/pkg/manifest/repo.go b/operator/pkg/manifest/repo.go index be80c0f099..8d52237865 100644 --- a/operator/pkg/manifest/repo.go +++ b/operator/pkg/manifest/repo.go @@ -100,7 +100,7 @@ func (r *LocalRepository) LoadManifest(_ context.Context, componentName string, return map[string]string{path: sb.String()}, nil } - // otherwise we are in namesapce mode + // otherwise we are in namespace mode rlog.Info("loading manifest", "component", componentName, "version", version, "mode", mode) p = filepath.Join(r.basedir, "packages", componentName, version, "namespaced", cnrmSystemFileName) b, err = os.ReadFile(p) diff --git a/operator/pkg/manifest/repo_test.go b/operator/pkg/manifest/repo_test.go index f55e1e9d28..7e9b092e83 100644 --- a/operator/pkg/manifest/repo_test.go +++ b/operator/pkg/manifest/repo_test.go @@ -479,7 +479,7 @@ func TestNewLocalRepository_LoadManifest(t *testing.T) { t.Run(tc.name, func(t *testing.T) { manifestStrs, err := repo.LoadManifest(context.TODO(), "configconnector", "0.0.0-test", tc.cc) if err != nil { - t.Fatalf("unexpected error while loadding the manifest: %v", err) + t.Fatalf("unexpected error while loading the manifest: %v", err) } if !reflect.DeepEqual(manifestStrs, tc.result) { t.Fatalf("unexpected diff: %v", cmp.Diff(manifestStrs, tc.result)) @@ -507,7 +507,7 @@ func TestNewLocalRepository_LoadNamespacedComponents(t *testing.T) { t.Parallel() manifests, err := repo.LoadNamespacedComponents(context.TODO(), "configconnector", "0.0.0-test") if err != nil { - t.Fatalf("unexpected error while loadding the manifest for namespaced components: %v", err) + t.Fatalf("unexpected error while loading the manifest for namespaced components: %v", err) } if !reflect.DeepEqual(manifests, tc.result) { t.Fatalf("unexpected diff: %v", cmp.Diff(manifests, tc.result)) diff --git a/pkg/controller/direct/bigqueryanalyticshub/dataexchange_controller.go b/pkg/controller/direct/bigqueryanalyticshub/dataexchange_controller.go index 9b3ae36eb1..8ab50b15cc 100644 --- a/pkg/controller/direct/bigqueryanalyticshub/dataexchange_controller.go +++ b/pkg/controller/direct/bigqueryanalyticshub/dataexchange_controller.go @@ -205,7 +205,7 @@ func (a *Adapter) Update(ctx context.Context, updateOp *directbase.UpdateOperati mapCtx := &direct.MapContext{} // TODO(kcc): Autogen "func immutable()" for each field - // TODO(kcc): autogen updateMastk.path for mutable gcp fields. + // TODO(kcc): autogen updateMask.path for mutable gcp fields. updateMask := &fieldmaskpb.FieldMask{} if !reflect.DeepEqual(a.desired.Spec.DisplayName, a.actual.DisplayName) { updateMask.Paths = append(updateMask.Paths, "display_name") diff --git a/pkg/controller/direct/cloudbuild/workerpool_controller.go b/pkg/controller/direct/cloudbuild/workerpool_controller.go index 711f528e41..ee326eb657 100644 --- a/pkg/controller/direct/cloudbuild/workerpool_controller.go +++ b/pkg/controller/direct/cloudbuild/workerpool_controller.go @@ -156,7 +156,7 @@ func (m *model) AdapterForObject(ctx context.Context, reader client.Reader, u *u } func (m *model) AdapterForURL(ctx context.Context, url string) (directbase.Adapter, error) { - // Format: //cloudbuild.googleapis.com/projects//lcoations//workerPools/ + // Format: //cloudbuild.googleapis.com/projects//locations//workerPools/ if !strings.HasPrefix(url, "//cloudbuild.googleapis.com/") { return nil, nil } diff --git a/pkg/controller/direct/logging/utils.go b/pkg/controller/direct/logging/utils.go index 39bbb345e8..c596b4ecf4 100644 --- a/pkg/controller/direct/logging/utils.go +++ b/pkg/controller/direct/logging/utils.go @@ -109,7 +109,7 @@ func convertAPItoKRM_LoggingLogMetric(projectID string, in *api.LogMetric) (*uns u := &unstructured.Unstructured{} if err := util.Marshal(lm, u); err != nil { - return nil, fmt.Errorf("error marshing logMetric to unstructured %w", err) + return nil, fmt.Errorf("error marshalling logMetric to unstructured %w", err) } return u, nil diff --git a/pkg/controller/direct/mappings/build.go b/pkg/controller/direct/mappings/build.go index 6035b2a404..e48647860d 100644 --- a/pkg/controller/direct/mappings/build.go +++ b/pkg/controller/direct/mappings/build.go @@ -151,7 +151,7 @@ func NewMapping(cloudObj any, krmObj any, fields ...FieldMapping) *MappingBuilde } b = b.addKRMToCloudMapping(resourceKRMType, resourceCloudType, true, fields...) - b = b.addCloudToKRMMappin(resourceCloudType, resourceKRMType, true, fields...) + b = b.addCloudToKRMMapping(resourceCloudType, resourceKRMType, true, fields...) return b } @@ -164,7 +164,7 @@ func (b *MappingBuilder) MapNested(cloudObj any, krmObj any, fields ...FieldMapp resourceKRMType := typeOf(krmVal.Type()) b = b.addKRMToCloudMapping(resourceKRMType, resourceCloudType, false, fields...) - b = b.addCloudToKRMMappin(resourceCloudType, resourceKRMType, false, fields...) + b = b.addCloudToKRMMapping(resourceCloudType, resourceKRMType, false, fields...) return b } @@ -210,8 +210,8 @@ func (b *MappingBuilder) addKRMToCloudMapping(inType *reflectType, outType *refl return b } -// addCloudToKRMMappin will add a mapping for mapping from Cloud to KRM objects. -func (b *MappingBuilder) addCloudToKRMMappin(inType *reflectType, outType *reflectType, hasSpecStatus bool, fields ...FieldMapping) *MappingBuilder { +// addCloudToKRMMapping will add a mapping for mapping from Cloud to KRM objects. +func (b *MappingBuilder) addCloudToKRMMapping(inType *reflectType, outType *reflectType, hasSpecStatus bool, fields ...FieldMapping) *MappingBuilder { createMapping := &structTypeMapping{ scope: b.mapping, inType: inType, diff --git a/pkg/controller/direct/sql/sqlinstance_equality.go b/pkg/controller/direct/sql/sqlinstance_equality.go index ff5e665b53..6b526468f3 100644 --- a/pkg/controller/direct/sql/sqlinstance_equality.go +++ b/pkg/controller/direct/sql/sqlinstance_equality.go @@ -487,7 +487,7 @@ func AclEntryListsMatch(desired []*api.AclEntry, actual []*api.AclEntry) bool { if len(desired) != len(actual) { return false } - // We mustiterate over the AclEntry lists in sorted order, + // We must iterate over the AclEntry lists in sorted order, // so that the comparison is deterministic. sort.Sort(AclEntriesByName(desired)) sort.Sort(AclEntriesByName(actual)) diff --git a/pkg/controller/reconciliationinterval/reconciliationinterval.go b/pkg/controller/reconciliationinterval/reconciliationinterval.go index fd0c9e6564..37241611b0 100644 --- a/pkg/controller/reconciliationinterval/reconciliationinterval.go +++ b/pkg/controller/reconciliationinterval/reconciliationinterval.go @@ -36,7 +36,7 @@ func MeanReconcileReenqueuePeriod(gvk schema.GroupVersionKind, if smLoader != nil { rcs, err := smLoader.GetResourceConfigs(gvk) if err == nil && len(rcs) > 0 { - // One GVK can map to mutiple ResourceConfigs, however these ResournceConfigs will share the same reconcile interval. + // One GVK can map to multiple ResourceConfigs, however these ResournceConfigs will share the same reconcile interval. if rcs[0].ReconciliationIntervalInSeconds != nil { return time.Duration(*rcs[0].ReconciliationIntervalInSeconds) * time.Second } diff --git a/pkg/controller/unmanageddetector/controller_test.go b/pkg/controller/unmanageddetector/controller_test.go index b4db88eaa8..3238f399b0 100644 --- a/pkg/controller/unmanageddetector/controller_test.go +++ b/pkg/controller/unmanageddetector/controller_test.go @@ -199,7 +199,7 @@ func getCurrentCondition(ctx context.Context, c client.Client, u *unstructured.U } resource, err := k8s.NewResource(unstruct) if err != nil { - return v1alpha1.Condition{}, false, fmt.Errorf("error marhsalling unstruct to k8s resource: %w", err) + return v1alpha1.Condition{}, false, fmt.Errorf("error marshalling unstruct to k8s resource: %w", err) } condition, found = k8s.GetReadyCondition(resource) return condition, found, nil diff --git a/pkg/k8s/meta_test.go b/pkg/k8s/meta_test.go index 0e3a307775..098726b47d 100644 --- a/pkg/k8s/meta_test.go +++ b/pkg/k8s/meta_test.go @@ -559,7 +559,7 @@ func TestValidateOrDefaultManagementConflictPreventionAnnotationForTFBasedResour err := k8s.ValidateOrDefaultManagementConflictPreventionAnnotationForTFBasedResource(&obj, &ns, &rc, fakeTFProvider.ResourcesMap) if tc.ShouldSucceed != (err == nil) { - t.Fatalf("expected success to be '%v', instead got error mismsatch: %v", tc.ShouldSucceed, err) + t.Fatalf("expected success to be '%v', instead got error mismatch: %v", tc.ShouldSucceed, err) } value, ok := k8s.GetAnnotation(k8s.ManagementConflictPreventionPolicyFullyQualifiedAnnotation, &obj) if ok || tc.ExpectedObjectAnnotation != "" { @@ -821,7 +821,7 @@ func TestValidateOrDefaultManagementConflictPreventionAnnotationForDCLBasedResou err := k8s.ValidateOrDefaultManagementConflictPreventionAnnotationForDCLBasedResource(&obj, &ns, tc.Schema) if tc.ShouldSucceed != (err == nil) { - t.Fatalf("expected success to be '%v', instead got error mismsatch: %v", tc.ShouldSucceed, err) + t.Fatalf("expected success to be '%v', instead got error mismatch: %v", tc.ShouldSucceed, err) } value, ok := k8s.GetAnnotation(k8s.ManagementConflictPreventionPolicyFullyQualifiedAnnotation, &obj) if ok || tc.ExpectedObjectAnnotation != "" { diff --git a/pkg/k8s/resource.go b/pkg/k8s/resource.go index d7bda4127b..0d2242d586 100644 --- a/pkg/k8s/resource.go +++ b/pkg/k8s/resource.go @@ -75,7 +75,7 @@ func NewResource(u *unstructured.Unstructured) (*Resource, error) { func (r *Resource) MarshalAsUnstructured() (*unstructured.Unstructured, error) { u := &unstructured.Unstructured{} if err := util.Marshal(r, u); err != nil { - return nil, fmt.Errorf("error marshing resource to Unstructured %w", err) + return nil, fmt.Errorf("error marshalling resource to Unstructured %w", err) } removeNilCreationTimestamp(u.Object) return u, nil diff --git a/pkg/resourceoverrides/compute_overrides.go b/pkg/resourceoverrides/compute_overrides.go index c3482ec140..add60dfa12 100644 --- a/pkg/resourceoverrides/compute_overrides.go +++ b/pkg/resourceoverrides/compute_overrides.go @@ -39,7 +39,7 @@ var ( supportedKinds = []string{"ComputeAddress"} ) -func GetComputeMangedSSLCertificateResourceOverrides() ResourceOverrides { +func GetComputeManagedSSLCertificateResourceOverrides() ResourceOverrides { return ResourceOverrides{ Kind: "ComputeManagedSSLCertificate", Overrides: []ResourceOverride{ diff --git a/pkg/resourceoverrides/overrides.go b/pkg/resourceoverrides/overrides.go index abb94d32e0..7cfaeaeb22 100644 --- a/pkg/resourceoverrides/overrides.go +++ b/pkg/resourceoverrides/overrides.go @@ -234,7 +234,7 @@ func init() { Handler.Register(GetRedisInstanceResourceOverrides()) Handler.Register(GetRunServiceResourceOverrides()) Handler.Register(GetAlloyDBInstanceResourceOverrides()) - Handler.Register(GetComputeMangedSSLCertificateResourceOverrides()) + Handler.Register(GetComputeManagedSSLCertificateResourceOverrides()) // IAM Handler.Register(GetIAMCustomRoleResourceOverrides()) diff --git a/pkg/test/main/testmain.go b/pkg/test/main/testmain.go index beb902902e..46c53c880c 100644 --- a/pkg/test/main/testmain.go +++ b/pkg/test/main/testmain.go @@ -82,7 +82,7 @@ func SetupMultipleEnvironments(m *testing.M, testType test.Type, crds []*apiexte stops = append(stops, stop) if err := testcontroller.EnsureNamespaceExists(mgr.GetClient(), k8s.SystemNamespace); err != nil { - log.Fatalf("error ensuring namesapce exists: %v", err) + log.Fatalf("error ensuring namespace exists: %v", err) } *mp = mgr } diff --git a/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-activedirectoryconfig-direct/README.md b/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-activedirectoryconfig-direct/README.md index 26b7cc320e..2a47e164f8 100644 --- a/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-activedirectoryconfig-direct/README.md +++ b/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-activedirectoryconfig-direct/README.md @@ -1,3 +1,3 @@ # TODO -Currently, KCC does not support managed Microsof AD, so it is impossible to create all the dependencies that would be needed for this test case. \ No newline at end of file +Currently, KCC does not support managed Microsoft AD, so it is impossible to create all the dependencies that would be needed for this test case. \ No newline at end of file diff --git a/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-activedirectoryconfig/README.md b/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-activedirectoryconfig/README.md index 26b7cc320e..2a47e164f8 100644 --- a/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-activedirectoryconfig/README.md +++ b/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-activedirectoryconfig/README.md @@ -1,3 +1,3 @@ # TODO -Currently, KCC does not support managed Microsof AD, so it is impossible to create all the dependencies that would be needed for this test case. \ No newline at end of file +Currently, KCC does not support managed Microsoft AD, so it is impossible to create all the dependencies that would be needed for this test case. \ No newline at end of file diff --git a/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-ssl-direct/create.yaml b/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-ssl-direct/create.yaml index 5ad0f2da80..5f4cf46079 100644 --- a/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-ssl-direct/create.yaml +++ b/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-ssl-direct/create.yaml @@ -24,7 +24,7 @@ spec: settings: ipConfiguration: # See https://cloud.google.com/sql/docs/mysql/admin-api/rest/v1/instances#ipconfiguration - # for docs about the different possible `sslMode` field values, and the limiations of the + # for docs about the different possible `sslMode` field values, and the limitations of the # `requireSsl` field. requireSsl: true sslMode: "TRUSTED_CLIENT_CERTIFICATE_REQUIRED" diff --git a/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-ssl-direct/update.yaml b/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-ssl-direct/update.yaml index 76990da555..a109556bf0 100644 --- a/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-ssl-direct/update.yaml +++ b/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-ssl-direct/update.yaml @@ -24,7 +24,7 @@ spec: settings: ipConfiguration: # See https://cloud.google.com/sql/docs/mysql/admin-api/rest/v1/instances#ipconfiguration - # for docs about the different possible `sslMode` field values, and the limiations of the + # for docs about the different possible `sslMode` field values, and the limitations of the # `requireSsl` field. requireSsl: false sslMode: ENCRYPTED_ONLY diff --git a/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-ssl/create.yaml b/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-ssl/create.yaml index 14c5643c9d..49b06f334b 100644 --- a/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-ssl/create.yaml +++ b/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-ssl/create.yaml @@ -22,7 +22,7 @@ spec: settings: ipConfiguration: # See https://cloud.google.com/sql/docs/mysql/admin-api/rest/v1/instances#ipconfiguration - # for docs about the different possible `sslMode` field values, and the limiations of the + # for docs about the different possible `sslMode` field values, and the limitations of the # `requireSsl` field. requireSsl: true sslMode: "TRUSTED_CLIENT_CERTIFICATE_REQUIRED" diff --git a/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-ssl/update.yaml b/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-ssl/update.yaml index 8c8d47eef6..48c191461d 100644 --- a/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-ssl/update.yaml +++ b/pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-ssl/update.yaml @@ -22,7 +22,7 @@ spec: settings: ipConfiguration: # See https://cloud.google.com/sql/docs/mysql/admin-api/rest/v1/instances#ipconfiguration - # for docs about the different possible `sslMode` field values, and the limiations of the + # for docs about the different possible `sslMode` field values, and the limitations of the # `requireSsl` field. requireSsl: false sslMode: ENCRYPTED_ONLY diff --git a/pkg/test/runner/runner.go b/pkg/test/runner/runner.go index c14496aed2..92db0bd5aa 100644 --- a/pkg/test/runner/runner.go +++ b/pkg/test/runner/runner.go @@ -165,7 +165,7 @@ func newSystemContext(ctx context.Context, t *testing.T, mgr manager.Manager) Sy serviceMetadataLoader := dclmetadata.New() dclSchemaLoader, err := dclschemaloader.New() if err != nil { - t.Fatalf("error creating a new DCL schema laoder: %v", dclSchemaLoader) + t.Fatalf("error creating a new DCL schema loader: %v", dclSchemaLoader) } dclConverter := dclconversion.New(dclSchemaLoader, serviceMetadataLoader) return SystemContext{ diff --git a/pkg/webhook/cert/certclient/certclient.go b/pkg/webhook/cert/certclient/certclient.go index f45bfd99f8..eac2ce51fe 100644 --- a/pkg/webhook/cert/certclient/certclient.go +++ b/pkg/webhook/cert/certclient/certclient.go @@ -164,7 +164,7 @@ func createOrReplaceHelper(c client.Client, obj client.Object, fn mutateFn) erro } err := c.Create(context.Background(), obj) if apierrors.IsAlreadyExists(err) { - // TODO: retry mutiple times with backoff if necessary. + // TODO: retry multiple times with backoff if necessary. // this cast is not safe per-say but is added to get around the transition from runtime.Object to client.Object existing, ok := obj.DeepCopyObject().(client.Object) if !ok { diff --git a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/dlp/dlpjobtrigger.md b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/dlp/dlpjobtrigger.md index 2f6760996e..da7182f54b 100644 --- a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/dlp/dlpjobtrigger.md +++ b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/dlp/dlpjobtrigger.md @@ -2777,7 +2777,7 @@ spec: projectRef: # Replace "${PROJECT_ID?}" with your project ID external: "projects/${PROJECT_ID?}" - loction: "us-west2" + location: "us-west2" regex: pattern: ".*" ```