347 Commits (f76a3467dcfaab6fa7cc25c843ef92cfbf602fea)

Author	SHA1	Message	Date
Martin Atkins	f76a3467dc	core: Call into refactoring.ValidateMoves after creating a plan ... As of this commit, refactoring.ValidateMoves doesn't actually do anything yet (always returns nil) but the goal here is to wire in the set of all declared instances so that refactoring.ValidateMoves will then have all of the information it needs to encapsulate our validation rules. The actual implementation of refactoring.ValidateMoves will follow in subsequent commits.	5 years ago
Martin Atkins	51346f0d87	instances: Expander.AllInstances ... In order to precisely implement the validation rules for "moved" statements we need to be able to test whether particular instances were declared in the configuration. The instance expander is the source of record for which instances we decided while creating a plan, but it's API is far more involved than what our validation rules need, so this new AllInstances method returns a wrapper object with a more straightforward API that provides read-only access to just the question of whether particular instances got registered in the expander already. This API covers all three of the kinds of objects that move statements can refer to. It includes module calls and resources, even though they aren't _themselves_ "instances" in the sense we usually mean, because the module instance addresses they are contained within _are_ instances and so we need to take their dynamic instance keys into account when answering these queries.	5 years ago
Martin Atkins	57d36c1d9d	addrs: ModuleInstance.ChildCall method ... This allows us to concisely construct AbsModuleCall address values by method chaining from module instance addresses.	5 years ago
Martin Atkins	5a6d11e375	addrs: Factor out MoveEndpointInModule module prefix matching ... All of our MoveDestination methods have the common problem of deciding whether the receiver is even potentially in the scope of a particular MoveEndpointInModule, which requires that the receiver belong to an instance of the module where the move statement was found. Previously we had this logic inline in all three cases, but now we'll factor it out into a shared helper function. At first it seemed like there ought to be more factoring possible for the AbsResource vs. AbsResourceInstance implementations, since textually they look very similar, but in practice they only look similar because those two types have a lot of method names in common, but the Go compiler sees them as completely distinct and thus we must write the same logic out twice. I did try some further refactoring to address that but it made the resulting code significantly more complicated and, by my judgement, harder to follow. Consequently I decided that a little duplication was okay and warranted here because this logic is already quite fiddly to read through and isn't likely to change significantly once released (due to backward-compatibility promises).	5 years ago
Martin Atkins	45d16b4a2b	addrs: MoveDestination for AbsResourceInstance-based move endpoints ... Previously our MoveDestination methods only honored move statements whose endpoints were module calls, module instances, or resources. Now we'll additionally handle when the endpoints are individual resource instances. This situation only applies to AbsResourceInstance.MoveDestination because no other objects can be contained inside of a resource instance. This completes all of the MoveDestination cases for all supported move statement types and moveable object types.	5 years ago
Martin Atkins	5e86bab159	addrs: MoveDestination for AbsResource-based move endpoints ... Previously our MoveDestination methods only honored move statements whose endpoints were module calls or module instances. Now we'll additionally handle when the endpoints are whole resource addresses. This includes both renaming resource blocks and moving resource blocks into or out of child modules. This doesn't yet include endpoints that are specific resource _instances_, which will follow in a subsequent commit. For the moment that situation will always indicate a non-match.	5 years ago
Rémi Lapeyre	da6717761e	Merge remote-tracking branch 'origin/main' into update-consul	5 years ago
Martin Atkins	994ee23c06	addrs: Module move support for AbsResource and AbsResourceInstance ... This is a subset of the MoveDestination behavior for AbsResource and AbsResourceInstance which deals with source and destination addresses that refer to module calls or module instances. They both work by delegating to ModuleInstance.MoveDestination and then applying the same resource or resource instance address to the newly-chosen module instance address, thus ensuring that when we move a module we also move all of the resources inside that module in the same way. This doesn't yet include support for moving between specific resource or resource instance addresses; that'll follow later. This commit should have enough logic to support moving between module names and module instance keys, including any module calls or resources nested within.	5 years ago
Martin Atkins	4d733b4d2d	addrs: Implement ModuleInstance.MoveDestination ... This method encapsulates the move-processing rules for applying move statements to ModuleInstance addresses. It honors both module call moves and module instance moves by trying to find a subsequence of the input that matches the "from" endpoint and then, if found, replacing it with the "to" endpoint while preserving the prefix and suffix around the match, if any.	5 years ago
Kristin Laemmert	0729e9fdd7	configs/configschema: extend block.AttributeByPath to descend into Objects (#29222) ... * configs/configschema: extend block.AttributeByPath to descend into Objects This commit adds a recursive Object.AttributeByPath function which will step through Attributes with NestedTypes. If an Attribute without a NestedType is encountered while there is still more to the path, it will return nil.	5 years ago
James Bardin	b12502679f	Merge pull request #29208 from hashicorp/jbardin/update-hcl ... update hcl v2.10.1	5 years ago
James Bardin	aaf03d3251	update test error for hclv2.10.1	5 years ago
James Bardin	6fa04091f5	Merge pull request #29193 from hashicorp/jbardin/ignore-changes-marks ... Handle marks on ignore_changes values	5 years ago
Kristin Laemmert	0b827ab6b6	format/diff: fix panic with null map in NestedType attrs (#29206)	5 years ago
James Bardin	07ee689eff	update comment and extend test	5 years ago
James Bardin	570b70b02f	Merge pull request #28078 from jasons42/configure-etcdv3-client-max-request-size ... Expose etcd client MaxCallSendMsgSize config	5 years ago
James Bardin	8dd722ece0	Merge pull request #29167 from xiaozhu36/xiaozhu ... backend/oss: Changes the DescribeEndpoint to DescribeEndpoints to fixes the unsupported sts bug	5 years ago
James Bardin	431aa0280e	Merge pull request #29157 from remilapeyre/unique-constraint ... Add uniqueness constraint on workspaces name for the pg backend	5 years ago
Jason Smith	d1608d7a7f	Expose etcd client MaxCallSendMsgSize config ... The etcdv3 client has a default request send limit of 2.0 MiB. This change exposes the configuration option to increase that limit enabling larger state using the etcdv3 backend. This also requires that the corresponding --max-request-bytes flag be increased on the server side. The default there is 1.5 MiB. Fixes https://github.com/hashicorp/terraform/issues/25745	5 years ago
James Bardin	dd330e5194	Merge pull request #29200 from hashicorp/jbardin/rebase-25554 ... manual rebase of #25554	5 years ago
Kevin Burke	c047958b57	go.mod,backend: update coreos/etcd dependency to release-3.4 branch ... etcd rewrote its import path from coreos/etcd to go.etcd.io/etcd. Changed the imports path in this commit, which also updates the code version. This lets us remove the github.com/ugorji/go/codec dependency, which was pinned to a fairly old version. The net change is a loss of 30,000 lines of code in the vendor directory. (I first noticed this problem because the outdated go/codec dependency was causing a dependency failure when I tried to put Terraform and another project in the same vendor directory.) Note the version shows up funkily in go.mod, but I verified visually it's the same commit as the "release-3.4" tag in github.com/coreos/etcd. The etcd team plans to fix the release version tagging in v3.5, which should be released soon.	5 years ago
James Bardin	9c20ed6185	StateMgr must be able to return with locked state ... The current usage of internal remote state backends requires that `StateMgr` be able to return an instance of `statemgr.Full` even if the state is currently locked.	5 years ago
James Bardin	66a5950acb	ignored value in this test should not be marked	5 years ago
James Bardin	e574f73f61	test with marked, unknown, planned values	5 years ago
James Bardin	ea077cbd90	handle marks within ignore_changes ... Up until now marks were not considered by `ignore_changes`, that however means changes to sensitivity within a configuration cannot ignored, even though they are planned as changes. Rather than separating the marks and tracking their paths, we can easily update the processIgnoreChanges routine to handle the marked values directly. Moving the `processIgnoreChanges` call also cleans up some of the variable naming, making it more consistent through the body of the function.	5 years ago
Alisdair McDiarmid	a456d030db	Fix flapping JSON output test properly ... This commit makes the output order of the resource drift messages stable, by building a slice of changes and sorting it by address.	5 years ago
Kristin Laemmert	0d80a74539	configs/configschema: fix missing "computed" attributes from NestedObject's ImpliedType (#29172) ... * configs/configschema: fix missing "computed" attributes from NestedObject's ImpliedType listOptionalAttrsFromObject was not including "computed" attributes in the list of optional object attributes. This is now fixed. I've also added some tests and fixed some panics and otherwise bad behavior when bad input is given. One natable change is in ImpliedType, which was panicking on an invalid nesting mode. The comment expressly states that it will return a result even when the schema is inconsistent, so I removed the panic and instead return an empty object.	5 years ago
Paddy	8bdea502ab	Add support for protocol 6 providers during init. (#29153) ... Update the version constraints for what providers will be downloaded from the registry, allowing protocol 6 providers to be downloaded from the registry.	5 years ago
Alisdair McDiarmid	c51112a30c	Fix flapping JSON output test ... This test would previously fail randomly due to the use of multiple resource instances. Instance keys are iterated over as a map for presentation, which has intentionally inconsistent ordering. To fix this, I changed the test to use different resource addresses for the three drift cases. I also extracted them to a separate test, and tweaked the test helper functions to reduce the number of fatal exit points, to make failed test debugging easier.	5 years ago
xiaozhu36	c495caafeb	backend/oss: Changes the DescribeEndpoint to DescribeEndpoints to fixes the unsupported sts bug	5 years ago
Martin Atkins	3e5bfa7364	refactoring: Stubbing of the logic for handling moves ... This is a whole lot of nothing right now, just stubbing out some control flow that ultimately just leads to TODOs that cause it to do nothing at all. My intent here is to get this cross-cutting skeleton in place and thus make it easier for us to collaborate on adding the meat to it, so that it's more likely we can work on different parts separately and still get a result that tessellates.	5 years ago
Martin Atkins	22eee529e3	addrs: MoveEndpointInModule ... We previously built out addrs.UnifyMoveEndpoints with a different implementation strategy in mind, but that design turns out to not be viable because it forces us to move to AbsMoveable addresses too soon, before we've done the analysis required to identify chained and nested moves. Instead, UnifyMoveEndpoints will return a new type MoveEndpointInModule which conceptually represents a matching pattern which either matches or doesn't match a particular AbsMoveable. It does this by just binding the unified relative address from the MoveEndpoint to the module where it was declared, and thus allows us to distinguish between the part of the module path which applies to any instances of the given modules vs. the user-specified part which must identify particular module instances.	5 years ago
Martin Atkins	cd06572c4f	addrs: ModuleInstance and AbsResourceInstance are UniqueKeyers ... Since these address types are not directly comparable themselves, we use an unexported named type around the string representation, whereby the special type can avoid any ambiguity between string representations of different types and thus each type only needs to worry about possible ambiguity of its _own_ string representation.	5 years ago
Martin Atkins	f3a57db293	addrs: UniqueKey and UniqueKeyer ... Many times now we've seen situations where we need to use addresses as map keys, but not all of our address types are comparable and thus we tend to end up using string representations as keys instead. That's problematic because conversion to string uses type information and some of the address types have string representations that are ambiguous with one another. UniqueKey therefore represents an opaque key that is unique for each functionally-distinct address across all types that implement UniqueKeyer. For this initial commit I've implemented UniqueKeyer only for the Referenceable family of types. These are an easy case because they were all already comparable (intentionally) anyway. Later commits can implement UniqueKeyer for other types that are not naturally comparable, such as any which include a ModuleInstance. This also includes a new type addrs.Set which wraps a map as a set of addresses, using the unique keys to ensure that there can be only one element for each distinct address.	5 years ago
Rémi Lapeyre	3c34e15d40	Update the Consul API client ... Some users would want to use Consul namespaces when using the Consul backend but the version of the Consul API client we use is too old and don't support them. In preparation for this change this patch just update it the client and replace testutil.NewTestServerConfig() by testutil.NewTestServerConfigT() in the tests.	5 years ago
Rémi Lapeyre	b8e0d6f418	Add UNIQUE constraint in the states table for the pg backend	5 years ago
Rémi Lapeyre	3bf053a5fc	Add a test to ensure that workspaces must have a unique name in pg backend	5 years ago
Kristin Laemmert	43f698dc9d	states: new `Move` funcs for Resource, ResourceInstance, and ModuleInstances (#29068) ... * states: add MoveAbsResource and MoveAbsResourceInstance state functions and corresponding syncState wrapper functions. * states: add MoveModuleInstance and MaybeMoveModuleInstance * addrs: adding a new function, ModuleInstance.IsDeclaredByCall, which returns true if the receiver is an instance of the given AbsModuleCall.	5 years ago
Alisdair McDiarmid	5a34825fc1	Merge pull request #29131 from hashicorp/alisdair/sequence-diff-commentary ... Add comments explaining how ctySequenceDiff works	5 years ago
Alisdair McDiarmid	72a7c95353	Merge pull request #29072 from hashicorp/alisdair/json-ui-resource-drift ... json-output: Add resource drift to machine readable UI	5 years ago
Alisdair McDiarmid	ef0181cfbd	Add comments explaining how ctySequenceDiff works ... The logic behind this code took me a while to understand, so I wrote down what I understand to be the reasoning behind how it works. The trickiest part is rendering changing objects as updates. I think the other pieces are fairly common to LCS sequence diff rendering, so I didn't explain those in detail.	5 years ago
Martin Atkins	6b8e103d6a	configs: Include "moved" blocks when merging multiple files into a module ... An earlier commit added logic to decode "moved" blocks and do static validation of them. Here we now include that result also in modules produced from those files, which we can then use in Terraform Core to actually implement the moves. This also places the feature behind an active experiment keyword called config_driven_move. For now activating this doesn't actually achieve anything except let you include moved blocks that Terraform will summarily ignore, but we'll expand the scope of this in later commits to eventually reach the point where it's really usable.	5 years ago
Martin Atkins	d92b5e5f5e	configs: valid-modules test ignores experimental features warning ... A common source of churn when we're running experiments is that a module that would otherwise be valid ends up generating a warning merely because the experiment is active. That means we end up needing to shuffle the test files around if the feature ultimately graduates to stable. To reduce that churn in simple cases, we'll make an exception to disregard the "Experiment is active" warning for any experiment that a module has intentionally opted into, because those warnings are always expected and not a cause for concern. It's still possible to test those warnings explicitly using the testdata/warning-files directory, if needed.	5 years ago
Martin Atkins	708003b035	configs: For Moved blocks, use addrs.MoveEndpoint instead of addrs.Target ... Although addrs.Target can in principle capture the information we need to represent move endpoints, it's semantically confusing because addrs.Targetable uses addrs.Abs... types which are typically for absolute addresses, but we were using them for relative addresses here. We now have specialized address types for representing moves and probably other things which have similar requirements later on. These types largely communicate the same information in the end, but aim to do so in a way that's explicit about which addresses are relative and which are absolute, to make it less likely that we'd inadvertently misuse these addresses.	5 years ago
Martin Atkins	4cbe6cabfc	addrs: AbsMoveable, ConfigMoveable, and MoveableEndpoint ... These three types represent the three different address representations we need to represent different stages of analysis for "moved" blocks in the configuration. The goal here is to encapsulate all of the static address wrangling inside these types so that users of these types elsewhere would have to work pretty hard to use them incorrectly. In particular, the MovableEndpoint type intentionally fully encapsulates the weird relative addresses we use in configuration so that code elsewhere in Terraform can never end up holding an address of a type that suggests absolute when it's actually relative. That situation only occurs in the internals of MoveableEndpoint where we use not-really-absolute AbsMoveable address types to represent the not-yet-resolved relative addresses. This only takes care of the static address wrangling. There's lots of other rules for what makes a "moved" block valid which will need to be checked elsewhere because they require more context than just the content of the address itself.	5 years ago
Martin Atkins	3212f6f367	addrs: AbsModuleCall type ... Our documentation for ModuleCall originally asserted that we didn't need AbsModuleCall because ModuleInstance captured the same information, but when we added count and for_each for modules we introduced ModuleCallInstance to represent a reference to an instance of a local module call, and now _that_ is the type whose absolute equivalent is ModuleInstance. We previously had no absolute representation of the call itself, without any particular instance. That's what AbsModuleCall now represents, allowing us to be explicit about when we're talking about the module block vs. instances it declares, which is the same distinction represented by AbsResource vs. AbsResourceInstance. Just like with AbsResource and AbsResourceInstance though, there is syntactic ambiguity between a no-key call instance and a whole module call, and so some codepaths might accept both to start and then use other context to dynamically choose a particular interpretation, in which case this distinction becomes meaningful in representing the result of that decision.	5 years ago
Martin Atkins	ab350289ab	addrs: Rename AbsModuleCallOutput to ModuleCallInstanceOutput ... The previous name didn't fit with the naming scheme for addrs types: The "Abs" prefix typically means that it's an addrs.ModuleInstance combined with whatever type name appears after "Abs", but this is instead a ModuleCallOutput combined with an InstanceKey, albeit structured the other way around for convenience, and so the expected name for this would be the suffix "Instance". We don't have an "Abs" type corresponding with this one because it would represent no additional information than AbsOutputValue.	5 years ago
Alisdair McDiarmid	71a067242d	json-output: Add resource drift to machine readable UI	5 years ago
Kristin Laemmert	35c19d7c9f	command/jsonstate: remove redundant remarking of resource instance (#29049) ... * command/jsonstate: remove redundant remarking of resource instance ResourceInstanceObjectSrc.Decode already handles marking values with any marks stored in ri.Current.AttrSensitivePaths, so re-applying those marks is not necessary. We've gotten reports of panics coming from this line of code, though I have yet to reproduce the panic in a test. * Implement test to reproduce panic on #29042 Co-authored-by: David Alger <davidmalger@gmail.com>	5 years ago
Martin Atkins	70bc432f85	command/views/json: Never generate invalid diagnostic snippet offsets ... Because our snippet generator is trying to select whole lines to include in the snippet, it has some edge cases for odd situations where the relevant source range starts or ends directly at a newline, which were previously causing this logic to return out-of-bounds offsets into the code snippet string. Although arguably it'd be better for the original diagnostics to report more reasonable source ranges, it's better for us to report a slightly-inaccurate snippet than to crash altogether, and so we'll extend our existing range checks to check both bounds of the string and thus avoid downstreams having to deal with out-of-bounds indices. For completeness here I also added some similar logic to the human-oriented diagnostic formatter, which consumes the result of the JSON diagnostic builder. That's not really needed with the additional checks in the JSON diagnostic builder, but it's nice to reinforce that this code can't panic (in this way, at least) even if its input isn't valid.	5 years ago