130 Commits (6440c839474f052d8997bb5cec19c2743e5108e6)

Author	SHA1	Message	Date
Jon Burgess	c0b1220a92	Fixes #21907 ... Don't show no-ops in `terraform show`, since it's not something that will change any state.	7 years ago
Radek Simko	12f7ac1374	command/format: Reduce extra whitespaces & new lines	7 years ago
Martin Atkins	6adcc7ab73	vendor: go get github.com/zclconf/go-cty@master ... cty now guarantees that sets of primitive values will iterate in a reasonable order. Previously it was the caller's responsibility to deal with that, but we invariably neglected to do so, causing inconsistent ordering. Since cty prioritizes consistent behavior over performance, it now imposes its own sort on set elements as part of iterating over them so that calling applications don't have to worry so much about it. This change also causes cty to consistently push unknown and null values in sets to the end of iteration, where before that was undefined. This means that our diff output will now consistently list additions before removals when showing sets, rather than the ordering being undefined as before. The ordering of known, non-null, non-primitive values is still not contractually fixed but remains consistent for a particular version of cty.	7 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
Kristin Laemmert	f8a5e17d3d	command/format: improve "source" of error messages regarding missing arguments (#20907) ... * vendor: update hcl2 dependency * command/format: revert diagnostic format behavior if snippet or highlight range is empty	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
Martin Atkins	69772b11b1	command/format: test for diff rendering with dynamic-typed subattrs ... We use cty a little differently when a nested list block contains a dynamically-typed attribute: it appears as a tuple value instead of a list value so that we can retain the individual types of each element. Here we introduce a test for that case, but doing so required also making the runTestCases function handle types in a stricter way so that it will produce planned values that match how Terraform Core would do it, including the necessary late-bound type information for the dynamically-typed attribute.	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
Kristin Laemmert	b9d8e96e0c	command/plan: plan output should indicate if a resource is being (#20580) ... replaced because the instance was tainted.	7 years ago
Martin Atkins	f193b11073	command/format: Normalize before/after values before rendering ... We are now allowing the legacy SDK to opt out of the safety checks we try to do after plan and apply, and so in such cases the before/after values in planned changes may be inconsistent with our usual rules. To avoid adding lots of extra complexity to the diff renderer to deal with these situations, instead we'll normalize the handling of nested blocks prior to using these values. In the long run it'd be better to do this normalization at the source, immediately after we receive an object from a provider using the opt-out, but we're doing this at the outermost layer for now to avoid risking unintended impacts on other Terraform Core components when we're just about to enter the beta phase of the v0.12.0 release cycle.	7 years ago
Kristin Laemmert	874b333962	command/format: fix an issue where data resources were not displaying (#20386) ... Fixes #20245	7 years ago
Kristin Laemmert	653bb74403	command/format: include nested blocks in `terraform show` output (#20149) ... * command/format: include nested blocks in terraform show output * command/format: fix tests	7 years ago
Radek Simko	b492c3662c	Merge pull request #20089 from hashicorp/t-cmd-fmt-sensitive-update ... command/format: Add test to cover update of sensitive field	7 years ago
Radek Simko	f04d0b48bc	command/format: Add test to cover update of sensitive field	7 years ago
Radek Simko	953eae7e4b	command/format: Fix rendering of different types	7 years ago
Radek Simko	f3d1565d6f	command/format: Fix tuple diff formatting	7 years ago
Radek Simko	0dff8fe5e0	Add failing test case for tuple	7 years ago
Radek Simko	3d0a25c65d	command/format: Fix nested (JSON) object formatting	7 years ago
Radek Simko	c5ba7469be	command/format: Fix rendering of unknown elements in set/map/list	7 years ago
Radek Simko	98cc99e632	command/format: Add crashing test with unknown element in map	7 years ago
Radek Simko	73225c7aeb	command/format: Add crashing test with unknown element in list	7 years ago
Radek Simko	e7e8b7358f	command/format: Add crashing test with unknown element in set	7 years ago
Radek Simko	13896d72c5	command/format: Render empty object as {}	7 years ago
Radek Simko	5f14b7a7f2	command/format: Render empty primitive list/set as []	7 years ago
Radek Simko	09d19ca9d9	command/format: Render empty JSON object as {}	7 years ago
Radek Simko	0dd2d56f18	command/format: Render empty maps as {}	7 years ago
Radek Simko	d96f4fa77b	command/format: Ignore removal of empty strings	7 years ago
Radek Simko	bc4b7cad68	command/format: Render null in dark gray (#19616)	7 years ago
Radek Simko	f64978b64c	backend/local: Render CBD replacement (+/-) correctly (#19642) ... * backend/local: Render CBD replacement (+/-) correctly * command/format: Use IsReplace helper function	7 years ago
Radek Simko	b28efa0bf3	command/format: Fix tests	7 years ago
Radek Simko	0b981fa641	command/format: Fix rendering of force-new updates	7 years ago
Radek Simko	fe117e9f02	command/format: Fix rendering of nested blocks during update	7 years ago
Radek Simko	2df886397b	command/format: Add more tests to cover non-primitive fields	7 years ago
Radek Simko	e3e459a8d4	command/format: Restructure tests	7 years ago
Radek Simko	49e7026bdd	command/format: Add tests for ResourceChange renderer	7 years ago
Kristin Laemmert	e3cecb7d56	format/state: added missing newline in the `outputs` output (#19542)	7 years ago
Radek Simko	4f2868a019	command/format: Fix rendering of attribute-agnostic diagnostics	7 years ago
James Bardin	e93d69f18b	more nil/known checks before val.LengthInt	8 years ago
Sander van Harmelen	4d6626b3a8	Terraform show didn’t show absolute paths ... Without using absolute paths any module info is lost in the output. And the attributes were randomly ordered and so changed between different executions of the command.	8 years ago
Martin Atkins	17b883f592	command/format: Include variable values in diagnostic messages ... When HCL encounters an error during expression evaluation, it annotates its diagnostics with information about the expression that was being evaluated and the EvalContext it was evaluated in. This gives us enough information to show helpful hints to the user about the final values of any reference expressions that are present in the expression, which is very useful extra context for expressions that get evaluated multiple times, such as: - Any expression in a block with "count" or "for_each" set - The sub-expressions within a "for" expression	8 years ago
James Bardin	e08a388d3c	check IsKnown on values that may panic	8 years ago
Sander van Harmelen	48ef7ecfa6	Updates after running `make fmt` with Go v1.11.1	8 years ago
Martin Atkins	275a44f552	command: Reinstate object ids in the UIHook progress logs ... We used to treat the "id" attribute of a resource as special and elevate it into its own struct field "ID" in the state, but the new state format and provider protocol treats it just as any other attribute. However, it's still useful to show the value of a single identifying attribute when there isn't room in the UI for showing all of the attributes, and so here we take a new strategy of considering "id" along with some other conventional names as special only in the UI layer. This new heuristic approach can be adjusted over time as new provider patterns emerge, but for now it covers some common conventions we've seen in real providers. With that said, since all existing providers made for Terraform versions prior to v0.12 were forced to set "id", we won't see any use of other attributes here until providers are updated to remove the placeholder ids they were generating in cases where an id was not actually relevant but was forced by the old protocol. At that point the UX should be improved by showing a more relevant attribute instead. We now also allow for the possibility of no id at all, since that is valid for resources that exist only within the Terraform state, like the ones from the "random" and "tls" providers.	8 years ago
Martin Atkins	34ebde0b95	command/format: be resilient to incomplete schema when formatting state ... In all real cases the schemas should be populated here, but we don't want to panic in UI rendering code if there's a bug here. This can also be tripped up by tests with incomplete mocks. It's unfortunate that this can therefore mask some problems in tests, but tests can protect against it by asserting on specific output text rather than just assuming that a zero exit status is a pass.	8 years ago
Kristin Laemmert	3cf1b001c2	command/format: revert indentation change for consistency's sake	8 years ago
Kristin Laemmert	db26324b3c	command/format: fix indentation ... also run go mod tidy	8 years ago
Kristin Laemmert	d08fe7a91f	cli: format/state_test.go ... Added a very simple test with state and schema. TODO: if tests are added we should test using golden files (and example state files, instead of strings). This seemed unnecessary with the simple test cases.	8 years ago
Kristin Laemmert	14c28b8de4	cli: format/state refactor to use blockBodyDiffPrinter ... Use functions from format/diff to print values	8 years ago
Kristin Laemmert	8063f69e5c	cli: format/state refactor for new state format ... format/state now requires provider schemas to properly format output state. command/show has been modified to pass a context to format.State.	8 years ago
Martin Atkins	058a1d81b0	command/format: Remove tests for plan.go ... plan.go as a whole will be removed before too long, so there's no point in us updating all of these tests to use the new plan types.	8 years ago
Martin Atkins	3b8d46418f	command/format: print correctly nested blocks with labels	8 years ago
Martin Atkins	a43b7df282	core: Handle forced-create_before_destroy during the plan walk ... Previously we used a single plan action "Replace" to represent both the destroy-before-create and the create-before-destroy variants of replacing. However, this forces the apply graph builder to jump through a lot of hoops to figure out which nodes need it forced on and rebuild parts of the graph to represent that. If we instead decide between these two cases at plan time, the actual determination of it is more straightforward because each resource is represented by only one node in the plan graph, and then we can ensure we put the right nodes in the graph during DiffTransformer and thus avoid the logic for dealing with deposed instances being spread across various different transformers and node types. As a nice side-effect, this also allows us to show the difference between destroy-then-create and create-then-destroy in the rendered diff in the CLI, although this change doesn't fully implement that yet.	8 years ago
Martin Atkins	a37d5268eb	command/format: Render unified diff for list and tuple value changes	8 years ago
Martin Atkins	30a46ed8ed	command/format: Further refinement on the heuristic JSON-based diff ... We'll now show an "update" symbol prior to the argument to this synthetic jsonencode(...) call, for consistency with how we show nested values in other cases and to attach a verb to any "# forces replacement". We'll also show a special form in the case where the value seems to differ only in whitespace, so users can understand what's going on in that hopefully-rare situation, particularly if those whitespace-only changes end up forcing us to replace a remote object.	8 years ago
Martin Atkins	783205948c	command/format: JSON value formatting heuristic not for primitive values ... Since our own syntax for primitive values is similar to that of JSON, and since we permit automatic conversions from number and bool to string, we must do this special JSON value diff formatting only if the value is a JSON array or object to avoid confusing results.	8 years ago
Martin Atkins	4406b06ef8	command/format: Don't include commas after elements in map diffs ... Although commas are allowed in this context, it's not idiomatic to use them.	8 years ago
Martin Atkins	ce157c7f23	command/format: show deep diffs for old/new JSON strings ... Because so far we've not supported dynamically-typed complex data structures, several providers have used strings containing JSON to stand in for these. In order to get a readable diff in those cases, we'll recognize situations where old and new are both JSON and present a diff of the effective value of the JSON, using a faux call to the jsonencode(...) function to indicate when we've done so. This is a bit of a "cute" heuristic, but is important at least for now until we can migrate away from that practice of passing large JSON strings to providers and use dynamically-typed attributes instead.	8 years ago
Martin Atkins	9706a00b3a	command/format: correct alignment for multi-line values in map diff	8 years ago
Martin Atkins	04d8c17be8	command/format: Nice rendering for changes to map values	8 years ago
Martin Atkins	a2f4b8b058	command/format: Show resource diff with header "comment" ... This extra comment line gives us a place to show the full resource address (since the block header line only includes type and name) and also allows us to explain in long form the meaning of the change icon on the following line.	8 years ago
Martin Atkins	239a54ad6f	command: initial structural diff rendering ... This is a light adaptation of our earlier prototype of structural diff rendering, as a starting point for what we'll actually ship. This is not consistent with the latest mocks, so will need some additional work before it is ready, but integrating this allows us to at least see the plan contents while fixing up remaining issues elsewhere.	8 years ago
Martin Atkins	a7342de274	core: Properly handle no-op changes in plan ... Previously we just left these out of the plan altogether, but in the new plan types we intentionally include change information for every resource instance, even if no changes are actually planned, to allow alternative plan file viewers to show what isn't changing as well as what is.	8 years ago
Martin Atkins	5731703de5	command/format: show planned changes in rendered plan ... This codepath is going to be significantly changed before release to make it support structural diff of the new data types, but this lets us lean on the old renderer to produce partial output in the mean time while we continue to work on getting things working end-to-end after the considerable refactoring that's been going on.	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	2ef56b3e05	Fix up some missed "go fmt" ... Because of the size of some of these files, automatic format-on-save was implicitly disabled in my editor, which I didn't notice before committing.	8 years ago
Martin Atkins	bd10b84a8e	command/format: include source snippets in diagnostics ... If we get a diagnostic message that references a source range, and if the source code for the referenced file is available, we'll show a snippet of the source code with the source range highlighted. At the moment we have no cache of source code, so in practice this codepath can never be visited. Callers to format.Diagnostic will be gradually updated in subsequent commits.	8 years ago
James Bardin	a37acb1837	gofmt with go1.10	8 years ago
Martin Atkins	ea81e75a4e	command: utility for rendering tfdiag diagnostics ... This new method showDiagnostics takes any value that would be accepted by tfdiags.Append and renders it to the UI. This is intended to encourage consistent handling of the different kinds of errors and diagnostics that can be produced, and allow richer error objects like the HCL2 diagnostics to be easily unwrapped and shown in their full-fidelity.	9 years ago
Martin Atkins	fe4cfd03b5	command/format: restore "(forces new resource)" caption ... In 3ea1592 the plan rendering was refactored to add an extra indirection of producing a display-oriented plan object first and then rendering from that object. There was a logic error while adapting the existing plan rendering code to use the new display-oriented object: the core InstanceDiff object sets the "Destroy" flag (a boolean) for both DiffDestroy and DiffDestroyCreate, and so this code previously checked r.Destroy to recognize the "destroy-create" case. This was incorrectly adapted to a check for the display action being DiffDestroy, when it should actually have been DiffDestroyCreate. The effect of this bug was to cause the "(forces new resource)" annotations to not be displayed on attributes, though the resource-level information still correctly reflected that a new resource was required. This fix restores the attribute-level annotations.	9 years ago
Martin Atkins	83414beb8f	command: various adjustments to the diff presentation ... The previous diff presentation was rather "wordy", and not very friendly to those who can't see color either because they have color-blindness or because they don't have a color-supporting terminal. This new presentation uses the actual symbols used in the plan output and tries to be more concise. It also uses some framing characters to try to separate the different stages of "terraform plan" to make it easier to visually navigate. The apply command also adopts this new plan presentation, in preparation for "terraform apply" (with interactive plan confirmation) becoming the primary, safe workflow in the next major release. Finally, we standardize on the terminology "perform" and "actions" rather than "execute" and "changes" to reflect the fact that reading is now an action and that isn't actually a _change_.	9 years ago
Martin Atkins	3ea159297c	command/format: improve consistency of plan results ... Previously the rendered plan output was constructed directly from the core plan and then annotated with counts derived from the count hook. At various places we applied little adjustments to deal with the fact that the user-facing diff model is not identical to the internal diff model, including the special handling of data source reads and destroys. Since this logic was just muddled into the rendering code, it behaved inconsistently with the tally of adds, updates and deletes. This change reworks the plan formatter so that it happens in two stages: - First, we produce a specialized Plan object that is tailored for use in the UI. This applies all the relevant logic to transform the physical model into the user model. - Second, we do a straightforward visual rendering of the display-oriented plan object. For the moment this is slightly overkill since there's only one rendering path, but it does give us the benefit of letting the counts be derived from the same data as the full detailed diff, ensuring that they'll stay consistent. Later we may choose to have other UIs for plans, such as a machine-readable output intended to drive a web UI. In that case, we'd want the web UI to consume a serialization of the _display-oriented_ plan so that it doesn't need to re-implement all of these UI special cases. This introduces to core a new diff action type for "refresh". Currently this is used _only_ in the UI layer, to represent data source reads. Later it would be good to use this type for the core diff as well, to improve consistency, but that is left for another day to keep this change focused on the UI.	9 years ago
Martin Atkins	0dc6d97a37	command/format: minor adjustments to plan rendering ... This change makes various minor adjustments to the rendering of plans in the output of "terraform plan": - Resources are identified using the standard resource address syntax, rather than exposing the legacy internal representation used in the module diff resource keys. This fixes #8713. - Subjectively, having square brackets in the addresses made it look more visually "off" when the same name but with different indices were shown together with differing-length "symbols", so the symbols are now all padded and right-aligned to three characters for consistent layout across all operations. - The -/+ action is now more visually distinct, using several different colors to help communicate what it will do and including a more obvious "(new resource required)" marker to help draw attention to this not being just an update diff. This fixes #15350. - The resources are now sorted in a manner that sorts index [10] after index [9], rather than after index [1] as we did before. This makes it easier to scan the list and avoids the common confusion where it seems that there are only 10 items when in fact there are 11-20 items with all the tens hiding further up in the list.	9 years ago
Mitchell Hashimoto	0a0842a7d9	command/format: a package for formatting plans/state for output	9 years ago