30 Commits (f2dbf80badc8c7385a7b44bb040ae5e8550e7e60)

Author	SHA1	Message	Date
James Bardin	e13eecbc5b	finish provider ModuleInstance replacement	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
Kristin Laemmert	80ab551867	terraform: use addrs.Provider as map keys for provider schemas (#24002) ... This is a stepping-stone PR for the provider source project. In this PR "legcay-stype" FQNs are created from the provider name string. Future work involves encoding the FQN directly in the AbsProviderConfig and removing the calls to addrs.NewLegacyProvider().	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
Kristin Laemmert	6541775ce4	addrs: roll back change to Type field in ProviderConfig (#23937)	6 years ago
Kristin Laemmert	e3416124cc	addrs: replace "Type string" with "Type Provider" in ProviderConfig ... * huge change to weave new addrs.Provider into addrs.ProviderConfig * terraform: do not include an empty string in the returned Providers / Provisioners - Fixed a minor bug where results included an extra empty string	6 years ago
Kristin Laemmert	99225b8d76	command/jsonstate,plan: fix panic with null values (#23492) ... The code responsible for marshalling attribute values was checking for nil values, but not null. Fixes #23485, #23274	6 years ago
Kristin Laemmert	4b10a6e1bf	command/jsonplan: fix bug with nested modules output (#23092) ... `marshalPlannedValues` builds a map of modules to their children in order to output the resource changes in a tree. The map was built from the list of resource changes. However if a module had no resources itself, and only called another module (a very normal case), that module would not get added to the map causing none of its children to be output in `planned_values`. This PR adds a walk up through a given module's ancestors to ensure that each module, even those without resources, would be added.	6 years ago
Kristin Laemmert	b9f114aa25	command/show (json): marshal the state snapshot included with the plan file (#21597) ... * command/show: marshal the state snapshot from the planfile The planfile contains a state snapshot with certain resources updated (outputs and datasources). Previously `terraform show -json PLANFILE` was using the current state instead of the state inside the plan as intended. This caused an issue when the state included a terraform_remote_state datasource. The datasource's state gets refreshed - and therefore upgraded to the current state version - during plan, but that won't persist to state until apply. * update comment to reflect new return	7 years ago
Kristin Laemmert	65fc037ecb	command/show (plan -json): fix panic (#21541) ... * command/show -json: fix panic afterUnknown should return only bools, not values. * command/jsonplan: let's delete some redundant code! the plan output was somewhat inconsistent with return values for "after_unknown". This strives to fix that. If all "after" values are known, return an empty object instead of iterating over values. Also fixing some typos and general copypasta.	7 years ago
Martin Atkins	d512584497	command/jsonplan: Don't panic with mixtures of known/unknown/empty ... The omitUnknowns and unknownAsBool functions were previously trying hard to preserve the same collection types in the output as they had in the input, by attempting to keep everything matched up so that the results would be valid. Unfortunately, this turns out to be a harder problem than we originally thought: it was possible for a collection value going in to produce inconsistent element types out (and thus a panic) in the following situations: - when a collection with mixed known and unknown values was passed in to omitUnknowns. - when a collection of collections where the inner collections are a mixture of empty and not empty in unknownAsNull. The results of these functions are only used to marshal to JSON anyway, and JSON serialization can't distinguish between the three sequence types or the two mapping types, so in practice we can just standardize on converting all sequences to tuple and all mappings to object here and not change the resulting output at all, and then we don't have to worry about making sure all of the inner types get preserved exactly. A nice consequence of that relaxation is that we can now do what we originally wanted to do with unknownAsBool, and omit map keys and object attributes altogether if their values would've been false, producing a much more compact result. This is easiest to do now when there's only one known user of this JSON plan output, and we know that user will treat both false and omitted as the same here.	7 years ago
Kristin Laemmert	c73a5fc07d	command/show: add provider name to resource changes (#20711)	7 years ago
Kristin Laemmert	9d0d564ec7	`terraform show` and `terraform providers schema -json` should return valid json (#20697) ... * command/providers schemas: return empty json object if config parses successfully but no providers found * command/show (state): return an empty object if state is nil	7 years ago
Kristin Laemmert	30672faebe	remove indentation from json output of `show` and `providers schema` (#20623) ... * command/providers schema: correct help text * command/show: remove indentation from json output * command/providers schema: remove indentation from json output	7 years ago
Kristin Laemmert	8fb4e5ce6e	command/show: differentiate between state schemas and plan schemas. (#20516) ... When a planfile is supplied to the `terraform show -json` command, the context that loads only included schemas for resources in the plan. We found an edge case where removing a data source from the configuration (though only if there are no managed resources from the same provider) would cause jsonstate.Marshal to fail because the provider schema wasn't in the plan context. jsonplan.Marshal now takes two schemas, one for plan and one for state. If the state schema is nil it will simply use the plan schemas.	7 years ago
Kristin Laemmert	c4151b7c7c	command/show: fixing bugs in modulecalls (#20513) ... * command/show: fixing bugs in modulecalls jsonconfig and jsonplan both had subtle bugs with the logic for marshaling module calls that only showed up when multiple modules were referenced. This PR fixes those bugs and extends the existing tests to include multiple modules. * sort all the things, mostly for tests	7 years ago
Kristin Laemmert	0c94e20a83	command/show enhancements and bugfixes ... * command/jsonconfig: provider config marshaling enhancements This PR fixes a bug wherein the keys in "provider_config" were the "addrs.ProviderConfig", and therefore being overwritten for each module, instead of the intended "addrs.AbsProviderConfig". We realized that there was still opportunity for ambiguity, for example if a user made a provider alias that was the same name as a module, so we opted to use the syntax `modulename:providername(.provideralias)` * command/json*: fixed a bug where we were attempting to lookup schemas with the provider name, instead of provider type.	7 years ago
Kristin Laemmert	c59a274e96	command/jsonplan: "deposed" should be a string, not a bool. (#20351)	7 years ago
Kristin Laemmert	818b4ec068	command/show: add "module_version" to "module_calls" in config (#20367) ... * command/show: add "module_version" to "module_calls" in config portion of `terraform show`. Also extended the `terraform show -json` test to run `init` so we could add examples with modules. This does _not_ test the "module_version" yet, but it _did_ help expose a bug in jsonplan where modules were duplicated. This is also fixed in this PR. * command/jsonconfig: rename version to version_constraint and resolved_source to source.	7 years ago
Kristin Laemmert	f2f35265bc	command/show: json output enhancements (#20291) ... * command/jsonplan: - add variables to plan output - print known planned values for resources Previously, resource attribute values were only displayed if the values were wholly known. Now we will filter the unknown values out of the change and print the known values. * command/jsonstate: added depends_on and tainted fields * command/show: update tests to reflect added fields	7 years ago
Kristin Laemmert	c810e4582c	command/show: continued work on `terraform show -json` output (#20171) ... * command/jsonstate: do not hide SchemaVersion of '0' * command/jsonconfig: module_calls should be a map * command/jsonplan: include current terraform version in output * command/jsonconfig: properly marshal expressions from a module call Previously this was looking at the root module's variables, instead of the child module variables, to build the module schema. This fixes that bug.	7 years ago
Kristin Laemmert	6e057c529e	command/jsonplan: sort resources by address (#20113) ... * command/jsonplan: sort resources by address * command/show: extend test case to include resources with count * command/json*: document resource ordering as consistent but undefined	7 years ago
Kristin Laemmert	514ac6b890	command/show: improvements to show -json output (#20110) ... * terraform_version is now included in state * provisioner "name" is now provisioner "type"	7 years ago
Kristin Laemmert	e9099b4fcc	command/jsonplan: fix panic when filteredAfter is null (#20096) ... * command/jsonplan: fix panic when filteredAfter is null * command/jsonconfig: provider short name is required to properly look up resource schema	7 years ago
Kristin Laemmert	f00fcb90bf	mildwonkey/b-show-state (#20032) ... * command/show: properly marshal attribute values to json marshalAttributeValues in jsonstate and jsonplan packages was returning a cty.Value, which json/encoding could not marshal. These functions now convert those cty.Values into json.RawMessages. * command/jsonplan: planned values should include resources that are not changing * command/jsonplan: return a filtered list of proposed 'after' attributes Previously, proposed 'after' attributes were not being shown if the attributes were not WhollyKnown. jsonplan now iterates through all the `after` attributes, omitting those which are not wholly known. The same was roughly true for after_unknown, and that structure is now correctly populated. In the future we may choose to filter the after_unknown structure to _only_ display unknown attributes, instead of all attributes. * command/jsonconfig: use a unique key for providers so that aliased providers don't get munged together This now uses the same "provider" key from configs.Module, e.g. `providername.provideralias`. * command/jsonplan: unknownAsBool needs to iterate through objects that are not wholly known * command/jsonplan: properly display actions as strings according to the RFC, instead of a plans.Action string. For example: a plans.Action string DeleteThenCreate should be displayed as ["delete", "create"] Tests have been updated to reflect this. * command/jsonplan: return "null" for unknown list items. The length of a list could be meaningful on its own, so we will turn unknowns into "null". The same is less likely true for maps and objects, so we will continue to omit unknown values from those.	7 years ago
Kristin Laemmert	5df9cd0f52	command/show: tests for -json output (#19980) ... * command/show: added test scaffold for json output More test cases will be added once the basic shape of the tests is validated. - command/json* packages now sort resources by address, matching behavior elsewhere - using cmp in tests instead of reflect.DeepEqual for the diffs - updating expected output in tests to match sorting	7 years ago
Kristin Laemmert	cdf7cc2449	command/json*: updating documentation and adding tests (#19944) ... A few minor fixes and cleanups as a result of said tests. Hooray for eventual consistency!	7 years ago
Kristin Laemmert	3e9c51c726	command/jsonstate: marshal state into a machine readable blob o'json (#19911) ... * command/jsonstate: marshal state into a machine readable blob o'json * consistent json tags are nice	7 years ago
Kristin Laemmert	2b6dc13f29	jsonplan: remove "proposed_unknown" structure in favor of "after_unknown" field in "change" (#19709) ... * jsonplan: remove "proposed_unknown" structure in favor of "after_unknown" field in "change"	7 years ago
Kristin Laemmert	126e5f337f	json output of terraform plan (#19687) ... * command/show: adding functions to aid refactoring The planfile -> statefile -> state logic path was getting hard to follow with blurry human eyes. The getPlan... and getState... functions were added to help streamline the logic flow. Continued refactoring may follow. * command/show: use ctx.Config() instead of a config snapshot As originally written, the jsonconfig marshaller was getting an error when loading configs that included one or more modules. It's not clear if that was an error in the function call or in the configloader itself, but as a simpler solution existed I did not dig too far. * command/jsonplan: implement jsonplan.Marshal Split the `config` portion into a discrete package to aid in naming sanity (so we could have for example jsonconfig.Resource instead of jsonplan.ConfigResource) and to enable marshaling the config on it's own.	7 years ago