37 Commits (ccf19fbf5e2b61ba62efd1ac47a3a3fd3917d494)

Author	SHA1	Message	Date
James Bardin	0b31ffa587	use a single log writer ... Use a single log writer instance for all std library logging. Setup the std log writer in the logging package, and remove boilerplate from test packages.	6 years ago
James Bardin	6ca477f042	move helper/logging to internal ... remove a dead code file too	6 years ago
Kristin Laemmert	3933cbd491	remove LegacyProvider (#26433)	6 years ago
James Bardin	53a8e321eb	remove mod=vendor in statemgr test	6 years ago
Kristin Laemmert	95eca06782	statemgr: add a NewUnlockErrorFull state manager for tests (#25823) ... * statemgr: add a NewUnlockErrorFull state manager for tests I've frequently needed to coerce Unlock() errors for tests and it's been awkward and fraught every time, so I decided to add a full state manger that returns *mostly* errors. I intend to use this in conjunction with the clistate.Locker interface, which first calls Lock() (to block if the mutex is in use) at the start of Unlock(), so Lock() rather awkwardly needed to succeed.	6 years ago
Kristin Laemmert	6621501ae3	state: remove deprecated state package (#25490) ... Most of the state package has been deprecated by the states package. This PR replaces all the references to the old state package that can be done simply - the low-hanging fruit. * states: move state.Locker to statemgr The state.Locker interface was a wrapper around a statemgr.Full, so moving this was relatively straightforward. * command: remove unnecessary use of state package for writing local terraform state files * move state.LocalState into terraform package state.LocalState is responsible for managing terraform.States, so it made sense (to me) to move it into the terraform package. * slight change of heart: move state.LocalState into clistate instead of terraform	6 years ago
James Bardin	15a95031e5	remove a few traces of states.EachMode	6 years ago
Mikhail Mazurskiy	c9ce1f0c1f	Fix typos (#24531)	6 years ago
James Bardin	3ee9cf49ce	missing wg.Wait in concurrent test	6 years ago
Kristin Laemmert	ed1aebbeda	terraform: large refactor to use Provider from configs.Resource (#24396) ... * terraform: large refactor to use Provider from configs.Resource configs.Resource.ImpliedProvider() now returns a string; it is the callers' responsibility to turn that into an addrs.Provider if needed. GraphNodeProviderConsumer ProvidedBy() no longer returns nil (reverting to earlier, pre-provider-fqn behavior): it will return either the provider set in config, provider set in state, or the default provider.	6 years ago
James Bardin	e13eecbc5b	finish provider ModuleInstance replacement	6 years ago
Alisdair McDiarmid	f54e2a62bf	states: Fix coverage blips in statemgr/filesystem ... Something non-deterministic in the test suite is causing a coverage blip in a line in the filesystem state manager. This commit adds a test which specifically covers that line, which hopefully pleases the Codecov robot.	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
aqche	bcaf7f7ba7	states/statemgr: Properly return error when Unlock detects invalid lock id	7 years ago
Radek Simko	7860f55e4f	Version tools per Go convention under tools.go	7 years ago
Radek Simko	8a6d1d62b6	stringer: Regenerate files with latest version	7 years ago
Sander van Harmelen	21cca34716	Fixup the docs for WriteStateForMigration	7 years ago
Sander van Harmelen	57f6e01830	backend/local: preserve serial and lineage on failure ... When failing to write the state, the local backend writes the state to a local file called `errrored.tfstate`. Previously it would do so by creating a new state file which would use a new serial and lineage. By exorting the existing state file and directly assigning the new state, the serial and lineage are preserved.	7 years ago
Andriy Borodiychuk	a0f3a2daa0	Update doc.go, fix typo (#20529)	7 years ago
Radek Simko	ea05da89cb	states/statemgr: Avoid HTML escaping when printing LockInfo	7 years ago
Martin Atkins	e8f9fad0e3	states/statemgr: use -mod=vendor to run the state locking helper ... This ensures that we test using the same source as we're using everywhere else, and more tactically also ensures that when running in Travis-CI we won't try to download all of the dependencies of Terraform during this test. In the long run we will look for a more global solution to this, rather than adding this to all of our embedded "go" command calls directly, but this is intended as a low-risk solution to get the build working again in the mean time.	7 years ago
Martin Atkins	5255e85238	"go fmt" fixups ... Apparently my editor is still not reliably formatting on save, so I missed a few formatting quirks in these files.	8 years ago
Martin Atkins	6cb3b0f4cf	states/statemgr: Local locks meta is near output path, not input path ... This was a mistake while adapting this code from the old state.LocalState. Since the lock is held on the output file (s.path) the metadata should live adjacent to that rather than being built from the read path (s.readPath) that is used only as the initial snapshot on first instantiation. This also includes more logging, continuing the trend of other recent commits in these files. The local state behavior is sufficiently complex that these trace logs are a great help in debugging issues such as this one with the wrong files being used or actions being taken in the wrong order.	8 years ago
Martin Atkins	48601d261d	states/statemgr: In Filesystem, back up output file, not input file ... The filesystem backend has the option of using a different file for its initial read. Previously we were incorrectly writing the contents of that file out into the backup file, rather than the prior contents of the output file. Now we will always read the output file in RefreshState in order to decide what we will back up but then we will optionally additionally read the input file and prefer its content as the "current" state snapshot. This is verified by command.TestMetaBackend_planLocalStatePath and TestMetaBackend_configureNew, which are both now passing.	8 years ago
Martin Atkins	ec27526cc3	command: Fix TestMetaBackend_configuredChangeCopy_multiToMulti ... This was failing because we now handle the settings for the local backend a little differently as a result of decoding it with the HCL2 machinery. Specifically, the backend.State* fields are now assumed to be what is given in configuration, and any CLI overrides are maintained separately in OverrideState* fields so that they can be imposed "just in time" in StatePaths. This is particularly important because OverrideStatePath (when set) is used regardless of workspace name, while StatePath is a suitable value only for the "default" workspace, with others needing to be constructed from StateWorkspaceDir instead.	8 years ago
Martin Atkins	22c84c71a4	command: Use statemgr.Import and statemgr.Export for state push and pull ... We previously hacked around the import/export functionality being missing in the statemgr layer after refactoring, but now it's been reintroduced to fix functionality elsewhere we should use the centralized Import and Export functions to ensure consistent behavior. In particular, this pushes the logic for checking lineage and serial during push down into the state manager itself, which is better because all other details about lineage and serial are managed within the state managers.	8 years ago
Martin Atkins	985b414dca	states/statemgr: Fix the Filesystem state manager tests ... Now that we're verifying the Terraform version during state loading, we need to force a particular Terraform version to use during these tests.	8 years ago
Martin Atkins	94510bc1b9	states/statemgr: Migrate, Import, and Export functions ... In our recent refactoring of the state manager interfaces we made serial and lineage management the responsibility of the state managers themselves, not exposing them at all to most callers, and allowing for simple state managers that don't implement them at all. However, we do have some specific cases where we need to preserve these properly when available, such as migration between backends, and the "terraform state push" and "terraform state pull" commands. These new functions and their associated optional interface allow the logic here to be captured in one place and access via some simple calls. Separating this from the main interface leaves things simple for the normal uses of state managers. Since these functions are mostly just thin wrappers around other functionality, they are not yet well-tested directly, but will be indirectly tested through the tests of their callers. A subsequent commit will add more unit tests here.	8 years ago
Sander van Harmelen	7fbd93b5cd	command/state: update and fix the state push and pull	8 years ago
James Bardin	d707049f72	don't make a backup of a nil state ... This makes sure we don't create a backup of an intermediate state if the first read state was empty.	8 years ago
Martin Atkins	b0016e9cf6	command: Allow tests to run to completion without panics or hangs ... There are still 160 test failures as of this commit, but at least the test program can run to completion and list out all the failures.	8 years ago
Martin Atkins	03e6771536	states/statemgr: don't panic if no state file is present on first write	8 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.	8 years ago
Martin Atkins	3bb731e2d6	statemgr: Helper funcs RefreshAndRead and WriteAndPersist ... In practice these pairs of functions are often used together when working with a "full" statemgr, so these helper wrappers allow us to do that more conveniently. This also introduces a new interface statemgr.Storage, which represents a state manager that has all of the storage capabilities but does not necessarily support locking. In practice callers will usually just use statemgr.Full, but these more-specific interfaces allow us to reflect in APIs which subset of the statemgr functionality each function depends on.	8 years ago
Martin Atkins	05936df0e7	statemgr: Backup file support for statemgr.Filesystem ... In the old state package we had this as a separate manager state.BackupState, but that doesn't work with our new interfaces because we handle lineage and serial within the state managers themselves and don't expose them to callers anymore. In practice it being built in to the filesystem manager is not a problem because we only use the backup functionality for local state anyway. This also slightly adjusts the behavior to be more intuitive. The old BackupState relied on the implementation detail that Terraform re-persists the original state early in an apply operation, which meant that by coincidence it would back up the right snapshot. In this new approach, we instead take an in-memory copy during State and then write _that_ to disk in WriteState if the new state seems different, so we're guaranteed that we'll always write out what we read before any changes were made. In future we may improve this further, such as keeping multiple generations of backups, etc. But for now this is intended to preserve the goals of the original implementation while making its behavior self-contained and not dependent on coincidences.	8 years ago
Martin Atkins	53cafc542b	statemgr: New package for state managers ... This idea of a "state manager" was previously modelled via the confusingly-named state.State interface, which we've been calling a "state manager" only in some local variable names in situations where there were also *terraform.State variables. As part of reworking our state models to make room for the new type system, we also need to change what was previously the state.StateReader interface. Since we've found the previous organization confusing anyway, here we just copy all of those interfaces over into statemgr where we can make the relationship to states.State hopefully a little clearer. This is not yet a complete move of the functionality from "state", since we're not yet ready to break existing callers. In a future commit we'll turn the interfaces in the old "state" package into aliases of the interfaces in this package, and update all the implementers of what will by then be statemgr.Reader to use *states.State instead of *terraform.State. This also includes an adaptation of what was previously state.LocalState into statemgr.FileSystem, using the new state serialization functionality from package statefile instead of the old terraform.ReadState and terraform.WriteState.	8 years ago