1808 Commits (a978d4ee99048967895eb48a208e731e5b00a36f)

Author	SHA1	Message	Date
Kristin Laemmert	77562d9b57	command/jsonprovider: bump format version (#28115) ... Support for attributes with NestedTypes was added in https://github.com/hashicorp/terraform/pull/28055, and should have included a format version bump: this is a backwards-compatible change, but consumers will need to be updated in order to properly decode attributes (with NestedTypes) going forward.	5 years ago
Alisdair McDiarmid	46a29b13ed	cli: Add format version to validate -json output ... In line with the other complex JSON output formats for plan and provider schema, here we add an explicit `format_version` field to the JSON output of terraform validate.	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
Alisdair McDiarmid	c92826c14d	cli: Use standard JSON diagnostics for validate ... Now that we have a comprehensive JSON diagnostic structure, we can use it in the `validate -json` output instead of the inline version. Note that this changes the output of `validate -json` in two ways: 1. We fix some off-by-one errors caused by zero-width highlight ranges. This aligns the JSON diagnostic output with the text output seen by most Terraform users, so I consider this a bug fix. 2. We add the `snippet` field to the JSON diagnostics where available. This is purely additive and is permitted under our JSON format stability guarantees.	5 years ago
Alisdair McDiarmid	d9d88b9243	cli: Add comprehensive JSON diagnostic structure ... This commit adds a comprehensive JSON format for diagnostics, which ensures that all current diagnostic output can be semantically represented in a machine-readable format. The diagnostic formatter interface remains unchanged, but it first transforms its input via the JSON format to ensure that there is only one code path for creating the diagnostic data. The JSON diagnostic renderer extracts the non-presentational logic from the format package, and returns a structure which can either be marshaled into JSON or rendered as text. The resulting text diagnostic output is unchanged for all cases covered by unit tests and my own manual testing. Included in this commit are a number of golden reference files for the marshaled JSON output of a diagnostic. This format should change rarely if at all, and these are in place to ensure that any changes to the format are intentional and considered.	5 years ago
Kristin Laemmert	b26ae9cf48	add support for attributes with nested types in providers schema (#28055) ... This PR extends jsonprovider to support attributes with NestedTypes and extends test coverage in jsonprovider and the providers schemas tests. I've also cleaned up some comments and extracted the logic to parse the nesting mode so it can be used in both marshalling blocks and attributes.	5 years ago
Pam Selle	242f319638	Give suggestions & remind users to use required_providers when provider not in registry (#28014) ... * Add helper suggestion when failed registry err When someone has a failed registry error on init, remind them that they should have required_providers in every module * Give suggestion for a provider based on reqs Suggest another provider on a registry error, from the list of requirements we have on init. This skips the legacy lookup process if there is a similar provider existing in requirements.	5 years ago
Masayuki Morita	31a5aa1878	command/init: Add a new flag `-lockfile=readonly` (#27630) ... Fixes #27506 Add a new flag `-lockfile=readonly` to `terraform init`. It would be useful to allow us to suppress dependency lockfile changes explicitly. The type of the `-lockfile` flag is string rather than bool, leaving room for future extensions to other behavior variants. The readonly mode suppresses lockfile changes, but should verify checksums against the information already recorded. It should conflict with the `-upgrade` flag. Note: In the original use-case described in #27506, I would like to suppress adding zh hashes, but a test code here suppresses adding h1 hashes because it's easy for testing. Co-authored-by: Alisdair McDiarmid <alisdair@users.noreply.github.com>	5 years ago
Alisdair McDiarmid	86495f93cb	views: Fix missing source in diagnostic output ... The previous implementation of views was copying and embedding the base View struct in each individual view. While this allowed for easy access to the interface of that struct (both in the view and externally), it more importantly completely broke the ability of the diagnostic printer to output source code snippets. This is because the `configSources` field on the base view is lazily set after the config loader is initialized. In the commands ported to use views, this happens after the base View struct is copied, so we are updating the wrong copy of the struct. This commit fixes this with a simple mechanical refactor: keep a pointer to the base View struct instead, and update all of the individual views to explicitly refer to that struct to access its fields and methods. This is not a particularly satisfying solution, but I can't find anything clearly better. It might be worth exploring the alternative approach in the view for the new test command, which explicitly pulls its dependencies out of the base view, rather than retaining a full reference. Maybe there's a third way which is better still.	5 years ago
Alisdair McDiarmid	7c0ec0107f	backend: Replace ShowDiagnostics with view.Diagnostics	5 years ago
Alisdair McDiarmid	3737ee5081	views: Remove outdated comment	5 years ago
Alisdair McDiarmid	4271b0e11d	cli: Remove -var/-var-file flags from validate ... These flags are not used and have been deprecated since 0.12.11.	5 years ago
Alisdair McDiarmid	7a03c3153e	Merge pull request #27861 from hashicorp/alisdair/help-global-options ... cli: Add reference to global options to help text	5 years ago
James Bardin	c103242bef	Merge pull request #27885 from hashicorp/jbardin/show-json ... jsonstate: indicate schema version mismatch during encoding	5 years ago
James Bardin	3449a8aa35	don't marshal state with the wrong schema ... Instead of returning an error with no context about unexpected attributes or incorrect types, notify users that the schema stored in the state does not match the current provider. User can only encounter this error if the providers have updated their schemas since the state was stored. This would appears when running `terraform show -json` to display the current state, or `terraform show -json planfile` if that plan was created with `-refresh=false`. In either case, the state must be refreshed in order to properly json encoded.	5 years ago
Alisdair McDiarmid	b7f54b30d5	cli: Fix overly broad auto-approve argument ... The auto-approve argument was part of the arguments.Operation type, which resulted in adding a silent -auto-approve flag to plan and refresh. This was unintended, and is fixed in this commit by moving the flag to the arguments.Apply type and updating the downstream callers.	5 years ago
Alisdair McDiarmid	8d9a08e3a1	cli: Migrate plan to command views	5 years ago
Alisdair McDiarmid	eeb5dfbf76	Merge pull request #27865 from hashicorp/alisdair/command-views-refresh ... cli: Migrate refresh to command views	5 years ago
Martin Atkins	7f78342953	command: Experimental "terraform test" command ... This is just a prototype to gather some feedback in our ongoing research on integration testing of Terraform modules. The hope is that by having a command integrated into Terraform itself it'll be easier for interested module authors to give it a try, and also easier for us to iterate quickly based on feedback without having to coordinate across multiple codebases. Everything about this is subject to change even in future patch releases. Since it's a CLI command rather than a configuration language feature it's not using the language experiments mechanism, but generates a warning similar to the one language experiments generate in order to be clear that backward compatibility is not guaranteed.	5 years ago
Alisdair McDiarmid	50d58b592a	cli: Migrate refresh to command views	5 years ago
Alisdair McDiarmid	56b756cfd9	Merge pull request #27841 from hashicorp/alisdair/command-views-apply ... cli: Migrate apply to command views	5 years ago
Alisdair McDiarmid	6bef157f8e	Merge pull request #27860 from hashicorp/alisdair/remove-noop-plan-backend ... cli: Remove no-op plan backend setup	5 years ago
Alisdair McDiarmid	43028c4912	cli: Migrate apply to command views	5 years ago
Kristin Laemmert	7b7273e3aa	Add support for plugin protocol v6 (#27826) ... * Add support for plugin protocol v6 This PR turns on support for plugin protocol v6. A provider can advertise itself as supporting protocol version 6 and terraform will use the correct client. Todo: The "unmanaged" providers functionality does not support protocol version, so at the moment terraform will continue to assume that "unmanaged" providers are on protocol v5. This will require some upstream work on go-plugin (I believe). I would like to convert the builtin providers to use protocol v6 in a future PR; however it is not necessary until we remove protocol v6. * add e2e test for using both plugin protocol versions - copied grpcwrap and made a version that returns protocol v6 provider - copied the test provider, provider-simple, and made a version that's using protocol v6 with the above fun - added an e2etest	5 years ago
Alisdair McDiarmid	94340b5940	cli: Add reference to global options to help text	5 years ago
Alisdair McDiarmid	b976178018	cli: Remove no-op plan backend setup ... This code does not appear to have any effect. The operation request has its PlanOutBackend field populated directly in the Meta.Operation method, by calling m.backendForState.ForPlan(). I tested a trivial null-resource config with a Consul backend, and the saved plans with and without this code present were identical.	5 years ago
Pam Selle	8f7807684a	Upgrade to quoted keywords to error ... The warning about deprecation is upgraded to an error	5 years ago
Pam Selle	fa7c3d7e10	Remove interpolation-only warning ... These interpolations are removed when upgrading using 0.12upgrade, and are removed in terraform fmt in many cases	5 years ago
James Bardin	3da5d2bdf6	Merge pull request #27692 from alexwlchan/abolish-the-heirarchy ... Correct the spelling of heirarchy/hierarchy throughout	5 years ago
Pam Selle	156b1615a2	Remove 0.13upgrade test fixtures	5 years ago
Alisdair McDiarmid	68558ccd54	backend/local: Replace CLI with view instance ... This commit extracts the remaining UI logic from the local backend, and removes access to the direct CLI output. This is replaced with an instance of a `views.Operation` interface, which codifies the current requirements for the local backend to interact with the user. The exception to this at present is interactivity: approving a plan still depends on the `UIIn` field for the backend. This is out of scope for this commit and can be revisited separately, at which time the `UIOut` field can also be removed. Changes in support of this: - Some instances of direct error output have been replaced with diagnostics, most notably in the emergency state backup handler. This requires reformatting the error messages to allow the diagnostic renderer to line-wrap them; - The "in-automation" logic has moved out of the backend and into the view implementation; - The plan, apply, refresh, and import commands instantiate a view and set it on the `backend.Operation` struct, as these are the only code paths which call the `local.Operation()` method that requires it; - The show command requires the plan rendering code which is now in the views package, so there is a stub implementation of a `views.Show` interface there. Other refactoring work in support of migrating these commands to the common views code structure will come in follow-up PRs, at which point we will be able to remove the UI instances from the unit tests for those commands.	5 years ago
Kristin Laemmert	f6505870cc	Mildwonkey/providers interface renaming (#27805) ... * providers.Interface: huge renamification This commit renames a handful of functions in the providers.Interface to match changes made in protocol v6. The following commit implements this change across the rest of the codebase; I put this in a separate commit for ease of reviewing and will squash these together when merging. One noteworthy detail: protocol v6 removes the config from the ValidateProviderConfigResponse, since it's never been used. I chose to leave that in place in the interface until we deprecate support for protocol v5 entirely. Note that none of these changes impact current providers using protocol v5; the protocol is unchanged. Only the translation layer between the proto and terraform have changed.	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
Pam Selle	48bfde2e28	Merge pull request #27798 from hashicorp/pselle/upgrade_command_removal ... Remove removed `upgrade` commands	5 years ago
Pam Selle	08b649b6f9	Remove removed upgrade commands ... Delete commands that are no longer in Terraform and have been removed for a full release cycle.	5 years ago
Pam Selle	b582b19359	Remove duplicate declaration	5 years ago
Alisdair McDiarmid	6375c6ce6b	Merge pull request #27787 from hashicorp/alisdair/command-views-state-locker ... clistate: Update clistate.Locker for command views	5 years ago
Alisdair McDiarmid	0aa227e0e3	cli: Fix misapplied terminal colors on run logs ... Due to calling the Colorize function with the full string instead of the format string, plan/apply logs which include resource instance keys or IDs which happen to match color formatting would be rendered incorrectly. This commit fixes this by only colorizing the known-safe format string. We also add full test coverage for the UI hook, although only one of the hooks is tested for this color bugfix due to verbosity of the test. We also add the bold coloring to the provisioner output prefix, which seems to have been an oversight.	5 years ago
Alisdair McDiarmid	1ae3d30383	Merge pull request #27760 from hashicorp/alisdair/command-views-ui-hook ... cli: Migrate Terraform UI hook to command views	5 years ago
Alisdair McDiarmid	20cb28b25f	Merge pull request #27788 from hashicorp/alisdair/command-views-output-tests ... views: Expand test coverage for views.Output	5 years ago
Alisdair McDiarmid	bb3f59b016	Merge pull request #27697 from hashicorp/alisdair/json-plan-provider-required-versions ... cli: Fix for missing provider requirements in JSON plan	5 years ago
Alisdair McDiarmid	96cf29111d	views: Expand test coverage for views.Output ... Now that the view code is separated, we can increase test coverage in unit tests. This commit moves some tests from the command package which were testing only view code, and adds more new test cases.	5 years ago
Alisdair McDiarmid	2d1976bbda	clistate: Update clistate.Locker for command views ... The clistate package includes a Locker interface which provides a simple way for the local backend to lock and unlock state, while providing feedback to the user if there is a delay while waiting for the lock. Prior to this commit, the backend was responsible for initializing the Locker, passing through direct access to the cli.Ui instance. This structure prevented commands from implementing different implementations of the state locker UI. In this commit, we: - Move the responsibility of creating the appropriate Locker to the source of the Operation; - Add the ability to set the context for a Locker via a WithContext method; - Replace the Locker's cli.Ui and Colorize members with a StateLocker view; - Implement views.StateLocker for human-readable UI; - Update the Locker interface to return detailed diagnostics instead of errors, reducing its direct interactions with UI; - Add a Timeout() method on Locker to allow the remote backend to continue to misuse the -lock-timeout flag to cancel pending runs. When an Operation is created, the StateLocker field must now be populated with an implementation of Locker. For situations where locking is disabled, this can be a no-op locker. This change has no significant effect on the operation of Terraform, with the exception of slightly different formatting of errors when state locking or unlocking fails.	5 years ago
Alisdair McDiarmid	a7b7cd29fc	cli: Migrate Terraform UI hook to command views ... Move the code which renders Terraform hook callbacks as UI into the views package, backed by a views.View instead of a cli.Ui. Update test setup accordingly. To allow commands to control this hook, we add a hooks member on the backend Operation struct. This supersedes the hooks in the Terraform context, which is not directly controlled by the command logic. This commit should not change how Terraform works, and is refactoring in preparation for more changes which move UI code out of the backend.	5 years ago
Alisdair McDiarmid	fa774dafc0	Merge pull request #27761 from hashicorp/alisdair/command-views-operation-diagnostics ... backend: Add per-operation diagnostic rendering	5 years ago
Alisdair McDiarmid	3cd086f46c	views: Use new streams helper functions	5 years ago
Alisdair McDiarmid	536c80da23	backend: Add per-operation diagnostic rendering ... The enhanced backends (local and remote) need to be able to render diagnostics during operations. Prior to this commit, this functionality was supported with a per-backend `ShowDiagnostics` function pointer. In order to allow users of these backends to control how diagnostics are rendered, this commit moves that function pointer to the `Operation` type. This means that a diagnostic renderer is configured for each operation, rather than once per backend initialization. Some secondary consequences of this change: - The `ReportResult` method on the backend is now moved to the `Operation` type, as it needs to access the `ShowDiagnostics` callback (and nothing else from the backend); - Tests which assumed that diagnostics would be written to the backend's `cli.Ui` instance are migrated to using a new record/playback diags helper function; - Apply, plan, and refresh commands now pass a pointer to the `Meta` struct's `showDiagnostics` method. This commit should not change how Terraform works, and is refactoring in preparation for more changes which move UI code out of the backend.	5 years ago
Alisdair McDiarmid	57879bfb71	cli: Add global view arguments parser ... Rather than modifying and relying on the existing Meta.process argument extractor, we can more clearly handle global CLI flags using a separate parser step. This allows us to explicitly configure the view in the command.	5 years ago
Alisdair McDiarmid	c5a6aa31d3	cli: Add initial command views abstraction ... Terraform supports multiple output formats for several sub-commands. The default format is user-readable text, but many sub-commands support a `-json` flag to output a machine-readable format for the result. The output command also supports a `-raw` flag for a simpler, scripting- focused machine readable format. This commit adds a "views" abstraction, intended to help ensure consistency between the various output formats. This extracts the render specific code from the command package, and moves it into a views package. Each command is expected to create an interface for its view, and one or more implementations of that interface. By doing so, we separate the concerns of generating the sub-command result from rendering the result in the specified output format. This should make it easier to ensure that all output formats will be updated together when changes occur in the result-generating phase. There are some other consequences of this restructuring: - Views now directly access the terminal streams, rather than the now-redundant cli.Ui instance; - With the reorganization of commands, parsing CLI arguments is now the responsibility of a separate "arguments" package. For now, views are added only for the output sub-command, as an example. Because this command uses code which is shared with the apply and refresh commands, those are also partially updated.	5 years ago
Alisdair McDiarmid	943df48491	cli: Optimize for large multi-line string outputs	5 years ago