From d35bc0531255b496beb5d932f185cbcdb2d61a99 Mon Sep 17 00:00:00 2001 From: Martin Atkins Date: Mon, 17 May 2021 13:04:16 -0700 Subject: [PATCH] Update various non-code references to renamed Go packages Previous commits have moved all of our Go packages under "internal", so this is a retroactive update of non-Go references to those same packages. --- .circleci/config.yml | 2 +- Makefile | 2 +- docs/architecture.md | 88 ++++++++++++------------ internal/command/e2etest/doc.go | 2 +- internal/command/e2etest/make-archive.sh | 2 +- 5 files changed, 48 insertions(+), 48 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 69353ff2e..a111ea967 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -93,7 +93,7 @@ jobs: - run: name: Run Go E2E Tests command: | - gotestsum --format=short-verbose --junitfile $TEST_RESULTS_DIR/gotestsum-report.xml -- -p 2 -cover -coverprofile=cov_e2e.part ./command/e2etest ./tools/terraform-bundle/e2etest + gotestsum --format=short-verbose --junitfile $TEST_RESULTS_DIR/gotestsum-report.xml -- -p 2 -cover -coverprofile=cov_e2e.part ./internal/command/e2etest ./tools/terraform-bundle/e2etest # save coverage report parts - persist_to_workspace: diff --git a/Makefile b/Makefile index d26ee96ea..20f2862ab 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ generate: protobuf: bash scripts/protobuf-check.sh bash internal/tfplugin5/generate.sh - bash plans/internal/planproto/generate.sh + bash internal/plans/internal/planproto/generate.sh fmtcheck: @sh -c "'$(CURDIR)/scripts/gofmtcheck.sh'" diff --git a/docs/architecture.md b/docs/architecture.md index 6724f02fd..2f060b266 100644 --- a/docs/architecture.md +++ b/docs/architecture.md @@ -23,7 +23,7 @@ in more detail in a corresponding section below. Each time a user runs the `terraform` program, aside from some initial bootstrapping in the root package (not shown in the diagram) execution transfers immediately into one of the "command" implementations in -[the `command` package](https://pkg.go.dev/github.com/hashicorp/terraform/command). +[the `command` package](https://pkg.go.dev/github.com/hashicorp/terraform/internal/command). The mapping between the user-facing command names and their corresponding `command` package types can be found in the `commands.go` file in the root of the repository. @@ -35,7 +35,7 @@ but it applies to the main Terraform workflow commands `terraform plan` and For these commands, the role of the command implementation is to read and parse any command line arguments, command line options, and environment variables that are needed for the given command and use them to produce a -[`backend.Operation`](https://pkg.go.dev/github.com/hashicorp/terraform/backend#Operation) +[`backend.Operation`](https://pkg.go.dev/github.com/hashicorp/terraform/internal/backend#Operation) object that describes an action to be taken. An _operation_ consists of: @@ -52,18 +52,18 @@ An _operation_ consists of: The operation is then passed to the currently-selected [backend](https://www.terraform.io/docs/backends/index.html). Each backend name corresponds to an implementation of -[`backend.Backend`](https://pkg.go.dev/github.com/hashicorp/terraform/backend#Backend), using a +[`backend.Backend`](https://pkg.go.dev/github.com/hashicorp/terraform/internal/backend#Backend), using a mapping table in -[the `backend/init` package](https://pkg.go.dev/github.com/hashicorp/terraform/backend/init). +[the `backend/init` package](https://pkg.go.dev/github.com/hashicorp/terraform/internal/backend/init). Backends that are able to execute operations additionally implement -[`backend.Enhanced`](https://pkg.go.dev/github.com/hashicorp/terraform/backend#Enhanced); +[`backend.Enhanced`](https://pkg.go.dev/github.com/hashicorp/terraform/internal/backend#Enhanced); the command-handling code calls `Operation` with the operation it has constructed, and then the backend is responsible for executing that action. Most backends do _not_ implement this interface, and so the `command` package wraps these backends in an instance of -[`local.Local`](https://pkg.go.dev/github.com/hashicorp/terraform/backend/local#Local), +[`local.Local`](https://pkg.go.dev/github.com/hashicorp/terraform/internal/backend/local#Local), causing the operation to be executed locally within the `terraform` process itself, which (at the time of writing) is currently the only way an operation can be executed. @@ -85,19 +85,19 @@ elsewhere. To execute an operation locally, the `local` backend uses a _state manager_ (either -[`statemgr.Filesystem`](https://pkg.go.dev/github.com/hashicorp/terraform/states/statemgr#Filesystem) if the +[`statemgr.Filesystem`](https://pkg.go.dev/github.com/hashicorp/terraform/internal/states/statemgr#Filesystem) if the local backend is being used directly, or an implementation provided by whatever backend is being wrapped) to retrieve the current state for the workspace specified in the operation, then uses the _config loader_ to load and do initial processing/validation of the configuration specified in the operation. It then uses these, along with the other settings given in the operation, to construct a -[`terraform.Context`](https://pkg.go.dev/github.com/hashicorp/terraform/terraform#Context), +[`terraform.Context`](https://pkg.go.dev/github.com/hashicorp/terraform/internal/terraform#Context), which is the main object that actually performs Terraform operations. The `local` backend finally calls an appropriate method on that context to begin execution of the relevant command, such as -[`Plan`](https://pkg.go.dev/github.com/hashicorp/terraform/terraform#Context.Plan) +[`Plan`](https://pkg.go.dev/github.com/hashicorp/terraform/internal/terraform#Context.Plan) or [`Apply`](), which in turn constructs a graph using a _graph builder_, described in a later section. @@ -105,21 +105,21 @@ described in a later section. ## Configuration Loader The top-level configuration structure is represented by model types in -[package `configs`](https://pkg.go.dev/github.com/hashicorp/terraform/configs). +[package `configs`](https://pkg.go.dev/github.com/hashicorp/terraform/internal/configs). A whole configuration (the root module plus all of its descendent modules) is represented by -[`configs.Config`](https://pkg.go.dev/github.com/hashicorp/terraform/configs#Config). +[`configs.Config`](https://pkg.go.dev/github.com/hashicorp/terraform/internal/configs#Config). The `configs` package contains some low-level functionality for constructing configuration objects, but the main entry point is in the sub-package -[`configload`](https://pkg.go.dev/github.com/hashicorp/terraform/configs/configload]), +[`configload`](https://pkg.go.dev/github.com/hashicorp/terraform/internal/configs/configload]), via -[`configload.Loader`](https://pkg.go.dev/github.com/hashicorp/terraform/configs/configload#Loader). +[`configload.Loader`](https://pkg.go.dev/github.com/hashicorp/terraform/internal/configs/configload#Loader). A loader deals with all of the details of installing child modules (during `terraform init`) and then locating those modules again when a configuration is loaded by a backend. It takes the path to a root module and recursively loads all of the child modules to produce a single -[`configs.Config`](https://pkg.go.dev/github.com/hashicorp/terraform/configs#Config) +[`configs.Config`](https://pkg.go.dev/github.com/hashicorp/terraform/internal/configs#Config) representing the entire configuration. Terraform expects configuration files written in the Terraform language, which @@ -139,17 +139,17 @@ A _state manager_ is responsible for storing and retrieving snapshots of the [Terraform state](https://www.terraform.io/docs/language/state/index.html) for a particular workspace. Each manager is an implementation of some combination of interfaces in -[the `statemgr` package](https://pkg.go.dev/github.com/hashicorp/terraform/states/statemgr), +[the `statemgr` package](https://pkg.go.dev/github.com/hashicorp/terraform/internal/states/statemgr), with most practical managers implementing the full set of operations described by -[`statemgr.Full`](https://pkg.go.dev/github.com/hashicorp/terraform/states/statemgr#Full) +[`statemgr.Full`](https://pkg.go.dev/github.com/hashicorp/terraform/internal/states/statemgr#Full) provided by a _backend_. The smaller interfaces exist primarily for use in other function signatures to be explicit about what actions the function might take on the state manager; there is little reason to write a state manager that does not implement all of `statemgr.Full`. The implementation -[`statemgr.Filesystem`](https://pkg.go.dev/github.com/hashicorp/terraform/states/statemgr#Filesystem) is used +[`statemgr.Filesystem`](https://pkg.go.dev/github.com/hashicorp/terraform/internal/states/statemgr#Filesystem) is used by default (by the `local` backend) and is responsible for the familiar `terraform.tfstate` local file that most Terraform users start with, before they switch to [remote state](https://www.terraform.io/docs/language/state/remote.html). @@ -158,7 +158,7 @@ Each of these saves and retrieves state via a remote network service appropriate to the backend that creates it. A state manager accepts and returns a state snapshot as a -[`states.State`](https://pkg.go.dev/github.com/hashicorp/terraform/states#State) +[`states.State`](https://pkg.go.dev/github.com/hashicorp/terraform/internal/states#State) object. The state manager is responsible for exactly how that object is serialized and stored, but all state managers at the time of writing use the same JSON serialization format, storing the resulting JSON bytes in some @@ -167,7 +167,7 @@ kind of arbitrary blob store. ## Graph Builder A _graph builder_ is called by a -[`terraform.Context`](https://pkg.go.dev/github.com/hashicorp/terraform/terraform#Context) +[`terraform.Context`](https://pkg.go.dev/github.com/hashicorp/terraform/internal/terraform#Context) method (e.g. `Plan` or `Apply`) to produce the graph that will be used to represent the necessary steps for that operation and the dependency relationships between them. @@ -177,7 +177,7 @@ In most cases, the graphs each represent a specific object in the configuration, or something derived from those configuration objects. For example, each `resource` block in the configuration has one corresponding -[`GraphNodeConfigResource`](https://pkg.go.dev/github.com/hashicorp/terraform/terraform#GraphNodeConfigResource) +[`GraphNodeConfigResource`](https://pkg.go.dev/github.com/hashicorp/terraform/internal/terraform#GraphNodeConfigResource) vertex representing it in the "plan" graph. (Terraform Core uses terminology inconsistently, describing graph _vertices_ also as graph _nodes_ in various places. These both describe the same concept.) @@ -194,23 +194,23 @@ graph from the set of changes described in the plan that is being applied. The graph builders all work in terms of a sequence of _transforms_, which are implementations of -[`terraform.GraphTransformer`](https://pkg.go.dev/github.com/hashicorp/terraform/terraform#GraphTransformer). +[`terraform.GraphTransformer`](https://pkg.go.dev/github.com/hashicorp/terraform/internal/terraform#GraphTransformer). Implementations of this interface just take a graph and mutate it in any way needed, and so the set of available transforms is quite varied. Some important examples include: -* [`ConfigTransformer`](https://pkg.go.dev/github.com/hashicorp/terraform/terraform#ConfigTransformer), +* [`ConfigTransformer`](https://pkg.go.dev/github.com/hashicorp/terraform/internal/terraform#ConfigTransformer), which creates a graph vertex for each `resource` block in the configuration. -* [`StateTransformer`](https://pkg.go.dev/github.com/hashicorp/terraform/terraform#StateTransformer), +* [`StateTransformer`](https://pkg.go.dev/github.com/hashicorp/terraform/internal/terraform#StateTransformer), which creates a graph vertex for each resource instance currently tracked in the state. -* [`ReferenceTransformer`](https://pkg.go.dev/github.com/hashicorp/terraform/terraform#ReferenceTransformer), +* [`ReferenceTransformer`](https://pkg.go.dev/github.com/hashicorp/terraform/internal/terraform#ReferenceTransformer), which analyses the configuration to find dependencies between resources and other objects and creates any necessary "happens after" edges for these. -* [`ProviderTransformer`](https://pkg.go.dev/github.com/hashicorp/terraform/terraform#ProviderTransformer), +* [`ProviderTransformer`](https://pkg.go.dev/github.com/hashicorp/terraform/internal/terraform#ProviderTransformer), which associates each resource or resource instance with exactly one provider configuration (implementing [the inheritance rules](https://www.terraform.io/docs/language/modules/develop/providers.html)) @@ -224,7 +224,7 @@ builder uses a different subset of these depending on the needs of the operation that is being performed. The result of graph building is a -[`terraform.Graph`](https://pkg.go.dev/github.com/hashicorp/terraform/terraform#Graph), which +[`terraform.Graph`](https://pkg.go.dev/github.com/hashicorp/terraform/internal/terraform#Graph), which can then be processed using a _graph walker_. ## Graph Walk @@ -232,17 +232,17 @@ can then be processed using a _graph walker_. The process of walking the graph visits each vertex of that graph in a way which respects the "happens after" edges in the graph. The walk algorithm itself is implemented in -[the low-level `dag` package](https://pkg.go.dev/github.com/hashicorp/terraform/dag#AcyclicGraph.Walk) +[the low-level `dag` package](https://pkg.go.dev/github.com/hashicorp/terraform/internal/dag#AcyclicGraph.Walk) (where "DAG" is short for [_Directed Acyclic Graph_](https://en.wikipedia.org/wiki/Directed_acyclic_graph)), in -[`AcyclicGraph.Walk`](https://pkg.go.dev/github.com/hashicorp/terraform/dag#AcyclicGraph.Walk). +[`AcyclicGraph.Walk`](https://pkg.go.dev/github.com/hashicorp/terraform/internal/dag#AcyclicGraph.Walk). However, the "interesting" Terraform walk functionality is implemented in -[`terraform.ContextGraphWalker`](https://pkg.go.dev/github.com/hashicorp/terraform/terraform#ContextGraphWalker), +[`terraform.ContextGraphWalker`](https://pkg.go.dev/github.com/hashicorp/terraform/internal/terraform#ContextGraphWalker), which implements a small set of higher-level operations that are performed during the graph walk: * `EnterPath` is called once for each module in the configuration, taking a module address and returning a - [`terraform.EvalContext`](https://pkg.go.dev/github.com/hashicorp/terraform/terraform#EvalContext) + [`terraform.EvalContext`](https://pkg.go.dev/github.com/hashicorp/terraform/internal/terraform#EvalContext) that tracks objects within that module. `terraform.Context` is the _global_ context for the entire operation, while `terraform.EvalContext` is a context for processing within a single module, and is the primary means @@ -254,7 +254,7 @@ will evaluate multiple vertices concurrently. Vertex evaluation code must therefore make careful use of concurrency primitives such as mutexes in order to coordinate access to shared objects such as the `states.State` object. In most cases, we use the helper wrapper -[`states.SyncState`](https://pkg.go.dev/github.com/hashicorp/terraform/states#SyncState) +[`states.SyncState`](https://pkg.go.dev/github.com/hashicorp/terraform/internal/states#SyncState) to safely implement concurrent reads and writes from the shared state. ## Vertex Evaluation @@ -287,27 +287,27 @@ a plan operation would include the following high-level steps: this operation. Each execution step for a vertex is an implementation of -[`terraform.Execute`](https://pkg.go.dev/github.com/hashicorp/terraform/terraform#Execute). +[`terraform.Execute`](https://pkg.go.dev/github.com/hashicorp/terraform/internal/erraform#Execute). As with graph transforms, the behavior of these implementations varies widely: whereas graph transforms can take any action against the graph, an `Execute` implementation can take any action against the `EvalContext`. The implementation of `terraform.EvalContext` used in real processing (as opposed to testing) is -[`terraform.BuiltinEvalContext`](https://pkg.go.dev/github.com/hashicorp/terraform/terraform#BuiltinEvalContext). +[`terraform.BuiltinEvalContext`](https://pkg.go.dev/github.com/hashicorp/terraform/internal/terraform#BuiltinEvalContext). It provides coordinated access to plugins, the current state, and the current plan via the `EvalContext` interface methods. In order to be executed, a vertex must implement -[`terraform.GraphNodeExecutable`](https://pkg.go.dev/github.com/hashicorp/terraform/terraform#GraphNodeExecutable), +[`terraform.GraphNodeExecutable`](https://pkg.go.dev/github.com/hashicorp/terraform/internal/terraform#GraphNodeExecutable), which has a single `Execute` method that handles. There are numerous `Execute` implementations with different behaviors, but some prominent examples are: -* [NodePlannableResource.Execute](https://pkg.go.dev/github.com/hashicorp/terraform/terraform#NodePlannableResourceInstance.Execute), which handles the `plan` operation. +* [NodePlannableResource.Execute](https://pkg.go.dev/github.com/hashicorp/terraform/internal/terraform#NodePlannableResourceInstance.Execute), which handles the `plan` operation. -* [`NodeApplyableResourceInstance.Execute`](https://pkg.go.dev/github.com/hashicorp/terraform/terraform#NodeApplyableResourceInstance.Execute), which handles the main `apply` operation. +* [`NodeApplyableResourceInstance.Execute`](https://pkg.go.dev/github.com/hashicorp/terraform/internal/terraform#NodeApplyableResourceInstance.Execute), which handles the main `apply` operation. -* [`NodeDestroyResourceInstance.Execute`](https://pkg.go.dev/github.com/hashicorp/terraform/terraform#EvalWriteState), which handles the main `destroy` operation. +* [`NodeDestroyResourceInstance.Execute`](https://pkg.go.dev/github.com/hashicorp/terraform/internal/terraform#EvalWriteState), which handles the main `destroy` operation. A vertex must complete successfully before the graph walk will begin evaluation for other vertices that have "happens after" edges. Evaluation can fail with one @@ -327,11 +327,11 @@ The high-level process for expression evaluation is: to. For example, the expression `aws_instance.example[1]` refers to one of the instances created by a `resource "aws_instance" "example"` block in configuration. This analysis is performed by - [`lang.References`](https://pkg.go.dev/github.com/hashicorp/terraform/lang#References), + [`lang.References`](https://pkg.go.dev/github.com/hashicorp/terraform/internal/lang#References), or more often one of the helper wrappers around it: - [`lang.ReferencesInBlock`](https://pkg.go.dev/github.com/hashicorp/terraform/lang#ReferencesInBlock) + [`lang.ReferencesInBlock`](https://pkg.go.dev/github.com/hashicorp/terraform/internal/lang#ReferencesInBlock) or - [`lang.ReferencesInExpr`](https://pkg.go.dev/github.com/hashicorp/terraform/lang#ReferencesInExpr) + [`lang.ReferencesInExpr`](https://pkg.go.dev/github.com/hashicorp/terraform/internal/lang#ReferencesInExpr) 1. Retrieve from the state the data for the objects that are referred to and create a lookup table of the values from these objects that the @@ -345,11 +345,11 @@ The high-level process for expression evaluation is: object) against the data and function lookup tables. In practice, steps 2 through 4 are usually run all together using one -of the methods on [`lang.Scope`](https://pkg.go.dev/github.com/hashicorp/terraform/lang#Scope); +of the methods on [`lang.Scope`](https://pkg.go.dev/github.com/hashicorp/terraform/internal/lang#Scope); most commonly, -[`lang.EvalBlock`](https://pkg.go.dev/github.com/hashicorp/terraform/lang#Scope.EvalBlock) +[`lang.EvalBlock`](https://pkg.go.dev/github.com/hashicorp/terraform/internal/lang#Scope.EvalBlock) or -[`lang.EvalExpr`](https://pkg.go.dev/github.com/hashicorp/terraform/lang#Scope.EvalExpr). +[`lang.EvalExpr`](https://pkg.go.dev/github.com/hashicorp/terraform/internal/lang#Scope.EvalExpr). Expression evaluation produces a dynamic value represented as a [`cty.Value`](https://pkg.go.dev/github.com/zclconf/go-cty/cty#Value). @@ -374,7 +374,7 @@ known when the main graph is constructed, but become known while evaluating other vertices in the main graph. This special behavior applies to vertex objects that implement -[`terraform.GraphNodeDynamicExpandable`](https://pkg.go.dev/github.com/hashicorp/terraform/terraform#GraphNodeDynamicExpandable). +[`terraform.GraphNodeDynamicExpandable`](https://pkg.go.dev/github.com/hashicorp/terraform/internal/terraform#GraphNodeDynamicExpandable). Such vertices have their own nested _graph builder_, _graph walk_, and _vertex evaluation_ steps, with the same behaviors as described in these sections for the main graph. The difference is in which graph transforms diff --git a/internal/command/e2etest/doc.go b/internal/command/e2etest/doc.go index 147cc48bc..e9bf474c7 100644 --- a/internal/command/e2etest/doc.go +++ b/internal/command/e2etest/doc.go @@ -12,7 +12,7 @@ // These tests can be used in two ways. The simplest way is to just run them // with "go test" as normal: // -// go test -v github.com/hashicorp/terraform/command/e2etest +// go test -v github.com/hashicorp/terraform/internal/command/e2etest // // This will compile on the fly a Terraform binary and run the tests against // it. diff --git a/internal/command/e2etest/make-archive.sh b/internal/command/e2etest/make-archive.sh index 451039a68..8fabe2f7a 100755 --- a/internal/command/e2etest/make-archive.sh +++ b/internal/command/e2etest/make-archive.sh @@ -38,7 +38,7 @@ cp -r testdata "$OUTDIR/testdata" go build -o "$OUTDIR/terraform$GOEXE" github.com/hashicorp/terraform # Build the test program -go test -o "$OUTDIR/e2etest$GOEXE" -c -ldflags "-X github.com/hashicorp/terraform/command/e2etest.terraformBin=./terraform$GOEXE" github.com/hashicorp/terraform/command/e2etest +go test -o "$OUTDIR/e2etest$GOEXE" -c -ldflags "-X github.com/hashicorp/terraform/internal/command/e2etest.terraformBin=./terraform$GOEXE" github.com/hashicorp/terraform/internal/command/e2etest # Now bundle it all together for easy shipping! cd "$OUTDIR"