1136 Commits (3e5ce033b0074fdddbea1fe57dbb425913086842)

Author	SHA1	Message	Date
Kristin Laemmert	126e5f337f	json output of terraform plan (#19687) ... * command/show: adding functions to aid refactoring The planfile -> statefile -> state logic path was getting hard to follow with blurry human eyes. The getPlan... and getState... functions were added to help streamline the logic flow. Continued refactoring may follow. * command/show: use ctx.Config() instead of a config snapshot As originally written, the jsonconfig marshaller was getting an error when loading configs that included one or more modules. It's not clear if that was an error in the function call or in the configloader itself, but as a simpler solution existed I did not dig too far. * command/jsonplan: implement jsonplan.Marshal Split the `config` portion into a discrete package to aid in naming sanity (so we could have for example jsonconfig.Resource instead of jsonplan.ConfigResource) and to enable marshaling the config on it's own.	8 years ago
James Bardin	149ccd929e	missing commits from 19688	8 years ago
James Bardin	9667e06a03	decode backend hash as uint64 ... Older versions of terraform could save the backend hash number in a value larger than an int. While we could conditionally decode the state into an intermediary data structure for upgrade, or detect the specific decode error and modify the json, it seems simpler to just decode into the most flexible value for now, which is a uint64.	8 years ago
Charles Kenney	2dfc3a399d	command: allow -no-color option on "providers" command	8 years ago
Radek Simko	f64978b64c	backend/local: Render CBD replacement (+/-) correctly (#19642) ... * backend/local: Render CBD replacement (+/-) correctly * command/format: Use IsReplace helper function	8 years ago
Radek Simko	b28efa0bf3	command/format: Fix tests	8 years ago
Radek Simko	0b981fa641	command/format: Fix rendering of force-new updates	8 years ago
Radek Simko	fe117e9f02	command/format: Fix rendering of nested blocks during update	8 years ago
Radek Simko	2df886397b	command/format: Add more tests to cover non-primitive fields	8 years ago
Radek Simko	e3e459a8d4	command/format: Restructure tests	8 years ago
Radek Simko	49e7026bdd	command/format: Add tests for ResourceChange renderer	8 years ago
Kristin Laemmert	e3cecb7d56	format/state: added missing newline in the `outputs` output (#19542)	8 years ago
Radek Simko	9e5677adeb	Merge pull request #19453 from hashicorp/b-whole-body-diag-rendering ... command/format: Fix rendering of attribute-agnostic diagnostics	8 years ago
Radek Simko	501fcd1e21	Fix tests after upgrading hcl	8 years ago
Radek Simko	4f2868a019	command/format: Fix rendering of attribute-agnostic diagnostics	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
Sander van Harmelen	79a9a15879	command/state: lock when pushing state ... Next to adding the locking for the `state push` command, this commit also fixes a small bug where the lock would not be propertly released when running the `state show` command. And finally it renames some variables in the `[un]taint` code in order to try to standardize the var names of a few frequently used variables (e.g. statemgr.Full, states.State, states.SyncState).	8 years ago
Martin Atkins	884aa387b8	command: Use vendoring when building helper programs in tests ... In a couple places in tests we execute a child "go build" to make a helper program. Now that we're running in module mode, "go build" will normally default to downloading and caching dependencies, which we don't want because we're still using vendoring for the moment. Therefore we need to instruct these child builds to use vendoring too, avoiding the need to download all of the dependencies and ensuring that we'll be building with the same dependencies that we'd use for a normal build.	8 years ago
Martin Atkins	5255e85238	"go fmt" fixups ... Apparently my editor is still not reliably formatting on save, so I missed a few formatting quirks in these files.	8 years ago
Martin Atkins	73c9521a04	command/e2etest: Temporarily disable tests that access network ... Several of these tests rely on external services (e.g. Terraform Registry) that have not yet been updated to support the needs of Terraform v0.12.0, so for now we'll skip all of these tests and wait until those systems have been updated. This should be removed before Terraform v0.12.0 final to enable these tests to be used as part of pre-release smoke testing.	8 years ago
Martin Atkins	37bc187f95	command: "terraform output" mustn't panic when no state is present ... This is verified by TestOutput_noArgs.	8 years ago
Martin Atkins	53b5b95ef5	command: Fix TestRefresh_backup ... The local filesystem state manager no longer creates backup files eagerly, instead creating them only if on first write there is already a snapshot present in the target file. Therefore for this test to exercise the codepaths it intends to we must create an initial state snapshot for it to overwrite, creating the backup in the process. There are several other tests for this behavior elsewhere, so this test is primarily to verify that the refresh command is configuring the backend appropriately to get the backups written in the desired location.	8 years ago
Martin Atkins	762a173c7f	command: Fix TestRefresh_outPath ... We now only create a backup state file if the given output file already exists, which it does not in this test. (The behavior of creating the backup files is already covered by other tests, so no need for this one go out of its way to do it.)	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	27abd9c6b8	command: Fix TestMetaBackend_localDoesNotDeleteLocal ... The changes to how we handle setting the state path on the local backend broke the heuristic we were using here for detecting migration from one local backend to another with the same state path, which would by default end up deleting the state altogether after migration. We now use the StatePaths method to do this, which takes into account both the default values and any settings that have been set. Additionally this addresses a flaw in the old method which could potentially have deleted all non-default workspace state files if the "path" setting were changed without also changing the "workspace_dir" setting. This new approach is conservative because it will preserve all of the files if any one overlaps.	8 years ago
Martin Atkins	be79bf0412	command: Fix TestPlan_outBackend ... In an earlier change we fixed the "backendFromConfig" codepath to be able to properly detect changes to the -backend-config arguments during "terraform init", but this detection is too strict for the normal case of running an operation in a previously-initialized directory. Before any of the recent changes, the logic here was to selectively update the hash to include -backend-config settings in the init case. Since that late hash recalculation was confusing, here we take the alternative path of using the hash only in the normal case and full value comparison in the init case. Treating both of these cases separately makes things marginally easier to follow here.	8 years ago
Martin Atkins	b316e4ab56	command: Fix TestImport_remoteState ... The import command was imposing the default state path at the CLI level, rather than leaving that to be handled by the backend. As a result, the output state was always forced to be terraform.tfstate, regardless of the backend settings.	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	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.	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	22c84c71a4	command: Use statemgr.Import and statemgr.Export for state push and pull ... We previously hacked around the import/export functionality being missing in the statemgr layer after refactoring, but now it's been reintroduced to fix functionality elsewhere we should use the centralized Import and Export functions to ensure consistent behavior. In particular, this pushes the logic for checking lineage and serial during push down into the state manager itself, which is better because all other details about lineage and serial are managed within the state managers.	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	24046ab833	command: More TRACE logging for the Backend instantiation codepaths	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
Martin Atkins	8c54da0ad2	command: TestInit_fromModule_explicitDest guard against other tests ... Some other test is leaving behind a terraform.tfstate after it concludes, which can cause this test to fail in a strange way due to picking up extra provider requirements from that state. This check doesn't fix that problem, but it at least makes the test fail in a more helpful way to avoid time wasted trying to debug this test when it's some other test that actually has the bug.	8 years ago
Martin Atkins	ced06a4ca3	command: fix panic in TestStatePush_lineageMismatch ... This test is currently failing due to the command completing successfully, which would previously cause a panic because we didn't properly initialize the MockUi and so its error buffer is nil unless written to. (The failure this was masking will be fixed in a subsequent commit.)	8 years ago
Martin Atkins	544c2932ce	command: Fix TestInit_checkRequiredVersion ... In prior refactoring we lost the required core version check from "terraform init", which we restore here. Additionally, this test used to have an incorrect name that suggested it was testing something in the "getProvider" codepath, but version checking happens regardless of what other options are selected.	8 years ago
Martin Atkins	9ba399bca8	command: Fix TestInit_getProvider ... After all of the refactoring we were no longer checking the Terraform version field in a state file, causing this test to fail. This restores that check, though with a slightly different error message.	8 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.	8 years ago
Martin Atkins	c0b7f58143	command: Fix detection of necessary backend migration ... In the refactoring for new HCL this codepath stopped taking into account changes to the CLI -backend-config options when deciding if a backend migration is required. This restores that behavior in a different way than it used to be: rather than re-hashing the merged config and comparing the hashes, we instead just compare directly the configuration values, which must be exactly equal in order to skip migration. This change is covered by the test TestInit_inputFalse, although as of this commit it is still not passing due a downstream problem within the migration code itself.	8 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.	8 years ago
Martin Atkins	297b3b8830	command: Fix TestInit_backendReinitConfigToExtra ... This test was re-using the same InitCommand value to run multiple times, which is not realistic. Since we now cache configuration source code inside command.Meta on load, it's important that we use a fresh InitCommand instance here so it'll see the modified configuration file we've left on disk.	8 years ago
Martin Atkins	b5547f00f6	command: backendConfig must mutate its copy, not the original ... Here we were going to the trouble of copying the body so we could mutate it, but then ended up mutating the original anyway and then returning the unmodified copy. Whoops! This fix is verified by a number of "init" command tests that exercise the -backend-config option, including TestInit_backendConfigFile and several others whose names have the prefix TestInit_backendConfig .	8 years ago
Martin Atkins	8b603e4877	command: Name the Terraform Registry specifically in error message ... When we originally wrote this message we struggled a bit for how to refer to the releases server without writing an awkwardly-ungrammatical sentence, and so "the official repository" became a placeholder name for it. Now that we'll be looking in Terraform Registry this gives us a nice proper noun to use. This message will need to evolve more as our integration with the registry gets more sophisticated, but for now this works.	8 years ago
Martin Atkins	592850e22c	command: Fix TestApply_plan_remoteState ... Some over-zealous bulk updating of this test file caused this test to be producing a remote state config cache file on disk when it doesn't actually need one: the backend config comes from the plan file when applying a saved plan.	8 years ago
Martin Atkins	c05a556c0e	command: Fix TestRefresh_backup ... This test intentionally overrides the backup file location using the -backup option, so the backup file is not in the default location for this one.	8 years ago
Martin Atkins	ad276142b4	command: Fix the command package test build ... Some merging conflict shenanigans here led to this usage not lining up with the imported symbol name, meaning that the tests couldn't compile any more.	8 years ago