Skip to content

Commit

Permalink
chore: Spelling (argoproj#3647)
Browse files Browse the repository at this point in the history
chore: Spelling (argoproj#3647)
  • Loading branch information
jsoref authored May 27, 2020
1 parent 1c5fc00 commit a724574
Show file tree
Hide file tree
Showing 45 changed files with 57 additions and 57 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ start-local: mod-vendor-local
ARGOCD_E2E_TEST=false \
goreman -f $(ARGOCD_PROCFILE) start ${ARGOCD_START}

# Runs pre-commit validaiton with the virtualized toolchain
# Runs pre-commit validation with the virtualized toolchain
.PHONY: pre-commit
pre-commit: dep-ensure codegen build lint test

Expand Down
6 changes: 3 additions & 3 deletions assets/swagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -2511,7 +2511,7 @@
},
"repocredsRepoCredsResponse": {
"type": "object",
"title": "RepoCredsResponse is a resonse to most repository credentials requests"
"title": "RepoCredsResponse is a response to most repository credentials requests"
},
"repositoryAppInfo": {
"type": "object",
Expand Down Expand Up @@ -2615,7 +2615,7 @@
"$ref": "#/definitions/repositoryKsonnetEnvironmentDestination"
},
"k8sVersion": {
"description": "KubernetesVersion is the kubernetes version the targetted cluster is running on.",
"description": "KubernetesVersion is the kubernetes version the targeted cluster is running on.",
"type": "string"
},
"name": {
Expand Down Expand Up @@ -4590,7 +4590,7 @@
},
"syncOptions": {
"type": "array",
"title": "Options allow youe to specify whole app sync-options",
"title": "Options allow you to specify whole app sync-options",
"items": {
"type": "string"
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/argocd/commands/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ func setAppSpecOptions(flags *pflag.FlagSet, spec *argoappv1.ApplicationSpec, ap
}
if flags.Changed("self-heal") {
if spec.SyncPolicy == nil || spec.SyncPolicy.Automated == nil {
log.Fatal("Cannot set --self-helf: application not configured with automatic sync")
log.Fatal("Cannot set --self-heal: application not configured with automatic sync")
}
spec.SyncPolicy.Automated.SelfHeal = appOpts.selfHeal
}
Expand Down
2 changes: 1 addition & 1 deletion controller/appcontroller.go
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@ func (ctrl *ApplicationController) processAppComparisonTypeQueueItem() (processN
return
}

// shouldbeDeleted returns whether a given resource obj should be deleted on cascade delete of application app
// shouldBeDeleted returns whether a given resource obj should be deleted on cascade delete of application app
func (ctrl *ApplicationController) shouldBeDeleted(app *appv1.Application, obj *unstructured.Unstructured) bool {
return !kube.IsCRD(obj) && !isSelfReferencedApp(app, kube.GetObjectRef(obj))
}
Expand Down
2 changes: 1 addition & 1 deletion controller/appcontroller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ func TestFinalizeAppDeletion(t *testing.T) {
assert.True(t, patched)
}

// Ensure any stray resources irregulary labeled with instance label of app are not deleted upon deleting,
// Ensure any stray resources irregularly labeled with instance label of app are not deleted upon deleting,
// when app project restriction is in place
{
defaultProj := argoappv1.AppProject{
Expand Down
6 changes: 3 additions & 3 deletions controller/cache/cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -188,9 +188,9 @@ var (
}
)

// skipAppRequeing checks if the object is an API type which we want to skip requeuing against.
// skipAppRequeuing checks if the object is an API type which we want to skip requeuing against.
// We ignore API types which have a high churn rate, and/or whose updates are irrelevant to the app
func skipAppRequeing(key kube.ResourceKey) bool {
func skipAppRequeuing(key kube.ResourceKey) bool {
return ignoredRefreshResources[key.Group+"/"+key.Kind]
}

Expand Down Expand Up @@ -244,7 +244,7 @@ func (c *liveStateCache) getCluster(server string) (clustercache.ClusterCache, e
continue
}
app := getApp(r, namespaceResources)
if app == "" || skipAppRequeing(r.ResourceKey()) {
if app == "" || skipAppRequeuing(r.ResourceKey()) {
continue
}
toNotify[app] = isRootAppNode(r) || toNotify[app]
Expand Down
2 changes: 1 addition & 1 deletion docs/operator-manual/argocd-secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
type: Opaque
data:
# TLS certificate and private key for API server (required).
# Autogenerated with a self-signed ceritificate when keys are missing or invalid.
# Autogenerated with a self-signed certificate when keys are missing or invalid.
tls.crt:
tls.key:

Expand Down
2 changes: 1 addition & 1 deletion examples/dashboard.json
Original file line number Diff line number Diff line change
Expand Up @@ -3146,7 +3146,7 @@
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Git Requets (ls-remote)",
"title": "Git Requests (ls-remote)",
"tooltip": {
"shared": true,
"sort": 2,
Expand Down
4 changes: 2 additions & 2 deletions hack/gen-crd-spec/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ func getCustomResourceDefinitions() map[string]*extensionsobj.CustomResourceDefi

// We need to completely remove validation of problematic fields such as creationTimestamp,
// which get marshalled to `null`, but are typed as as a `string` during Open API validation
removeValidataion(un, "metadata.creationTimestamp")
removeValidation(un, "metadata.creationTimestamp")

crd := toCRD(un)
crd.Labels = map[string]string{
Expand All @@ -65,7 +65,7 @@ func deleteFile(path string) {
checkErr(os.Remove(path))
}

func removeValidataion(un *unstructured.Unstructured, path string) {
func removeValidation(un *unstructured.Unstructured, path string) {
schemaPath := []string{"spec", "validation", "openAPIV3Schema"}
for _, part := range strings.Split(path, ".") {
schemaPath = append(schemaPath, "properties", part)
Expand Down
2 changes: 1 addition & 1 deletion hack/generate-proto.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ MOD_ROOT=${GOPATH}/pkg/mod

. ${PROJECT_ROOT}/hack/versions.sh

# protbuf tooling required to build .proto files from go annotations from k8s-like api types
# protobuf tooling required to build .proto files from go annotations from k8s-like api types
go build -i -o dist/go-to-protobuf ./vendor/k8s.io/code-generator/cmd/go-to-protobuf
go build -i -o dist/protoc-gen-gogo ./vendor/k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo

Expand Down
2 changes: 1 addition & 1 deletion hack/git-ask-pass.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
# This script is used as the commaned supplied to GIT_ASKPASS as a way to supply username/password
# This script is used as the command supplied to GIT_ASKPASS as a way to supply username/password
# credentials to git, without having to use git credentials helpers, or having on-disk config.
case "$1" in
Username*) echo "${GIT_USERNAME}" ;;
Expand Down
2 changes: 1 addition & 1 deletion manifests/crds/application-crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ spec:
type: boolean
type: object
syncOptions:
description: Options allow youe to specify whole app sync-options
description: Options allow you to specify whole app sync-options
items:
type: string
type: array
Expand Down
2 changes: 1 addition & 1 deletion manifests/ha/install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,7 @@ spec:
type: boolean
type: object
syncOptions:
description: Options allow youe to specify whole app sync-options
description: Options allow you to specify whole app sync-options
items:
type: string
type: array
Expand Down
2 changes: 1 addition & 1 deletion manifests/ha/namespace-install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,7 @@ spec:
type: boolean
type: object
syncOptions:
description: Options allow youe to specify whole app sync-options
description: Options allow you to specify whole app sync-options
items:
type: string
type: array
Expand Down
2 changes: 1 addition & 1 deletion manifests/install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,7 @@ spec:
type: boolean
type: object
syncOptions:
description: Options allow youe to specify whole app sync-options
description: Options allow you to specify whole app sync-options
items:
type: string
type: array
Expand Down
2 changes: 1 addition & 1 deletion manifests/namespace-install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,7 @@ spec:
type: boolean
type: object
syncOptions:
description: Options allow youe to specify whole app sync-options
description: Options allow you to specify whole app sync-options
items:
type: string
type: array
Expand Down
2 changes: 1 addition & 1 deletion pkg/apiclient/repocreds/repocreds.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/apis/application/v1alpha1/generated.proto

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/apis/application/v1alpha1/openapi_generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkg/apis/application/v1alpha1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ func (e Env) Environ() []string {
return environ
}

// does an operation similar to `envstubst` tool,
// does an operation similar to `envsubst` tool,
// but unlike envsubst it does not change missing names into empty string
// see https://linux.die.net/man/1/envsubst
func (e Env) Envsubst(s string) string {
Expand Down Expand Up @@ -540,7 +540,7 @@ func (o SyncOptions) HasOption(option string) bool {
type SyncPolicy struct {
// Automated will keep an application synced to the target revision
Automated *SyncPolicyAutomated `json:"automated,omitempty" protobuf:"bytes,1,opt,name=automated"`
// Options allow youe to specify whole app sync-options
// Options allow you to specify whole app sync-options
SyncOptions SyncOptions `json:"syncOptions,omitempty" protobuf:"bytes,2,opt,name=syncOptions"`
}

Expand Down
2 changes: 1 addition & 1 deletion reposerver/apiclient/clientset.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const (
MaxGRPCMessageSize = 100 * 1024 * 1024
)

// Clientset represets repository server api clients
// Clientset represents repository server api clients
type Clientset interface {
NewRepoServerClient() (io.Closer, RepoServerServiceClient, error)
}
Expand Down
2 changes: 1 addition & 1 deletion reposerver/apiclient/repository.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion reposerver/repository/repository.proto
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ message KustomizeAppSpec {
message KsonnetEnvironment {
// Name is the user defined name of an environment
string name = 1;
// KubernetesVersion is the kubernetes version the targetted cluster is running on.
// KubernetesVersion is the kubernetes version the targeted cluster is running on.
string k8sVersion = 2;
// Destination stores the cluster address that this environment points to.
KsonnetEnvironmentDestination destination = 4;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ end

if obj.status ~= nil and obj.status.certificateStatus == "Active" then
hs.status = "Healthy"
hs.message = "All ceritificates are active"
hs.message = "All certificates are active"
return hs
end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ tests:
inputPath: testdata/failed.yaml
- healthStatus:
status: Healthy
message: "All ceritificates are active"
message: "All certificates are active"
inputPath: testdata/active.yaml
2 changes: 1 addition & 1 deletion server/application/application.go
Original file line number Diff line number Diff line change
Expand Up @@ -844,7 +844,7 @@ func (s *Server) PatchResource(ctx context.Context, q *application.ApplicationRe
}, nil
}

// DeleteResource deletes a specificed resource
// DeleteResource deletes a specified resource
func (s *Server) DeleteResource(ctx context.Context, q *application.ApplicationResourceDeleteRequest) (*application.ApplicationResponse, error) {
resourceRequest := &application.ApplicationResourceRequest{
Name: q.Name,
Expand Down
6 changes: 3 additions & 3 deletions server/project/project_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -459,14 +459,14 @@ p, role:admin, projects, update, *, allow`)
t.Run("TestAddWildcardSource", func(t *testing.T) {

proj := existingProj.DeepCopy()
wildSouceRepo := "*"
proj.Spec.SourceRepos = append(proj.Spec.SourceRepos, wildSouceRepo)
wildSourceRepo := "*"
proj.Spec.SourceRepos = append(proj.Spec.SourceRepos, wildSourceRepo)

projectServer := NewServer("default", fake.NewSimpleClientset(), apps.NewSimpleClientset(proj), enforcer, util.NewKeyLock(), nil, policyEnf)
request := &project.ProjectUpdateRequest{Project: proj}
updatedProj, err := projectServer.Update(context.Background(), request)
assert.Nil(t, err)
assert.Equal(t, wildSouceRepo, updatedProj.Spec.SourceRepos[1])
assert.Equal(t, wildSourceRepo, updatedProj.Spec.SourceRepos[1])
})

t.Run("TestCreateRolePolicySuccessfully", func(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion server/repocreds/repocreds.proto
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ message RepoCredsDeleteRequest {
string url = 1;
}

// RepoCredsResponse is a resonse to most repository credentials requests
// RepoCredsResponse is a response to most repository credentials requests
message RepoCredsResponse {}

// RepoCreateRequest is a request for creating repository credentials config
Expand Down
2 changes: 1 addition & 1 deletion server/session/ratelimiter.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func (redis *redisStateStorage) get(key string) (int, error) {
}

// NewLoginRateLimiter creates a function which enforces max number of concurrent login requests.
// Function returns closer that should be closed when loging request has completed or error if number
// Function returns closer that should be closed when logging request has completed or error if number
// of incomplete requests exceeded max number.
func NewLoginRateLimiter(storage stateStorage, maxNumber int) func() (util.Closer, error) {
runLocked := func(callback func() error) error {
Expand Down
2 changes: 1 addition & 1 deletion sonar-project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ sonar.host.url=https://sonarcloud.io
# Exclude following set of patterns from coverage analysis
sonar.coverage.exclusions=**/*.pb.go,**/*.pb.gw.go,**/mocks/**,**/*.ts*,**/vendor/**,**/openapi_generated.go,**/*_test.go,**/*_generated*,test/**,pkg/client/**,pkg/apiclient/**

# Exlcude following set of patterns from code analysis
# Exclude following set of patterns from code analysis
sonar.go.exclusions=**/vendor/**,*/*.pb.go,**/*_test.go,**/*.pb.gw.go,**/mocks/**,**/openapi_generated.go,**/*_generated*.go

# Exclude following set of patterns from duplication detection
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/helm_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ func TestKubeVersion(t *testing.T) {
And(func(app *Application) {
kubeVersion := FailOnErr(Run(".", "kubectl", "-n", DeploymentNamespace(), "get", "cm", "my-map",
"-o", "jsonpath={.data.kubeVersion}")).(string)
// Capabiliets.KubeVersion defaults to 1.9.0, we assume here you are running a later version
// Capabilities.KubeVersion defaults to 1.9.0, we assume here you are running a later version
assert.Equal(t, GetVersions().ServerVersion.Format("v%s.%s.0"), kubeVersion)
})
}
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/selective_sync_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
. "github.com/argoproj/argo-cd/test/e2e/fixture/app"
)

// when you selectively sync, only seleceted resources should be synced, but the app will be out of sync
// when you selectively sync, only selected resources should be synced, but the app will be out of sync
func TestSelectiveSync(t *testing.T) {
Given(t).
Path("guestbook").
Expand Down
2 changes: 1 addition & 1 deletion ui/src/app/login/components/login.scss
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ $logoNegativePath: 'assets/images/argo.png';
padding: 20px 0 80px;
}

&__box-outter {
&__box-outer {
display: table-cell;
vertical-align: middle;
overflow: hidden;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ class PolicyWrapper extends React.Component<PolicyProps, any> {
<input
className='argo-field'
list='permission'
value={this.getPermision()}
value={this.getPermission()}
onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
this.setPermission(e.target.value);
}}
Expand Down Expand Up @@ -175,7 +175,7 @@ class PolicyWrapper extends React.Component<PolicyProps, any> {
this.props.fieldApi.setValue(fields.join());
}

private getPermision(): string {
private getPermission(): string {
const fields = (this.props.fieldApi.getValue() as string).split(',');
if (fields.length !== 6) {
return '';
Expand Down
6 changes: 3 additions & 3 deletions util/argo/argo_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func TestRefreshApp(t *testing.T) {
appIf := appClientset.ArgoprojV1alpha1().Applications("default")
_, err := RefreshApp(appIf, "test-app", argoappv1.RefreshTypeNormal)
assert.Nil(t, err)
// For some reason, the fake Application inferface doesn't reflect the patch status after Patch(),
// For some reason, the fake Application interface doesn't reflect the patch status after Patch(),
// so can't verify it was set in unit tests.
//_, ok := newApp.Annotations[common.AnnotationKeyRefresh]
//assert.True(t, ok)
Expand Down Expand Up @@ -111,7 +111,7 @@ func TestContainsSyncResource(t *testing.T) {

for _, table := range tables {
if out := ContainsSyncResource(table.u.GetName(), table.u.GroupVersionKind(), table.rr); out != table.expected {
t.Errorf("Expected %t for slice %+v conains resource %+v; instead got %t", table.expected, table.rr, table.u, out)
t.Errorf("Expected %t for slice %+v contains resource %+v; instead got %t", table.expected, table.rr, table.u, out)
}
}
}
Expand Down Expand Up @@ -525,7 +525,7 @@ func TestValidatePermissions(t *testing.T) {
},
}
db := &dbmocks.ArgoDB{}
db.On("GetCluster", context.Background(), spec.Destination.Server).Return(nil, fmt.Errorf("Unknown error occured"))
db.On("GetCluster", context.Background(), spec.Destination.Server).Return(nil, fmt.Errorf("Unknown error occurred"))
_, err := ValidatePermissions(context.Background(), &spec, &proj, db)
assert.Error(t, err)
})
Expand Down
Loading

0 comments on commit a724574

Please sign in to comment.