49 Commits (e024960c745f0a464cb081d04765d93f94deaba0)

Author	SHA1	Message	Date
Justin Downing	1e32ae243c	grammatical updates to comments and docs (#20195)	7 years ago
James Bardin	149ccd929e	missing commits from 19688	8 years ago
Sander van Harmelen	ef9054562e	commands: make sure the correct flagset is used ... A lot of commands used `c.Meta.flagSet()` to create the initial flagset for the command, while quite a few of them didn’t actually use or support the flags that are then added. So I updated a few commands to use `flag.NewFlagSet()` instead to only add the flags that are actually needed/supported. Additionally this prevents a few commands from using locking while they actually don’t need locking (as locking is enabled as a default in `c.Meta.flagSet()`.	8 years ago
Martin Atkins	e2ba90fdfa	command: Fix TestMetaBackend_planLocalMatch ... We now don't create a local state backup until the first snapshot write, so we don't expect there to be a backup file until the end of the test. (There is already a check at the end there, unmodified by this change.)	8 years ago
Martin Atkins	48601d261d	states/statemgr: In Filesystem, back up output file, not input file ... The filesystem backend has the option of using a different file for its initial read. Previously we were incorrectly writing the contents of that file out into the backup file, rather than the prior contents of the output file. Now we will always read the output file in RefreshState in order to decide what we will back up but then we will optionally additionally read the input file and prefer its content as the "current" state snapshot. This is verified by command.TestMetaBackend_planLocalStatePath and TestMetaBackend_configureNew, which are both now passing.	8 years ago
Martin Atkins	2b9f92be31	command: Partially fix TestMetaBackend_planLocalStatePath ... This test is testing some strange implementation details of the old local backend which do not hold with the new filesystem state manager. Specifically, it was expecting state to be read from the stateOutPath rather than the statePath, which makes no sense here because the backend is configured to read from the default terraform.tfstate file (which does not exist.) There is another problem with this test which will be addressed in a subsequent commit.	8 years ago
Martin Atkins	aecb66d3db	command: Fix TestMetaBackend_configuredChangeCopy_multiToNoDefaultWithoutDefault ... As part of integrating the new "remote" backend we relaxed the requirement that a "default" workspace must exist in all backends and now skip migrating empty workspace states to avoid creating unnecessary "default" workspaces when switching between backends that require it and backends that don't, such as when switching from the local backend (which always has a "default" workspace) to Terraform Enterprise.	8 years ago
Martin Atkins	ec27526cc3	command: Fix TestMetaBackend_configuredChangeCopy_multiToMulti ... This was failing because we now handle the settings for the local backend a little differently as a result of decoding it with the HCL2 machinery. Specifically, the backend.State* fields are now assumed to be what is given in configuration, and any CLI overrides are maintained separately in OverrideState* fields so that they can be imposed "just in time" in StatePaths. This is particularly important because OverrideStatePath (when set) is used regardless of workspace name, while StatePath is a suitable value only for the "default" workspace, with others needing to be constructed from StateWorkspaceDir instead.	8 years ago
Martin Atkins	f39a5d0962	command: Fix various TestMetaBackend-prefix tests ... Our new state model has a different implementation of "empty" that doesn't consider lineage/serial, so we need to have some actual content in these state fixtures to avoid them being skipped during state migrations.	8 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.	8 years ago
Martin Atkins	2293391241	command: Fix TestMetaBackend_emptyWithExplicitState ... This test was incorrectly updated in a previous iteration, with it creating a modified state to write but then not actually writing it, writing an empty test state instead. This made the test fail because a backup state file is created only if the new state snapshot is different to the old when written.	8 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.	8 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.	8 years ago
Martin Atkins	8b466811d2	command: Fix a few tests from meta_backend_test.go	8 years ago
Martin Atkins	53bb3f57e6	command: Remove tests related to legacy remote state migrations, etc ... We no longer support legacy remote state, so the behaviors these tests were covering are no longer present.	8 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.	8 years ago
Martin Atkins	a270a18a4d	command: Update tests for changes in "terraform" package ... This is not exhaustive, but it gets the tests in this package compiling again and gets most of them working.	8 years ago
Martin Atkins	ebafa51723	command: Various updates for the new backend package API ... This is a rather-messy, complex change to get the "command" package building again against the new backend API that was updated for the new configuration loader. A lot of this is mechanical rewriting to the new API, but meta_config.go and meta_backend.go in particular saw some major changes to interface with the new loader APIs and to deal with the change in order of steps in the backend API.	8 years ago
Sean Chittenden	d749420a25	Fix drift caused from gofmt when running make dev and go 1.11. ... A fresh checkout of `origin/master` does not build atm using the `dev` target because `master` has not been formatted using `gofmt` from Go 1.11 (tis has been the case for a while if you've been running devel). None of the drift in question is especially new but now that Go 1.11 has been released and gofmt's formatting guidelines have been updated, it would be *really* nice if the code in `master` reflected the current tooling in order to avoid having to fight this drift locally. * 8mo: https://github.com/hashicorp/terraform/blame/master/backend/remote-state/s3/backend_test.go#L260-L261 * 6mo: https://github.com/hashicorp/terraform/blame/master/builtin/provisioners/chef/linux_provisioner_test.go#L124 * 1yr: 7cfeffe36b/command/init.go (L75-L76) * 12d: 7cfeffe36b/command/meta_backend_test.go (L1437) * 2yr: 7cfeffe36b/helper/schema/resource_timeout_test.go (L26) * 4yr: 7cfeffe36b/helper/schema/schema_test.go (L2059) * 1yr: 7cfeffe36b/plugin/discovery/get_test.go (L151)	8 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
Sander van Harmelen	97d1c46602	Update the backend import names ... It’s a purely cosmetic change, but I find it easier to read them like this.	8 years ago
James Bardin	909dff36a8	remove extra "yes" confirmation in tests ... There were two tests that had the duplicate confirmations hard-coded in the input stream.	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	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
James Bardin	0e0f0b64b9	add init -reconfigure test ... Check that we can reconfigure a backend ignoring the saved config, and without effecting the saved backend.	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	8050eda52d	don't delete local state on a local backend ... Don't erase local state during backend migration if the new and old paths are the same. Skipping the confirmation and copy are handled in another patch, but the local state was always erased by default, even when it was our new state.	9 years ago
James Bardin	7d23e1ef20	add equivalent tests to meta_backend_test	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
Mitchell Hashimoto	e1f4eca93c	command: apply needs to look at the right field for backend state ... Plans were properly encoding backend configuration but the apply was reading it from the wrong field. :( This meant that every apply from a plan was applying it locally with backends. This needs to get released ASAP.	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	03493f7d46	command: validate backend config ... The validation itself was added a couple weeks ago but I forgot to actually call it. :sad:	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	b53704ed87	Thread the environment through all commands ... Add Env and SetEnv methods to command.Meta to retrieve the current environment name inside any command. Make sure all calls to Backend.State contain an environment name, and make the package compile against the update backend package.	9 years ago
Mitchell Hashimoto	ebb22d3ecd	backend/local: don't RefreshState on State API	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
James Bardin	94f2f4d6ae	Create state files first for backup tests ... Previously when runnign a plan with no exitsing state, the plan would be written out and then backed up on the next WriteState by another BackupState instance. Since we now maintain a single State instance thoughout an operation, the backup happens before any state exists so no backup file is created. This is OK, as the backup state the tests were checking for is from the plan file, which already exists separate from the state.	10 years ago
James Bardin	1380bbedb2	don't print err in Fatalf when it's nil	10 years ago
James Bardin	b8bd4846db	fix test despite original comments ... Original comments were incorrect, and the test was checking for the absence of state	10 years ago
James Bardin	39ca4fa2f8	Ensure that backend tests check for data in state ... Test should not simply check for the existence of a file for state, but make sure that file also contains data.	10 years ago
James Bardin	8f7f1917f2	Remove state file data when writing a nil state ... The old behavior in this situation was to simply delete the file. Since we now have a lock on this file we don't want to close or delete it, so instead truncate the file at offset 0. Fix a number of related tests	10 years ago
James Bardin	eb59b5925e	Fix some tests, and make rest fail with good errs ... Having the state files always created for locking breaks a lot of tests. Most can be fixed by simple checking for state within a file, but a few still might be writing state when they shouldn't.	10 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.	10 years ago