77 Commits (3679de0630ffbe67fa8d2ff299891dfdcb01cd6a)

Author	SHA1	Message	Date
Kristin Laemmert	3679de0630	command/format: fix repetitive "unchanged attribute hidden" message (#28589) ... writeNestedAttrDiff and writeAttrDiff were both printing the "unchanged attribute" message. This removes one of the redundant prints. Fixing this led me (in a very roundabout way) to realize that NestedType attributes were printing a sum total of unchanged attributes, including those in entirely unchanged elements, while *not* printing the total of unchanged elements. I added the necessary logic to count and print the number of unchanged elements for maps and lists.	5 years ago
Martin Atkins	1d3e34e35e	command: New -replace=... planning option ... This allows a similar effect to pre-tainting an object but does the action within the context of a normal plan and apply, avoiding the need for an intermediate state where the old object still exists but is marked as tainted. The core functionality for this was already present, so this commit is just the UI-level changes to make that option available for use and to explain how it contributed to the resulting plan in Terraform's output.	5 years ago
Alisdair McDiarmid	c95e9ada6b	cli: Show forces replacement for sensitive attrs ... When rendering a plan diff, sensitive resource attributes would previously omit the "forces replacement" comment, which can lead to confusion when the only reason for a resource being replaced is a sensitive attribute.	5 years ago
Martin Atkins	b802237e03	plans: Track an optional extra "reason" for some planned actions ... Previously we were repeating some logic in the UI layer in order to recover relevant additional context about a change to report to a user. In order to help keep things consistent, and to have a clearer path for adding more such things in the future, here we capture this user-facing idea of an "action reason" within the plan model, and then use that directly in order to decide how to describe the change to the user. For the moment the "tainted" situation is the only one that gets a special message, matching what we had before, but we can expand on this in future in order to give better feedback about the other replace situations too. This also preemptively includes the "replacing by request" reason, which is currently not reachable but will be used in the near future as part of implementing the -replace=... plan command line option to allow forcing a particular object to be replaced. So far we don't have any special reasons for anything other than replacing, which makes sense because replacing is the only one that is in a sense a special case of another action (Update), but this could expand to other kinds of reasons in the future, such as explaining which of the few different reasons a data source read might be deferred until the apply step.	5 years ago
Kristin Laemmert	fac60ab124	Add formatting for attributes with nested types (#28069) ... * format/diff: extract attributes-writing logic to a function This is a stepping-stone commit (for easier reviewability, and to prove that tests did not change) as part of writing a NestedType-specific diff printer. * command/format: add support for formatting attributes with NestedTypes This commit adds custom formatting for NestedType attributes. THe logic was mostly copied from the block diff printer, with minor tweaks here and there. I used the (excellent) existing test coverage and added a NestedType attribute to every test. Since the (nested-block specific) test schemas were nearly identical, I added a function that returns the schema with the requested NestingMode.	5 years ago
Kristin Laemmert	2b4e389839	Mildwonkey/nested type format (#27793) ... * command/format: check for sensitive NestedTypes Eventually, the diff formatter will need to be updated to properly handle NestedTypes, but for now we can let the existing function deal with them as regular cty.Object-type attributes. To avoid printing sensitive nested attributes, we will treat any attribute with at least one sensitive nested attribute as an entirely sensitive attribute. * bugfix for Object ImpliedType() ImpliedType() was returning too early when the given object had optional attributes, therefore skipping the incredibly important step of accounting for the nesting mode when returning said type.	5 years ago
Alisdair McDiarmid	943df48491	cli: Optimize for large multi-line string outputs	5 years ago
James Bardin	dcf0dba6f4	Merge pull request #27081 from hashicorp/jbardin/staticcheck ... Fixes to pass static analysis	5 years ago
Kristin Laemmert	3fa063b8dc	command/format: concise diff is now the default (#27079) ... * command/format: concise diff is no longer an experiment Since state formatting goes through the "diff" printer, I have repurposed the concise flag as a verbose flag, used only when printing state. It's silly but it works! * remove helper/experiment With this experiment concluded, we no longer need helper/experiment. The shadow experiment had not been touched in many years, so I removed all references, and removed the package entirely. Any new experiments are expected to be configuration experiments handled by our (other) experiments package. * check for the verbose flag consistently, in case we end up using it in plans in the future	5 years ago
James Bardin	41d4dd82d6	format staticcheck	5 years ago
Alisdair McDiarmid	c798dc98db	command: Show diffs when only sensitivity changes ... When an attribute's sensitivity changes, but its value remains the same, we consider this an update operation for the plan. This commit updates the diff renderer to match this, detecting and displaying the change in sensitivity. Previously, the renderer would detect no changes to the value of the attribute, and consider it a no-op action. This resulted in suppression of the attribute when the plan is in concise mode. This is achieved with a new helper function, ctyEqualValueAndMarks. We call this function whenever we want to check that two values are equal in order to determine whether the action is update or no-op.	5 years ago
Alisdair McDiarmid	d05e3b40bf	Merge pull request #26492 from hashicorp/alisdair/sensitive-value-force-replacement ... command: Fix missing force new for sensitive vars and blocks	5 years ago
Alisdair McDiarmid	62e6f56a50	command: Fix missing force new for sensitive blocks ... If an entire block is marked sensitive (possibly because it is of type NestedSet) and results in replacement of the resource, we should render the standard "forces replacement" text after the opening line of the block.	5 years ago
Alisdair McDiarmid	79a3e33c4d	command: Fix missing force new for sensitive vars ... If a value rendered for the diff is sensitive and results in replacement of the resource, we should render the standard "forces replacement" text after the "(sensitive)" value display.	5 years ago
Alisdair McDiarmid	eb873f5021	Merge pull request #25725 from FGtatsuro/diff_heredoc_hyphen ... Use valid heredoc begin symbol in diff output.	5 years ago
Pam Selle	55c96da27e	Move nested block printing to own method for readability	5 years ago
Pam Selle	73b1d8b0d1	Add special diff for nested blocks ... When a value in a nested block is marked as sensitive, it will result in the behavior of every member of that block being sensitive. As such, show a specialized diff that reduces noise of (sensitive) for many attributes that we won't show. Also update the warning to differentiate between showing a warning for an attribute or warning for blocks.	5 years ago
Pam Selle	3e7be13dff	Update ordering for marking/unmarking and asserting plan valid ... Update when we unmark objects so we can assert the plan is valid, and process UnknownAsNull on the unmarked value	5 years ago
Pam Selle	52b6f7f53e	Move common IsMarked checks above switch statement	5 years ago
Pam Selle	1780351636	If the whole map is marked, have the same sensitivity behavior as a single value	5 years ago
Pam Selle	0520f143a2	Add diff coverage for maps ... Considers wholly marked maps as well as map keys	5 years ago
Pam Selle	634e83ab63	Change sensitivity warning to be yellow only on 'Warning'	5 years ago
Pam Selle	5b549224ae	Refactor to call ContainsMarked less and use len() instead	5 years ago
Pam Selle	3c9fad0b0e	Move plan action check into the sensitivity warning method	5 years ago
Pam Selle	531728f6e9	Sensitive diffs for primitive types ... When showing primitive type diffs, hide possibly sensitive values	5 years ago
Pam Selle	20921dbfb8	Add warning about sensitivity change ... This commit adds a warning before displaying a sensitive diff, and always obfuscates the old value (even if it was not previously marked as sensitive)	5 years ago
Pam Selle	8d8389da74	Add diff test with a sensitive change ... Adds a diff test for a changed value, and modifies the diff file to cover variable diffs on sensitive values	6 years ago
Pam Selle	e4e16ccbd3	Rebase fix	6 years ago
Pam Selle	bc55b6a28b	Use UnmarkDeepWithPaths and MarkWithPaths ... Updates existing code to use the new Value methods for unmarking/marking and removes panics/workarounds in cty marshall methods	6 years ago
Pam Selle	896d277a69	If the path is empty, we should not be marking the path	6 years ago
Pam Selle	84d118e18f	Track sensitivity through evaluation ... Mark sensitivity on a value. However, when the value is encoded to send to the provider to produce a changeset we must remove the marks, so unmark the value and remark it with the saved path afterwards	6 years ago
Alisdair McDiarmid	09d8355f43	command: Add experimental concise diff renderer ... When rendering a diff between current state and projected state, we only show resources and outputs which have changes. However, we show a full structural diff for these values, which includes all attributes and blocks for a changed resource or output. The result can be a very long diff, which makes it difficult to verify what the changed fields are. This commit adds an experimental concise diff renderer, which suppresses most unchanged fields, only displaying the most relevant changes and some identifying context. This means: - Always show all identifying attributes, initially defined as `id`, `name`, and `tags`, even if unchanged; - Only show changed, added, or removed primitive values: `string`, `number`, or `bool`; - Only show added or removed elements in unordered collections and structural types: `map`, `set`, and `object`; - Show added or removed elements with any surrounding unchanged elements for sequence types: `list` and `tuple`; - Only show added or removed nested blocks, or blocks with changed attributes. If any attributes, collection elements, or blocks are hidden, a count is kept and displayed at the end of the parent scope. This ensures that it is clear that the diff is only displaying a subset of the resource. The experiment is currently enabled by default, but can be disabled by setting the TF_X_CONCISE_DIFF environment variable to 0.	6 years ago
FGtatsuro	b6cf1c3673	Use valid heredoc begin symbol in diff output.	6 years ago
Martin Atkins	31a4b44d2e	backend/local: treat output changes as side-effects to be applied ... This is a baby-step towards an intended future where all Terraform actions which have side-effects in either remote objects or the Terraform state can go through the plan+apply workflow. This initial change is focused only on allowing plan+apply for changes to root module output values, so that these can be written into a new state snapshot (for consumption by terraform_remote_state elsewhere) without having to go outside of the primary workflow by running "terraform refresh". This is also better than "terraform refresh" because it gives an opportunity to review the proposed changes before applying them, as we're accustomed to with resource changes. The downside here is that Terraform Core was not designed to produce accurate changesets for root module outputs. Although we added a place for it in the plan model in Terraform 0.12, Terraform Core currently produces inaccurate changesets there which don't properly track the prior values. We're planning to rework Terraform Core's evaluation approach in a forthcoming release so it would itself be able to distinguish between the prior state and the planned new state to produce an accurate changeset, but this commit introduces a temporary stop-gap solution of implementing the logic up in the local backend code, where we can freeze a snapshot of the prior state before we take any other actions and then use that to produce an accurate output changeset to decide whether the plan has externally-visible side-effects and render any changes to output values. This temporary approach should be replaced by a more appropriately-placed solution in Terraform Core in a release, which should then allow further behaviors in similar vein, such as user-visible drift detection for resource instances.	6 years ago
Pam Selle	2b8e876bdb	Don't inspect an empty set, return false	6 years ago
tmshn	fcc1a76d5e	make plan-diff format a bit more dry	6 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	6 years ago
Thayne McCombs	a895a42f85	command/format: fix missing elements at the end of lists in diffs	6 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.	6 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.	6 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
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
Frederic	0f1f504c22	command/format: indicate in diff when adding an attribute forces replacement	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
James Bardin	0569e39788	don't try to treat "null" as json in diff output ... Trying to decode and write "null" as json will panic, since it decodes to nil.	7 years ago
Martin Atkins	2d41c1009b	command/format: Diffs for NestingMap block types ... Our initial prototype of new-style diff rendering excluded this because the old SDK has no support for this construct. However, we want to be able to introduce this construct in the new SDK without breaking compatibility with existing versions of Terraform Core, so we need to implement it now so it's ready to be used once the SDK implements it. The key associated with each block allows us to properly correlate the items to recognize the difference between an in-place update of an existing block and the addition/deletion of a block.	7 years ago
Martin Atkins	dd1fa322a7	command/format: Support list/map blocks with dynamic-typed attrs ... Our null-to-empty normalization was previously assuming these would always be collection types, but that isn't true when a block contains something dynamic since we must then use tuple or object types instead to properly represent all of the individual element types.	7 years ago
James Bardin	b8e53255b4	Revert "remove NormalizeObjectFromLegacySDK from diff" ... This reverts commit 5c40d6610c.	7 years ago
James Bardin	a95d97f066	Merge pull request #20595 from hashicorp/jbardin/normalize-objects ... normalize all objects read from the provider	7 years ago
James Bardin	5c40d6610c	remove NormalizeObjectFromLegacySDK from diff ... The NormalizeObjectFromLegacySDK calls have been moved into the provider shims, so all objects generated by the provider should conform now.	7 years ago