diff --git a/CHANGELOG.md b/CHANGELOG.md index caf19143b..ff412d4d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -469,7 +469,7 @@ None your Git host (ex. via GitHub protected branches). If so, you'll need to change your settings to require the new names to pass and un-require the old names. - > If you were on a version lower than `v0.5.*` then read the backwards compatiblity + > If you were on a version lower than `v0.5.*` then read the backwards compatibility notes for release `0.5.0`. **NOTE from the maintainer**: I take backwards compatibility seriously and I diff --git a/Dockerfile b/Dockerfile index f7e9953d2..91be69b10 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ LABEL authors="Anubhav Mishra, Luke Kysow" # install terraform binaries ENV DEFAULT_TERRAFORM_VERSION=0.12.19 -# In the official Atlantis image we only have the latest of each Terrafrom version. +# In the official Atlantis image we only have the latest of each Terraform version. RUN AVAILABLE_TERRAFORM_VERSIONS="0.8.8 0.9.11 0.10.8 0.11.14 ${DEFAULT_TERRAFORM_VERSION}" && \ for VERSION in ${AVAILABLE_TERRAFORM_VERSIONS}; do \ curl -LOks https://releases.hashicorp.com/terraform/${VERSION}/terraform_${VERSION}_linux_amd64.zip && \ diff --git a/cmd/server.go b/cmd/server.go index 3fb9f2bbe..5d97e5626 100644 --- a/cmd/server.go +++ b/cmd/server.go @@ -488,8 +488,8 @@ func (s *ServerCmd) validate(userConfig server.UserConfig) error { if logLevel != "debug" && logLevel != "info" && logLevel != "warn" && logLevel != "error" { return errors.New("invalid log level: not one of debug, info, warn, error") } - checkoutStrat := userConfig.CheckoutStrategy - if checkoutStrat != "branch" && checkoutStrat != "merge" { + checkoutStrategy := userConfig.CheckoutStrategy + if checkoutStrategy != "branch" && checkoutStrategy != "merge" { return errors.New("invalid checkout strategy: not one of branch or merge") } diff --git a/runatlantis.io/docs/apply-requirements.md b/runatlantis.io/docs/apply-requirements.md index eef656feb..2ae23ccee 100644 --- a/runatlantis.io/docs/apply-requirements.md +++ b/runatlantis.io/docs/apply-requirements.md @@ -129,7 +129,7 @@ In Azure DevOps, all pull requests are mergeable unless there is a conflict. You * Allow users to approve their own changes * Allow completion even if some reviewers vote "Waiting" or "Reject" * Reset code reviewer votes when there are new changes -* Require a specfic merge strategy (squash, rebase, etc.) +* Require a specific merge strategy (squash, rebase, etc.) ::: warning At this time, the Azure DevOps client only supports merging using the default 'no fast-forward' strategy. Make sure your branch policies permit this type of merge. diff --git a/runatlantis.io/docs/server-configuration.md b/runatlantis.io/docs/server-configuration.md index 9f175e264..bd91583de 100644 --- a/runatlantis.io/docs/server-configuration.md +++ b/runatlantis.io/docs/server-configuration.md @@ -453,7 +453,7 @@ Values are chosen in this order: # or (recommended) ATLANTIS_TFE_TOKEN='xxx.atlasv1.yyy' atlantis server ``` - A token for Terraform Cloud/Terraform Enteprise integration. See [Terraform Cloud](terraform-cloud.html) for more details. + A token for Terraform Cloud/Terraform Enterprise integration. See [Terraform Cloud](terraform-cloud.html) for more details. * ### `--vcs-status-name` ```bash diff --git a/runatlantis.io/docs/server-side-repo-config.md b/runatlantis.io/docs/server-side-repo-config.md index 0a2946b3c..818bf045e 100644 --- a/runatlantis.io/docs/server-side-repo-config.md +++ b/runatlantis.io/docs/server-side-repo-config.md @@ -306,7 +306,7 @@ If you set a workflow with the key `default`, it will override this. ### Repo | Key | Type | Default | Required | Description | |------------------------|----------|---------|----------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| id | string | none | yes | Value can be a regular expresion when specified as /<regex>/ or an exact string match. Repo IDs are of the form `{vcs hostname}/{org}/{name}`, ex. `github.com/owner/repo`. Hostname is specified without scheme or port. For Bitbucket Server, {org} is the **name** of the project, not the key. | +| id | string | none | yes | Value can be a regular expression when specified as /<regex>/ or an exact string match. Repo IDs are of the form `{vcs hostname}/{org}/{name}`, ex. `github.com/owner/repo`. Hostname is specified without scheme or port. For Bitbucket Server, {org} is the **name** of the project, not the key. | | workflow | string | none | no | A custom workflow. | | apply_requirements | []string | none | no | Requirements that must be satisfied before `atlantis apply` can be run. Currently the only supported requirements are `approved` and `mergeable`. See [Apply Requirements](apply-requirements.html) for more details. | | allowed_overrides | []string | none | no | A list of restricted keys that `atlantis.yaml` files can override. The only supported keys are `apply_requirements` and `workflow` | diff --git a/runatlantis.io/docs/terraform-cloud.md b/runatlantis.io/docs/terraform-cloud.md index ed6abc7d4..06ee3c74a 100644 --- a/runatlantis.io/docs/terraform-cloud.md +++ b/runatlantis.io/docs/terraform-cloud.md @@ -2,7 +2,7 @@ ::: tip NOTE Terraform Enterprise was [recently renamed](https://www.hashicorp.com/blog/introducing-terraform-cloud-remote-state-management) Terraform Cloud -and Private Terraform Enteprise was renamed Terraform Enterprise. +and Private Terraform Enterprise was renamed Terraform Enterprise. ::: Atlantis integrates seamlessly with Terraform Cloud and Terraform Enterprise, whether you're using: diff --git a/runatlantis.io/docs/upgrading-atlantis-yaml.md b/runatlantis.io/docs/upgrading-atlantis-yaml.md index 1d78b6155..1b8fe7aaa 100644 --- a/runatlantis.io/docs/upgrading-atlantis-yaml.md +++ b/runatlantis.io/docs/upgrading-atlantis-yaml.md @@ -12,7 +12,7 @@ if you don't wish to do so. The only change from v2 to v3 is that we're parsing custom `run` steps differently. ```yaml # atlantis.yaml -worklows: +workflows: custom: plan: steps: diff --git a/server/events/command_runner.go b/server/events/command_runner.go index cb8b3615d..9f63690ab 100644 --- a/server/events/command_runner.go +++ b/server/events/command_runner.go @@ -455,7 +455,7 @@ func (c *DefaultCommandRunner) deletePlans(ctx *CommandContext) { func (c *DefaultCommandRunner) updateDB(ctx *CommandContext, pull models.PullRequest, results []models.ProjectResult) (models.PullStatus, error) { // Filter out results that errored due to the directory not existing. We - // don't store these in the database because they would never be "applyable" + // don't store these in the database because they would never be "apply-able" // and so the pull request would always have errors. var filtered []models.ProjectResult for _, r := range results { diff --git a/server/events/event_parser.go b/server/events/event_parser.go index 6e143f50f..6a64110ff 100644 --- a/server/events/event_parser.go +++ b/server/events/event_parser.go @@ -384,9 +384,9 @@ func (e *EventParser) ParseGithubIssueCommentEvent(comment *github.IssueCommentE err = errors.New("comment.user.login is null") return } - commentorUsername := comment.Comment.User.GetLogin() + commenterUsername := comment.Comment.User.GetLogin() user = models.User{ - Username: commentorUsername, + Username: commenterUsername, } pullNum = comment.Issue.GetNumber() if pullNum == 0 { diff --git a/server/events/git_cred_writer_test.go b/server/events/git_cred_writer_test.go index f010a3365..db1c121f7 100644 --- a/server/events/git_cred_writer_test.go +++ b/server/events/git_cred_writer_test.go @@ -98,7 +98,7 @@ func TestWriteGitCreds_ConfigureGitCredentialHelper(t *testing.T) { } // Test that git is configured to use https instead of ssh -func TestWriteGitCreds_ConfigureGitUrlOveride(t *testing.T) { +func TestWriteGitCreds_ConfigureGitUrlOverride(t *testing.T) { tmp, cleanup := TempDir(t) defer cleanup() diff --git a/server/events/terraform/terraform_client_test.go b/server/events/terraform/terraform_client_test.go index 00eb73032..0f5cec44a 100644 --- a/server/events/terraform/terraform_client_test.go +++ b/server/events/terraform/terraform_client_test.go @@ -32,7 +32,7 @@ import ( . "github.com/runatlantis/atlantis/testing" ) -func TestMustConstraint_PancisOnBadConstraint(t *testing.T) { +func TestMustConstraint_PanicsOnBadConstraint(t *testing.T) { t.Log("MustConstraint should panic on a bad constraint") defer func() { if r := recover(); r == nil { diff --git a/server/events/webhooks/slack_client_test.go b/server/events/webhooks/slack_client_test.go index b111647e6..ee89bf7a7 100644 --- a/server/events/webhooks/slack_client_test.go +++ b/server/events/webhooks/slack_client_test.go @@ -32,14 +32,14 @@ var client webhooks.DefaultSlackClient var result webhooks.ApplyResult func TestAuthTest_Success(t *testing.T) { - t.Log("When the underylying client succeeds, function should succeed") + t.Log("When the underlying client succeeds, function should succeed") setup(t) err := client.AuthTest() Ok(t, err) } func TestAuthTest_Error(t *testing.T) { - t.Log("When the underylying slack client errors, an error should be returned") + t.Log("When the underlying slack client errors, an error should be returned") setup(t) When(underlying.AuthTest()).ThenReturn(nil, errors.New("")) err := client.AuthTest() @@ -82,7 +82,7 @@ func TestChannelExists_True(t *testing.T) { } func TestChannelExists_Error(t *testing.T) { - t.Log("When the underylying slack client errors, an error should be returned") + t.Log("When the underlying slack client errors, an error should be returned") setup(t) When(underlying.GetChannels(true)).ThenReturn(nil, errors.New("")) @@ -135,7 +135,7 @@ func TestPostMessage_Success(t *testing.T) { } func TestPostMessage_Error(t *testing.T) { - t.Log("When the underylying slack client errors, an error should be returned") + t.Log("When the underlying slack client errors, an error should be returned") setup(t) expParams := slack.NewPostMessageParameters() diff --git a/server/events/webhooks/webhooks_test.go b/server/events/webhooks/webhooks_test.go index 138a27869..fc9018b25 100644 --- a/server/events/webhooks/webhooks_test.go +++ b/server/events/webhooks/webhooks_test.go @@ -116,7 +116,7 @@ func TestNewWebhooksManager_NoConfigSuccess(t *testing.T) { Assert(t, m != nil, "manager shouldn't be nil") Equals(t, 0, len(m.Webhooks)) - t.Log("passing nil client hould succeed") + t.Log("passing nil client should succeed") m, err = webhooks.NewMultiWebhookSender(emptyConfigs, nil) Ok(t, err) Assert(t, m != nil, "manager shouldn't be nil") diff --git a/server/events/working_dir.go b/server/events/working_dir.go index 7563278f4..8b2edc599 100644 --- a/server/events/working_dir.go +++ b/server/events/working_dir.go @@ -220,7 +220,7 @@ func (w *FileWorkspace) forceClone(log *logging.SimpleLogger, cmd.Dir = cloneDir // The git merge command requires these env vars are set. cmd.Env = append(os.Environ(), []string{ - "EMAIL=atlantis@runatlants.io", + "EMAIL=atlantis@runatlantis.io", "GIT_AUTHOR_NAME=atlantis", "GIT_COMMITTER_NAME=atlantis", }...) diff --git a/server/events/yaml/raw/repo_cfg_test.go b/server/events/yaml/raw/repo_cfg_test.go index c199ba980..8984f71d2 100644 --- a/server/events/yaml/raw/repo_cfg_test.go +++ b/server/events/yaml/raw/repo_cfg_test.go @@ -236,7 +236,7 @@ func TestConfig_ToValid(t *testing.T) { }, }, { - description: "automerge ommitted", + description: "automerge omitted", input: raw.RepoCfg{ Version: Int(2), }, diff --git a/server/events/yaml/valid/global_cfg.go b/server/events/yaml/valid/global_cfg.go index f14d032b0..df21d9626 100644 --- a/server/events/yaml/valid/global_cfg.go +++ b/server/events/yaml/valid/global_cfg.go @@ -92,10 +92,10 @@ func NewGlobalCfg(allowRepoCfg bool, mergeableReq bool, approvedReq bool) Global applyReqs = append(applyReqs, ApprovedApplyReq) } - allowCustomWorkfows := false + allowCustomWorkflows := false if allowRepoCfg { allowedOverrides = []string{ApplyRequirementsKey, WorkflowKey} - allowCustomWorkfows = true + allowCustomWorkflows = true } return GlobalCfg{ @@ -105,7 +105,7 @@ func NewGlobalCfg(allowRepoCfg bool, mergeableReq bool, approvedReq bool) Global ApplyRequirements: applyReqs, Workflow: &defaultWorkflow, AllowedOverrides: allowedOverrides, - AllowCustomWorkflows: &allowCustomWorkfows, + AllowCustomWorkflows: &allowCustomWorkflows, }, }, Workflows: map[string]Workflow{ @@ -238,16 +238,16 @@ func (g GlobalCfg) ValidateRepoCfg(rCfg RepoCfg, repoID string) error { } // Check custom workflows. - var allowCustomWorklows bool + var allowCustomWorkflows bool for _, repo := range g.Repos { if repo.IDMatches(repoID) { if repo.AllowCustomWorkflows != nil { - allowCustomWorklows = *repo.AllowCustomWorkflows + allowCustomWorkflows = *repo.AllowCustomWorkflows } } } - if len(rCfg.Workflows) > 0 && !allowCustomWorklows { + if len(rCfg.Workflows) > 0 && !allowCustomWorkflows { return fmt.Errorf("repo config not allowed to define custom workflows: server-side config needs '%s: true'", AllowCustomWorkflowsKey) } diff --git a/server/server.go b/server/server.go index 54dab8e67..7e49c5539 100644 --- a/server/server.go +++ b/server/server.go @@ -181,7 +181,7 @@ func NewServer(userConfig UserConfig, config Config) (*Server, error) { } if userConfig.BitbucketUser != "" { // The default BitbucketBaseURL is https://api.bitbucket.org which can't actually be used for git - // so we overide it here only if it's that to be bitbucket.org + // so we override it here only if it's that to be bitbucket.org bitbucketBaseURL := userConfig.BitbucketBaseURL if bitbucketBaseURL == "https://api.bitbucket.org" { bitbucketBaseURL = "bitbucket.org" diff --git a/server/server_test.go b/server/server_test.go index 5e7f93c89..8df71914e 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -232,7 +232,7 @@ func TestParseAtlantisURL(t *testing.T) { ExpErr: "http or https must be specified", }, { - In: "httpl://localhost/test", + In: "http0://localhost/test", ExpErr: "http or https must be specified", }, } diff --git a/server/static/bindata_assetfs.go b/server/static/bindata_assetfs.go index 4bd941cb6..0e80ae914 100644 --- a/server/static/bindata_assetfs.go +++ b/server/static/bindata_assetfs.go @@ -265,7 +265,7 @@ var _bindata = map[string]func() (*asset, error){ // b.png // then AssetDir("data") would return []string{"foo.txt", "img"} // AssetDir("data/img") would return []string{"a.png", "b.png"} -// AssetDir("foo.txt") and AssetDir("notexist") would return an error +// AssetDir("foo.txt") and AssetDir("nonexistent") would return an error // AssetDir("") will return []string{"data"}. func AssetDir(name string) ([]string, error) { node := _bintree diff --git a/server/static/css/custom.css b/server/static/css/custom.css index 0358d7acb..f3d14edff 100644 --- a/server/static/css/custom.css +++ b/server/static/css/custom.css @@ -125,7 +125,7 @@ tbody { left: 0; } .has-docked-nav .navbar-spacer { display: block; } - /* Re-overiding the width 100% declaration to match size of % based container */ + /* Re-overriding the width 100% declaration to match size of % based container */ .has-docked-nav .navbar > .container { width: 80%; } diff --git a/server/testfixtures/githubIssueCommentEvent_notWhitelisted.json b/server/testfixtures/githubIssueCommentEvent_notWhitelisted.json index 8a868029c..0a71381c4 100644 --- a/server/testfixtures/githubIssueCommentEvent_notWhitelisted.json +++ b/server/testfixtures/githubIssueCommentEvent_notWhitelisted.json @@ -43,7 +43,7 @@ "created_at": "2015-05-05T23:40:28Z", "updated_at": "2015-05-05T23:40:28Z", "closed_at": null, - "body": "It looks like you accidently spelled 'commit' with two 't's." + "body": "It looks like you accidentally spelled 'commit' with two 't's." }, "comment": { "url": "https://api.github.com/repos/baxterthehacker/public-repo/issues/comments/99262140",