terraform

Commit Graph

Author	SHA1	Message	Date
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

19 Commits (394cf7f25eddcaeddf45c581ca64d71135ab887b)