35 Commits (f2dbf80badc8c7385a7b44bb040ae5e8550e7e60)

Author	SHA1	Message	Date
Sander van Harmelen	973e2a7cf9	core: add a context to the UIInput interface	7 years ago
Martin Atkins	6c7cecfbd8	command: More logging during migration ... This just finishes off the logging added in earlier commits to get all the way through to the actual migration call.	7 years ago
Martin Atkins	aacbe1d14b	command: Fix TestMetaBackend_configureNewWithState ... This test was initially failing because its fixture had a state which our new state models consider to be "empty", and thus it was not migrated. After fixing that (by adding an output to the fixture), this revealed a bug that the lineage was not being persisted through the migration. This is fixed by using the statemgr.Migrate method instead of writing via the normal Writer interface, which allows two cooperating state managers to properly transfer the lineage and serial along with the state snapshot.	7 years ago
Martin Atkins	f6d468ffd5	command: Fix TestInit_inputFalse ... This test was using old-style state files as its input, differing only by lineage. Since lineages are now managed within the state manager itself, the test can't use that to distinguish the two files and so we put a different output in each one instead. This also introduces some TRACE logging to the migration codepaths. There's some hard-to-follow control flow here and so this extra logging helps to understand the reason for a particular outcome, and since this codepath is visited only in "terraform init" anyway it doesn't hurt to be a bit more verbose here.	7 years ago
Sander van Harmelen	5e9414bf03	backend/migrations: only select workspaces if supported ... If the backend does not support workspaces, we don't have to try to select a workspace and we should not return an error.	7 years ago
Sander van Harmelen	52a1b22f7a	Implement the remote enhanced backend ... This is a refactored version of the `remote` backend that was initially added to Terraform v0.11.8 which should now be compatible with v0.12.0.	7 years ago
Martin Atkins	541952bb8f	Revert some work that happened since v0.12-dev branched ... This work was done against APIs that were already changed in the branch before work began, and so it doesn't apply to the v0.12 development work. To allow v0.12 to merge down to master, we'll revert this work out for now and then re-introduce equivalent functionality in later commits that works against the new APIs.	7 years ago
Martin Atkins	a3403f2766	terraform: Ugly huge change to weave in new State and Plan types ... Due to how often the state and plan types are referenced throughout Terraform, there isn't a great way to switch them out gradually. As a consequence, this huge commit gets us from the old world to a _compilable_ new world, but still has a large number of known test failures due to key functionality being stubbed out. The stubs here are for anything that interacts with providers, since we now need to do the follow-up work to similarly replace the old terraform.ResourceProvider interface with its replacement in the new "providers" package. That work, along with work to fix the remaining failing tests, will follow in subsequent commits. The aim here was to replace all references to terraform.State and its downstream types with states.State, terraform.Plan with plans.Plan, state.State with statemgr.State, and switch to the new implementations of the state and plan file formats. However, due to the number of times those types are used, this also ended up affecting numerous other parts of core such as terraform.Hook, the backend.Backend interface, and most of the CLI commands. Just as with 5861dbf3fc before, I apologize in advance to the person who inevitably just found this huge commit while spelunking through the commit history.	7 years ago
Sander van Harmelen	f410a5bb26	backend/migrations: migrate the default state ... Certain backends (currently only the `remote` backend) do not support using both the default and named workspaces at the same time. To make the migration easier for users that currently use both types of workspaces, this commit adds logic to ask the user for a new workspace name during the migration process.	8 years ago
Sander van Harmelen	7fb2d1b8de	Implement the Enterprise enhanced remote backend	8 years ago
James Bardin	bdd475e149	use the new clistate.Locker in commands ... Use the new StateLocker field to provide a wrapper for locking the state during terraform.Context creation in the commands that directly manipulate the state.	8 years ago
James Bardin	e9a76808df	create clistate.Locker interface ... Simplify the use of clistate.Lock by creating a clistate.Locker instance, which stores the context of locking a state, to allow unlock to be called without knowledge of how the state was locked. This alows the backend code to bring the needed UI methods to the point where the state is locked, and still unlock the state from an outer scope. Provide a NoopLocker as well, so that callers can always call Unlock without verifying the status of the lock. Add the StateLocker field to the backend.Operation, so that the state lock can be carried between the different function scopes of the backend code. This will allow the backend context to lock the state before it's read, while allowing the different operations to unlock the state when they complete.	8 years ago
James Bardin	f45205feb7	re-word state migration prompts ... The existing prompts were worded as if backend configurations were named, but they can only really be referenced by their type. Change the wording to reference them as type "X backend". When migrating state, refer to the backends as the "previously configured" and "newly configured", since they will often have the same type.	8 years ago
James Bardin	885e4cde81	don't loop indefinitely in confirm method ... Only check for input twice in the meta.confirm method. This prevents an errant newline from aborting the run while allowing Terraform to exit if there is no input available. We don't just check for a tty, since we still rely on being able to pipe input in for testing. Remove the redundant confirmation loops in the migration code, and only use the confirm method.	8 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	31d556894f	command: shallow UI-focused rename of "environment" to "workspace" ... Feedback after 0.9 was that the term "environment" was confusing due to it colliding with several other concepts, such as OS environment variables, a non-aligned Terraform Enterprise concept, and differing ideas of "environment" within various organizations. This new term "workspace" is intended to ease some of that confusion. This term is not used anywhere else in Terraform today, and we expect it to not be used in a manner that would be confusing within user organizations. This begins a deprecation cycle for the "terraform env" family of commands, instead moving to an equivalent set of "terraform workspace" commands. There are some remaining references to the old "environment" concept in the code, which will be cleaned up in a separate change. This change is instead focused on text visible in the UI and wording within code comments for the benefit of human maintainers of the code.	9 years ago
Mat Schaffer	76d4abd12a	Fix typo on state migration input error	9 years ago
David Joos	bbd2e6de35	Fix for minor typo ... "destionation" -> "destination"	9 years ago
James Bardin	fb4a365d12	noop migrate copy, add -lock and -input ... A couple commits got rebased together here, and it's easier to enumerate them in a single commit. Skip copying of states during migration if they are the same state. This can happen when trying to reconfigure a backend's options, or if the state was manually transferred. This can fail unexpectedly with locking enabled. Honor the `-input` flag for all confirmations (the new test hit some more). Also unify where we reference the Meta.forceInitCopy and transfer the value to the existing backendMigrateOpts.force field.	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
James Bardin	54e536cfe0	add `-force-copy` option to init command ... The `-force-copy` option will suppress confirmation for copying state data. Modify some tests to use the option, making sure to leave coverage of the Input code path.	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
James Bardin	ea095eda87	change to default state after backend migration ... When migrating from a multi-state backend to a single-state backend, we have to ensure that our locally configured environment is changed back to "default", or we won't be able to access the new backend.	9 years ago
Mitchell Hashimoto	1e3d452613	command: multistate to multistate conversions	9 years ago
Mitchell Hashimoto	c82d7dd56c	command: multi-state (non-default env) to single state	9 years ago
Mitchell Hashimoto	e75b666591	command: test multi-state to single state	9 years ago
Mitchell Hashimoto	3ef82e6b5f	command: test multi-state with default only to single state	9 years ago
Mitchell Hashimoto	1d8b76c89d	command: initial work on migrating envs, basic cases first	9 years ago
James Bardin	a372e9c54b	fix state migration lock info	9 years ago
James Bardin	f5ed8cd288	Use NewLockInfo to get a pre-populated value ... Using NewLockInfo ensure we start with all required fields filled.	9 years ago
James Bardin	4f0c465187	make command tests pass with new state.Locker	9 years ago
Mitchell Hashimoto	90f3d40c1f	command: use new state lock/unlock helpers for better UX	9 years ago
James Bardin	0c1b138719	Add state locking during backend init ... During backend initialization, especially during a migration, there is a chance that an existing state could be overwritten. Attempt to get a locks when writing the new state. It would be nice to always have a lock when reading the states, but the recursive structure of the Meta.Backend config functions makes that quite complex.	9 years ago
Mitchell Hashimoto	9654387771	command: meta.Backend is used for initializing the backend ... This is a complex function that handles all the potential cases that can happen with legacy remote state, new configurations, etc.	9 years ago