61 Commits (6cc3e1d0bd635cdae92b3e0055c19d86dfa7a222)

Author	SHA1	Message	Date
James Bardin	f9b62cb5fe	Merge pull request #20335 from hashicorp/jbardin/diff-apply ... Diff apply needs to check for both types of containers keys	7 years ago
James Bardin	c34c37fbd5	missed .% suffixes in diff.Apply ... Diff.Apply checks for unneeded container count diffs, but was missing the check for maps. Add an early return for planning a destroy.	7 years ago
Martin Atkins	fedbd6c3b8	helper/plugin: fix panic with empty objects in normalizeNullValues ... cty.Value.AsValueMap can return nil if called on an empty map or object. The logic above was dealing with that case for maps, but object types were falling through into this codepath and panicking when trying to assign a new key into the nil dstMap. This also includes a bonus fix where we were calling ty.ElementType in a switch case that accepts object types. Object types don't have a single element type, so we can't call ElementType on those (that also panics) but we _can_ use the type of the value we selected from src to construct our placeholder null value.	7 years ago
Martin Atkins	eb1346447f	Merge #20282: Enforce expected behaviors for provider PlanResourceChange ... An exception remains for the legacy SDK, which does not meet all of these requirements.	7 years ago
Martin Atkins	31299e688d	core: Allow legacy SDK to opt out of plan-time safety checks ... Due to the inprecision of our shimming from the legacy SDK type system to the new Terraform Core type system, the legacy SDK produces a number of inconsistencies that produce only minor quirky behavior or broken edge-cases. To retain compatibility with those existing weird behaviors, the legacy SDK opts out of our safety checks. The intent here is to allow existing providers to continue to do their previous unsafe behaviors for now, accepting that this will allow certain quirky bugs from previous releases to persist, and then gradually migrate away from the legacy SDK and remove this opt-out on a per-resource basis over time. As with the apply-time safety check opt-out, this is reserved only for the legacy SDK and must not be used in any new SDK implementations. We still include any inconsistencies as warnings in the logs as an aid to anyone debugging weird behavior, so that they can see situations where blame may be misplaced in the user-visible error messages.	7 years ago
James Bardin	1bfc27817e	process state even after provider.Apply errors ... Terraform core expects a sane state even when the provider returns an error. Make sure at the prior state is always the default value to return, and then alway attempt to process any state returned by provider.Apply.	7 years ago
James Bardin	82588af892	switch blocks based on value type, and check attrs ... Check attributes on null objects, and fill in unknowns. If we're evaluating the object, it either means we are at the top level, or a NestingSingle block was present, and in either case we need to treat the attributes as null rather than the entire object. Switch on the block types rather than Nesting, so we don't need add any logic to change between List/Tuple or Map/Object when DynamicPseudoType is involved.	7 years ago
James Bardin	32671241e0	set unknowns during initial PlanResourceChange ... If ID is not set, make sure it's unknown. Use SetUnknowns to set the rest of the computed values to Unknown.	7 years ago
James Bardin	d17ba647a8	add SetUnknowns ... SetUnknown walks through a resource and changes any unset (null) values that are going computed in the schema to Unknown.	7 years ago
Martin Atkins	1530fe52f7	core: Legacy SDK providers opt out of our new apply result check ... The shim layer for the legacy SDK type system is not precise enough to guarantee it will produce identical results between plan and apply. In particular, values that are null during plan will often become zero-valued during apply. To avoid breaking those existing providers while still allowing us to introduce this check in the future, we'll introduce a rather-hacky new flag that allows the legacy SDK to signal that it is the legacy SDK and thus disable the check. Once we start phasing out the legacy SDK in favor of one that natively understands our new type system, we can stop setting this flag and thus get the additional safety of this check without breaking any previously-released providers. No other SDK is permitted to set this flag, and we will remove it if we ever introduce protocol version 6 in future, assuming that any provider supporting that protocol will always produce consistent results.	7 years ago
James Bardin	3b18dd7c01	Merge pull request #20224 from hashicorp/jbardin/sdk ... SDK set fixes	7 years ago
James Bardin	58c9c2311a	Turn on helper/schema proto5 flag in GetSchema ... This turns it on at the last moment, and in one place for all uses of helper/schema. There's no way to use the new protocol without calling GetSchema, so we can be sure that any subsequent api calls have this set when required.	7 years ago
Martin Atkins	bdcac8792d	plugin: Use correct schema when marshaling imported resource objects ... Previously we were using the type name requested in the import to select the schema, but a provider is free to return additional objects of other types as part of an import result, and so it's important that we perform schema selection separately for each returned object. If we don't do this, we get confusing downstream errors where the resulting object decodes to the wrong type and breaks various invariants expected by Terraform Core. The testResourceImportOther test in the test provider didn't catch this previously because it happened to have an identical schema to the other resource type being imported. Now the schema is changed and also there's a computed attribute we can set as part of the refresh phase to make sure we're completing the Read call properly during import. Refresh was working correctly, but we didn't have any tests for it as part of the import flow.	7 years ago
James Bardin	4a603011c5	don't normalizeNullValues in ReadResource ... The required normalization now happens in PlanResourceChange, and this function is no longer appropriate for ReadResource.	7 years ago
James Bardin	ba081f5de4	change copyMissingValues to normalizeNullValues ... While copyMissingValues was meant to re-insert empty values that were null after apply, it turns out plan is sometimes not predictable as well. normalizeNullValue is meant to fix up any null/empty transitions between to values, and be useful during plan as well. For plan the function only concerns itself with individual, known values, and skips sets entirely. The result of running with plan == true is that only changes between empty and null collections should be fixed.	7 years ago
James Bardin	3b04b41250	fix RequiresNew in diff ... With the new diff.Apply we can keep the diff mostly intact, but we need turn off all RequiresNew flags so that the prior state is not removed from the apply.	7 years ago
Martin Atkins	477da57a92	helper/plugin: Honor resource type overrides in import ... One quirky aspect of our import feature is that we allow the importer to produce additional resources alongside the one that was imported, such as to create separate rules for each rule of an imported security group. Providers need to be able to set the types of these other resources since they may not match the "main" resource type. They do this by calling ResourceData.SetType, which in turn sets InstanceState.Ephemeral.Type. In our shims here we therefore need to copy that out into our new TypeName field so that the new core import code can see it and create the right type in the state. Testing this required a minor change to the test harness to allow the ImportStateCheck function to see the resource type.	7 years ago
Paul Tyng	bb9ae50279	Copy TF version to helper/schema provider	7 years ago
James Bardin	37b5e2dc87	don't remove empty diff values ... Our new diff handling no longer requires stripping the empty diffs out, and provider may be relying on some of the empty-value quirks in helper/schema.	7 years ago
James Bardin	46a4628782	Merge pull request #20081 from hashicorp/jbardin/list-block ... New Diff.Apply method	7 years ago
Martin Atkins	f65b7c5372	helper/plugin: Discard meaningless differences from provider planning ... Due to various inprecisions in the old SDK implementation, applying the generated diff can potentially make changes to the data structure that have no real effect, such as replacing an empty list with a null list or vice-versa. Although we can't totally eliminate such diff noise, here we attempt to avoid it in situations where there are _only_ meaningless changes -- where the prior state and planned state are equivalent -- by just echoing back the prior state verbatim to ensure that Terraform will treat it as a noop change. If there _are_ some legitimate changes then the result may still contain meaningless changes alongside it, but that is just a cosmetic problem for the diff renderer, because the meaningless changes will be ignored altogether during a subsequent apply anyway. The primary goal here is just to ensure we can converge on a fixpoint when there are no explicit changes in the configuration.	7 years ago
James Bardin	8d302c5bd2	update grpc_provider for new diffs ... Keep the diff as-is before applying.	7 years ago
James Bardin	286cb0a39d	clean out diff a little more before checking ... Check if there wasn't any real diff attributes first, before returning the original state in PlanResourceChange.	7 years ago
James Bardin	4f691c5988	don't replace null strings with empty strings ... This adds unexpected values in some cases, and since the case this handles is only within set objects, we'll deal woth this when tackling the sets themselves.	7 years ago
James Bardin	2cc651124e	don't overwrite values in plan ... Plan can change known values too, which we can't match in sets. We'll find another way to normalize these eithout losing plan values.	7 years ago
James Bardin	7d05dee08d	refactor ApplyResourceChange ... Remove a bunch of indentation by returning early, and make sure we don't fail on non-fatal error without saving the applied value.	7 years ago
James Bardin	0a731167db	add a round trip through the shims during apply ... Cycle through the shim operations after Apply, to ensure that we can converge on a stable value for for Plan. While the shims produce valid values in both directions, helper/schema sometimes does not agree on which containers should be empty or null.	7 years ago
James Bardin	e8096e9c8b	normalize values during ReadResource ... Match the normalization behavior of Apply, so we don't end up causing any diffs between zero values when refreshing resources.	7 years ago
James Bardin	b55ec74c27	add copyMissingValues for normalizing shimmed Vals ... Zero values and empty containers can be lost during the shimming process, and during the provider's Apply step. If we have known zero value containers and primitives in the source, which appear as null values in the destination, we copy over the zero value. Sets (and lists to an extent) are more difficult, since there before and after indexes may not correlate. In that case we take the entire container if it's wholly known, expecting the provider to have correctly handled the value.	7 years ago
James Bardin	8300d65539	don't strip sets with count 1 when normalizing ... normalizeFlatmapContainers should retain sets with a count of 1, and convert sets with a count of 0 if they were 1 before the Apply step.	7 years ago
James Bardin	924b97238f	Handle StateFuncs in provider shim ... Any state modifying functions can only be run once during the plan-apply cycle. When regenerating the Diff during ApplyResourceChange, strip out all StateFunc and CustomizeDiff functions from the schema. Thew NewExtra diff field was where config data that was modified by a StateFunc was stored, and needs to be maintained between plan and apply. During PlanResourceChange, store any NewExtra data from the Diff in the PlannedPrivate data, and re-insert the NewExtra data into the Diff generated during ApplyResourceChange.	7 years ago
James Bardin	5f9b189fcf	catch conversion errors in PrepareProviderConfig ... Errors were being ignore with the intention that they would be caught later in validation, but it turns out we nee dto catch those earlier. The legacy schemas also allowed providers to set and empty string for a bool value, which we need to handle here, since it's not being handled from user input like a normal config value.	7 years ago
James Bardin	6f4d86094f	preserve possible zero values when normalizing ... When normalizing flatmapped containers, compare the attributes to the prior state and preserve pre-existing zero-length or unknown values. A zero-length value that was previously unknown is preserved as a zero-length value, as that may have been computed as such by the provider.	7 years ago
James Bardin	f375691819	add missing key-value from test	8 years ago
Martin Atkins	4fe9632f09	plugin: Establish our current plugin protocol as version 5 ... The main significant change here is that the package name for the proto definition is "tfplugin5", which is important because this name is part of the wire protocol for references to types defined in our package. Along with that, we also move the generated package into "internal" to make it explicit that importing the generated Go package from elsewhere is not the right approach for externally-implemented SDKs, which should instead vendor the proto definition they are using and generate their own stubs to ensure that the wire protocol is the only hard dependency between Terraform Core and plugins. After this is merged, any provider binaries built against our helper/schema package will need to be rebuilt so that they use the new "tfplugin5" package name instead of "proto". In a future commit we will include more elaborate and organized documentation on how an external codebase might make use of our RPC interface definition to implement an SDK, but the primary concern here is to ensure we have the right wire package name before release.	8 years ago
James Bardin	e95f2b586e	another test case in helper/plugin	8 years ago
James Bardin	89b2c6f21e	comment fixes	8 years ago
James Bardin	17ecda53b5	strip empty containers from flatmap attributes ... In order to prevent mismatched states between read/plan/apply, we need to ensure that the attributes are generated consistently each time. Because of the various ways in which helper/schema and the hcl2 shims interpret empty values, the only way to ensure consistency is to always remove them altogether.	8 years ago
James Bardin	34766ca666	use the new InstanceState shim	8 years ago
James Bardin	b872491baa	incremental progress towards applying diffs	8 years ago
James Bardin	718a3c400a	fix state variable name	8 years ago
James Bardin	e0ea2a5d06	if there is no plan diff, prefer the prior state ... The prior state may contain customizations made by the provider. If there is no prior state, then take the proposed state.	8 years ago
James Bardin	e38a5a769d	copy timouts into plan and apply state ... helper/schema will remove "timeouts" from the config, and stash them in the diff.Meta map. Terraform sees "timeouts" as a regular config block, so needs them to be present in the state in order to not show a diff. Have the GRPCProviderServer shim copy all timeout values into any state it returns to provide consistent diffs in core.	8 years ago
James Bardin	6dad121e70	insert resource timeouts into the config schema ... Resource timeouts were a separate config block, but did not exist in the resource schema. Insert any defined timeouts when generating the configshema.Block so that the fields can be accepted and validated by core.	8 years ago
James Bardin	a8f75bc554	don't set defaults for deprecated or removed ... These may still have defaults set, even if they are not intended to be used.	8 years ago
James Bardin	e077c9ce95	Insert default values into provider config ... Add any top-level default attributes from the provider schema into Null config values.	8 years ago
James Bardin	a3ac49b3fb	GRPCProviderServer and PrepareProviderconfig ... Update the server side of the plugin to match the new method signature.	8 years ago
James Bardin	38163f2b37	use SimpleDiff and set "id" as RequiresReplace ... Use the new SimpleDiff method of the provider so that the diff isn't altered by ForceNew attributes. Always set an "id" as RequiresReplace so core knows an instance will be replaced, even if all ForceNew attributes are filtered out due to ignore_changes.	8 years ago
James Bardin	f8b1a3c7a4	make sure apply can properly destroy ... We need to ensure that a destroyed value is returned as such from apply	8 years ago
James Bardin	52c0032aed	update provisioners for multiple processes ... The "internal" provisioners are still run in a separate process, and need to be updated to restart on each walk.	8 years ago