28 Commits (f2dbf80badc8c7385a7b44bb040ae5e8550e7e60)

Author	SHA1	Message	Date
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
James Bardin	e13eecbc5b	finish provider ModuleInstance replacement	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
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
Martin Atkins	8b511524d6	Initial steps towards AbsProviderConfig/LocalProviderConfig separation (#23978) ... * Introduce "Local" terminology for non-absolute provider config addresses In a future change AbsProviderConfig and LocalProviderConfig are going to become two entirely distinct types, rather than Abs embedding Local as written here. This naming change is in preparation for that subsequent work, which will also include introducing a new "ProviderConfig" type that is an interface that AbsProviderConfig and LocalProviderConfig both implement. This is intended to be largely just a naming change to get started, so we can deal with all of the messy renaming. However, this did also require a slight change in modeling where the Resource.DefaultProviderConfig method has become Resource.DefaultProvider returning a Provider address directly, because this method doesn't have enough information to construct a true and accurate LocalProviderConfig -- it would need to refer to the configuration to know what this module is calling the provider it has selected. In order to leave a trail to follow for subsequent work, all of the changes here are intended to ensure that remaining work will become obvious via compile-time errors when all of the following changes happen: - The concept of "legacy" provider addresses is removed from the addrs package, including removing addrs.NewLegacyProvider and addrs.Provider.LegacyString. - addrs.AbsProviderConfig stops having addrs.LocalProviderConfig embedded in it and has an addrs.Provider and a string alias directly instead. - The provider-schema-handling parts of Terraform core are updated to work with addrs.Provider to identify providers, rather than legacy strings. In particular, there are still several codepaths here making legacy provider address assumptions (in order to limit the scope of this change) but I've made sure each one is doing something that relies on at least one of the above changes not having been made yet. * addrs: ProviderConfig interface In a (very) few special situations in the main "terraform" package we need to make runtime decisions about whether a provider config is absolute or local. We currently do that by exploiting the fact that AbsProviderConfig has LocalProviderConfig nested inside of it and so in the local case we can just ignore the wrapping AbsProviderConfig and use the embedded value. In a future change we'll be moving away from that embedding and making these two types distinct in order to represent that mapping between them requires consulting a lookup table in the configuration, and so here we introduce a new interface type ProviderConfig that can represent either AbsProviderConfig or LocalProviderConfig decided dynamically at runtime. This also includes the Config.ResolveAbsProviderAddr method that will eventually be responsible for that local-to-absolute translation, so that callers with access to the configuration can normalize to an addrs.AbsProviderConfig given a non-nil addrs.ProviderConfig. That's currently unused because existing callers are still relying on the simplistic structural transform, but we'll switch them over in a later commit. * rename LocalType to LocalName Co-authored-by: Kristin Laemmert <mildwonkey@users.noreply.github.com>	6 years ago
Kristin Laemmert	6541775ce4	addrs: roll back change to Type field in ProviderConfig (#23937)	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
James Bardin	96d1e57191	fix type in state mv test	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	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
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	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
Sander van Harmelen	7ec3f96e3a	command/state: update and fix the state mv command	7 years ago
Martin Atkins	43d5206d82	command: Stub the "terraform state mv" tests to remind to fix ... This command isn't yet updated for the new state types, but since we were not returning a non-successful error status here the tests were just failing in a weird way instead. Now we'll fail with a message that makes it clear there is still work to do in the real implementation here.	7 years ago
Martin Atkins	a3403f2766	terraform: Ugly huge change to weave in new State and Plan types ... Due to how often the state and plan types are referenced throughout Terraform, there isn't a great way to switch them out gradually. As a consequence, this huge commit gets us from the old world to a _compilable_ new world, but still has a large number of known test failures due to key functionality being stubbed out. The stubs here are for anything that interacts with providers, since we now need to do the follow-up work to similarly replace the old terraform.ResourceProvider interface with its replacement in the new "providers" package. That work, along with work to fix the remaining failing tests, will follow in subsequent commits. The aim here was to replace all references to terraform.State and its downstream types with states.State, terraform.Plan with plans.Plan, state.State with statemgr.State, and switch to the new implementations of the state and plan file formats. However, due to the number of times those types are used, this also ended up affecting numerous other parts of core such as terraform.Hook, the backend.Backend interface, and most of the CLI commands. Just as with 5861dbf3fc before, I apologize in advance to the person who inevitably just found this huge commit while spelunking through the commit history.	7 years ago
James Bardin	51547ad2ba	add tests for state commands through a backend	9 years ago
James Bardin	33ba6774e0	Make the state commands use the real command.Meta ... In order to use a backend for the state commands, we need an initialized meta. Use a single Meta instance rather than temporary ones to make sure the backends are initialized properly.	9 years ago
James Bardin	6e7baaaeff	don't load the backend when -state is provided ... When using a `state` command, if the `-state` flag is provided we do not want to modify the Backend state. In this case we should always create a local state instance. The backup flag was also being ignored, and some tests were relying on that, which have been fixed.	9 years ago
James Bardin	5f939b42fe	test that `state mv -state` doesn't use Backend ... If we provide a -state flag to a state command, we do not want terraform to modify the backend state. This test fails since the state specified in the backend doesn't exist	9 years ago
Martin Atkins	8364383c35	Push plugin discovery down into command package ... Previously we did plugin discovery in the main package, but as we move towards versioned plugins we need more information available in order to resolve plugins, so we move this responsibility into the command package itself. For the moment this is just preserving the existing behavior as long as there are only internal and unversioned plugins present. This is the final state for provisioners in 0.10, since we don't want to support versioned provisioners yet. For providers this is just a checkpoint along the way, since further work is required to apply version constraints from configuration and support additional plugin search directories. The automatic plugin discovery behavior is not desirable for tests because we want to mock the plugins there, so we add a new backdoor for the tests to use to skip the plugin discovery and just provide their own mock implementations. Most of this diff is thus noisy rework of the tests to use this new mechanism.	9 years ago
James Bardin	43c7bd648c	fix sorting of module resources during state mv ... Module resource were being sorted lexically by name by the state filter. If there are 10 or more resources, the order won't match the index order, and resources will have different indexes in their new location. Sort the FilterResults by index numerically when the names match. Clean up the module String output for visual inspection by sorting Resource name parts numerically when they are an integer value.	9 years ago
Mitchell Hashimoto	e4d2193ed6	command/state: mv and rm -backup works ... Fixes #12154 The "-backup" flag before for "state *" CLI had some REALLY bizarre behavior: it would change the _destination_ state and actually not create any additional backup at all (the original state was unchanged and the normal timestamped backup still are written). Really weird. This PR makes the -backup flag work as you'd expect with one caveat: we'll _still_ create the timestamped backup file. The timestamped backup file helps make sure that you always get a backup history when using these commands. We don't want to make it easy for you to overwrite a state with the `-backup` flag.	9 years ago
Mitchell Hashimoto	0d1ea84d39	command: test for moving resource with count [GH-7797]	10 years ago
Mitchell Hashimoto	3b3f92cd9b	terraform: fix some test failures on state add with multiple modules	10 years ago
Mitchell Hashimoto	a44c8b8760	terraform: state mv tests	10 years ago
Mitchell Hashimoto	32d0d29b56	command: test for moving into another state file	10 years ago
Mitchell Hashimoto	235e860118	command/state mv: handle -state-out to a different path	10 years ago
Mitchell Hashimoto	c4e5355a02	command/state mv	10 years ago