1668 Commits (fc8a76a2a3a2ce0d318cdb2e6f3f76ebbc6b28ac)

Author	SHA1	Message	Date
Kristin Laemmert	60321b41e8	getproviders: move protocol compatibility functions into registry client (#24846) ... * internal/registry source: return error if requested provider version protocols are not supported * getproviders: move responsibility for protocol compatibility checks into the registry client The original implementation had the providercache checking the provider metadata for protocol compatibility, but this is only relevant for the registry source so it made more sense to move the logic into getproviders. This also addresses an issue where we were pulling the metadata for every provider version until we found one that was supported. I've extended the registry client to unmarshal the protocols in `ProviderVersions` so we can filter through that list, instead of pulling each version's metadata.	6 years ago
Alisdair McDiarmid	82ebbf9a23	command: Add prompt & confirmation to 0.13upgrade	6 years ago
Alisdair McDiarmid	62b0cbed12	internal: Fix LookupLegacyProvider ... When looking up the namespace for a legacy provider source, we need to use the /v1/providers/-/{name}/versions endpoint. For non-HashiCorp providers, the /v1/providers/-/{name} endpoint returns a 404. This commit updates the LegacyProviderDefaultNamespace method and the mock registry servers accordingly.	6 years ago
Alisdair McDiarmid	1fdcbc4825	command: Fix 0.13upgrade bug with multiple blocks ... If a configuration had multiple blocks in the versions.tf file, it would be added to the `rewritePaths` list multiple times. We would then remove it from this slice, but only once, and so the output file would later be rewritten to remove the required providers block. This commit uses a set instead of a list to prevent this case, and adds a regression test.	6 years ago
Alisdair McDiarmid	e2be704d81	command: Extract reused hclwrite helper code	6 years ago
Alisdair McDiarmid	a740b739e0	command: Change 0.13upgrade default to versions.tf ... Instead of using providers.tf as the default output file for the upgrader, we now default to versions.tf. This means that if the configuration has no `required_providers` blocks at all, or has multiple, the provider version requirements will be stored in the versions.tf file. We now also update the versions.tf file to set a `required_version` attribute in the first `terraform` block, with value ">= 0.13". This is similar to the behaviour of the 0.12upgrade command, and signals that the configuration should not be used with older versions of Terraform.	6 years ago
Alisdair McDiarmid	01a3376ead	command: Check required_version before upgrading ... If a configuration has a version constraint which prevents use with Terraform 0.13, the upgrade command should exit before making any changes.	6 years ago
Alisdair McDiarmid	ae98bd12a7	command: Rework 0.13upgrade sub-command ... This commit implements most of the intended functionality of the upgrade command for rewriting configurations. For a given module, it makes a list of all providers in use. Then it attempts to detect the source address for providers without an explicit source. Once this step is complete, the tool rewrites the relevant configuration files. This results in a single "required_providers" block for the module, with a source for each provider. Any providers for which the source cannot be detected (for example, unofficial providers) will need a source to be defined by the user. The tool writes an explanatory comment to the configuration to help with this.	6 years ago
Mike Morris	9568de6b90	command: Fix OAuth2 PKCE arguments ... Providers like Okta and AWS Cognito expect that the PKCE challenge uses base64 URL Encoding without any padding (base64.RawURLEncoding) Additionally, Okta strictly adheres to section 4.2 of RFC 7636 and requires that the unencoded key for the PKCE data is at least 43 characters in length.	6 years ago
Kristin Laemmert	0b76100da0	init: return proper config errors (#24865) ... Fixed a bug where we were returning earlyConfDiags instead of confDiags.	6 years ago
James Bardin	9debd341bc	Merge pull request #24807 from hashicorp/jbardin/remove-each-mode ... Remove EachMode from state	6 years ago
Kristin Laemmert	ce03f1255f	internal/providercache: fix error message for protocol mismatch (#24818) ... There was a bug in the installer trying to pass a nil error.	6 years ago
James Bardin	2bfaddcf57	fix state mv to work without EachMode ... The only situation where `state mv` needs to understand the each mode is when with resource addresses that may reference a single instance, or a group of for_each or count instances. In this case we can differentiate the two by checking the existence of the NoKey instance key.	6 years ago
James Bardin	15a95031e5	remove a few traces of states.EachMode	6 years ago
Pam Selle	87bce5f9dd	Support reading module outputs in terraform console (#24808) ... * Include eval in output walk This allows outputs to be evaluated in the evalwalk, impacting terraform console. Outputs are still not evaluated for terraform console in the root module, so this has no impact on writing to state (as child module outputs are not written to state). Also adds test coverage to the console command, including for evaluating locals (another use of the evalwalk)	6 years ago
Alisdair McDiarmid	9266e944fa	Merge pull request #24752 from hashicorp/alisdair/terraform-state-replace-provider-docs ... website: Add docs for state replace-provider	6 years ago
Martin Atkins	1ce3c60693	command/cliconfig: Explicit provider installation method configuration ... This set of commits allows explicit configuration of provider installation methods in the CLI config, overriding the implicit method selections.	6 years ago
Martin Atkins	622abf707d	command/cliconfig: Remove redundant struct types ... These were being used in an earlier iteration of the provider installation configuration but it was all collapsed down into a single ProviderInstallationMethod type later, making these redundant.	6 years ago
Martin Atkins	6b2050f42a	main: Properly handle provider installation method exclusions ... Previously we were incorrectly using the Include configuration for both the include and exclude list, making the include portion totally ineffective.	6 years ago
Martin Atkins	3167067029	command/e2etest: provider installation with explicit install methods ... This exercises the ability to customize the installation methods used by the provider plugin installer, in this case forcing the use of a custom local directory with a result essentially the same as what happens when you pass -plugin-dir to "terraform init".	6 years ago
Martin Atkins	c7fe6b9160	command/cliconfig: handle provider_installation block in JSON syntax ... The CLI config can be written in both native HCL and HCL JSON syntaxes, so the provider_installation block must be expressible using JSON too. Our previous checks to approximate HCL 2-level strictness were too strict for HCL JSON where things are more ambiguous even in HCL 2, so this includes some additional relaxations if we detect that we're decoding an AST produced from a JSON file. This is still subject to the quirky ways HCL 1 handles JSON though, so the JSON value must be structured in a way that doesn't trigger HCL's heuristics that try to guess what is a block and what is an attribute. (This is the issue that HCL 2 fixes by always decoding using a schema; there's more context on this in: https://log.martinatkins.me/2019/04/25/hcl-json/ )	6 years ago
Martin Atkins	f5012c12da	command/cliconfig: Installation methods, not installation sources ... Unfortunately in the user model the noun "source" is already used for the argument in the required_providers block to specify which provider to use, so it's confusing to use the same noun to also refer to the method used to obtain that provider. In the hope of mitigating that confusion, here we use the noun "method", as in "installation method", to talk about the decision between getting a provider directly from its origin registry or getting it from some mirror. This is distinct from the provider's "source", which is the location where a provider _originates_ (prior to mirroring). This noun is also not super awesome, but better than overloading an existing term in the same feature.	6 years ago
Martin Atkins	e872ec4461	command/cliconfig: Remove remnant extraArg checks in provider_installation ... In the first pass of implementing this it was strict about what arguments are allowed inside source blocks, but that was counter to our usual design principles for CLI config where we tend to ignore unrecognized things to allow for some limited kinds of future expansion without breaking compatibility with older versions of Terraform that will be sharing the same CLI configuration files with newer versions. However, I'd removed the tracking of that prior to the initial commit. I missed some leftover parts when doing that removal, so this cleans up the rest of it.	6 years ago
Martin Atkins	8b75d1498f	command/cliconfig: Use existing HTTP mirror source rather than new stub ... An earlier commit added a redundant stub for a new network mirror source that was already previously stubbed as HTTPMirrorSource. This commit removes the unnecessary extra stub and changes the CLI config handling to use it instead. Along the way this also switches to using a full base URL rather than just a hostname for the mirror, because using the usual "Terraform-native service discovery" protocol here doesn't isn't as useful as in the places we normally use it (the mirror mechanism is already serving as an indirection over the registry protocol) and using a direct base URL will make it easier to deploy an HTTP mirror under a path prefix on an existing static file server.	6 years ago
Martin Atkins	b8856c677c	cliconfig: Ignore config dir if TF_CLI_CONFIG_FILE envvar is set ... When we originally introduced this environment variable it was intended to solve for the use-case where a particular invocation of Terraform needs a different CLI configuration than usual, such as if Terraform is being run as part of an automated test suite or other sort of automated situation with different needs than normal use. However, we accidentally had it only override the original singleton CLI config file, while leaving the CLI configuration directory still enabled. Now we'll take the CLI configuration out of the equation too, so that only the single specified configuration file and any other environment-sourced settings will be included.	6 years ago
Alisdair McDiarmid	52d64127f7	website: Add docs for state replace-provider	6 years ago
Kristin Laemmert	21b9da5a02	internal/providercache: verify that the provider protocol version is compatible (#24737) ... * internal/providercache: verify that the provider protocol version is compatible The public registry includes a list of supported provider protocol versions for each provider version. This change adds verification of support and adds a specific error message pointing users to the closest matching version.	6 years ago
Martin Atkins	2c535d829d	command/cliconfig: Decode provider_installation blocks ... This new CLI config block type allows explicitly specifying where Terraform should look to find provider plugins for installation. This is not used anywhere as of this commit, but in a future commit we'll change package main to treat the presence of a block of this type as a request to disable the default set of provider sources and use these explicitly- specified ones instead.	6 years ago
Kristin Laemmert	8108face36	terraform: return `initialization required` error when provider schemas not found (#24715) ... A side effect of the various changes to the provider installer included losing the initialization required error message which would occur if a user removed or modified the .terraform directory. Previously, plugin factories were created after the configuration was loaded, in terraform.NewContext. Terraform would compare the required providers (from config and state) to the available providers and return the aforementioned error if a provider was missing. Provider factories are now loaded at the beginning of any terraform command, before terraform even loads the configuration, and therefore before terraform has a list of required providers. This commit replaces the current error when a providers' schema cannot be found in the provider factories with the init error, and adds a command test (to plan tests, for no real reason other than that's what I thought of first).	6 years ago
Alisdair McDiarmid	e32e7e2c4b	Merge pull request #24617 from hashicorp/alisdair/provider-installer-signature-verification ... internal: Verify provider signatures on install	6 years ago
Martin Atkins	92d6a30bb4	main: skip direct provider installation for providers available locally ... This more closely replicates the 0.12-and-earlier behavior, where having at least one version of a provider installed locally would totally disable any attempt to look for newer versions remotely. This is just for the implicit default behavior. Assumption is that later we'll have an explicit configuration mechanism that will allow the user to specify exactly where to look for what, and thus avoid tricky heuristics like this.	6 years ago
Alisdair McDiarmid	a5b3d497cc	internal: Verify provider signatures on install ... Providers installed from the registry are accompanied by a list of checksums (the "SHA256SUMS" file), which is cryptographically signed to allow package authentication. The process of verifying this has multiple steps: - First we must verify that the SHA256 hash of the package archive matches the expected hash. This could be done for local installations too, in the future. - Next we ensure that the expected hash returned as part of the registry API response matches an entry in the checksum list. - Finally we verify the cryptographic signature of the checksum list, using the public keys provided by the registry. Each of these steps is implemented as a separate PackageAuthentication type. The local archive installation mechanism uses only the archive checksum authenticator, and the HTTP installation uses all three in the order given. The package authentication system now also returns a result value, which is used by command/init to display the result of the authentication process. There are three tiers of signature, each of which is presented differently to the user: - Signatures from the embedded HashiCorp public key indicate that the provider is officially supported by HashiCorp; - If the signing key is not from HashiCorp, it may have an associated trust signature, which indicates that the provider is from one of HashiCorp's trusted partners; - Otherwise, if the signature is valid, this is a community provider.	6 years ago
Kristin Laemmert	f09ae6f862	provider source tests: added test suite to exercise hyphenated providers (#24685)	6 years ago
Kristin Laemmert	269d511481	command/providers: refactor with new provider types and functions ... The providers command has been refactored to use the modern provider types and ProviderRequirements() functions. This resulted in a breaking change to the output: it no longer outputs the providers by module and no longer prints `(inherited)` or `(from state)` to show why a provider is included. We decided that at this time it was best to stick with the existing functions and make this change, but if we get feedback from the community we will revisit. Additional tests to exercise providers in modules and providers from state have been included.	6 years ago
Kristin Laemmert	0a5fb40fdf	configs: include provider configs in ProviderRequirements() ... This PR adds iteration through any provider configuration blocks in the config in addProviderRequirements(). A stale comment (of mine!) would leave one expecting the module.ProviderRequirements to include any requirements from provider configs. The comment was inaccurate and has been updated.	6 years ago
James Bardin	b84e6f7f95	remove race from closed-over err variable	6 years ago
Martin Atkins	297a3a5db9	command/init: Restore the unconstrained provider warnings ... When a provider dependency is implicit rather than explicit, or otherwise when version constraints are lacking, we produce a warning recommending the addition of explicit version constraints in the configuration. This restores the warning functionality from previous Terraform versions, adapting it slightly to account for the new provider FQN syntax and to recommend using a required_providers block rather than version constraints in "provider" blocks, because the latter is no longer recommended in the documentation.	6 years ago
Martin Atkins	a6f63c4891	command/e2etest: update "init" tests for abbreviated provider addresses ... We're now longer showing the default registry hostname as part of addresses coming from that registry.	6 years ago
Kristin Laemmert	5852a5c33d	Mildwonkey/last tests (#24553) ... * show text fixture update * temporarily disable providers tests	6 years ago
Alisdair McDiarmid	0f5a38b384	internal: Fix init provider lockfile test ... The fake installable package meta used a ZIP archive which gave different checksums between macOS and Linux targets. This commit removes the target from the contents of this archive, and updates the golden hash value in the test to match. This test should now pass on both platforms.	6 years ago
Alisdair McDiarmid	b233aa39e9	addrs: Simplify presentation of provider FQNs ... The provider fully-qualified name string used in configuration is very long, and since most providers are hosted in the public registry, most of that length is redundant. This commit adds and uses a `ForDisplay` method, which simplifies the presentation of provider FQNs. If the hostname is the default hostname, we now display only the namespace and type. This is only used in UI, but should still be unambiguous, as it matches the FQN string parsing behaviour.	6 years ago
Martin Atkins	8c928e8358	main: Consult local directories as potential mirrors of providers ... This restores some of the local search directories we used to include when searching for provider plugins in Terraform 0.12 and earlier. The directory structures we are expecting in these are different than before, so existing directory contents will not be compatible without restructuring, but we need to retain support for these local directories so that users can continue to sideload third-party provider plugins until the explicit, first-class provider mirrors configuration (in CLI config) is implemented, at which point users will be able to override these to whatever directories they want. This also includes some new search directories that are specific to the operating system where Terraform is running, following the documented layout conventions of that platform. In particular, this follows the XDG Base Directory specification on Unix systems, which has been a somewhat-common request to better support "sideloading" of packages via standard Linux distribution package managers and other similar mechanisms. While it isn't strictly necessary to add that now, it seems ideal to do all of the changes to our search directory layout at once so that our documentation about this can cleanly distinguish "0.12 and earlier" vs. "0.13 and later", rather than having to document a complex sequence of smaller changes. Because this behavior is a result of the integration of package main with package command, this behavior is verified using an e2etest rather than a unit test. That test, TestInitProvidersVendored, is also fixed here to create a suitable directory structure for the platform where the test is being run. This fixes TestInitProvidersVendored.	6 years ago
Martin Atkins	fcb8c53454	command/jsonconfig: Use correct provider address to access schema ... There was a remaining TODO in this package to find the true provider FQN when looking up the schema for a resource type. We now have that data available in the Provider field of configs.Resource, so we can now complete that change. The tests for this functionality actually live in the parent "command" package as part of the tests for the "terraform show" command, so this fix is verified by all of the TestShow... tests now passing except one, and that remaining one is failing for some other reason which we'll address in a later commit.	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
Martin Atkins	958ea4f7d1	internal/providercache: Handle built-in providers ... Built-in providers are special providers that are distributed as part of Terraform CLI itself, rather than being installed separately. They always live in the terraform.io/builtin/... namespace so it's easier to see that they are special, and currently there is only one built-in provider named "terraform". Previous commits established the addressing scheme for built-in providers. This commit makes the installer aware of them to the extent that it knows not to try to install them the usual way and it's able to report an error if the user requests a built-in provider that doesn't exist or tries to impose a particular version constraint for a built-in provider. For the moment the tests for this are the ones in the "command" package because that's where the existing testing infrastructure for this functionality lives. A later commit should add some more focused unit tests here in the internal/providercache package, too.	6 years ago
Kristin Laemmert	27a794062e	Mildwonkey/command tests (#24535) ... * command: refactor testBackendState to write states.State testBackendState was using the older terraform.State format, which is no longer sufficient for most tests since the state upgrader does not encode provider FQNs automatically. Users will run `terraform 0.13upgrade` to update their state to include provider FQNs in resources, but tests need to use the modern state format instead of relying on the automatic upgrade. * plan tests passing * graph tests passing * json packages test update * command test updates * update show test fixtures * state show tests passing	6 years ago
Martin Atkins	de6c9ccec1	command/init: Move "vendored provider" test to e2etests ... In the new design the ProviderSource is decided by package main, not by the "command" package, and so making sure the vendor directory is included is the responsibility of that package instead. Therefore we can no longer test this at the "command" package level, but we'll retain a test for it in e2etests to record that it isn't currently working, so that we have a prompt to fix it before releasing.	6 years ago
Martin Atkins	f35ebe2d65	internal/providercache: Fix incorrect logic in Installer.SetGlobalCacheDir ... Due to some incomplete rework of this function in an earlier commit, the safety check for using the same directory as both the target and the cache was inverted and was raising an error _unless_ they matched, rather than _if_ they matched. This change is verified by the e2etest TestInitProviders_pluginCache, which is also updated to use the new-style cache directory layout as part of this commit.	6 years ago
Martin Atkins	14d456372a	command/e2etest: Update expected output for new plugin installer ... These tests make assertions against specific user-oriented output from the "terraform init" command, but we've intentionally changed some of these messages as part of introducing support for the decentralized provider namespace.	6 years ago
Kristin Laemmert	0af09b23ca	command: apply and most of import tests passing	6 years ago
Martin Atkins	fe9105abfe	command: Fix TestInit_getProviderMissing ... This one just needs a tweak for the new wording of the error message.	6 years ago
Martin Atkins	add7006de6	command: Fix TestInit_pluginDirProviders and _pluginDirProvidersDoesNotGet ... Both of these are attempting to test -plugin-dir, which means we need some additional help to populate some suitable directories for -plugin-dir to refer to. The new installFakeProviderPackagesElsewhere helper generalizes the earlier installFakeProviderPackages to allow installing fake provider packages to an arbitrary other directory.	6 years ago
Martin Atkins	c81eebe0ac	command/init: Fix TestInit_providerSource ... This test is focused on making sure that the required_providers syntax is working, so the rewritten version does not include any special handling of pre-installed packages or "vendored" packages. Pre-installed plugins are tested in other tests such as TestInit_getUpgradePlugins.	6 years ago
Martin Atkins	14701b8300	command/init: Fix TestInit_getUpgradePlugins ... This test now requires a bit of a different approach because it was previously directly constructing a cache directory but we now use a different directory layout. Rather than manually constructing the new heirarchical directory layout (which would've required a lot more inline code), this introduces a helper function installFakeProviderPackages that installs a fake provider package directly into the local cache directory associated with a Meta object, with the correct directory layout.	6 years ago
Martin Atkins	c4fb22863c	command/init: Support -plugin-dir again ... This is a slightly different approach than we used to take for this option: rather than disabling the installer and causing all future commands to look elsewhere for plugins, we'll now leave the installer enabled by constrain it to only look at the given directories. This is overall simpler because it doesn't require any special tracking of the plugin directories for subsequent commands. Instead, the selections file generated by the installer will record the versions it selected from the specified directories, and we'll link them in to the local cache just as we would normally so that other commands don't need to do anything special to select the right plugins in either case.	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	3f6ce3c588	Mildwonkey/tests (#24522) ... * terraform: add helper functions for creating test state testSetResourceInstanceCurrent and testSetResourceInstanceTainted are wrapper functions around states.Module.SetResourceInstanceCurrent() used to set a resource in state. They work with current, non-deposed resources with no dependencies. testSetResourceInstanceDeposed can be used to set a desosed resource in state. * terraform: update all tests to use modern providers and state	6 years ago
Martin Atkins	549aede792	Remove terraform.ResourceProvider, use providercache.Installer instead ... Back when we first introduced provider versioning in Terraform 0.10, we did the provider version resolution in terraform.NewContext because we weren't sure yet how exactly our versioning model was going to play out (whether different versions could be selected per provider configuration, for example) and because we were building around the limitations of our existing filesystem-based plugin discovery model. However, the new installer codepath is new able to do all of the selections up front during installation, so we don't need such a heavy inversion of control abstraction to get this done: the command package can select the exact provider versions and pass their factories directly to terraform.NewContext as a simple static map. The result of this commit is that CLI commands other than "init" are now able to consume the local cache directory and selections produced by the installation process in "terraform init", passing all of the selected providers down to the terraform.NewContext function for use in implementing the main operations. This commit is just enough to get the providers passing into the terraform.Context. There's still plenty more to do here, including to repair all of the tests this change has additionally broken.	6 years ago
Martin Atkins	f113a7c22d	command/init: Collect provider dependencies using our new helpers ... This produces a value shaped the way the provider installer expects without the need for further flattening and preprocessing.	6 years ago
Martin Atkins	e6df3905c9	command/init: Generate progress output during provider installation ... This restores some sequential event log output similar to what we had in the previous implementation of plugin installation.	6 years ago
Martin Atkins	94e1ac2d07	command: Minimal integration of new provider installer in "init" ... There's still a lot of work to do here around both the UX and the follow-up steps that need to happen after installation completes, but this is enough to faciliate some initial end-to-end testing of the new-style install process.	6 years ago
Alisdair McDiarmid	7165d6c429	command: Add state replace-provider subcommand ... Terraform 0.13 will allow the installation of providers from various sources. If a user updates their configuration to change the source of an in-use provider (for example, if the provider namespace changes), they will also need to update the state file accordingly. This commit introduces a new `state replace-provider` subcommand which supports this. All resources using the `from` provider will be updated to use the `to` provider.	6 years ago
Alisdair McDiarmid	67203dade8	command: Simplify Meta.process helper method ... After some refactoring, this helper method had an unused argument (vars) and an always-nil error return value. This commit cleans this up.	6 years ago
Alisdair McDiarmid	7b94ddd2f6	Merge pull request #24471 from hashicorp/alisdair/fmt-source ... command/fmt: Include source snippets in errors	6 years ago
Alisdair McDiarmid	7302bfb484	Merge pull request #24473 from hashicorp/alisdair/fix-multiline-diagnostic-output ... command/format: Fix multi-line diagnostic output	6 years ago
Alisdair McDiarmid	a23c3e3c81	command/format: Fix multi-line diagnostic output ... Previously, if a diagnostic context spanned multiple lines, any lines which did not overlap with the highlight range would be displayed as blank. This commit fixes the bug. The problem was caused by the unconditional use of `PartitionAround` to split the line into before/highlighted/after ranges. When two ranges don't overlap, this method returns empty ranges, which results in a blank line. Instead, we first check if the ranges do overlap, and if not we print the entire line from the context.	6 years ago
Alisdair McDiarmid	206e2e6d6a	command/fmt: Include source snippets in errors ... Previously, diagnostic errors would display the filename and line number, along with "(source code not available)". This is because the fmt command directly loads and parses the configuration, instead of using the config loader. This commit registers the manually parsed source as a synthetic configuration file, so that the diagnostic formatter can look up the source for the range with the error and display it.	6 years ago
James Bardin	b3fc0dab94	use addrs.ConfigResource for dependency tracking ... We can't get module instances during transformation, so we need to reduce the Dependencies to using `addrs.ConfigResource` for now.	6 years ago
Martin Atkins	754b7ebb65	command: Expose providercache package objects for use elsewhere ... These new functions allow command implementations to get hold of the providercache objects and installation source object derived from the current CLI configuration.	6 years ago
Kristin Laemmert	4f141ae365	rename provider-specific functions (#24417) ... missingPlugins was hard-coded to work only with provider plugins, so I renamed it to clarify the usage. Also renamed a test provider from greater_than to greater-than as the underscore is an invalid provider name character and this will become a hard error in the near future.	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
Kristin Laemmert	5f313a65ad	command: remove 0.12upgrade (#24403) ... * command: remove 0.12upgrade and related `configupgrade` library * leave deprecation warning for 0.12upgrade to point users to v0.12	6 years ago
Alisdair McDiarmid	8c7a44355b	command: Fix bug when using terraform login on Windows	6 years ago
Alisdair McDiarmid	fb7035ac3e	Merge pull request #24364 from hashicorp/alisdair/013upgrade ... command: Add scaffold for 0.13upgrade command	6 years ago
James Bardin	a8b9547e0d	fixup states.Resource change throughout packages	6 years ago
Alisdair McDiarmid	3b0b29ef52	command: Add scaffold for 0.13upgrade command	6 years ago
James Bardin	e13eecbc5b	finish provider ModuleInstance replacement	6 years ago
Kristin Laemmert	5901952882	command: tests should not leave dirs behind thank you (#24340)	6 years ago
Kristin Laemmert	add16fc67b	jsonstate: sort child modules by address for consistency (#24329) ... * jsonstate: sort child modules by address for consistency	6 years ago
Paddy	e6592dc710	Add support for provider metadata to modules. (#22583) ... Implement a new provider_meta block in the terraform block of modules, allowing provider-keyed metadata to be communicated from HCL to provider binaries. Bundled in this change for minimal protocol version bumping is the addition of markdown support for attribute descriptions and the ability to indicate when an attribute is deprecated, so this information can be shown in the schema dump. Co-authored-by: Paul Tyng <paul@paultyng.net>	6 years ago
Kristin Laemmert	7f1b0a4681	command/jsonstate: fix inconsistency with resource address (#24256) ... * command/jsonstate: fix inconsistency with resource address Resource addresses in state output were not including index for instances created with for_each or count, while the index was appearing in the plan output. This PR fixes that inconsistency, adds tests, and updates the existing tests. Fixes #24110 * add tests showing expected prior state resource addressing * added example of show json state output with modules	6 years ago
James Bardin	10d926904f	state mv should always target instance each mode ... When doing a state mv of an instance, the resulting each mode should always be taken from the target address.	6 years ago
Martin Atkins	f899f5aa42	command/init: new error message for signature verification failure ... Our initial Terraform 0.13.0 release will continue to support only the hard-coded official HashiCorp signing key, with support for other keys to follow in a later release once the trust infrastructure is in place to support that. This change is intended to (marginally) improve the UX for a possible future situation where a HashiCorp-distributed provider makes a released signed with a new key and a prior version of Terraform ends up trying to install it due to incorrect version constraints. With this new text we hope to give the user a better prompt for onward troubleshooting, but in a sort of hedging way because we have not yet finalized the details of how new keys might roll out in practice. Hopefully a user seeing this message would consult the release notes for Terraform itself and for the provider in question and find some as-yet-undetermined information about how to proceed. If the decentralized trust model design comes together before the v0.13.0 release then we may make further amendments here to prepare for that, but that work should not block the v0.13.0 release if other work concludes first.	6 years ago
Pam Selle	c249943360	Module Expansion: Part 2 (#24154) ... * WIP: dynamic expand * WIP: add variable and local support * WIP: outputs * WIP: Add referencer * String representation, fixing tests it impacts * Fixes TestContext2Apply_outputOrphanModule * Fix TestContext2Apply_plannedDestroyInterpolatedCount * Update DestroyOutputTransformer and associated types to reflect PlannableOutputs * Remove comment about locals * Remove module count enablement * Removes allowing count for modules, and reverts the test, while adding a Skip()'d test that works when you re-enable the config * update TargetDownstream signature to match master * remove unnecessary method Co-authored-by: James Bardin <j.bardin@gmail.com>	6 years ago
James Bardin	1b45b744c3	remove json2dot command ... There's no need for the json2dot command since we can't create json debug graphs.	6 years ago
Alisdair McDiarmid	678760b61a	Merge pull request #24122 from hashicorp/alisdair/unlock-commentary ... command: Comment to explain why unlock is required	6 years ago
Alisdair McDiarmid	7696c14661	Merge pull request #24107 from hashicorp/alisdair/terraform-login-wsl-browser-launcher-fix ... command/login: Fix browser launcher for WSL users	6 years ago
Alisdair McDiarmid	aa38cbe3bc	command: Comment to explain why unlock is required	6 years ago
Alisdair McDiarmid	f0cf57e5d3	Remove unused import-provider-mismatch fixture	6 years ago
Alisdair McDiarmid	6413313529	command/graph: Remove no-op state unlock ... The graph command never locks the state, so this unlock operation was a no-op and is a bit of a red herring. Remove it.	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	add134298a	addrs: ProviderConfig fixups (#24115) ... * fix outdated syntax in comments * test for non-strings in ParseAbsProviderConfig * ProviderConfigDefault and ProviderConfigAliased now take Providers instead of strings	6 years ago
James Bardin	dc8cdd260c	add missing deps to targeted destroy test	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
Alisdair McDiarmid	12e090ce48	command/login: Fix browser launcher for WSL users ... With the current implementation of terraform login, Windows Subsystem for Linux fails to open a browser due to lack of support for xdg-open. This commit reuses a fix from pkg/browser#8 which detects a WSL environment and uses cmd.exe to open the URL instead.	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
Li Kexian	f3bbe8d33f	command/workspace delete: release lock after workspace removal warning (#24085)	6 years ago
Alisdair McDiarmid	7ff58780d4	Remove unnecessary type assertion checks ... The type assertion checks on the credentials source are unnecessary, and the alternative code path they allow would panic.	6 years ago
Alisdair McDiarmid	325f8a84f8	command/logout: Exit early if already logged out	6 years ago
Alisdair McDiarmid	081f02971d	command/logout: Add terraform logout command ... Use terraform logout to remove stored credentials for a remote service host.	6 years ago
Alisdair McDiarmid	e57685d8fc	Merge pull request #24030 from hashicorp/alisdair/terraform-login-token-validation ... Add token validation for manual terraform login	6 years ago
Kristin Laemmert	7eed30595a	moduledeps: replace ProviderInstance with addrs.Provider (#24017) ... * addrs: add ParseProviderSourceString function to parse fqns from tfconfig-inspect * moduledeps: use addrs.Provider instead of ProviderInstance	6 years ago
Alisdair McDiarmid	c77cfaafc2	Add token validation for manual terraform login ... When a token is pasted by the user, we make a request to the TFE API /account/details endpoint to verify its validity. If successful, we display the logged-in username as confirmation. If not, we refuse to store the invalid token and display an error message. This commit also trims whitespace from around the pasted value, to reduce the likelihood of a copy & paste error.	6 years ago
Kristin Laemmert	927999a820	command/state show: use configured provider (#24027) ... The `state show` command was not checking if a given resource had a configured provider, and instead was only using the default provider config. This PR checks for a configured provider, using the default provider if one is not set. Fixes #22010	6 years ago
Alisdair McDiarmid	f34cba407f	Merge pull request #23995 from hashicorp/alisdair/terraform-login ... Enable login subcommand, add manual token support	6 years ago
Kristin Laemmert	80ab551867	terraform: use addrs.Provider as map keys for provider schemas (#24002) ... This is a stepping-stone PR for the provider source project. In this PR "legcay-stype" FQNs are created from the provider name string. Future work involves encoding the FQN directly in the AbsProviderConfig and removing the calls to addrs.NewLegacyProvider().	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
Alisdair McDiarmid	b75201acc2	Enable login subcommand, add manual token support	6 years ago
Kristin Laemmert	6541775ce4	addrs: roll back change to Type field in ProviderConfig (#23937)	6 years ago
Martin Atkins	e9d0822b2a	command: Accept a "provider source" from the main package ... Following the same approach we use for other CLI-Config-able objects like the service discovery system, the main package is responsible for producing a suitable implementation of this interface which the command package can then use. When unit testing in the command package we can then substitute mocks as necessary, following the dependency inversion principle.	6 years ago
Kristin Laemmert	92f427779d	command/show: fix issue with show and aliased provider (#23848) ... The formatter in `command/format/state.go`, when formatting a resource with an aliased provider, was looking for a schema with the alias (ie, test.foo), but the schemas are only listed by provider type (test). Update the state formatter to lookup schemas by provider type only. Some of the show tests (and a couple others) were not properly cleaning up the created tmpdirs, so I fixed those. Also, the show tests are using a statefile named `state.tfstate`, but were not passing that path to the show command, so we were getting some false positives (a `show` command that returns `no state` exits 0). Fixes #21462	6 years ago
Kristin Laemmert	18dd1bb4d6	Mildwonkey/tfconfig upgrade (#23670) ... * deps: bump terraform-config-inspect library * configs: parse `version` in new required_providers block With the latest version of `terraform-config-inspect`, the required_providers attribute can now be a string or an object with attributes "source" and "version". This change allows parsing the version constraint from the new object while ignoring any given source attribute.	6 years ago
Pam Selle	cd6c93774a	Update docs to reflect current behavior	6 years ago
Kristin Laemmert	4d8fde3d6f	command: use backend config from state when backend=false is used. (#23802) ... * command: use backend config from state when backend=false is used. When a user runs `terraform init --backend=false`, terraform should inspect the state for a previously-configured backend, and use that backend, ignoring any backend config in the current configuration. If no backend is configured or there is no state, return a local backend. Fixes #16593	6 years ago
James Bardin	98c02ac114	remove stale dependencies on `state mv` ... Clear any Dependencies if there is an entry matching a `state mv` from address. While stale dependencies won't directly effect any current operations, clearing the list will allow them to be recreated in their entirety during refresh. This will help future releases that may rely solely on the pre-calculated dependencies for destruction ordering.	6 years ago
Pam Selle	d2fc7aad87	Merge pull request #23268 from rajata07/master ... small fix with command usage 'terraform workspace New'	6 years ago
Kristin Laemmert	49fc53d1d1	provider source enhancements ... * 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. This is an intermediate step; the next step will change the returned types to something based in the configs package. * command: rename choosePlugins to chooseProviders to clarify scope of function * use `Provider.LegacyString()` (instead of `Provider.Type`) consistently * explicitly create legacy-style provider (continuing from above change)	6 years ago
Martin Atkins	c06675c616	command: New -compact-warnings option ... When warnings appear in isolation (not accompanied by an error) it's reasonable to want to defer resolving them for a while because they are not actually blocking immediate work. However, our warning messages tend to be long by default in order to include all of the necessary context to understand the implications of the warning, and that can make them overwhelming when combined with other output. As a compromise, this adds a new CLI option -compact-warnings which is supported for all the main operation commands and which uses a more compact format to print out warnings as long as they aren't also accompanied by errors. The default remains unchanged except that the threshold for consolidating warning messages is reduced to one so that we'll now only show one of each distinct warning summary. Full warning messages are always shown if there's at least one error included in the diagnostic set too, because in that case the warning message could contain additional context to help understand the error.	6 years ago
Kristin Laemmert	f8a23da480	explicitly create legacy-style provider	6 years ago
Kristin Laemmert	86e450a85f	use LegacyString() consistently	6 years ago
Kristin Laemmert	efafadbe5e	command: rename choosePlugins to chooseProviders to clarify scope of function	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
James Bardin	f281eb2b44	Merge pull request #23595 from hashicorp/jbardin/deprecate-destroy-references ... Update destroy provisioner warnings	6 years ago
Pam Selle	d8c31a1efa	Merge pull request #23581 from hashicorp/pselle/show-panic-23377 ... Fix panic on show plan	6 years ago
Pam Selle	9c4d3cc1b1	Add a test	6 years ago
James Bardin	42a2bb4da3	expand test tempdir symlinks to fix tests on macos	6 years ago
James Bardin	96d1e57191	fix type in state mv test	6 years ago
James Bardin	b715ef2590	don't print just warnings when loading backend cfg ... Any warnings will be caught again when the entire config is loaded, and duplicated in the output.	6 years ago
Kristin Laemmert	e3416124cc	addrs: replace "Type string" with "Type Provider" in ProviderConfig ... * huge change to weave new addrs.Provider into addrs.ProviderConfig * terraform: do not include an empty string in the returned Providers / Provisioners - Fixed a minor bug where results included an extra empty string	6 years ago
James Bardin	4896052736	Merge pull request #23582 from hashicorp/jbardin/state-mv ... Allow moving instances to new resources	6 years ago
Aaron Heesakkers	3dfeb67708	command/internal-plugin: Strip off TF_CLI_ARGS arguments ... These are not meaningful for the `internal-plugin` subcommand, which is for internal use only.	6 years ago
James Bardin	a5cb36b34c	Allow moving instances to new resources ... If a state mv target happens to be a resource that doesn't exist, allow the creation of the new resource inferring the EachMode from the target address.	6 years ago
Pam Selle	2b8e876bdb	Don't inspect an empty set, return false	6 years ago
Pam Selle	ba9cb786c3	Merge pull request #23546 from tmshn/dry-plan-color ... make plan-diff format a bit more dry	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
tmshn	fcc1a76d5e	make plan-diff format a bit more dry	6 years ago
Kristin Laemmert	6728e521c1	addrs: rename Provider Name to more accurate Provider Type (#23449)	6 years ago
Kristin Laemmert	99225b8d76	command/jsonstate,plan: fix panic with null values (#23492) ... The code responsible for marshalling attribute values was checking for nil values, but not null. Fixes #23485, #23274	6 years ago
Martin Atkins	7081c26e54	command: Don't show more than two of the same warning ... Some of our warnings are produced in response to particular configuration constructs which might appear many times across a Terraform configuration. To avoid the warning output dwarfing all of the other output, we'll use ConsolidateWarnings to limit each distinct warning summary to appear at most twice, and annotate the final one in the sequence with an additional paragraph noting that some number of them have been hidden. This is intended as a compromise to ensure that these warnings are still seen and noted but to help ensure that we won't produce so many of them as to distract from other output that appears alongside them. This applies only to warnings relating to specific configuration ranges; errors will continue to be shown individually, and sourceless warnings (which are rare in Terraform today) will likewise remain ungrouped because they are less likely to be repeating the same statement about different instances of the same problem throughout the configuration.	7 years ago
Simon Brady	7a9fa93724	command/plan: Fix panic in plan output with string containing null and whitespace (#23102) ... * command/plan: Fix panic in plan output with string containing null and whitespace * command/format: add test for null string with whitespace	7 years ago
Martin Atkins	d0f50ff83f	command: Don't treat config warnings as errors ... Meta.backendConfig was incorrectly treating the second return value from loadBackendConfig as if it were go "error" rather than tfdiags.Diagnostics, which in turn meant that it would treat warnings like errors. This had confusing results because it still returned that tfdiags.Diagnostics value in its own diagnostics return value, causing the caller to see warnings even though the backendConfig function had taken the error codepath.	7 years ago
Ethan	6833ac290b	command: Use full URL for the download page when prompting for upgrade ... This makes it more likely that a terminal emulator will detect the URL as a clickable link.	7 years ago
Thayne McCombs	a895a42f85	command/format: fix missing elements at the end of lists in diffs	7 years ago
James Bardin	bee703360c	Merge pull request #23252 from hashicorp/jbardin/abs-state-dependencies ... store absolute addresses for resource dependencies in the state	7 years ago
Martin Atkins	7db2825646	command/format: multi-line rendering for unchanged strings ... We have a special treatment for multi-line strings that are being updated in-place where we show them across multiple lines in the plan output, but we didn't use that same treatment for rendering multi-line strings in isolation such as when they are being added for the first time. Here we detect when we're rendering a multi-line string in a no-change situation and render it using the diff renderer instead, using the same value for old and new and thus producing a multi-line result without any diff markers at all. This improves consistency between the change and no-change cases, and makes multi-line strings (such as YAML in block mode) readable in all cases.	7 years ago
James Bardin	46dbb3dde5	use Dependencies to connect creator and destroyer ... The DestroyEdgeTransformer cannot determine ordering from the graph when the destroyers are from orphaned resources, because there are no references to resolve. The new stored Dependencies provides what we need to connect the instances in this case. We also add the StateDependencies method directly in the GraphNodeResourceInstance interface, since all instances already implement this, and we don't need another optional interface to check. The old code in DestroyEdgeTransformer may no longer be needed in the long run, but that can be determined separately, since too many of the tests start with an incomplete state and rely on the Dependencies being determined from the configuration alone.	7 years ago
James Bardin	886af20f07	fixup some test comparisons	7 years ago
Josh Grancell	ac3578a0bc	command/output: Absence of outputs is not an error	7 years ago
Martin Atkins	d0cbbb6a00	command/format: Remove defunct "Plan" type and associated symbols ... This "Plan" type, along with the other types it directly or indirectly embeds and the associated functions, are adaptations of the flatmap-oriented plan renderer logic from Terraform 0.11 and prior. The current diff rendering logic is in diff.go, and so the contents of the plan.go file are defunct apart from the DiffActionSymbol function that both implementations share. Therefore here we move DiffActionSymbol into diff.go and then remove plan.go entirely, in the interests of dead code removal.	7 years ago
Martin Atkins	9a62ab3014	command: "terraform show" renders plans like "terraform plan" ... During the Terraform 0.12 work we briefly had a partial update of the old Terraform 0.11 (and prior) diff renderer that could work with the new plan structure, but could produce only partial results. We switched to the new plan implementation prior to release, but the "terraform show" command was left calling into the old partial implementation, and thus produced incomplete results when rendering a saved plan. Here we instead use the plan rendering logic from the "terraform plan" command, making the output of both identical. Unfortunately, due to the current backend architecture that logic lives inside the local backend package, and it contains some business logic around state and schema wrangling that would make it inappropriate to move wholesale into the command/format package. To allow for a low-risk fix to the "terraform show" output, here we avoid some more severe refactoring by just exporting the rendering functionality in a way that allows the "terraform show" command to call into it. In future we'd like to move all of the code that actually writes to the output into the "command" package so that the roles of these components are better segregated, but that is too big a change to block fixing this issue.	7 years ago
rajata07	f40f8bd4e3	small fix with command usage 'terraform workspace New'	7 years ago
James Bardin	2c3c011f20	change state dependencies to AbsResource addrs ... We need to be able to reference all possible dependencies for ordering when the configuration is no longer present, which means that absolute addresses must be used. Since this is only to recreate the proper ordering for instance destruction, only resources addresses need to be listed rather than individual instance addresses.	7 years ago
Kristin Laemmert	4b10a6e1bf	command/jsonplan: fix bug with nested modules output (#23092) ... `marshalPlannedValues` builds a map of modules to their children in order to output the resource changes in a tree. The map was built from the list of resource changes. However if a module had no resources itself, and only called another module (a very normal case), that module would not get added to the map causing none of its children to be output in `planned_values`. This PR adds a walk up through a given module's ancestors to ensure that each module, even those without resources, would be added.	7 years ago
Radek Simko	c1ea09141f	Merge pull request #23063 from hashicorp/svchost-migration ... Replace svchost package with hashicorp/terraform-svchost	7 years ago
Kristin Laemmert	96af863065	command/validate: warn if unused flags are set on the command line (#22989) ... * command/validate: output a warning if unused flags are set The -var and -var-file command line flags are accepted, but not used, in `terraform validate`. This PR adds a warning for users who set either of those flags, so they know that setting them has no effect.	7 years ago
Radek Simko	32f9722d9d	Replace import paths & set UA string where necessary	7 years ago
Martin Atkins	8664749b59	backend: Allow certain commands to opt out of required variable checks ... Terraform Core expects all variables to be set, but for some ancillary commands it's fine for them to just be set to placeholders because the variable values themselves are not key to the command's functionality as long as the terraform.Context is still self-consistent. For such commands, rather than prompting for interactive input for required variables we'll just stub them out as unknowns to reflect that they are placeholders for values that a user would normally need to provide. This achieves a similar effect to how these commands behaved before, but without the tendency to produce a slightly invalid terraform.Context that would fail in strange ways when asked to run certain operations.	7 years ago
Martin Atkins	e21f0fa61e	backend/local: Handle interactive prompts for variables in UI layer ... During the 0.12 work we intended to move all of the variable value collection logic into the UI layer (command package and backend packages) and present them all together as a unified data structure to Terraform Core. However, we didn't quite succeed because the interactive prompts for unset required variables were still being handled _after_ calling into Terraform Core. Here we complete that earlier work by moving the interactive prompts for variables out into the UI layer too, thus allowing us to handle final validation of the variables all together in one place and do so in the UI layer where we have the most context still available about where all of these values are coming from. This allows us to fix a problem where previously disabling input with -input=false on the command line could cause Terraform Core to receive an incomplete set of variable values, and fail with a bad error message. As a consequence of this refactoring, the scope of terraform.Context.Input is now reduced to only gathering provider configuration arguments. Ideally that too would move into the UI layer somehow in a future commit, but that's a problem for another day.	7 years ago
Jeff Green	e505845a63	command/apply: remove duplicate statement (#23011)	7 years ago
Kristin Laemmert	a9da6f0e5b	command/jsonstate: properly marshal deposed resources (#23027) ... * command/jsonstate: properly marshal deposed resources This PR addresses 2 issues: `show -json` would crash if there was not a `Current` `states.ResourceInstance` for a given resource, and `deposed` resource instances were not shown at all. Fixes #22642	7 years ago
Nick Fagerlund	02d793f0ff	website / help: reconcile 'validate' command docs	7 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.	7 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
Lars Lehtonen	85b2000223	command/show: Fix dropped errors (#22772)	7 years ago
Kristin Laemmert	120bb0a66c	plugin/discovery: use new addrs.ProviderType in place of a provider typeName string (#22724) ... This is a relatively small change meant to lay the foundation for future enhancements to providers' address.	7 years ago
Martin Atkins	0ca6b578f5	command/login: Remove unimplemented -into-file option ... This was a vestige from earlier prototyping when we were considering supporting adding credentials to existing .tfrc native syntax files. However, that proved impractical because the CLI config format is still HCL 1.0 and that can't reliably perform programmatic surgical updates, so we'll remove this option for now. We might add it back in later if it becomes more practical to support it.	7 years ago
Martin Atkins	8381112a5c	command: Tests for the "terraform login" command ... These run against a stub OAuth server implementation, verifying that we are able to run an end-to-end login transaction for both the authorization code and the password grant types. This includes adding support for authorization code grants to our stub OAuth server implementation; it previously supported only the password grant type.	7 years ago
Martin Atkins	7ccd6204c4	command: Swappable implementation of launching web browsers ... For unit testing in particular we can't launch a real browser for testing, so this indirection is primarily to allow us to substitute a mock when testing a command that can launch a browser. This includes a simple mock implementation that expects to interact with a running web server directly.	7 years ago
Martin Atkins	daf733af33	command/login: UI cleanup	7 years ago
Martin Atkins	f25cb008f1	command/login: Save the new API token ... Once we've successfully obtained an API token, we'll can save it in the credentials store.	7 years ago
Martin Atkins	a1e387a0e5	command: A stub OAuth server implementation for login testing	7 years ago
Martin Atkins	f605bde562	command/login: Password-based credentials request	7 years ago
Martin Atkins	cfc1c4900d	command/login: Use Cli.Ask to request confirmation ... This is more straightforward than using readline because it already works properly with panicwrap.	7 years ago
Martin Atkins	0b346e589a	command/login: Show login consent prompt before proceeding ... Because we're going to pass the credentials we obtain on to some credentials store (either a credentials helper or a local file on disk) we ought to disclose that first and give the user a chance to cancel out and set up a different credentials storage mechanism first if desired. This also includes the very beginnings of support for the owner password grant type when running against app.terraform.io. This will be used only temporarily at initial release to allow a faster initial release without blocking on implementation of a full OAuth flow in Terraform Cloud.	7 years ago
Martin Atkins	6bba3ceb42	command: "terraform login" command	7 years ago
Martin Atkins	cf43663e85	command/e2etest: Fix TestInitProviders ... The canonical location of the "template" provider is now in the hashicorp namespace rather than the terraform-providers namespace, so the output has changed to reflect that.	7 years ago
Pam Selle	0d0df8e3f4	Merge pull request #22145 from jeffb4/terraform-21483-allow-vars-for-console ... fix, use extended flags for terraform console	7 years ago
Martin Atkins	c4076fe6a2	command/cliconfig: EmptyCredentialsSourceForTests ... A more convenient interface to get a throwaway empty credentials source for use in tests, which doesn't interact at all with the real CLI configuration directory.	7 years ago
Kristin Laemmert	f4af55d611	command/console: use user-supplied plugin-dir (#22616) ... Previously `terraform console` would output an `init required` error if it was run in a directory originally `init`ed with a `-plugin-dir` specified. Fixes #17826	7 years ago
Martin Atkins	8272d3b101	command/cliconfig: Remove command dependency ... This was a leftover from the migration of these types from the main package, but we don't actually need or want this here because this particular detail is still handled by the main package, and because the cliconfig package must not depend on the command package in order to avoid an import cycle.	7 years ago
Martin Atkins	1e2da4f776	command/cliconfig: New CredentialsSource implementation ... This new implementation is not yet used, but should eventually replace the technique of composing together various types from the svchost/auth package, since our requirements are now complex enough that they're more straightforward to express in direct code within a single type than as a composition of the building blocks in the svchost/auth package.	7 years ago
Hasan Ramezani	f7b1ef876c	command/workspace: Added `show` subcommand to workspace command help text. (#22367)	7 years ago
Kristin Laemmert	c9d62bb2f6	command: discard output from flags package and return errs directly (#22373) ... Any command using meta.defaultFlagSet *might* occasionally exit before the flag package's output got written. This caused flag error messages to get lost. This PR discards the flag package output in favor of directly returning the error to the end user.	7 years ago
Alex Pilon	4bf43efcfd	move hcl2shim package to configs	7 years ago
Pam Selle	ce8e7811ae	Merge pull request #18823 from minamijoyo/fix-multibyte-trucate ... command/hook_ui: Truncate the ID considering multibyte characters	7 years ago
kmoe	3a0c1794b6	Merge pull request #22320 from hashicorp/svh/f-fmt-help ... Mention the -no-color option	7 years ago
Sander van Harmelen	e81fafeefa	Mention the -no-color option ... This option is a valid option for the fmt subcommand, but it isn't listed in the help text.	7 years ago
James Bardin	3cda2bd7a5	Merge pull request #22299 from hashicorp/jbardin/state-mv ... allow moving resource to new modules not in state	7 years ago
hiroqn	de4235698b	command/0.12upgrade: honor user-supplied plugin-dir ... Fixes #21594	7 years ago
James Bardin	32f7f58345	allow moving resource to new modules not in state ... Create the missing modules in the state when moving resources to a module that doesn't yet exist. This allows for refactoring of configuration into new modules, without having to create dummy resources in the module before the "state mv" operations.	7 years ago
Martin Atkins	e1590d0a70	command/cliconfig: Factor out CLI config handling ... This is just a wholesale move of the CLI configuration types and functions from the main package into its own package, leaving behind some type aliases and wrappers for now to keep existing callers working. This commit alone doesn't really achieve anything, but in future commits we'll expand the functionality in this package.	7 years ago
James Bardin	8b2646c2a6	Merge pull request #22149 from hashicorp/jbardin/state-show-deposed ... account for deposed in terraform show	7 years ago
James Bardin	345dfaccb6	Account for deposed instances in show command, adding the details for ... each deposed instance. Prevent crash if the current instance is missing.	7 years ago
Kristin Laemmert	a16e1fc0a1	command/init: omit a warning if -backend-config is used with no backend (#22164) ... * command/init: omit a warning if -backend-config is used with no backend block Terraform would silently accept - and swallow - `-backend-config` on the CLI when there was no `backend` block. Since it is mostly expected to override existing backend configuration, terraform should omit a warning if there is no backend configuration to override. If the user intended to override the default (local) backend configuration, they can first add a `backend` block to the `terraform` block to silence the warning (or just ignore it): ```hcl terraform { backend "local" {} } ```	7 years ago
Jeff Bachtel	4ad7907b0c	fix, use extended flags for terraform console ... Allows -var and -var-file flags as expected	7 years ago
Alex Pilon	d5997e05db	prune dead code from command/meta	7 years ago
appilon	b143c04216	Merge pull request #22125 from hashicorp/appilon/move-VarEnvPrefix ... [SDK cleanup] Move VarEnvPrefix out of terraform pkg	7 years ago
Alex Pilon	e3bc1e7d5c	move VarEnvPrefix out of terraform pkg	7 years ago
Alex Pilon	0450f487fa	move IsEmptyDir to configs package	7 years ago
James Bardin	e4640a43d7	fix show-json test to expect error from nested mod ... One of the show json command tests expected no error when presented with an invalid configuration in a nested module. Modify the test created in PR #21569 so that it can still verify there is no panic, but now expect an error from init.	7 years ago
Masayuki Morita	ca9b643c73	docs: Fix typo in (*Meta) RunOperation comments	7 years ago
Pam Selle	1666df3668	Merge pull request #21911 from Biteable/no-nopop-in-plan-show ... Fixes #21907	7 years ago
Antoine Jacoutot	37a6331ebf	command/version: drop empty line on version check (#14858) ... We always add an empty line when asking/checking the version. We should only do that if there is a new version available. While this is purely cosmetic, it reads better and is consistent with packer.	7 years ago
Dirk Avery	02efe97a59	command/import: change import message to 'prepared' (#20018) ... * Change import message to 'prepared' * Update command/hook_ui.go Co-Authored-By: Kristin Laemmert <mildwonkey@users.noreply.github.com>	7 years ago
Radek Simko	5b9f2fafc8	Standardise directory name for test data	7 years ago
Jon Burgess	c0b1220a92	Fixes #21907 ... Don't show no-ops in `terraform show`, since it's not something that will change any state.	7 years ago
Martin Atkins	b1e92b3769	vendor: go get github.com/hashicorp/hcl2@0b64543c968c ... This includes a fix to make sure that an expression with a static string index, like foo["bar"], will be parsed as a traversal rather than as a dynamic index expression.	7 years ago
Pam Selle	82dcd5276e	Normalize in the fmt -check test	7 years ago
Radek Simko	f342824647	Merge pull request #21334 from hashicorp/b-cmd-show-reduce-whitespaces ... command/format: Reduce extra whitespaces & new lines	7 years ago
Tim Sharpe	615110e13e	provisioner: new Puppet provisioner (#18851) ... * Basic Puppet provisioner * (fixup) fix snake_case use in Bolt * (fixup) Remove unused ValidateFunc * (fixup) Check bolt result status * (lint) go fmt * Requested changes * Remove PE autodetection * Apply suggestions from @svanharmelen Co-Authored-By: rodjek <tim@sharpe.id.au> * Tag all JSON fields in bolt output * Defer comm.Disconnect() as suggested * Make bolt timeout configurable * Update builtin/provisioners/puppet/resource_provisioner.go Co-Authored-By: rodjek <tim@sharpe.id.au> * Make extension_requests and custom_attributes configurable	7 years ago
James Bardin	e71e3d85a9	Merge pull request #21611 from hashicorp/jbardin/private-data-read ... Make sure resource private data is carried through the entire resource lifecycle	7 years ago
James Bardin	ac2219ba6e	don't lose Private state data during copy ... Fix the scope of the private data copy in DeepCopy. Make sure Dependencies matches nil vs empty so that Equal compares correctly between copied states	7 years ago
Ivan Kalita	5b6b1663ef	backend/http: implement retries for the http backend (#19702) ... Fixes #19619	7 years ago
Kristin Laemmert	b9f114aa25	command/show (json): marshal the state snapshot included with the plan file (#21597) ... * command/show: marshal the state snapshot from the planfile The planfile contains a state snapshot with certain resources updated (outputs and datasources). Previously `terraform show -json PLANFILE` was using the current state instead of the state inside the plan as intended. This caused an issue when the state included a terraform_remote_state datasource. The datasource's state gets refreshed - and therefore upgraded to the current state version - during plan, but that won't persist to state until apply. * update comment to reflect new return	7 years ago
Kristin Laemmert	06a3333316	note: this is an unusual edgecase in the category of "probably should not happen" ... If https://github.com/hashicorp/terraform/issues/21543 is fixed, we can remove this check.	7 years ago
Kristin Laemmert	703f024cbd	command/show (-json): fix panic if a moduleCall has a nil config ... In the unlikely event that a moduleCall has a nil config - for example, if a nested module call includes a variable with a typo in an attribute - continue gracefully.	7 years ago
Kristin Laemmert	65fc037ecb	command/show (plan -json): fix panic (#21541) ... * command/show -json: fix panic afterUnknown should return only bools, not values. * command/jsonplan: let's delete some redundant code! the plan output was somewhat inconsistent with return values for "after_unknown". This strives to fix that. If all "after" values are known, return an empty object instead of iterating over values. Also fixing some typos and general copypasta.	7 years ago
James Bardin	7f5ffbfe90	Merge pull request #21439 from hashicorp/jbardin/init-backend ... init always prompts for migration with most remote backend configurations	7 years ago
James Bardin	06dfc4abd8	allow setting -backend-config='' to unset override ... There is currently no way to unset -backend-config during init, since not setting that option assumes the user will use the saved config. Allow setting `-backend-config=""` to specify no overrides.	7 years ago
Martin Atkins	d512584497	command/jsonplan: Don't panic with mixtures of known/unknown/empty ... The omitUnknowns and unknownAsBool functions were previously trying hard to preserve the same collection types in the output as they had in the input, by attempting to keep everything matched up so that the results would be valid. Unfortunately, this turns out to be a harder problem than we originally thought: it was possible for a collection value going in to produce inconsistent element types out (and thus a panic) in the following situations: - when a collection with mixed known and unknown values was passed in to omitUnknowns. - when a collection of collections where the inner collections are a mixture of empty and not empty in unknownAsNull. The results of these functions are only used to marshal to JSON anyway, and JSON serialization can't distinguish between the three sequence types or the two mapping types, so in practice we can just standardize on converting all sequences to tuple and all mappings to object here and not change the resulting output at all, and then we don't have to worry about making sure all of the inner types get preserved exactly. A nice consequence of that relaxation is that we can now do what we originally wanted to do with unknownAsBool, and omit map keys and object attributes altogether if their values would've been false, producing a much more compact result. This is easiest to do now when there's only one known user of this JSON plan output, and we know that user will treat both false and omitted as the same here.	7 years ago
James Bardin	c017149b31	don't store prepared backend config ... The backend gets to "prepare" the configuration before Configure is called, in order to validate the values and insert defaults. We don't want to store this value in the "config state", because it will often not match the raw config after it is prepared, forcing unecessary backend migrations during init. Since PrepareConfig is always called before Configure, we can store the config value directly, and assume that it will be prepared in the same manner each time.	7 years ago
James Bardin	ee9a618369	don't migrate backend during init without override ... If the backend config hashes match during init, and there are no new backend override options, then we assume the existing config is OK. Since init should be idempotent, we should be able to run init with no options or config changes, and not effect the backends at all.	7 years ago
James Bardin	cefc927e48	failing test for backend re-init	7 years ago
Sander van Harmelen	8fd3aa91a0	Merge pull request #21234 from hashicorp/svh/f-init-v0.12 ... Always try to select a workspace after initialization (v0.12)	7 years ago
Radek Simko	12f7ac1374	command/format: Reduce extra whitespaces & new lines	7 years ago
Martin Atkins	63fa1ac418	vendor: go get github.com/hashicorp/hcl2@master ... This includes a small fix to ensure the parser doesn't produce an invalid body for block parsing syntax errors, and instead produces an incomplete result that calling applications like Terraform can still analyze. The problem here was affecting our version-constraint-sniffing code, which intentionally tried to find a core version constraint even if there's a syntax error so that it can report that a new version of Terraform is a likely cause of the syntax error. It was working in most cases, unless it was the "terraform" block itself that contained the error, because then we'd try to analyze a broken hcl.Block with a nil body. This includes a new test for "terraform init" that exercises this recovery codepath.	7 years ago
Sander van Harmelen	d9ba0c69ea	Always try to select a workspace after initialization ... There are a number of use cases that can require a user to select a workspace after initializing Terraform. To make sure we cover all these use cases, we will always call the selectWorkspace method to verify a valid workspace is already selected or (if needed) offer to select one before moving on.	7 years ago
Martin Atkins	6adcc7ab73	vendor: go get github.com/zclconf/go-cty@master ... cty now guarantees that sets of primitive values will iterate in a reasonable order. Previously it was the caller's responsibility to deal with that, but we invariably neglected to do so, causing inconsistent ordering. Since cty prioritizes consistent behavior over performance, it now imposes its own sort on set elements as part of iterating over them so that calling applications don't have to worry so much about it. This change also causes cty to consistently push unknown and null values in sets to the end of iteration, where before that was undefined. This means that our diff output will now consistently list additions before removals when showing sets, rather than the ordering being undefined as before. The ordering of known, non-null, non-primitive values is still not contractually fixed but remains consistent for a particular version of cty.	7 years ago
Martin Atkins	eed605ac05	[WIP] Re-enable the end-to-end tests (#20044) ... * internal/initwd: Allow deprecated relative module paths In Terraform 0.11 we deprecated this form but didn't have any explicit warning for it. Now we'll still accept it but generate a warning. In a future major release we will drop this form altogether, since it is ambiguous with registry module source addresses. This codepath is covered by the command/e2etest suite. * e2e: Skip copying .exists file, if present We use this only in the "empty" test fixture in order to let git know that the directory exists. We need to skip copying it so that we can test "terraform init -from-module=...", which expects to find an empty directory. * command/e2etests: Re-enable and fix up the e2etest "acctests" We disabled all of the tests that accessed remote services like the Terraform Registry while they were being updated to support the new protocols we now expect. With those services now in place, we can re-enable these tests. Some details of exactly what output we print, etc, have intentionally changed since these tests were last updated. * e2e: refactor for modern states and plans * command/e2etest: re-enable e2etests and update for tf 0.12 compatibility plugin/discovery: mkdirAll instead of mkdir when creating cache dir	7 years ago
Sander van Harmelen	e41c2ecdce	Merge pull request #21139 from hashicorp/svh/b-stdin ... Make sure UIInput keeps working after being canceled	7 years ago
Sander van Harmelen	9ab2e9d8b2	Make sure UIInput keeps working after being canceled ... Once you start reading from stdin, that is a blocking call that will never finish. So when a context is canceled causing the input method to return, the read will remain blocking in the running goroutine. There isn't a real solution for it (e.g. its not possible to unblock the read) so the only solution is to make the reader reusable.	7 years ago
James Bardin	f79a768a4e	command/format: take noop changes from lcs ... When rendering the diff, the NoOp changes should come from the LCS sequence, rather than the new sequence. The two indexes will not align in many cases, adding the wrong new object or indexing out of bounds.	7 years ago
Przemysław Dąbek	9605b093d9	command/graph: use user-supplied plugin path when running graph command (#18083)	7 years ago
Kristin Laemmert	c1079b59bd	command/state_list.go: fix bug loading user-defined state (#21015) ... * command/state_list.go: fix bug loading user-defined state If the user supplied a state path via the `-state` flag and terraform was running in a workspace other than `default`, the state was not being loaded properly. Fixes #19920	7 years ago
Kristin Laemmert	1c95b21c6c	command/output: get the state path from the workspace or CLI argument (#20994) ... Previously this command was setting the state path to the default state file, instead of honoring the backend configuration.	7 years ago
Martin Atkins	88e76fa9ef	configs/configschema: Introduce the NestingGroup mode for blocks ... In study of existing providers we've found a pattern we werent previously accounting for of using a nested block type to represent a group of arguments that relate to a particular feature that is always enabled but where it improves configuration readability to group all of its settings together in a nested block. The existing NestingSingle was not a good fit for this because it is designed under the assumption that the presence or absence of the block has some significance in enabling or disabling the relevant feature, and so for these always-active cases we'd generate a misleading plan where the settings for the feature appear totally absent, rather than showing the default values that will be selected. NestingGroup is, therefore, a slight variation of NestingSingle where presence vs. absence of the block is not distinguishable (it's never null) and instead its contents are treated as unset when the block is absent. This then in turn causes any default values associated with the nested arguments to be honored and displayed in the plan whenever the block is not explicitly configured. The current SDK cannot activate this mode, but that's okay because its "legacy type system" opt-out flag allows it to force a block to be processed in this way anyway. We're adding this now so that we can introduce the feature in a future SDK without causing a breaking change to the protocol, since the set of possible block nesting modes is not extensible.	7 years ago
Pam Selle	346e341ff2	Only display status link if public registry used ... Updates to throw a specific error if using the defined public registry vs. another registry.	7 years ago
Kristin Laemmert	f8a5e17d3d	command/format: improve "source" of error messages regarding missing arguments (#20907) ... * vendor: update hcl2 dependency * command/format: revert diagnostic format behavior if snippet or highlight range is empty	7 years ago
Frederic	0f1f504c22	command/format: indicate in diff when adding an attribute forces replacement	7 years ago
Pam Selle	ff7245f27c	Add status link to make message more helpful	7 years ago
Pam Selle	d72456d188	Add friendly error for when registry unresponsive ... If the registry is unresponsive, you will now get an error specific to this, rather than a misleading "provider unavailable" type error. Also adds debug logging for when errors like this may occur	7 years ago
Kristin Laemmert	d5bb09b13b	command/show: refresh is required to show remote state (#20818)	7 years ago
Justin Downing	1e32ae243c	grammatical updates to comments and docs (#20195)	7 years ago
findkim	161fe47b34	plugin/discovery: improve providery discovery verification errors	7 years ago
Martin Atkins	e918fa83ec	command/format: Don't panic when item removed from list of objects ... Due to these tests happening in the wrong order, removing an object from the end of a sequence of objects would previously cause a bounds-check panic. Rather than a more severe rework of the logic here, for now we'll just introduce an extra precondition to prevent the panic. The code that follows already handles the case where there _is_ no new object (i.e. the "old" object is being deleted) as long as we're able to pass through this type-checking logic. The new "JSON list of objects - removing item" test covers this problem by rendering a diff for an object being removed from the end of a list of objects within a JSON value.	7 years ago
Justin Campbell	e696e063dc	Merge pull request #20674 from hashicorp/registry-warnings ... plugin/discovery: Parse warnings from TF Registry	7 years ago
Justin Campbell	e6316c9de6	plugin/discovery: Parse warnings from TF Registry ... Terraform Registry (and other registry implementations) can now return an array of warnings with the versions response. These warnings are now displayed to the user during a `terraform init`.	7 years ago
Justin Campbell	24e13d8ec1	plugin/discovery: Return tfdiags from Get ... Allows us to surface warnings to the user using the tfdiags interfaces.	7 years ago
Martin Atkins	c39905e1a8	command: Fix various issues in the "terraform state ..." subcommands ... In earlier refactoring we updated these commands to support the new address and state types, but attempted to partially retain the old-style "StateFilter" abstraction that originally lived in the Terraform package, even though that was no longer being used for any other functionality. Unfortunately the adaptation of the existing filtering to the new types wasn't exact and so these commands ended up having a few bugs that were not covered by the existing tests. Since the old StateFilter behavior was the source of various misbehavior anyway, here it's removed altogether and replaced with some simpler functions in the state_meta.go file that are tailored to the use-cases of these sub-commands. As well as just generally behaving more consistently with the other parts of Terraform that use the new resource address types, this commit fixes the following bugs: - A resource address of aws_instance.foo would previously match an resource of that type and name in any module, which disagreed with the expected interpretation elsewhere of meaning a single resource in the root module. - The "terraform state mv" command was not supporting moves from a single resource address to an indexed address and vice-versa, because the old logic didn't need to make that distinction while they are two separate address types in the new logic. Now we allow resources that do not have count/for_each to be treated as if they are instances for the purposes of this command, which is a better match for likely user intent and for the old behavior. Finally, we also clean up a little some of the usage output from these commands, which hasn't been updated for some time and so had both some stale information and some inaccurate terminology.	7 years ago