Skip to content

Commit

Permalink
Merge pull request #3218 from jsoref/spelling-10
Browse files Browse the repository at this point in the history
[CHORE] Spelling 10/n
  • Loading branch information
google-oss-prow[bot] authored Nov 21, 2024
2 parents 9884390 + 7cfe95c commit 966fc94
Show file tree
Hide file tree
Showing 30 changed files with 59 additions and 60 deletions.
3 changes: 1 addition & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,7 @@ by creating an Artifact Registry resource through Config Connector.
#### Looking for error logs
You can look for error logs by checking the controller logs following the steps
[here](https://cloud.google.com/config-connector/docs/troubleshooting#check-controller-logs).
You can look for error logs by checking the controller logs following the [troubleshooting](https://cloud.google.com/config-connector/docs/troubleshooting#check-controller-logs).
#### Pods fail to pull image
When the cluster is created without providing a service account, a Compute Engine service account is created for the cluster. Users must grant the service account permission to pull images from the project registry.
Expand Down
2 changes: 1 addition & 1 deletion config/tests/samples/create/contents_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ func validateResourceName(t *testing.T, sampleName string, u *unstructured.Unstr
}
}
// In addition to this naming scheme following the sample guidelines, the
// create sample test looks for either "sample" or "dep" to "uniqify" the
// create sample test looks for either "sample" or "dep" to "uniquify" the
// name of a sample
t.Errorf("invalid metadata.name value '%v' in sample '%v': must contain one of {%v} to be valid",
u.GetName(), sampleName, strings.Join(allowedNameFragments, ","))
Expand Down
2 changes: 1 addition & 1 deletion config/tests/servicemapping/servicemapping_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1227,7 +1227,7 @@ func TestV1alpha1ToV1beta1IsSetForManuallyConfiguredAndAllowlistedResources(t *t
if r.AutoGenerated && isV1alpha1ToV1beta1 {
t.Errorf("resource config %v is auto-generated "+
"and allowlisted, but has `v1alpha1ToV1beta1: true`: "+
"`v1alpha1ToV1beta1` should be usnet", r.Name)
"`v1alpha1ToV1beta1` should be unset", r.Name)
continue
}
if !r.AutoGenerated {
Expand Down
2 changes: 1 addition & 1 deletion crds/bigquery_v1alpha1_bigquerydatasetaccess.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ spec:
status:
properties:
apiUpdatedMember:
description: If true, represents that that the iam_member in the config
description: If true, represents that the iam_member in the config
was translated to a different member type by the API, and is stored
in state as a different member type.
type: boolean
Expand Down
2 changes: 1 addition & 1 deletion crds/cloudscheduler_v1beta1_cloudschedulerjob.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ spec:
and finally retries at intervals of max_backoff_duration up
to retry_count times. For example, if min_backoff_duration is
10s, max_backoff_duration is 300s, and `max_doublings` is 3,
then the a job will first be retried in 10s. The retry interval
then the job will first be retried in 10s. The retry interval
will double three times, and then increase linearly by 2^3 *
10s. Finally, the job will retry at intervals of max_backoff_duration
until the job has been attempted retry_count times. Thus, the
Expand Down
2 changes: 1 addition & 1 deletion crds/monitoring_v1beta1_monitoringnotificationchannel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ spec:
type: string
sensitiveLabels:
description: |-
Different notification type behaviors are configured primarily using the the 'labels' field on this
Different notification type behaviors are configured primarily using the 'labels' field on this
resource. This block contains the labels which contain secrets or passwords so that they can be marked
sensitive and hidden from plan output. The name of the field, eg: password, will be the key
in the 'labels' map in the api request.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ spec:
should contain all of the labels specified here. The selection
is determined based on the best match. For example, suppose
there are three EndpointPolicy resources P1, P2 and P3 and
if P1 has a the matcher as MATCH_ANY , P2 has MATCH_ALL
if P1 has the matcher as MATCH_ANY , P2 has MATCH_ALL
, and P3 has MATCH_ALL . If a client with label connects,
the config from P1 will be selected. If a client with label
connects, the config from P2 will be selected. If a client
Expand Down
2 changes: 1 addition & 1 deletion crds/tpu_v1alpha1_tpunode.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ spec:
Immutable. Whether the VPC peering for the node is set up through Service Networking API.
The VPC Peering should be set up before provisioning the node. If this field is set,
cidr_block field should not be specified. If the network that you want to peer the
TPU Node to is a Shared VPC network, the node must be created with this this field enabled.
TPU Node to is a Shared VPC network, the node must be created with this field enabled.
type: boolean
zone:
description: Immutable. The GCP location for the TPU. If it is not
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ type TypeUpdater struct {
opts *UpdateTypeOptions
newField newProtoField
dependentMessages map[string]protoreflect.MessageDescriptor // key: fully qualified name of proto message
generatedGoField generatedGoField // TOOD: support multiple new fields
generatedGoField generatedGoField // TODO: support multiple new fields
generatedGoStructs []generatedGoStruct
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,11 @@ type CompositionSpec struct {
type ValidationStatus string

const (
// ValidationStatusUnkown is when it is not validated
// ValidationStatusUnknown is when it is not validated
ValidationStatusUnknown ValidationStatus = "unknown"
// ValidationStatusSuccess is when valdiation succeeds
// ValidationStatusSuccess is when validation succeeds
ValidationStatusSuccess ValidationStatus = "success"
// ValidationStatusFailed is when valdiation fails
// ValidationStatusFailed is when validation fails
ValidationStatusFailed ValidationStatus = "failed"
// ValidationStatusError is when validation was not called
ValidationStatusError ValidationStatus = "error"
Expand Down
4 changes: 2 additions & 2 deletions operator/pkg/controllers/imagetransform.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"sigs.k8s.io/kubebuilder-declarative-pattern/pkg/patterns/declarative/pkg/manifest"
)

// ImageTranform remaps container images in a manifest.
// ImageTransform remaps container images in a manifest.
type ImageTransform struct {
// ImagePrefix changes the image registry to a different registry, keeping the name.
// We strip off all but the last component of the image name, and then add the prefix.
Expand All @@ -45,7 +45,7 @@ func NewImageTransform(imagePrefix string) *ImageTransform {
}

// Remap images to the specified mirror / alternative location.
// This function can be used as an object transfomration.
// This function can be used as an object transformation.
func (x *ImageTransform) RemapImages(ctx context.Context, o declarative.DeclarativeObject, manifest *manifest.Objects) error {
for _, obj := range manifest.Items {
if err := x.remapImages(obj); err != nil {
Expand Down
2 changes: 1 addition & 1 deletion pkg/cli/cmd/commonparams/commonparams.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func ValidateIAMFormat(value string) error {
return fmt.Errorf("invalid %v value of '%v': must be one of {%v}", IAMFormatParamName, value, strings.Join(iamFormatOptions, ", "))
}

// Convert from the an IAMPolicyParam supplied on the command line to the stream type
// Convert from the IAMPolicyParam supplied on the command line to the stream type
func IAMFormatParamToStreamIAMFormat(iamFormatParam string) (stream.IAMFormat, error) {
switch iamFormatParam {
case PartialPolicyFormatOption:
Expand Down
2 changes: 1 addition & 1 deletion pkg/cli/stream/yamlstream.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ type YAMLStream struct {
nextErr error
// true if the consumer of the stream has read at least one non-error result
returnedAtLeastOneNonErrorResult bool
// true if the end of the stream was reached and the tranmission terminator was returned
// true if the end of the stream was reached and the transmission terminator was returned
returnedTransmissionTerminator bool
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/cluster/installation_identifier_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ func testDeleteNamespaceID(t *testing.T, mgr manager.Manager) {
}

if val, ok := configMap.Data[namespaceName]; ok {
t.Fatalf("error checking deleted namespace, upexpected value from configmap '%v': %v", namespaceName, val)
t.Fatalf("error checking deleted namespace, unexpected value from configmap '%v': %v", namespaceName, val)
}
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/dcl/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -692,7 +692,7 @@ func (r *Reconciler) isOrphaned(_ context.Context, resource *dcl.Resource) (orph
}

// getStateHint returns a state hint based on the given resource live state. A
// state hint is a DCL unstructurd object that represents the live state of the
// state hint is a DCL unstructured object that represents the live state of the
// resource.
//
// This function returns the given live state (if it's not nil) as a DCL
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/iam/iamclient/externalonly.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
// ExternalOnlyType is a KCC resource type that KCC does not support as a
// core resource, but does support referencing externally in IAM.
type ExternalOnlyType struct {
// UnstuctHandler is a function that fills in the external field information
// UnstructHandler is a function that fills in the external field information
// from the given reference into the given unstructured object.
UnstructHandler func(ref iamv1beta1.ResourceReference, u *unstructured.Unstructured) *unstructured.Unstructured

Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/iam/iamclient/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ func embedPolicyData(spec map[string]interface{}) error {

// An unfortunate reality is that the GVK is not always properly filled in when
// reading a resource from the K8s API server, and there are functions that
// need the Kind to be filled in to work (e.g. krmtotf.NewResource,
// need the Kind to be filled to work (e.g. krmtotf.NewResource,
// k8s.MarshalAsUnstructured, etc.). The Kind is not set because the TypeMeta
// is empty. The reason why the TypeMeta is empty is because in
// k8s.io/apimachinery/pkg/runtime/serializer/versioning/versioning.go the
Expand Down
6 changes: 3 additions & 3 deletions pkg/krmtotf/conversion.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ func CtyValToMap(val cty.Value, t cty.Type) map[string]interface{} {
}
var ret map[string]interface{}
if err := json.Unmarshal(b, &ret); err != nil {
panic(fmt.Errorf("error unmarshaling JSON as map[string]interface{}: %w", err))
panic(fmt.Errorf("error unmarshalling JSON as map[string]interface{}: %w", err))
}
return ret
}
Expand All @@ -80,7 +80,7 @@ func MapToCtyVal(m map[string]interface{}, t cty.Type) cty.Value {
}
ret, err := ctyjson.Unmarshal(b, t)
if err != nil {
panic(fmt.Errorf("error unmarshaling JSON as cty.Value: %w", err))
panic(fmt.Errorf("error unmarshalling JSON as cty.Value: %w", err))
}
return ret
}
Expand All @@ -92,7 +92,7 @@ func MapToCtyValWithSchema(m map[string]interface{}, s map[string]*schema.Schema
}
ret, err := ctyjson.Unmarshal(b, schema.InternalMap(s).CoreConfigSchema().ImpliedType())
if err != nil {
panic(fmt.Errorf("error unmarshaling JSON as cty.Value: %w", err))
panic(fmt.Errorf("error unmarshalling JSON as cty.Value: %w", err))
}
return ret
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/krmtotf/legacygcpmanagedfields.go
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ func getLastAppliedValue(r *Resource, path ...string) (val interface{}, found bo
}
lastAppliedConfig := make(map[string]interface{})
if err := json.Unmarshal([]byte(lastAppliedConfigRaw), &lastAppliedConfig); err != nil {
return nil, false, fmt.Errorf("error unmarshaling last applied configuration: %w", err)
return nil, false, fmt.Errorf("error unmarshalling last applied configuration: %w", err)
}
specPath := append([]string{"spec"}, path...)
return unstructured.NestedFieldCopy(lastAppliedConfig, specPath...)
Expand Down
2 changes: 1 addition & 1 deletion pkg/lease/leasable/leasable_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ func TestDCLSchemaSupportsLeasing(t *testing.T) {
t.Parallel()
res, err := DCLSchemaSupportsLeasing(tc.schema)
if err != nil {
t.Fatalf("unexpcted error: %v", err)
t.Fatalf("unexpected error: %v", err)
}
if res != tc.expected {
t.Fatalf("expect to get %v, but got %v", tc.expected, res)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ func fileToServiceMapping(key string) (*v1alpha1.ServiceMapping, error) {
func parseServiceMapping(b []byte) (*v1alpha1.ServiceMapping, error) {
var sm v1alpha1.ServiceMapping
if err := yaml.UnmarshalStrict(b, &sm); err != nil {
return nil, fmt.Errorf("error unmarshaling byte to service mapping: %w", err)
return nil, fmt.Errorf("error unmarshalling byte to service mapping: %w", err)
}
return &sm, nil
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/test/equals.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func normalize(t *testing.T, obj interface{}) map[string]interface{} {
}
var ret map[string]interface{}
if err := json.Unmarshal(b, &ret); err != nil {
t.Fatalf("error unmarshaling JSON bytes: %v", err)
t.Fatalf("error unmarshalling JSON bytes: %v", err)
}
return ret
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ metadata:
name: monitoringservicelevelobjective-${uniqueId}
namespace: ${uniqueId}
spec:
displayName: updae request - a window based metric sum filter
displayName: update request - a window based metric sum filter
goal: 0.8
projectRef:
external: projects/${projectId}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ Content-Type: application/json
User-Agent: kcc/controller-manager DeclarativeClientLib/0.0.1

{
"displayName": "updae request - a window based metric sum filter",
"displayName": "update request - a window based metric sum filter",
"goal": 0.8,
"rollingPeriod": "172800s",
"serviceLevelIndicator": {
Expand Down Expand Up @@ -258,7 +258,7 @@ X-Frame-Options: SAMEORIGIN
X-Xss-Protection: 0

{
"displayName": "updae request - a window based metric sum filter",
"displayName": "update request - a window based metric sum filter",
"goal": 0.8,
"name": "projects/${projectNumber}/services/monitoringservice-${uniqueId}/serviceLevelObjectives/monitoringservicelevelobjective-${uniqueId}",
"rollingPeriod": "172800s",
Expand Down Expand Up @@ -300,7 +300,7 @@ X-Frame-Options: SAMEORIGIN
X-Xss-Protection: 0

{
"displayName": "updae request - a window based metric sum filter",
"displayName": "update request - a window based metric sum filter",
"goal": 0.8,
"name": "projects/${projectNumber}/services/monitoringservice-${uniqueId}/serviceLevelObjectives/monitoringservicelevelobjective-${uniqueId}",
"rollingPeriod": "172800s",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
external: projects/${projectId}
serviceRef:
external: monitoringservice-${uniqueId}
displayName: "updae request - a window based metric sum filter"
displayName: "update request - a window based metric sum filter"
goal: 0.8
rollingPeriod: "172800s"
serviceLevelIndicator:
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func Marshal(raw interface{}, processed interface{}) error {
return fmt.Errorf("error marshaling as JSON: %w", err)
}
if err := json.Unmarshal(b, processed); err != nil {
return fmt.Errorf("error unmarshaling into processed object: %w", err)
return fmt.Errorf("error unmarshalling into processed object: %w", err)
}
return nil
}
Expand Down
Loading

0 comments on commit 966fc94

Please sign in to comment.