Commit 49ee3d3e authored by Jonathan Hall's avatar Jonathan Hall
Browse files

Grammar nit: "setup" as a verb should be spelled "set up"

parent 5682f559
main 0.15.3 MatthewTestBranch add-cont-valid-callout add-internals-to-sidebar add-jsonstate-to-cloudbackendstate add-jsonstate-to-cloudbackendstate2 add-learn-callout-moved-blocks add-new-intro-docs add-note-about-spaces add-page-metadata add-tutorial-custom-conditions add-version-notes-1.2 add-warnings-backends alisdair/disable-preconditions-postconditions alisdair/fix-configload-snapshot-panic alisdair/fix-remote-backend-migrate-version-check alisdair/metadata-functions-command alisdair/prototype-moved-actions alisdair/resource-instance-object-dependencies alisdair/still-applying-consolidation alisdair/version-should-include-prerelease b-1.1-module-source-git b-check-output-multi-expand b-check-resource-multi-expand b-diags-sensitive-value b-flatten-panic b-miekg-dns-upgrade b-move-implied-cross-package b-tf-builtin-provider-parser-fix b-type-conversion-funcs-null b-yamldecode-emptydoc-null backport/29156_do_not_log_sensitive_values/nearly-safe-bullfrog backport/4th-alternate-mirror-directory-fix/closely-key-civet backport/add-cont-valid-callout/luckily-golden-wildcat backport/add-format-function-guidance/ultimately-lucky-halibut backport/add-internals-to-sidebar/willingly-bright-sunbird backport/add-learn-callout-moved-blocks/multiply-awaited-cub backport/add-new-intro-docs/strangely-lucky-bluegill backport/add-powershell-warning/certainly-amazing-lemur backport/add-version-notes-1.2/amazingly-premium-woodcock backport/add-warnings-backends/physically-many-mantis backport/alisdair/cty-1.8.3/seriously-tidy-foal backport/alisdair/fix-30641/firmly-musical-lemming backport/alisdair/fix-show-plan-against-non-default-state/blatantly-balanced-porpoise backport/alisdair/fix-stuck-lock-when-applying-state-plan/enormously-refined-sheepdog backport/alisdair/json-ui-resource-drift/broadly-careful-rooster backport/alisdair/pre-convert-optional-defaults/virtually-able-mouse backport/alisdair/redact-sensitive-values-from-function-errors/definitely-assured-mantis backport/alisdair/sensitive-attribute-forces-replacement/mildly-optimal-platypus backport/b-check-resource-multi-expand/extremely-key-sheep backport/backport/cstella84/patch-add-hyperlink-for-referenced-argument/manually-patient-locust backport/barrettclark/update-go-slug/severely-destined-crow backport/bugfix_typos/hardly-sharp-mosquito backport/clarify-backend-state-storage/ultimately-causal-ladybird backport/consul-size-limit/amazingly-innocent-python backport/cstella84/patch-add-hyperlink-for-referenced-argument backport/description-metadata-language-docs/frankly-desired-penguin backport/doc-provisioner-scp/definitely-capital-bug backport/doc-refactoring-nav-link/honestly-sweet-sawfly backport/doc-s3-fix/utterly-close-rabbit backport/docs-fix-typo/usefully-blessed-monkey backport/docs-for-each-list-toset/basically-still-zebra backport/docs/unknwon-value/completely-musical-lionfish backport/f-build-go1.19.3/largely-peaceful-grouper backport/f-cty-funcs-marks/poorly-mutual-walleye backport/f-non-existing-module-instance-crash/neatly-perfect-kiwi backport/f-plan-action-reason/incredibly-concrete-jackal backport/f-plan-refresh-only-and-replace/really-absolute-silkworm backport/file-provisioner-powershell-warning/noticeably-adequate-mullet backport/fix-apt-page/abnormally-relative-quagga backport/fix-backends-link/strangely-emerging-crane backport/fix-backends-link/vertically-noble-hornet backport/fix-broken-link/certainly-measured-chipmunk backport/fix-broken-links-1-10/firmly-equal-rabbit backport/fix-cdktf-link/highly-pumped-snapper backport/fix-glossary-table-contents/uniquely-pro-garfish backport/fix-grammar/precisely-polite-tortoise backport/fix-internals-overview/globally-allowed-kid backport/fix-internals-overview/noticeably-up-rodent backport/fix-intro-page-images/constantly-capable-shiner backport/fix-last-intro-nits/infinitely-workable-redfish backport/fix-links-devdot/strictly-notable-sparrow backport/fix-links-release/seemingly-living-dinosaur backport/fix-remote-backend-references/primarily-tops-mite backport/fix-workspace-name-docs/ideally-uncommon-pheasant backport/jbardin/cancel-auto-approve/extremely-brave-bear backport/jbardin/coerce-value-nested-types/certainly-rested-chigger backport/jbardin/format-empty-nested-attrs/rightly-uncommon-bluegill backport/jbardin/format-id-name-marks/perfectly-boss-bass backport/jbardin/ignore-changes-marks/formerly-new-insect backport/jbardin/k8s-mod-update/likely-probable-falcon backport/jbardin/optional-attrs/obviously-growing-duck backport/jbardin/static-validate-nested-types/possibly-crack-mouse backport/kevin/rewrite-internal-redirects/quietly-helped-pelican backport/laura-add-mrui-to-sidebar/highly-resolved-blowfish backport/main/absolutely-sterling-whippet backport/main/cleanly-mature-scorpion backport/mg_no_code_prov_followup/marginally-relevant-eagle backport/mktg-tf-76ef54dc3c574e032725e0341be8e1d2/constantly-smart-kingfish backport/mktg-tf-76ef54dc3c574e032725e0341be8e1d2/distinctly-sharp-ferret backport/mktg-tf-76ef54dc3c574e032725e0341be8e1d2/friendly-evident-grouse backport/module-invocation-warning/fully-fitting-buzzard backport/nvanthao/update-docs-implicit-provider/locally-neutral-lemur backport/optional-type-attributes-note/inherently-dear-goat backport/patch-1/gladly-mature-oarfish backport/patch-1/manually-fine-mantis backport/patch-1/nationally-working-kite backport/patch-1/noticeably-comic-manatee backport/patch-1/rarely-informed-gopher backport/patch-1/sensibly-saving-swine backport/patch-1/usually-clear-shad backport/patch-1/vaguely-deciding-beagle backport/patch-1/virtually-more-rhino backport/patch-1/wholly-verified-racer backport/patch-1/willingly-usable-husky backport/patch-1/yearly-rich-skunk backport/patch-2/badly-game-spider backport/patch-2/finally-amazed-catfish backport/patch-2/openly-clean-tick backport/patch-2/weekly-selected-tiger backport/rar-docs-update-add-anchor/cheaply-sincere-escargot backport/remove-future-statement-import/briefly-viable-glowworm backport/remove-provisioners/readily-correct-ferret backport/remove-provisioners/widely-singular-hound backport/replace-flag-clarifications/definitely-saved-elf backport/replace-flag-updates/nominally-assured-weevil backport/startsswith-to-startswith/highly-gorgeous-katydid backport/system-parameter/infinitely-open-bluebird backport/tf-integration-program-guide/briefly-certain-quail backport/tweak-multi-to-multi-migration-tfc/suddenly-real-duckling backport/update-cloud-block-pages/verbally-key-kangaroo backport/update-console-docs/closely-genuine-javelin backport/update-for-each-example/early-crucial-piranha backport/update-plan-page/lightly-outgoing-halibut backport/update-run-task-result/factually-star-sunfish backport/update_docs_for_30072/gradually-trusting-wahoo backport/workspaces-confusion-fixes/secondly-huge-titmouse barrettclark/fix-state-outputs-read-permissions brandonc/changelog_nested_sensitive brandonc/changelog_sensitive_diff_fixes brandonc/cloud_upgrade_013 brandonc/nested_attr_sensitive brandonc/output_cloud_reads brandonc/providers-estimate brandonc/run_variables_types brandonc/scheme_override_cloud brandonc/variable_parsing_refactor build-pr-checks build-workflow-dev/cgo-enabled build-workflow-dev/liamcervante/equivalence-test-action bump-gcp-storage-dependency bump-gcp-storage-dependency-2 cloud-e2e-fix cloud-integration-changelog-entry dependabot/go_modules/github.com/bmatcuk/doublestar-1.3.4 dependabot/go_modules/github.com/mattn/go-shellwords-1.0.12 dev-portal-updates-docs dividers-devdot-fixes doc-config-refactoring doc-provisioner-scp doc-refactoring-nav-link doc-s3-backend-dynamodb-locks doc-unicode-hcl doc-yamlencode-stable docs-for-each-list-toset docs-readme-updates-versioned-docs docs/top-pages-gloss ds.submodule-nav-main f-addrs-static-checkable f-build-go1.19.3 f-cli-hide-fast-refresh f-cmd-web f-config-refcount f-cty-funcs-marks f-debugger f-decode-moved f-derived-values-tracking f-diagnostics-cli-reorg f-dynamic-provider-assignment f-e2etest-deps-forbidden f-expand-root-outputs f-exprstress f-fewer-apply-updates f-fileexists-errmsg f-func-expandnull f-functions-in-providers f-implied-move-module-call f-init-provider-source-feedback f-jsonstate-2 f-moduletest-2 f-moved-again f-new-build-pipeline f-new-plan-modes f-ng-workflow f-output-value-types f-partial-plan-on-error f-partial-plan-on-error-ui f-persistent-checks-old f-plan-immediate-ops f-plan-refresh-only-and-replace f-plugin-finder f-rpcplugin-interface f-submodule-outputs-inferred-sensitive f-svcauth-environment f-template-values f-testing-with-conditions f-tfaddr-lib f-unused-attr f-validate-lint f/azurerm-backend-msal fix-apt-page fix-broken-link fix-broken-links-1-10 fix-cdktf-link fix-dividers-for-devdot fix-future-facing-language fix-future-lang-2 fix-internals-overview fix-intro-page-images fix-last-intro-nits fix-links-devdot fix-links-release fix-postconditions-example fix-preconditions fix-provisioners-content fix-readme-again gcs-backend-add-kms gcs-backend-add-private-connect-support gcs-refactor-credential-handling go-get1.5.2 gs/add-pre-plan-run-tasks jbardin/1.3-destroy-perf jbardin/backport-29017 jbardin/backport-29167 jbardin/backport-29559 jbardin/backport-31576 jbardin/call-plan-destroy jbardin/data-source-destroy-edges jbardin/go-getter-update jbardin/lookup-objects jbardin/null-variable jbardin/output-perf jbardin/plan-orphan-deleted jbardin/remove-deprecated-backends jbardin/resolved-provided-by jbardin/terraform-data jbardin/terraform-null jbardin/trigger-replacement jbardin/variable-eval json-schema-export-crash k8s-backend-credentials kevin/local-preview-post-split kevin/preview kevin/remove-guides-docs kevin/vercel-config kmoe/http-backend-debug-log kmoe/init-checksum-miss-error kmoe/misc-help-text kmoe/unused-resource-attributes lafentres/autolabel-dependabot-prs lafentres/refactor-show-command laura-fix-jsonencode-note laura-update-docs-readme laura-update-pre-post-conditions liamcervante/cicd-go-vet liamcervante/structured-run-output link_multicloud_tutorial_from_use_cases link_to_refresh_tutorial link_workflow_tutorials megan_invalid_creds megan_update_msg migrate-go-tfe-1_0 nf/nov21-migrate-away-from-cloud nq.content-update nq.docs-content-update omarismail/run-vars paddy_backport_proto6_download paddy_protocol_six_registry paddy_tf_log_json preapply-runtasks-cli-output preapply-runtasks-clioutput prototype-implicit-graph pselle/env_delete rar-docs-update-add-anchor release-notes-env-credentials remote-backend-refresh-alias replace-flag-updates res-add-learn-link-debug res-add-learn-link-debug-1 res-lifecycle-tutorial revert-29088-minify_jsonencode review-1.0-docs rln-add-versions-tutorials-links rt-backport-changelog rt-changelog-entry-1.1 run-tasks-backport sebasslash/add-cloud-e2e-test-workflow sebasslash/add-tf-hostname-env-var sebasslash/add-tf-org-env-var sebasslash/env-cloud-e2e-tests sebasslash/err-approval-input-false sebasslash/resolve-flaky-env-var-test sebasslash/tf-workspace-cloud-config solutiongeek-patch-1 stable-website tags-reconfigure-msg tchupp/override-local-vars test-branch-protection-workflow tf-swift-backend-swauth tfc-integration-docs uk1288/backport-cloud-integration-panic-fix uk1288/fix-for-cloud-integration-panic uk1288/update-changelog-md uk1288/update-changelog-md-v1-1 update-TF-WORKSPACE-variable update-cidrnetmask-docs update-depends-on-docs update-for-each-example update-packaging-action-name update-tfe-login-flow update_gen_meta uturunku1-patch-1 uturunku1-patch-2 v0.15 v1.0 v1.1 v1.4.0-alpha20221109 v1.3.5 v1.3.4 v1.3.3 v1.3.2 v1.3.1 v1.3.0 v1.3.0-rc1 v1.3.0-dev v1.3.0-beta1 v1.3.0-alpha20220817 v1.3.0-alpha20220803 v1.3.0-alpha20220706 v1.3.0-alpha20220622 v1.3.0-alpha20220608 v1.2.9 v1.2.8 v1.2.7 v1.2.6 v1.2.5 v1.2.4 v1.2.3 v1.2.2 v1.2.1 v1.2.0 v1.2.0-rc2 v1.2.0-rc1 v1.2.0-beta1 v1.2.0-alpha20220413 v1.2.0-alpha-20220328 v1.1.9 v1.1.8 v1.1.7 v1.1.6 v1.1.5 v1.1.4 v1.1.3 v1.1.2 v1.1.1 v1.1.0 v1.1.0-rc1 v1.1.0-beta2 v1.1.0-beta1 v1.1.0-alpha20211029 v1.1.0-alpha20211020 v1.1.0-alpha20211006 v1.1.0-alpha20210922 v1.1.0-alpha20210908 v1.1.0-alpha20210811 v1.1.0-alpha20210728 v1.1.0-alpha20210714 v1.1.0-alpha20210630 v1.1.0-alpha20210616 v1.0.11 v1.0.10 v1.0.9 v1.0.8 v1.0.7 v1.0.6 v1.0.5 v1.0.4 v1.0.3 v1.0.2 v1.0.1 v1.0.0 v0.15.5 v0.15.4 v0.15.3 v0.15.2 v0.15.1 v0.15.0 v0.15.0-rc2 v0.15.0-rc1 v0.15.0-beta2 v0.15.0-beta1 v0.15.0-alpha20210210 v0.15.0-alpha20210127
No related merge requests found
Showing with 25 additions and 25 deletions
+25 -25
...@@ -64,7 +64,7 @@ The Terraform team is not merging PRs for new state storage backends at the curr ...@@ -64,7 +64,7 @@ The Terraform team is not merging PRs for new state storage backends at the curr
Please see the [CODEOWNERS](https://github.com/hashicorp/terraform/blob/master/CODEOWNERS) file for the status of a given backend. Community members with an interest in a particular standard backend are welcome to help maintain it. Please see the [CODEOWNERS](https://github.com/hashicorp/terraform/blob/master/CODEOWNERS) file for the status of a given backend. Community members with an interest in a particular standard backend are welcome to help maintain it.
Currently, merging state storage backends places a significant burden on the Terraform team. The team must setup an environment and cloud service provider account, or a new database/storage/key-value service, in order to build and test remote state storage backends. The time and complexity of doing so prevents us from moving Terraform forward in other ways. Currently, merging state storage backends places a significant burden on the Terraform team. The team must set up an environment and cloud service provider account, or a new database/storage/key-value service, in order to build and test remote state storage backends. The time and complexity of doing so prevents us from moving Terraform forward in other ways.
We are working to remove ourselves from the critical path of state storage backends by moving them towards a plugin model. In the meantime, we won't be accepting new remote state backends into Terraform. We are working to remove ourselves from the critical path of state storage backends by moving them towards a plugin model. In the meantime, we won't be accepting new remote state backends into Terraform.
......
...@@ -39,7 +39,7 @@ func (b *Local) opApply( ...@@ -39,7 +39,7 @@ func (b *Local) opApply(
return return
} }
// Setup our count hook that keeps track of resource changes // Set up our count hook that keeps track of resource changes
countHook := new(CountHook) countHook := new(CountHook)
stateHook := new(StateHook) stateHook := new(StateHook)
if b.ContextOpts == nil { if b.ContextOpts == nil {
...@@ -137,7 +137,7 @@ func (b *Local) opApply( ...@@ -137,7 +137,7 @@ func (b *Local) opApply(
} }
} }
// Setup our hook for continuous state updates // Set up our hook for continuous state updates
stateHook.StateMgr = opState stateHook.StateMgr = opState
// Start the apply in a goroutine so that we can be interrupted. // Start the apply in a goroutine so that we can be interrupted.
......
...@@ -59,7 +59,7 @@ func (b *Local) opPlan( ...@@ -59,7 +59,7 @@ func (b *Local) opPlan(
return return
} }
// Setup our count hook that keeps track of resource changes // Set up our count hook that keeps track of resource changes
countHook := new(CountHook) countHook := new(CountHook)
if b.ContextOpts == nil { if b.ContextOpts == nil {
b.ContextOpts = new(terraform.ContextOpts) b.ContextOpts = new(terraform.ContextOpts)
......
...@@ -125,7 +125,7 @@ func TestLocalProvider(t *testing.T, b *Local, name string, schema *terraform.Pr ...@@ -125,7 +125,7 @@ func TestLocalProvider(t *testing.T, b *Local, name string, schema *terraform.Pr
b.ContextOpts = &terraform.ContextOpts{} b.ContextOpts = &terraform.ContextOpts{}
} }
// Setup our provider // Set up our provider
b.ContextOpts.Providers = map[addrs.Provider]providers.Factory{ b.ContextOpts.Providers = map[addrs.Provider]providers.Factory{
addrs.NewDefaultProvider(name): providers.FactoryFixed(p), addrs.NewDefaultProvider(name): providers.FactoryFixed(p),
} }
......
...@@ -49,7 +49,7 @@ func (c *httpClient) httpRequest(method string, url *url.URL, data *[]byte, what ...@@ -49,7 +49,7 @@ func (c *httpClient) httpRequest(method string, url *url.URL, data *[]byte, what
if err != nil { if err != nil {
return nil, fmt.Errorf("Failed to make %s HTTP request: %s", what, err) return nil, fmt.Errorf("Failed to make %s HTTP request: %s", what, err)
} }
// Setup basic auth // Set up basic auth
if c.Username != "" { if c.Username != "" {
req.SetBasicAuth(c.Username, c.Password) req.SetBasicAuth(c.Username, c.Password)
} }
......
...@@ -110,7 +110,7 @@ func (p *provisioner) ProvisionResource(req provisioners.ProvisionResourceReques ...@@ -110,7 +110,7 @@ func (p *provisioner) ProvisionResource(req provisioners.ProvisionResourceReques
workingdir = wdVal.AsString() workingdir = wdVal.AsString()
} }
// Setup the reader that will read the output from the command. // Set up the reader that will read the output from the command.
// We use an os.Pipe so that the *os.File can be passed directly to the // We use an os.Pipe so that the *os.File can be passed directly to the
// process, and not rely on goroutines copying the data which may block. // process, and not rely on goroutines copying the data which may block.
// See golang.org/issue/18874 // See golang.org/issue/18874
...@@ -124,7 +124,7 @@ func (p *provisioner) ProvisionResource(req provisioners.ProvisionResourceReques ...@@ -124,7 +124,7 @@ func (p *provisioner) ProvisionResource(req provisioners.ProvisionResourceReques
cmdEnv = os.Environ() cmdEnv = os.Environ()
cmdEnv = append(cmdEnv, env...) cmdEnv = append(cmdEnv, env...)
// Setup the command // Set up the command
cmd := exec.CommandContext(p.ctx, cmdargs[0], cmdargs[1:]...) cmd := exec.CommandContext(p.ctx, cmdargs[0], cmdargs[1:]...)
cmd.Stderr = pw cmd.Stderr = pw
cmd.Stdout = pw cmd.Stdout = pw
......
...@@ -31,7 +31,7 @@ func homeDir() (string, error) { ...@@ -31,7 +31,7 @@ func homeDir() (string, error) {
// First prefer the HOME environmental variable // First prefer the HOME environmental variable
if home := os.Getenv("HOME"); home != "" { if home := os.Getenv("HOME"); home != "" {
// FIXME: homeDir gets called from globalPluginDirs during init, before // FIXME: homeDir gets called from globalPluginDirs during init, before
// the logging is setup. We should move meta initializtion outside of // the logging is set up. We should move meta initializtion outside of
// init, but in the meantime we just need to silence this output. // init, but in the meantime we just need to silence this output.
//log.Printf("[DEBUG] Detected home directory from env var: %s", home) //log.Printf("[DEBUG] Detected home directory from env var: %s", home)
......
...@@ -630,7 +630,7 @@ func testInteractiveInput(t *testing.T, answers []string) func() { ...@@ -630,7 +630,7 @@ func testInteractiveInput(t *testing.T, answers []string) func() {
// Disable test mode so input is called // Disable test mode so input is called
test = false test = false
// Setup reader/writers // Set up reader/writers
testInputResponse = answers testInputResponse = answers
defaultInputReader = bytes.NewBufferString("") defaultInputReader = bytes.NewBufferString("")
defaultInputWriter = new(bytes.Buffer) defaultInputWriter = new(bytes.Buffer)
...@@ -651,7 +651,7 @@ func testInputMap(t *testing.T, answers map[string]string) func() { ...@@ -651,7 +651,7 @@ func testInputMap(t *testing.T, answers map[string]string) func() {
// Disable test mode so input is called // Disable test mode so input is called
test = false test = false
// Setup reader/writers // Set up reader/writers
defaultInputReader = bytes.NewBufferString("") defaultInputReader = bytes.NewBufferString("")
defaultInputWriter = new(bytes.Buffer) defaultInputWriter = new(bytes.Buffer)
......
...@@ -110,7 +110,7 @@ func (c *ConsoleCommand) Run(args []string) int { ...@@ -110,7 +110,7 @@ func (c *ConsoleCommand) Run(args []string) int {
} }
}() }()
// Setup the UI so we can output directly to stdout // Set up the UI so we can output directly to stdout
ui := &cli.BasicUi{ ui := &cli.BasicUi{
Writer: wrappedstreams.Stdout(), Writer: wrappedstreams.Stdout(),
ErrorWriter: wrappedstreams.Stderr(), ErrorWriter: wrappedstreams.Stderr(),
......
...@@ -123,7 +123,7 @@ func (c *InitCommand) Run(args []string) int { ...@@ -123,7 +123,7 @@ func (c *InitCommand) Run(args []string) int {
c.Ui.Output("") c.Ui.Output("")
} }
// If our directory is empty, then we're done. We can't get or setup // If our directory is empty, then we're done. We can't get or set up
// the backend with an empty directory. // the backend with an empty directory.
empty, err := configs.IsEmptyDir(path) empty, err := configs.IsEmptyDir(path)
if err != nil { if err != nil {
......
...@@ -102,7 +102,7 @@ func (m *Meta) Backend(opts *BackendOpts) (backend.Enhanced, tfdiags.Diagnostics ...@@ -102,7 +102,7 @@ func (m *Meta) Backend(opts *BackendOpts) (backend.Enhanced, tfdiags.Diagnostics
log.Printf("[TRACE] Meta.Backend: instantiated backend of type %T", b) log.Printf("[TRACE] Meta.Backend: instantiated backend of type %T", b)
} }
// Setup the CLI opts we pass into backends that support it. // Set up the CLI opts we pass into backends that support it.
cliOpts, err := m.backendCLIOpts() cliOpts, err := m.backendCLIOpts()
if err != nil { if err != nil {
diags = diags.Append(err) diags = diags.Append(err)
...@@ -1206,7 +1206,7 @@ Terraform configuration you're using is using a custom configuration for ...@@ -1206,7 +1206,7 @@ Terraform configuration you're using is using a custom configuration for
the Terraform backend. the Terraform backend.
Changes to backend configurations require reinitialization. This allows Changes to backend configurations require reinitialization. This allows
Terraform to setup the new configuration, copy existing state, etc. This is Terraform to set up the new configuration, copy existing state, etc. This is
only done during "terraform init". Please run that command now then try again. only done during "terraform init". Please run that command now then try again.
If the change reason above is incorrect, please verify your configuration If the change reason above is incorrect, please verify your configuration
......
...@@ -65,7 +65,7 @@ func (m *Meta) backendMigrateState(opts *backendMigrateOpts) error { ...@@ -65,7 +65,7 @@ func (m *Meta) backendMigrateState(opts *backendMigrateOpts) error {
errMigrateLoadStates), opts.TwoType, err) errMigrateLoadStates), opts.TwoType, err)
} }
// Setup defaults // Set up defaults
opts.oneEnv = backend.DefaultStateName opts.oneEnv = backend.DefaultStateName
opts.twoEnv = backend.DefaultStateName opts.twoEnv = backend.DefaultStateName
opts.force = m.forceInitCopy opts.force = m.forceInitCopy
......
...@@ -285,7 +285,7 @@ func TestPlan_outBackend(t *testing.T) { ...@@ -285,7 +285,7 @@ func TestPlan_outBackend(t *testing.T) {
) )
}) })
// Setup our backend state // Set up our backend state
dataState, srv := testBackendState(t, originalState, 200) dataState, srv := testBackendState(t, originalState, 200)
defer srv.Close() defer srv.Close()
testStateFileRemote(t, dataState) testStateFileRemote(t, dataState)
......
...@@ -110,7 +110,7 @@ func TestStatePush_replaceMatchStdin(t *testing.T) { ...@@ -110,7 +110,7 @@ func TestStatePush_replaceMatchStdin(t *testing.T) {
expected := testStateRead(t, "replace.tfstate") expected := testStateRead(t, "replace.tfstate")
// Setup the replacement to come from stdin // Set up the replacement to come from stdin
var buf bytes.Buffer var buf bytes.Buffer
if err := writeStateForTesting(expected, &buf); err != nil { if err := writeStateForTesting(expected, &buf); err != nil {
t.Fatalf("err: %s", err) t.Fatalf("err: %s", err)
......
...@@ -19,7 +19,7 @@ import ( ...@@ -19,7 +19,7 @@ import (
// Communicator is an interface that must be implemented by all communicators // Communicator is an interface that must be implemented by all communicators
// used for any of the provisioners // used for any of the provisioners
type Communicator interface { type Communicator interface {
// Connect is used to setup the connection // Connect is used to set up the connection
Connect(provisioners.UIOutput) error Connect(provisioners.UIOutput) error
// Disconnect is used to terminate the connection // Disconnect is used to terminate the connection
......
...@@ -97,7 +97,7 @@ func New(v cty.Value) (*Communicator, error) { ...@@ -97,7 +97,7 @@ func New(v cty.Value) (*Communicator, error) {
return nil, err return nil, err
} }
// Setup the random number generator once. The seed value is the // Set up the random number generator once. The seed value is the
// time multiplied by the PID. This can overflow the int64 but that // time multiplied by the PID. This can overflow the int64 but that
// is okay. We multiply by the PID in case we have multiple processes // is okay. We multiply by the PID in case we have multiple processes
// grabbing this at the same time. This is possible with Terraform and // grabbing this at the same time. This is possible with Terraform and
...@@ -342,7 +342,7 @@ func (c *Communicator) Start(cmd *remote.Cmd) error { ...@@ -342,7 +342,7 @@ func (c *Communicator) Start(cmd *remote.Cmd) error {
return err return err
} }
// Setup our session // Set up our session
session.Stdin = cmd.Stdin session.Stdin = cmd.Stdin
session.Stdout = cmd.Stdout session.Stdout = cmd.Stdout
session.Stderr = cmd.Stderr session.Stderr = cmd.Stderr
......
...@@ -16,7 +16,7 @@ import ( ...@@ -16,7 +16,7 @@ import (
// verify that we can locate public key data // verify that we can locate public key data
func TestFindKeyData(t *testing.T) { func TestFindKeyData(t *testing.T) {
// setup a test directory // set up a test directory
td, err := ioutil.TempDir("", "ssh") td, err := ioutil.TempDir("", "ssh")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
......
...@@ -298,7 +298,7 @@ func (w *Walker) Update(g *AcyclicGraph) { ...@@ -298,7 +298,7 @@ func (w *Walker) Update(g *AcyclicGraph) {
} }
// Start all the new vertices. We do this at the end so that all // Start all the new vertices. We do this at the end so that all
// the edge waiters and changes are setup above. // the edge waiters and changes are set up above.
for _, raw := range newVerts { for _, raw := range newVerts {
v := raw.(Vertex) v := raw.(Vertex)
go w.walkVertex(v, w.vertexMap[v]) go w.walkVertex(v, w.vertexMap[v])
......
...@@ -35,7 +35,7 @@ func fds() (stdin, stdout, stderr *os.File) { ...@@ -35,7 +35,7 @@ func fds() (stdin, stdout, stderr *os.File) {
return return
} }
// These are the wrapped standard streams. These are setup by the // These are the wrapped standard streams. These are set up by the
// platform specific code in initPlatform. // platform specific code in initPlatform.
var ( var (
wrappedStdin *os.File wrappedStdin *os.File
......
...@@ -1286,7 +1286,7 @@ func (m schemaMap) diffString( ...@@ -1286,7 +1286,7 @@ func (m schemaMap) diffString(
if os == ns && !all && !computed { if os == ns && !all && !computed {
// They're the same value. If there old value is not blank or we // They're the same value. If there old value is not blank or we
// have an ID, then return right away since we're already setup. // have an ID, then return right away since we're already set up.
if os != "" || d.Id() != "" { if os != "" || d.Id() != "" {
return nil return nil
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment