40 Commits (449ea72e87da7e697ef7b68283a852cc9cc09045)

Author	SHA1	Message	Date
Alisdair McDiarmid	aa38cbe3bc	command: Comment to explain why unlock is required	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	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
Martin Atkins	8b511524d6	Initial steps towards AbsProviderConfig/LocalProviderConfig separation (#23978) ... * Introduce "Local" terminology for non-absolute provider config addresses In a future change AbsProviderConfig and LocalProviderConfig are going to become two entirely distinct types, rather than Abs embedding Local as written here. This naming change is in preparation for that subsequent work, which will also include introducing a new "ProviderConfig" type that is an interface that AbsProviderConfig and LocalProviderConfig both implement. This is intended to be largely just a naming change to get started, so we can deal with all of the messy renaming. However, this did also require a slight change in modeling where the Resource.DefaultProviderConfig method has become Resource.DefaultProvider returning a Provider address directly, because this method doesn't have enough information to construct a true and accurate LocalProviderConfig -- it would need to refer to the configuration to know what this module is calling the provider it has selected. In order to leave a trail to follow for subsequent work, all of the changes here are intended to ensure that remaining work will become obvious via compile-time errors when all of the following changes happen: - The concept of "legacy" provider addresses is removed from the addrs package, including removing addrs.NewLegacyProvider and addrs.Provider.LegacyString. - addrs.AbsProviderConfig stops having addrs.LocalProviderConfig embedded in it and has an addrs.Provider and a string alias directly instead. - The provider-schema-handling parts of Terraform core are updated to work with addrs.Provider to identify providers, rather than legacy strings. In particular, there are still several codepaths here making legacy provider address assumptions (in order to limit the scope of this change) but I've made sure each one is doing something that relies on at least one of the above changes not having been made yet. * addrs: ProviderConfig interface In a (very) few special situations in the main "terraform" package we need to make runtime decisions about whether a provider config is absolute or local. We currently do that by exploiting the fact that AbsProviderConfig has LocalProviderConfig nested inside of it and so in the local case we can just ignore the wrapping AbsProviderConfig and use the embedded value. In a future change we'll be moving away from that embedding and making these two types distinct in order to represent that mapping between them requires consulting a lookup table in the configuration, and so here we introduce a new interface type ProviderConfig that can represent either AbsProviderConfig or LocalProviderConfig decided dynamically at runtime. This also includes the Config.ResolveAbsProviderAddr method that will eventually be responsible for that local-to-absolute translation, so that callers with access to the configuration can normalize to an addrs.AbsProviderConfig given a non-nil addrs.ProviderConfig. That's currently unused because existing callers are still relying on the simplistic structural transform, but we'll switch them over in a later commit. * rename LocalType to LocalName Co-authored-by: Kristin Laemmert <mildwonkey@users.noreply.github.com>	6 years ago
Kristin Laemmert	67fc4dd5a1	configs: move ProviderConfigCompact[Str] from addrs to configs ... The configs package is aware of provider name and type (which are the same thing today, but expected to be two different things in a future release), and should be the source of truth for a provider config address.	6 years ago
Martin Atkins	39e609d5fd	vendor: switch to HCL 2.0 in the HCL repository ... Previously we were using the experimental HCL 2 repository, but now we'll shift over to the v2 import path within the main HCL repository as part of actually releasing HCL 2.0 as stable. This is a mechanical search/replace to the new import paths. It also switches to the v2.0.0 release of HCL, which includes some new code that Terraform didn't previously have but should not change any behavior that matters for Terraform's purposes. For the moment the experimental HCL2 repository is still an indirect dependency via terraform-config-inspect, so it remains in our go.sum and vendor directories for the moment. Because terraform-config-inspect uses a much smaller subset of the HCL2 functionality, this does still manage to prune the vendor directory a little. A subsequent release of terraform-config-inspect should allow us to completely remove that old repository in a future commit.	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
Brian Flad	20a814028d	command: Consistency implement and document parallelism default of 10 ... References: * f4da82a023/command/command.go (L41) * b9d8e96e0c/terraform/context.go (L149-L155)	7 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()`.	7 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).	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	5b61cc919b	command: Fix "terraform import" tests	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	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
Martin Atkins	fc7871c5ee	command/import: default provider config in same module ... Previously we were defaulting the provider configuration selection to a provider in the root module inferred from the resource type name. This is close, but not quite right: we need to _start_ with a provider configuration in the same module as we're importing into, and then our provider resolution steps during import graph construction will use that as a starting point for a walk up the tree to find the nearest matching configuration (which might eventually still be in the root, but not necessarily).	7 years ago
Martin Atkins	c937c06a03	terraform: ugly huge change to weave in new HCL2-oriented types ... Due to how deeply the configuration types go into Terraform Core, there isn't a great way to switch out to HCL2 gradually. As a consequence, this huge commit gets us from the old state to a _compilable_ new state, but does not yet attempt to fix any tests and has a number of known missing parts and bugs. We will continue to iterate on this in forthcoming commits, heading back towards passing tests and making Terraform fully-functional again. The three main goals here are: - Use the configuration models from the "configs" package instead of the older models in the "config" package, which is now deprecated and preserved only to help us write our migration tool. - Do expression inspection and evaluation using the functionality of the new "lang" package, instead of the Interpolator type and related functionality in the main "terraform" package. - Represent addresses of various objects using types in the addrs package, rather than hand-constructed strings. This is not critical to support the above, but was a big help during the implementation of these other points since it made it much more explicit what kind of address is expected in each context. Since our new packages are built to accommodate some future planned features that are not yet implemented (e.g. the "for_each" argument on resources, "count"/"for_each" on modules), and since there's still a fair amount of functionality still using old-style APIs, there is a moderate amount of shimming here to connect new assumptions with old, hopefully in a way that makes it easier to find and eliminate these shims later. I apologize in advance to the person who inevitably just found this huge commit while spelunking through the commit history.	7 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.	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
Martin Atkins	9a5c865040	command: validate config as part of loading it ... Previously we required callers to separately call .Validate on the root module to determine if there were any value errors, but we did that inconsistently and would thus see crashes in some cases where later code would try to use invalid configuration as if it were valid. Now we run .Validate automatically after config loading, returning the resulting diagnostics. Since we return a diagnostics here, it's possible to return both warnings and errors. We return the loaded module even if it's invalid, so callers are free to ignore returned errors and try to work with the config anyway, though they will need to be defensive against invalid configuration themselves in that case. As a result of this, all of the commands that load configuration now need to use diagnostic printing to signal errors. For the moment this just allows us to return potentially-multiple config errors/warnings in full fidelity, but also sets us up for later when more subsystems are able to produce rich diagnostics so we can show them all together. Finally, this commit also removes some stale, commented-out code for the "legacy" (pre-0.8) graph implementation, which has not been available for some time.	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	4034f988df	update import command docs ... Fix the -state and -state-out wording to be consistent with other commands. Remove the erroneous reference to remote state in the website version of the flag description.	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
Robert Liebowitz	8d98fdecac	Autoload only .auto.tfvars files	9 years ago
Robert Liebowitz	006744bfe0	Use all tfvars files in working directory ... As a side effect, several commands that previously did not have a failure state can now fail during meta-parameter processing.	9 years ago
James Bardin	0cbd51c365	find -plugin-dir during import ... The import command wasn't loading the plugin path at all, relying on the local directory for binaries. Load the plugin dir into Meta, and pass in ForceLocal for consistency. The Backend returned was going to be a Local anyway, so the added check wasn't ensuring anything.	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
James Bardin	718ede0636	have Meta.Backend use a Config rather than loading ... Instead of providing the a path in BackendOpts, provide a loaded *config.Config instead. This reduces the number of places where configuration is loaded.	9 years ago
James Bardin	5eca913b14	add cli flags for -lock-timeout ... Add the -lock-timeout flag to the appropriate commands. Add the -lock flag to `init` and `import` which were missing it. Set both stateLock and stateLockTimeout in Meta.flagsSet, and remove the extra references for clarity.	9 years ago
Mitchell Hashimoto	ad7b063262	command: convert to use backends	9 years ago
Mitchell Hashimoto	f84fd39ef9	command/import: document -var-file and -var is available #11211	9 years ago
Mitchell Hashimoto	28d933f6dd	nitpicks for #10310	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	ec0ef95c6f	terraform: verify import providers only depend on vars	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	f6a59734ef	command: UI for import	10 years ago
Mitchell Hashimoto	182a8a28c0	command/import more wip	10 years ago
Mitchell Hashimoto	ff94381e7e	command/import wip	10 years ago