77 Commits (db08ee4ac59d5eb8bcfffc175489ebf461bf4a92)

Author	SHA1	Message	Date
James Bardin	e0ee1e4d6e	Merge pull request #16070 from octo/defaultdatadir ... backend/local: Remove unused const DefaultDataDir.	9 years ago
Martin Atkins	0fe43c8977	cli: allow disabling "next steps" message in terraform plan ... In #15884 we adjusted the plan output to give an explicit command to run to apply a plan, whereas before this command was just alluded to in the prose. Since releasing that, we've got good feedback that it's confusing to include such instructions when Terraform is running in a workflow automation tool, because such tools usually abstract away exactly what commands are run and require users to take different actions to proceed through the workflow. To accommodate such environments while retaining helpful messages for normal CLI usage, here we introduce a new environment variable TF_IN_AUTOMATION which, when set to a non-empty value, is a hint to Terraform that it isn't being run in an interactive command shell and it should thus tone down the "next steps" messaging. The documentation for this setting is included as part of the "...in automation" guide since it's not generally useful in other cases. We also intentionally disclaim comprehensive support for this since we want to avoid creating an extreme number of "if running in automation..." codepaths that would increase the testing matrix and hurt maintainability. The focus is specifically on the output of the three commands we give in the automation guide, which at present means the following two situations: * "terraform init" does not include the final paragraphs that suggest running "terraform plan" and tell you in what situations you might need to re-run "terraform init". * "terraform plan" does not include the final paragraphs that either warn about not specifying "-out=..." or instruct to run "terraform apply" with the generated plan file.	9 years ago
Florian Forster	ce85600cd4	backend/local: Remove unused const DefaultDataDir. ... Not to be confused with the const of the same name in the "command" package.	9 years ago
Martin Atkins	83414beb8f	command: various adjustments to the diff presentation ... The previous diff presentation was rather "wordy", and not very friendly to those who can't see color either because they have color-blindness or because they don't have a color-supporting terminal. This new presentation uses the actual symbols used in the plan output and tries to be more concise. It also uses some framing characters to try to separate the different stages of "terraform plan" to make it easier to visually navigate. The apply command also adopts this new plan presentation, in preparation for "terraform apply" (with interactive plan confirmation) becoming the primary, safe workflow in the next major release. Finally, we standardize on the terminology "perform" and "actions" rather than "execute" and "changes" to reflect the fact that reading is now an action and that isn't actually a _change_.	9 years ago
Martin Atkins	3ea159297c	command/format: improve consistency of plan results ... Previously the rendered plan output was constructed directly from the core plan and then annotated with counts derived from the count hook. At various places we applied little adjustments to deal with the fact that the user-facing diff model is not identical to the internal diff model, including the special handling of data source reads and destroys. Since this logic was just muddled into the rendering code, it behaved inconsistently with the tally of adds, updates and deletes. This change reworks the plan formatter so that it happens in two stages: - First, we produce a specialized Plan object that is tailored for use in the UI. This applies all the relevant logic to transform the physical model into the user model. - Second, we do a straightforward visual rendering of the display-oriented plan object. For the moment this is slightly overkill since there's only one rendering path, but it does give us the benefit of letting the counts be derived from the same data as the full detailed diff, ensuring that they'll stay consistent. Later we may choose to have other UIs for plans, such as a machine-readable output intended to drive a web UI. In that case, we'd want the web UI to consume a serialization of the _display-oriented_ plan so that it doesn't need to re-implement all of these UI special cases. This introduces to core a new diff action type for "refresh". Currently this is used _only_ in the UI layer, to represent data source reads. Later it would be good to use this type for the core diff as well, to improve consistency, but that is left for another day to keep this change focused on the UI.	9 years ago
James Bardin	9a7ffbfb1b	Merge pull request #15566 from hashicorp/jbardin/state-serial ... Add warning to mismatched plan state	9 years ago
James Bardin	a1727ec4c2	Add warning to mismatched plan state ... Forward-port the plan state check from the 0.9 series. 0.10 has improved the serial handling for the state, so this adds relevant comments and some more test coverage for the case of an incrementing serial during apply.	9 years ago
James Bardin	3fb76f3ebb	only show state path help if state is local	9 years ago
Martin Atkins	6afa72f6ca	command: minor adjustments to the -auto-approve=false UX ... Some tweaks to the messaging and presentation.	9 years ago
David Glasser	14af879fe0	command: also print plan for destroy	9 years ago
David Glasser	039d36bf91	command: add "apply -auto-approve=false" flag ... A common reason to want to use `terraform plan` is to have a chance to review and confirm a plan before running it. If in fact that is the only reason you are running plan, this new `terraform apply -auto-approve=false` flag provides an easier alternative to P=$(mktemp -t plan) terraform refresh terraform plan -refresh=false -out=$P terraform apply $P rm $P The flag defaults to true for now, but in a future version of Terraform it will default to false.	9 years ago
Martin Atkins	45a4ba1ea7	Merge #15344: Avoid double-counting resources to create	9 years ago
Chris Marchesi	5654a676d9	core: Skip diff hooks for stubs on eval altogether ... Rather than overloading InstanceDiff with a "Stub" attribute that is going to be largely meaningless, we are just going to skip pre/post-diff hooks altogether. This is under the notion that we will eventually not need to "stub" a diff for scale-out, stateless nodes on refresh at all, so diff behaviour won't be necessary at that point, so we should not assume that hooks will run at this stage anyway. Also as part of this removed the CountHook test that is now failing because CountHook is out of scope of the new behaviour.	9 years ago
Chris Marchesi	50cd33f781	core: Move Refreh/Plan diff count to general operation test ... We are changing the behaviour of the "stub" diff operation to just have the pre/post-diff hooks skipped on eval, meaning that the test against CountHook will ultimately be meaningless and fail, hence we need a different test here that tests it on a more general level.	9 years ago
James Bardin	ac937a890d	improve plugin reinit error text	9 years ago
James Bardin	7a955f990c	make display plugin checksum error to user ... The error follows a generic message, so can be ignored by users who may not understand the implications.	9 years ago
James Bardin	5be15ed77c	have the local backend provide a plugin init msg ... During plan and apply, because the provider constraints need to be built from a plan, they are not checked until the terraform.Context is created. Since the context is always requested by the backend during the Operation, the backend needs to be responsible for generating contextual error messages for the user. Instead of formatting the ResolveProviders errors during NewContext, return a special error type, ResourceProviderError to signal that init will be required. The backend can then extract and format the errors.	9 years ago
Chris Marchesi	f249386c8a	core: Test to ensure PostDiff is ignoring stubs ... Added a test that shows that PostDiff is ignoring diffs where the Stub attribute is set.	9 years ago
Chris Marchesi	45528b2217	core: Instance/EvalDiff.Quiet -> Stub ... Changed the language of this field to indicate that this diff is not a "real" diff, in that it should not be acted on, versus a "quiet" mode, which would indicate just simply to act silently.	9 years ago
Chris Marchesi	eef933f2a7	core: Don't count scaled-out resources twice in the UI ... This fixes a bug with the new refresh graph behaviour where a resource was being counted twice in the UI on part of being scaled out: * We are no longer transforming refresh nodes without state to plannable resources (the transformer will be removed shortly) * A Quiet flag has been added to EvalDiff and InstanceDiff - this allows for the flagging of a diff that should not be treated as real diff for purposes of planning * When there is no state for a refresh node now, a new path is taken that is similar to plan, but flags Quiet, and does nothing with the diff afterwards. Tests pending - light testing has confirmed this should fix the double count issue, but we should have some tests to actually confirm the bug.	9 years ago
Martin Atkins	f7ce6a15f8	backend: Operation.Environment renamed to "Workspace" ... This is part of an effort to switch this terminology across all of Terraform.	9 years ago
Martin Atkins	418a8a8bc9	command + backend: rename various API objects to "Workspace" terminology ... We're shifting terminology from "environment" to "workspace". This takes care of some of the main internal API surface that was using the old terminology, though is not intended to be entirely comprehensive and is mainly just to minimize the amount of confusion for maintainers as we continue moving towards eliminating the old terminology.	9 years ago
Martin Atkins	5026e1d313	backend/local: "environment_dir" renamed to "workspace_dir" ... As part of switching our terminology, we begin a deprecation cycle for "environment_dir" and advise users to switch to "workspace_dir" instead.	9 years ago
David Glasser	c25d848ffb	core: allow overriding environment name via env var ... This allows you to run multiple concurrent terraform operations against different environments from the same source directory. Fixes #14447. Also removes some dead code which appears to do the same thing as the function I modified.	9 years ago
Martin Atkins	c835ef8ff3	Update tests for the new ProviderResolver interface ... Rather than providing an already-resolved map of plugins to core, we now provide a "provider resolver" which knows how to resolve a set of provider dependencies, to be determined later, and produce that map. This requires the context to be instantiated in a different way, so this very noisy diff is a mostly-mechanical update of all of the existing places where contexts get created for testing, using some adapted versions of the pre-existing utilities for passing in mock providers.	9 years ago
Martin Atkins	a42ebe389c	Revert "have StateHook periodically PersistState" ... This reverts commit b73d037761. This commit seems to have introduced a race condition where we can concurrently keep updating state after we've checked if we need to increase the serial, and thus end up writing partial changes to the state backend. In the case of Terraform Enterprise, this fails altogether because of the state hash consistency check it does.	9 years ago
Radek Simko	1244309579	Fix stringer comments (#15069)	9 years ago
He Guimin	87562be855	provider/alicloud: Add the function of replacing ecs instance's system disk (#15048) ... * add replacing system disk function for ecs * remove ForceNew of system_disk_size	9 years ago
Jake Champlin	ac177492fb	core: Revert stringer changes from earlier commits	9 years ago
Thomas Schaaf	79c91e11c8	provider/aws: Add aws elastic beanstalk solution stack (#14944) ... * Add aws elastic beanstalk solution stack Signed-off-by: Thomas Schaaf <thomaschaaf@Thomass-MBP.fritz.box> * Fix incorrect naming Signed-off-by: Thomas Schaaf <thomaschaaf@Thomass-MBP.fritz.box> * Use unique go variable/function names Signed-off-by: Thomas Schaaf <thomaschaaf@Thomass-MacBook-Pro.local> * Add docs to sidebar * Sort provider by alphabet * Fix indent * Add required statement * Fix acceptance test	9 years ago
James Bardin	f8bfc0a80d	check for empty diff in CountHook.PreApply ... Make sure we don't try to count anything from a nil diff.	9 years ago
James Bardin	9e4c0ff2ad	call PersistState immediately when cancelling ... When the backend operation is cancelled, immediately call PersistState. The is a high likelihood that the user is going to terminate the process early if the provider doesn't return in a timely manner, so persist as much state as possible.	9 years ago
James Bardin	b73d037761	have StateHook periodically PersistState ... Have StateHook periodically call PersistState to flush any cached state to permanent storage. This uses a minimal 10 second interval between calls to PersistState.	9 years ago
Martin Atkins	9cda37205d	backend/local: create local state file if backend write fails ... In the old remote state system we had the idea of a local backup, which is actually still present for the legacy backends but no longer applies for the new-style backends like the s3 backend. It's problematic when an apply runs for long enough that someone's time-limited AWS STS credentials expire and then Terraform fails and can't persist state to S3. To reduce the risk of lost state, here we add some extra fallback code for the local apply operation in particular. If either state writing or state persisting fail then we attempt to write the state to a special backup file errored.tfstate, and produce an error message that guides the user on how to retry uploading this state. In the unlikely event that we can't write to local disk either (e.g. permissions problems) we take a last-ditch attempt to dump the JSON onto stdout and advise the user to manually copy it into a file for import. If even that doesn't work for some reason, we assume a critical Terraform bug (JSON-serialization problem with states?) and bail out with an apologetic error message. This is implemented for the apply command in particular because this is the one command where new objects are created in real APIs that we don't want to lose track of. For other operations it's less bad to just generate a simple error message and have the user retry. This fixes #14298.	9 years ago
James Bardin	58759b1167	Merge pull request #13941 from hashicorp/jbardin/sigint-message ... improve SIGINT output	9 years ago
James Bardin	7dad3f4d48	remove redundant output when interrupting apply ... The backend apply operation doesn't need to output the same text as the cli itself. Instead notify the user that we are in the process of stopping the operation.	9 years ago
James Bardin	563cfd00df	always wrap remote state in a BackupState ... Use a local backup for remote state operations. This allows for manual recovery in the case of a put failure.	9 years ago
Martin Atkins	b1763e262a	Restore stringer-generated files back to new version ... stringer has changed the boilerplate it generates in a recent version. We'd previously updated to the new format but accientally rolled back to the old while merging a long-running feature branch. This restores us back to the new format again.	9 years ago
Jasmin Gacic	61499cfcf0	Provider Oneandone (#13633) ... * Terraform Provider 1&1 * Addressing pull request remarks * Fixed imports * Fixing remarks * Test optimiziation	9 years ago
James Bardin	928e60672f	context Refresh and Apply sometimes return nil ... The documentation for Refresh indicates that it will always return a valid state, but that wasn't true in the case of a graph builder error. While this same concept wasn't documented for Apply, it was still assumed in the terraform apply code. Since the helper testing framework relies on the absence of a state to determine if it can call Destroy, the Context can't can't start returning a state in all cases. Document this, and use the State method to fetch the correct state value after Apply. Add a nil check to the WriteState function, so that writing a nil state is a noop. Make sure to init before sorting the state, to make sure we're not attempting to sort nil values. This isn't technically needed with the current code, but it's just safer in general.	9 years ago
James Bardin	305ef43aa6	provide contexts to clistate.Lock calls ... Add fields required to create an appropriate context for all calls to clistate.Lock. Add missing checks for Meta.stateLock, where we would attempt to lock, even if locking should be skipped.	9 years ago
James Bardin	3f0dcd1308	Have the clistate Lock use LockWithContext ... - Have the ui Lock helper use state.LockWithContext. - Rename the message package to clistate, since that's how it's imported everywhere. - Use a more idiomatic placement of the Context in the LockWithContext args.	9 years ago
Martin Atkins	21cd5595e2	Update stringer-generated files to new boilerplate ... golang/tools commit 23ca8a263 changed the format of the leading comment to comply with some new standards discussed here: https://golang.org/issue/13560 This is the result of running generate with the latest version of stringer. Everyone working on Terraform will need to update stringer after this is merged, to avoid reverting this: go get -u golang.org/x/tools/cmd/stringer	9 years ago
James Bardin	7b8e1aff3d	fix local backend test ... The local backend can't define a StateOut path if we want to test writing multiple named state files. Use a default local backend.	9 years ago
Mitchell Hashimoto	d01886a644	command: remove legacy remote state on migration ... Fixes #12871 We were forgetting to remove the legacy remote state from the actual state value when migrating. This only causes an issue when saving a plan since the plan contains the state itself and causes an error where both a backend + legacy state exist. If saved plans aren't used this causes no noticable issue. Due to buggy upgrades already existing in the wild, I also added code to clear the remote section if it exists in a standard unchanged backend	9 years ago
Mitchell Hashimoto	2be1f55cbb	backend/local: allow refresh on empty/non-existent state ... This allows a refresh on a non-existent or empty state file. We changed this in 0.9.0 to error which seemed reasonable but it turns out this complicates automation that runs refresh since it now needed to determine if the state file was empty before running. Its easier to just revert this into a warning with exit code zero. The reason this changed is because in 0.8.x and earlier, the output would be simply empty with exit code zero which seemed odd.	9 years ago
Mitchell Hashimoto	2969b29d9b	backend/local: call new test API correctly	9 years ago
Mitchell Hashimoto	f63e8b3398	backend/local: run backend.TestBackend ... This verifies that local behaves in an expected way by the backend package.	9 years ago
Mitchell Hashimoto	e75b666591	command: test multi-state to single state	9 years ago
Mitchell Hashimoto	1d8b76c89d	command: initial work on migrating envs, basic cases first	9 years ago