Skip to content

Commit 11f972e

Browse files
chenrui333lukaspj
authored andcommitted
chore: fix typos (runatlantis#5202)
Signed-off-by: Rui Chen <[email protected]> Signed-off-by: Lukas Peter Aldershaab <[email protected]>
1 parent fe7c44a commit 11f972e

26 files changed

+47
-47
lines changed

CHANGELOG.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ Maintenance release for security patches with atlantis-base image
200200
* docker: bump git-lfs and gosu dependencies by @hi-artem in https://github.com/runatlantis/atlantis/pull/2096
201201
* fix(docker): fix base image for multi-platform build by @Tenzer in https://github.com/runatlantis/atlantis/pull/2099
202202
* fix(docker): fix installation of git-lfs in armv7 image by @Tenzer in https://github.com/runatlantis/atlantis/pull/2100
203-
* fix(docker): download Terraform and conftest versions maching image architecture by @Tenzer in https://github.com/runatlantis/atlantis/pull/2101
203+
* fix(docker): download Terraform and conftest versions matching image architecture by @Tenzer in https://github.com/runatlantis/atlantis/pull/2101
204204

205205
# v0.18.3
206206

@@ -237,7 +237,7 @@ Maintenance release for security patches with atlantis-base image
237237
* build(deps): bump github.com/hashicorp/go-version from 1.3.0 to 1.4.0 by @dependabot in https://github.com/runatlantis/atlantis/pull/1987
238238
* build(deps): bump go.uber.org/zap from 1.19.1 to 1.20.0 by @dependabot in https://github.com/runatlantis/atlantis/pull/1988
239239
* docs: document `undiverged` apply requirement in more places by @fishpen0 in https://github.com/runatlantis/atlantis/pull/1992
240-
* fix: fix autoplan when .terraform.lock.hcl is modifed by @gezb in https://github.com/runatlantis/atlantis/pull/1991
240+
* fix: fix autoplan when .terraform.lock.hcl is modified by @gezb in https://github.com/runatlantis/atlantis/pull/1991
241241
* feat: add XTerm JS to the server static files by @Ka1wa in https://github.com/runatlantis/atlantis/pull/1985
242242
* feat: post workflow hooks by @tim775 in https://github.com/runatlantis/atlantis/pull/1990
243243
* docs: add colon to policy checking yaml by @williamlord-wise in https://github.com/runatlantis/atlantis/pull/1996

runatlantis.io/blog/2018/hosting-our-static-site-over-ssl-with-s3-acm-cloudfront-and-terraform.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Because I'm going to host the site on AWS services, I need requests to <www.runa
5252

5353
At this point, we've generated an SSL certificate for <www.runatlantis.io> and our website is available on the internet via its S3 url so can't we just CNAME to the S3 bucket and call it a day? Unfortunately not.
5454

55-
Since we generated our own certificate, we would need S3 to sign its responses using our certificiate. S3 doesn't support this and thus we need CloudFront. CloudFront supports using our own SSL cert and will just pull its data from the S3 bucket.
55+
Since we generated our own certificate, we would need S3 to sign its responses using our certificate. S3 doesn't support this and thus we need CloudFront. CloudFront supports using our own SSL cert and will just pull its data from the S3 bucket.
5656

5757
# Terraform Time
5858

runatlantis.io/docs/custom-workflows.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ workflows:
298298
name: TF_IN_AUTOMATION
299299
value: 'true'
300300
- run:
301-
# Allow for targetted plans/applies as not supported for Terraform wrappers by default
301+
# Allow for targeted plans/applies as not supported for Terraform wrappers by default
302302
command: terragrunt plan -input=false $(printf '%s' $COMMENT_ARGS | sed 's/,/ /g' | tr -d '\\') -no-color -out $PLANFILE
303303
output: hide
304304
- run: |
@@ -727,7 +727,7 @@ Full:
727727
| multienv.command | string | none | yes | Name of the custom script to run |
728728
| multienv.shell | string | "sh" | no | Name of the shell to use for command execution |
729729
| multienv.shellArgs | string or []string | "-c" | no | Command line arguments to be passed to the shell. Cannot be set without `shell` |
730-
| multienv.output | string | "show" | no | Setting output to "hide" will supress the message obout added environment variables |
730+
| multienv.output | string | "show" | no | Setting output to "hide" will suppress the message obout added environment variables |
731731

732732
The output of the command execution must have the following format:
733733
`EnvVar1Name=value1,EnvVar2Name=value2,EnvVar3Name=value3`

runatlantis.io/docs/post-workflow-hooks.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ back to the PR as a comment.
1111
Post workflow hooks can only be specified in the Server-Side Repo Config under
1212
the `repos` key.
1313

14-
## Atlantis Command Targetting
14+
## Atlantis Command Targeting
1515

1616
By default, the workflow hook will run when any command is processed by Atlantis.
1717
This can be modified by specifying the `commands` key in the workflow hook containing a comma delimited list

runatlantis.io/docs/pre-workflow-hooks.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ behavior can be changed by setting the [fail-on-pre-workflow-hook-error](server-
2121
flag in the Atlantis server configuration.
2222
:::
2323

24-
## Atlantis Command Targetting
24+
## Atlantis Command Targeting
2525

2626
By default, the workflow hook will run when any command is processed by Atlantis.
2727
This can be modified by specifying the `commands` key in the workflow hook containing a comma delimited list

runatlantis.io/docs/repo-and-project-permissions.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ checking if the external command exited with code `0` and if the last line
157157
of output is `pass`.
158158

159159
```text
160-
# Psuedo-code of Atlantis evaluation of external commands
160+
# Pseudo-code of Atlantis evaluation of external commands
161161
162162
user_authorized =
163163
external_command.exit_code == 0

runatlantis.io/docs/repo-level-atlantis-yaml.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ in your repo.
4444
If you have many directories with Terraform configuration, each directory will
4545
need to be defined.
4646

47-
This behavior can be overriden by setting `autodiscover.mode` to
47+
This behavior can be overridden by setting `autodiscover.mode` to
4848
`enabled` in which case Atlantis will still try to discover projects which were not
4949
explicitly configured. If the directory of any discovered project conflicts with a
5050
manually configured project, the manually configured project will take precedence.

runatlantis.io/docs/server-configuration.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ and set `--autoplan-modules` to `false`.
509509

510510
This will not work with `-d` yet and to use `-p` the repo projects must be defined in the repo `atlantis.yaml` file.
511511

512-
This will bypass `--restrict-file-list` if regex is used, normal commands will stil be blocked if necessary.
512+
This will bypass `--restrict-file-list` if regex is used, normal commands will still be blocked if necessary.
513513

514514
::: warning SECURITY WARNING
515515
It's not supposed to be used with `--disable-apply-all`.
@@ -1140,7 +1140,7 @@ This is useful when you have many projects and want to keep the pull request cle
11401140

11411141
`--restrict-file-list` will block plan requests from projects outside the files modified in the pull request.
11421142
This will not block plan requests with regex if using the `--enable-regexp-cmd` flag, in these cases commands
1143-
like `atlantis plan -p .*` will still work if used. normal commands will stil be blocked if necessary.
1143+
like `atlantis plan -p .*` will still work if used. normal commands will still be blocked if necessary.
11441144
Defaults to `false`.
11451145

11461146
### `--silence-allowlist-errors`
@@ -1342,7 +1342,7 @@ This flag is useful when having multiple projects that need to run a plan and ap
13421342
* [plugin_cache_dir concurrently discussion](https://github.com/hashicorp/terraform/issues/31964)
13431343
* [PR to improve the situation](https://github.com/hashicorp/terraform/pull/33479)
13441344

1345-
The effect of the race condition is more evident when using parallel configuration to run plan and apply, by disabling the use of plugin cache will impact in the performance when starting a new plan or apply, but in large atlantis deployments with multiple projects and shared modules the use of `--parallel_plan` and `--parallel_apply` is mandatory for an efficient managment of the PRs.
1345+
The effect of the race condition is more evident when using parallel configuration to run plan and apply, by disabling the use of plugin cache will impact in the performance when starting a new plan or apply, but in large atlantis deployments with multiple projects and shared modules the use of `--parallel_plan` and `--parallel_apply` is mandatory for an efficient management of the PRs.
13461346

13471347
### `--var-file-allowlist`
13481348

server/controllers/events/events_controller_e2e_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ func TestGitHubWorkflow(t *testing.T) {
465465
},
466466
},
467467
{
468-
Description: "omitting apply from allow commands always takes presedence",
468+
Description: "omitting apply from allow commands always takes precedence",
469469
RepoDir: "simple-yaml",
470470
ModifiedFiles: []string{"main.tf"},
471471
AllowCommands: []command.Name{command.Plan},
@@ -845,7 +845,7 @@ func TestSimpleWorkflow_terraformLockFile(t *testing.T) {
845845

846846
if !c.LockFileTracked {
847847
// replace the lock file generated by the previous init to simulate
848-
// dependcies needing updating in a latter plan
848+
// dependencies needing updating in a latter plan
849849
runCmd(t, "", "cp", oldLockFilePath, fmt.Sprintf("%s/repos/runatlantis/atlantis-tests/2/default/.terraform.lock.hcl", atlantisWorkspace.DataDir))
850850
}
851851

server/core/config/raw/global_cfg.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@ func (g GlobalCfg) ToValid(defaultCfg valid.GlobalCfg) valid.GlobalCfg {
126126
applyReqs := defaultCfg.Repos[0].ApplyRequirements
127127
var globalApplyReqs []string
128128
for _, req := range applyReqs {
129-
for _, nonOverrideableReq := range valid.NonOverrideableApplyReqs {
130-
if req == nonOverrideableReq {
129+
for _, nonOverridableReq := range valid.NonOverridableApplyReqs {
130+
if req == nonOverridableReq {
131131
globalApplyReqs = append(globalApplyReqs, req)
132132
}
133133
}

server/core/config/raw/repo_cfg.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
// DefaultEmojiReaction is the default emoji reaction for repos
1111
const DefaultEmojiReaction = ""
1212

13-
// DefaultAbortOnExcecutionOrderFail being false is the default setting for abort on execution group failiures
13+
// DefaultAbortOnExcecutionOrderFail being false is the default setting for abort on execution group failures
1414
const DefaultAbortOnExcecutionOrderFail = false
1515

1616
// RepoCfg is the raw schema for repo-level atlantis.yaml config.

server/core/config/raw/step_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ func TestStep_Validate(t *testing.T) {
482482
{
483483
// For atlantis.yaml v2, this wouldn't parse, but now there should
484484
// be no error.
485-
description: "unparseable shell command",
485+
description: "unparsable shell command",
486486
input: raw.Step{
487487
StringVal: map[string]string{
488488
"run": "my 'c",

server/core/config/raw/workflow_step_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ func TestGlobalConfigStep_Validate(t *testing.T) {
100100
{
101101
// For atlantis.yaml v2, this wouldn't parse, but now there should
102102
// be no error.
103-
description: "unparseable shell command",
103+
description: "unparsable shell command",
104104
input: raw.WorkflowHook{
105105
StringVal: map[string]string{
106106
"run": "my 'c",

server/core/config/valid/global_cfg.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ var AllowedSilencePRComments = []string{"plan", "apply"}
3434
// DefaultAtlantisFile is the default name of the config file for each repo.
3535
const DefaultAtlantisFile = "atlantis.yaml"
3636

37-
// NonOverrideableApplyReqs will get applied across all "repos" in the server side config.
37+
// NonOverridableApplyReqs will get applied across all "repos" in the server side config.
3838
// If repo config is allowed overrides, they can override this.
3939
// TODO: Make this more customizable, not everyone wants this rigid workflow
4040
// maybe something along the lines of defining overridable/non-overrideable apply
4141
// requirements in the config and removing the flag to enable policy checking.
42-
var NonOverrideableApplyReqs = []string{PoliciesPassedCommandReq}
42+
var NonOverridableApplyReqs = []string{PoliciesPassedCommandReq}
4343

4444
// GlobalCfg is the final parsed version of server-side repo config.
4545
type GlobalCfg struct {

server/core/locking/apply_locking.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func NewApplyClient(backend Backend, disableApply bool, disableGlobalApplyLock b
5454
}
5555

5656
// LockApply acquires global apply lock.
57-
// DisableApply takes presedence to any existing locks, if it is set to true
57+
// DisableApply takes precedence to any existing locks, if it is set to true
5858
// this function returns an error
5959
func (c *ApplyClient) LockApply() (ApplyCommandLock, error) {
6060
response := ApplyCommandLock{}
@@ -76,7 +76,7 @@ func (c *ApplyClient) LockApply() (ApplyCommandLock, error) {
7676
}
7777

7878
// UnlockApply releases a global apply lock.
79-
// DisableApply takes presedence to any existing locks, if it is set to true
79+
// DisableApply takes precedence to any existing locks, if it is set to true
8080
// this function returns an error
8181
func (c *ApplyClient) UnlockApply() error {
8282
if c.disableApply {

server/core/runtime/plan_step_runner.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ locally at this time.
284284
285285
`
286286

287-
// remoteOpsErr100 is the error terraform plan will retrun if this project is
287+
// remoteOpsErr100 is the error terraform plan will return if this project is
288288
// using TFE remote operations in TF 1.0.{0,1}.
289289
var remoteOpsErr100 = `Error: Saving a generated plan is currently not supported
290290

server/core/runtime/post_workflow_hook_runner_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ func TestPostWorkflowHookRunner_Run(t *testing.T) {
1919

2020
defaultShell := "sh"
2121
defaultShellArgs := "-c"
22-
defautShellCommandNotFoundErrorFormat := commandNotFoundErrorFormat(defaultShell)
22+
defaultShellCommandNotFoundErrorFormat := commandNotFoundErrorFormat(defaultShell)
2323
defaultUnterminatedStringError := unterminatedStringError(defaultShell, defaultShellArgs)
2424

2525
cases := []struct {
@@ -82,7 +82,7 @@ func TestPostWorkflowHookRunner_Run(t *testing.T) {
8282
Command: "lkjlkj",
8383
Shell: defaultShell,
8484
ShellArgs: defaultShellArgs,
85-
ExpOut: fmt.Sprintf(defautShellCommandNotFoundErrorFormat, "lkjlkj"),
85+
ExpOut: fmt.Sprintf(defaultShellCommandNotFoundErrorFormat, "lkjlkj"),
8686
ExpErr: "exit status 127: running \"sh -c lkjlkj\" in",
8787
ExpDescription: "",
8888
},

server/core/runtime/pre_workflow_hook_runner_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func TestPreWorkflowHookRunner_Run(t *testing.T) {
3939

4040
defaultShell := "sh"
4141
defaultShellArgs := "-c"
42-
defautShellCommandNotFoundErrorFormat := commandNotFoundErrorFormat(defaultShell)
42+
defaultShellCommandNotFoundErrorFormat := commandNotFoundErrorFormat(defaultShell)
4343
defaultUnterminatedStringError := unterminatedStringError(defaultShell, defaultShellArgs)
4444

4545
cases := []struct {
@@ -102,7 +102,7 @@ func TestPreWorkflowHookRunner_Run(t *testing.T) {
102102
Command: "lkjlkj",
103103
Shell: defaultShell,
104104
ShellArgs: defaultShellArgs,
105-
ExpOut: fmt.Sprintf(defautShellCommandNotFoundErrorFormat, "lkjlkj"),
105+
ExpOut: fmt.Sprintf(defaultShellCommandNotFoundErrorFormat, "lkjlkj"),
106106
ExpErr: "exit status 127: running \"sh -c lkjlkj\" in",
107107
ExpDescription: "",
108108
},

server/core/terraform/terraform_client_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ is 0.11.13. You can update by downloading from developer.hashicorp.com/terraform
7878
defer tempSetEnv(t, "PATH", fmt.Sprintf("%s:%s", tmp, os.Getenv("PATH")))()
7979

8080
mockDownloader := mocks.NewMockDownloader()
81-
distibution := terraform.NewDistributionTerraformWithDownloader(mockDownloader)
81+
distribution := terraform.NewDistributionTerraformWithDownloader(mockDownloader)
8282

83-
c, err := terraform.NewClient(logger, distibution, binDir, cacheDir, "", "", "", cmd.DefaultTFVersionFlag, cmd.DefaultTFDownloadURL, true, true, projectCmdOutputHandler)
83+
c, err := terraform.NewClient(logger, distribution, binDir, cacheDir, "", "", "", cmd.DefaultTFVersionFlag, cmd.DefaultTFDownloadURL, true, true, projectCmdOutputHandler)
8484
Ok(t, err)
8585

8686
Ok(t, err)
@@ -301,10 +301,10 @@ func TestEnsureVersion_downloaded(t *testing.T) {
301301
projectCmdOutputHandler := jobmocks.NewMockProjectCommandOutputHandler()
302302

303303
mockDownloader := mocks.NewMockDownloader()
304-
distibution := terraform.NewDistributionTerraformWithDownloader(mockDownloader)
304+
distribution := terraform.NewDistributionTerraformWithDownloader(mockDownloader)
305305

306306
downloadsAllowed := true
307-
c, err := terraform.NewTestClient(logger, distibution, binDir, cacheDir, "", "", "0.11.10", cmd.DefaultTFVersionFlag, cmd.DefaultTFDownloadURL, downloadsAllowed, true, projectCmdOutputHandler)
307+
c, err := terraform.NewTestClient(logger, distribution, binDir, cacheDir, "", "", "0.11.10", cmd.DefaultTFVersionFlag, cmd.DefaultTFDownloadURL, downloadsAllowed, true, projectCmdOutputHandler)
308308
Ok(t, err)
309309

310310
Equals(t, "0.11.10", c.DefaultVersion().String())

server/events/markdown_renderer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ func (m *MarkdownRenderer) renderProjectResults(ctx *command.Context, results []
316316
resultData.Rendered = m.renderTemplateTrimSpace(templates.Lookup("stateRmSuccessUnwrapped"), result.StateRmSuccess)
317317
}
318318
// Error out if no template was found, only if there are no errors or failures.
319-
// This is because some errors and failures rely on additional context rendered by templtes, but not all errors or failures.
319+
// This is because some errors and failures rely on additional context rendered by templates, but not all errors or failures.
320320
} else if !(result.Error != nil || result.Failure != "") {
321321
resultData.Rendered = "Found no template. This is a bug!"
322322
}

server/events/models/models.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,7 @@ type TeamAllowlistCheckerContext struct {
669669
API bool
670670
}
671671

672-
// WorkflowHookCommandContext defines the context for a pre and post worklfow_hooks that will
672+
// WorkflowHookCommandContext defines the context for a pre and post workflow_hooks that will
673673
// be executed before workflows.
674674
type WorkflowHookCommandContext struct {
675675
// BaseRepo is the repository that the pull request will be merged into.

server/events/project_command_builder.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const (
3232
DefaultWorkspace = "default"
3333
// DefaultDeleteSourceBranchOnMerge being false is the default setting whether or not to remove a source branch on merge
3434
DefaultDeleteSourceBranchOnMerge = false
35-
// DefaultAbortOnExcecutionOrderFail being false is the default setting for abort on execution group failiures
35+
// DefaultAbortOnExcecutionOrderFail being false is the default setting for abort on execution group failures
3636
DefaultAbortOnExcecutionOrderFail = false
3737
)
3838

@@ -238,7 +238,7 @@ type DefaultProjectCommandBuilder struct {
238238
AutoDetectModuleFiles string
239239
// User config option: List of file patterns to to to check if a directory contains modified files.
240240
AutoplanFileList string
241-
// User config option: Format Terraform plan output into a markdown-diff friendy format for color-coding purposes.
241+
// User config option: Format Terraform plan output into a markdown-diff friendly format for color-coding purposes.
242242
EnableDiffMarkdownFormat bool
243243
// User config option: Block plan requests from projects outside the files modified in the pull request.
244244
RestrictFileList bool

server/events/project_command_runner.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ type ProjectApplyCommandRunner interface {
124124
}
125125

126126
type ProjectPolicyCheckCommandRunner interface {
127-
// PolicyCheck runs OPA defined policies for the project desribed by ctx.
127+
// PolicyCheck runs OPA defined policies for the project described by ctx.
128128
PolicyCheck(ctx command.ProjectContext) command.ProjectResult
129129
}
130130

server/events/project_command_runner_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -845,7 +845,7 @@ func TestDefaultProjectCommandRunner_ApprovePolicies(t *testing.T) {
845845
expFailure: "One or more policy sets require additional approval.",
846846
},
847847
{
848-
description: "When user is a top-level ownner through membership, increment approval on all policies.",
848+
description: "When user is a top-level owner through membership, increment approval on all policies.",
849849
userTeams: []string{"someuserteam"},
850850
policySetCfg: valid.PolicySets{
851851
Owners: valid.PolicyOwners{

0 commit comments

Comments
 (0)