41 Commits (6440c839474f052d8997bb5cec19c2743e5108e6)

Author	SHA1	Message	Date
Alisdair McDiarmid	d8e9964363	terraform: Eval module call arguments for import ... Include the import walk in the list of operations for which we create an EvalModuleCallArgument node. This causes module call arguments to be evaluated even if the module variables have defaults, ensuring that invalid default values (such as the common "{}" for variables thought of as maps) do not cause failures specific to import. This fixes a bug where a child module evaluates an input variable in its locals block, assuming that it is a nested object structure. The bug report includes a default value of "{}", which is overridden by a root variable value. Without the eval node added in this commit, the default value is used and the local evaluation errors.	6 years ago
Alisdair McDiarmid	9ab9ef6291	command/import: Fix allow-missing-config option ... We previously intentionally removed support for the allow-missing-config option to terraform import, requiring that all imported resources have matching config. See #24412. However, the option was not removed from the import command, and it is widely used. This commit reintroduces support for importing with a missing configuration by falling back to implying the provider FQN based on the resource type.	6 years ago
Alisdair McDiarmid	d2b215f4d5	command: Fix test cleanup ... This test runs `init`, which causes some dangling `.terraform` state after running tests.	6 years ago
Kristin Laemmert	b611bd7209	reproduction test	6 years ago
Martin Atkins	69cae48a11	command/import: fix TestImport_initializationErrorShouldUnlock ... This was checking for a specific output error message which has changed due to our new provider installer/selection approach.	6 years ago
Kristin Laemmert	0af09b23ca	command: apply and most of import tests passing	6 years ago
Martin Atkins	d40085f374	command: Make the tests compile again ... They still aren't passing, but this is just enough updating to make the test program compile successfully after the refactoring related to provider installation. They are now using the mock provider source offered by the getproviders package, which is similar but not totally identical to the idea of mocking the entire installer as these tests used to do, and so many of them need further adjustment to still be testing what they intended to test under this new architecture. Subsequent commits will gradually repair the failing tests.	6 years ago
Kristin Laemmert	c8d64846ad	Mildwonkey/ps import (#24412) ... * import: remove Config from ImportOpts `Config` in ImportOpts was any provider configuration provided by the user on the command line. This option has already been removed in favor of only taking the provider from the configuration loaded in the current context. * terrafrom: add Config to ImportStateTransformer and refactor Transform to get the resource provider FQN from the Config	6 years ago
Alisdair McDiarmid	701d095808	command: Fix stale lock when exiting early ... If an error occurs on creating the context for console or import, we would fail to unlock the state. Fix this by unlocking slightly earlier. Affects console and import commands. Fixes #23318	6 years ago
Kristin Laemmert	47a16b0937	addrs: embed Provider in AbsProviderConfig instead of Type ... a large refactor to addrs.AbsProviderConfig, embedding the addrs.Provider instead of a Type string. I've added and updated tests, added some Legacy functions to support older state formats and shims, and added a normalization step when reading v4 (current) state files (not the added tests under states/statefile/roundtrip which work with both current and legacy-style AbsProviderConfig strings). The remaining 'fixme' and 'todo' comments are mostly going to be addressed in a subsequent PR and involve looking up a given local provider config's FQN. This is fine for now as we are only working with default assumption.	6 years ago
Kristin Laemmert	1c7167a9a1	command/import: remove -provider command line argument (#24090) ... Now that #22862 has been merged, terraform will properly pick up the resource provider configuration from state. We can remove the deprecated `-provider` flag.	6 years ago
Kristin Laemmert	80862f3436	command/import: attach references before validating provider (#22862) ... There was an order-of-operations bug where the import graph builder was validating that the provider did not have any resource references before references were actually being attached. This PR fixes the order of operations and adds a test (in the command package). Fixes #22804	6 years ago
Kristin Laemmert	86e450a85f	use LegacyString() consistently	6 years ago
Kristin Laemmert	9891d0354a	providers: use addrs.Provider as map keys for provider.Factory (#23548) ... * terraform/context: use new addrs.Provider as map key in provider factories * added NewLegacyProviderType and LegacyString funcs to make it explicit that these are temporary placeholders This PR introduces a new concept, provider fully-qualified name (FQN), encapsulated by the `addrs.Provider` struct.	6 years ago
Kristin Laemmert	54661ec1df	command/import: fix error during import when implied provider was not used (#22855) ... * command/import: properly use `-provider` supplied on the command line The import command now attaches the provider configuration in the resource instance, if set. That config is attached to the NodeAbstractResource during the import graph building. This prevents errors when the implied provider is not actually in the configuration at all, which may happen when a configuration is using the `-beta` version of a provider (and only that `-beta` version). * command/import: fix variable reassignment and update docs Fixes #22564	7 years ago
findkim	7816e61614	Bump installer protocol version to 5 and separate client and server protocol references	7 years ago
Martin Atkins	86c02d5c35	command: "terraform init" can partially initialize for 0.12upgrade ... There are a few constructs from 0.11 and prior that cause 0.12 parsing to fail altogether, which previously created a chicken/egg problem because we need to install the providers in order to run "terraform 0.12upgrade" and thus fix the problem. This changes "terraform init" to use the new "early configuration" loader for module and provider installation. This is built on the more permissive parser in the terraform-config-inspect package, and so it allows us to read out the top-level blocks from the configuration while accepting legacy HCL syntax. In the long run this will let us do version compatibility detection before attempting a "real" config load, giving us better error messages for any future syntax additions, but in the short term the key thing is that it allows us to install the dependencies even if the configuration isn't fully valid. Because backend init still requires full configuration, this introduces a new mode of terraform init where it detects heuristically if it seems like we need to do a configuration upgrade and does a partial init if so, before finally directing the user to run "terraform 0.12upgrade" before running any other commands. The heuristic here is based on two assumptions: - If the "early" loader finds no errors but the normal loader does, the configuration is likely to be valid for Terraform 0.11 but not 0.12. - If there's already a version constraint in the configuration that excludes Terraform versions prior to v0.12 then the configuration is probably _already_ upgraded and so it's just a normal syntax error, even if the early loader didn't detect it. Once the upgrade process is removed in 0.13.0 (users will be required to go stepwise 0.11 -> 0.12 -> 0.13 to upgrade after that), some of this can be simplified to remove that special mode, but the idea of doing the dependency version checks against the liberal parser will remain valuable to increase our chances of reporting version-based incompatibilities rather than syntax errors as we add new features in future.	7 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.	7 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.	7 years ago
Martin Atkins	40eda180d6	command: go fmt in import_test.go and refresh_test.go	7 years ago
Martin Atkins	5b61cc919b	command: Fix "terraform import" tests	7 years ago
Martin Atkins	73318a436b	command: go fmt	7 years ago
Martin Atkins	d63c2fdd8d	command: Show snippet of invalid resource addresses in import ... If we fail to parse the resource address given to "terraform import" then it's helpful to produce a "source code" snippet of what the user provided so they might see more precisely which part of the address was invalid.	7 years ago
Martin Atkins	54c1616d73	command: Update import_test.go for new provider types ... This only makes it compile. It does not yet ensure that the tests pass.	7 years ago
James Bardin	90a75422fb	unlock state in console, import, graph, and push ... The state locking improvements for the regular command had the side effect of locking the state in the console, import, graph and push commands. Those commands had been updated to get a state via the Backend.Context method, which locks the state whenever possible, and now need to call Unlock directly. Add Unlock calls to all commands that call Context directly.	8 years ago
Martin Atkins	f1079257ac	command: show a special error message when importing in an empty dir ... If users run "terraform import" in a directory with no Terraform configuration files, it's likely that they've made a mistake either by being in the wrong directory or forgetting to use the -config option on the command line. To help users find their mistake in this case, we'll now produce a specialized error message for this situation: Error: No Terraform configuration files The directory /home/user/example does not contain any Terraform configuration files (.tf or .tf.json). To specify a different configuration directory, use the -config="..." command line option. While here, this also converts some of the other existing messages to diagnostics so that we can show any configuration warnings along with the error message, and move towards the new standard error presentation.	8 years ago
James Bardin	3c807e5427	update state test strings in command package	8 years ago
Jack Bruno	3f2136d7ee	cli: terraform import -ignore-missing-config ... This new option allows importing without configuration present. Configuration is required by default as a confirmation that the provided resource name is correct, but it can be useful to override this in tools that wrap Terraform to do more involved operations.	9 years ago
James Bardin	e3748901b4	Don't ForceLocal for the import backend ... While the `local.Local` backend is the only implementation of `backend.Local`, creating the backend with `ForceLocal` bypasses the `backend.Backend` in the `local.Local` causing a local state to be implicitly created rather than using the configured state backend. Add a test that imports into a configured backend (using the "local" backend as a remote state proxy). This further confirms the confusing nature of ForceLocal, as the backend _is_ local, but not from the viewpoint of meta.Backend.	9 years ago
James Bardin	85b9069eb7	test import with -plugin-dir ... The import command wasn't loading the full plugin path for discovery. Run a basic plugin init sequence, and verify we can find a plugin (even though the plugin is invalid and will fail).	9 years ago
Martin Atkins	9a398a7793	command: require resource to be in config before import ... Previously we encouraged users to import a resource and _then_ write the configuration block for it. This ordering creates lots of risk, since for various reasons users can end up subsequently running Terraform without any configuration in place, which then causes Terraform to want to destroy the resource that was imported. Now we invert this and require a minimal configuration block be written first. This helps ensure that the user ends up with a correlated resource config and state, protecting against any inconsistency caused by typos. This addresses #11835.	9 years ago
Martin Atkins	7d8719150c	command: validate import resource address early ... Previously we deferred validation of the resource address on the import command until we were in the core guts, which caused the error responses to be rather unhelpful. By validating these things early we can give better feedback to the user.	9 years ago
Martin Atkins	f6305fcc27	command: remove commented-out, misplaced tests ... For some reason there was a block of commented-out tests for the refresh command in the test file for the import command. Here we remove them to reduce the noise in this file.	9 years ago
Martin Atkins	4ab8973520	core: provide config to all import context tests ... We're going to use config to determine provider dependencies, so we need to always provide a config when instantiating a context or we'll end up loading no providers at all. We previously had a test for running "terraform import -config=''" to disable the config entirely, but this test is now removed because it makes no sense. The actual functionality its testing still remains for now, but it will be removed in a subsequent commit when we start requiring that a resource to be imported must already exist in configuration.	9 years ago
Martin Atkins	8364383c35	Push plugin discovery down into command package ... Previously we did plugin discovery in the main package, but as we move towards versioned plugins we need more information available in order to resolve plugins, so we move this responsibility into the command package itself. For the moment this is just preserving the existing behavior as long as there are only internal and unversioned plugins present. This is the final state for provisioners in 0.10, since we don't want to support versioned provisioners yet. For providers this is just a checkpoint along the way, since further work is required to apply version constraints from configuration and support additional plugin search directories. The automatic plugin discovery behavior is not desirable for tests because we want to mock the plugins there, so we add a new backdoor for the tests to use to skip the plugin discovery and just provide their own mock implementations. Most of this diff is thus noisy rework of the tests to use this new mechanism.	9 years ago
Mitchell Hashimoto	f84fd39ef9	command/import: document -var-file and -var is available #11211	9 years ago
Daniel Spangenberg	804a5bd3c5	Implements import with specified provider ... This allows the import with a specified provider. So far it was not possible to get resources imported from a different provider than the default.	9 years ago
Mitchell Hashimoto	f8ec7dad19	command/import: allow the -config flag to specify a config location	9 years ago
Mitchell Hashimoto	5107c33119	command/import: load configurations and allow empty config dirs ... Fixes #7774 This modifies the `import` command to load configuration files from the pwd. This also augments the configuration loading section for the CLI to have a new option (default false, same as old behavior) to allow directories with no Terraform configurations. For import, we allow directories with no Terraform configurations so this option is set to true.	9 years ago
Mitchell Hashimoto	d6c059c43e	command/import: tests passing	10 years ago
Mitchell Hashimoto	182a8a28c0	command/import more wip	10 years ago