Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move all Go packages under internal/ #28723

Merged
merged 23 commits into from
May 17, 2021
Merged

Move all Go packages under internal/ #28723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
df4f0bc
Move backend/ to internal/backend/
apparentlymart May 17, 2021
993b47b
Move builtin/ to internal/builtin/
apparentlymart May 17, 2021
a8a81b8
Move dag/ to internal/dag/
apparentlymart May 17, 2021
98159ce
Move repl/ to internal/repl/
apparentlymart May 17, 2021
6ea5e84
Move registry/ to internal/registry/
apparentlymart May 17, 2021
9201594
Move e2e/ to internal/e2e/
apparentlymart May 17, 2021
0ca489d
Move httpclient/ to internal/httpclient/
apparentlymart May 17, 2021
c6c1563
Move communicator/ to internal/communicator/
apparentlymart May 17, 2021
e713baf
Move tfdiags/ to internal/tfdiags/
apparentlymart May 17, 2021
593cf7e
Move instances/ to internal/instances/
apparentlymart May 17, 2021
be27391
Move providers/ to internal/providers/
apparentlymart May 17, 2021
01d3dda
Move provisioners/ to internal/provisioners/
apparentlymart May 17, 2021
af6f540
Move moduledeps/ to internal/moduledeps/
apparentlymart May 17, 2021
9697a5e
Move experiments/ to internal/experiments/
apparentlymart May 17, 2021
198e053
Move addrs/ to internal/addrs/
apparentlymart May 17, 2021
5aef6df
Move command/ to internal/command/
apparentlymart May 17, 2021
82d0320
Move configs/ to internal/configs/
apparentlymart May 17, 2021
915e91b
Move lang/ to internal/lang/
apparentlymart May 17, 2021
dbba81a
Move plans/ to internal/plans/
apparentlymart May 17, 2021
350cd7b
Move plugin/ and plugin6/ to internal/plugin{,6}/
apparentlymart May 17, 2021
b3349d1
Move states/ to internal/states/
apparentlymart May 17, 2021
8b657ae
Move terraform/ to internal/terraform/
apparentlymart May 17, 2021
bb0292c
Update various non-code references to renamed Go packages
apparentlymart May 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'"
Expand Down
4 changes: 2 additions & 2 deletions checkpoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"path/filepath"

"github.com/hashicorp/go-checkpoint"
"github.com/hashicorp/terraform/command"
"github.com/hashicorp/terraform/command/cliconfig"
"github.com/hashicorp/terraform/internal/command"
"github.com/hashicorp/terraform/internal/command/cliconfig"
)

func init() {
Expand Down
12 changes: 6 additions & 6 deletions commands.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ import (
svchost "github.com/hashicorp/terraform-svchost"
"github.com/hashicorp/terraform-svchost/auth"
"github.com/hashicorp/terraform-svchost/disco"
"github.com/hashicorp/terraform/addrs"
"github.com/hashicorp/terraform/command"
"github.com/hashicorp/terraform/command/cliconfig"
"github.com/hashicorp/terraform/command/views"
"github.com/hashicorp/terraform/command/webbrowser"
"github.com/hashicorp/terraform/internal/addrs"
"github.com/hashicorp/terraform/internal/command"
"github.com/hashicorp/terraform/internal/command/cliconfig"
"github.com/hashicorp/terraform/internal/command/views"
"github.com/hashicorp/terraform/internal/command/webbrowser"
"github.com/hashicorp/terraform/internal/getproviders"
pluginDiscovery "github.com/hashicorp/terraform/internal/plugin/discovery"
"github.com/hashicorp/terraform/internal/terminal"
pluginDiscovery "github.com/hashicorp/terraform/plugin/discovery"
)

// runningInAutomationEnvName gives the name of an environment variable that
Expand Down
88 changes: 44 additions & 44 deletions docs/architecture.md
View file
Open in desktop

Large diffs are not rendered by default.

0 addrs/count_attr.go → internal/addrs/count_attr.go
View file
Open in desktop
File renamed without changes.
0 addrs/doc.go → internal/addrs/doc.go
View file
Open in desktop
File renamed without changes.
0 addrs/for_each_attr.go → internal/addrs/for_each_attr.go
View file
Open in desktop
File renamed without changes.
0 addrs/input_variable.go → internal/addrs/input_variable.go
View file
Open in desktop
File renamed without changes.
0 addrs/instance_key.go → internal/addrs/instance_key.go
View file
Open in desktop
File renamed without changes.
0 addrs/local_value.go → internal/addrs/local_value.go
View file
Open in desktop
File renamed without changes.
0 addrs/module.go → internal/addrs/module.go
View file
Open in desktop
File renamed without changes.
0 addrs/module_call.go → internal/addrs/module_call.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion addrs/module_instance.go → internal/addrs/module_instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/zclconf/go-cty/cty"
"github.com/zclconf/go-cty/cty/gocty"

"github.com/hashicorp/terraform/tfdiags"
"github.com/hashicorp/terraform/internal/tfdiags"
)

// ModuleInstance is an address for a particular module instance within the
Expand Down
0 addrs/module_instance_test.go → internal/addrs/module_instance_test.go
View file
Open in desktop
File renamed without changes.
0 addrs/module_test.go → internal/addrs/module_test.go
View file
Open in desktop
File renamed without changes.
0 addrs/output_value.go → internal/addrs/output_value.go
View file
Open in desktop
File renamed without changes.
0 addrs/output_value_test.go → internal/addrs/output_value_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion addrs/parse_ref.go → internal/addrs/parse_ref.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/hashicorp/hcl/v2"
"github.com/hashicorp/hcl/v2/hclsyntax"
"github.com/hashicorp/terraform/tfdiags"
"github.com/hashicorp/terraform/internal/tfdiags"
)

// Reference describes a reference to an address with source location
Expand Down
2 changes: 1 addition & 1 deletion addrs/parse_ref_test.go → internal/addrs/parse_ref_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/go-test/deep"
"github.com/hashicorp/hcl/v2"
"github.com/hashicorp/hcl/v2/hclsyntax"
"github.com/hashicorp/terraform/tfdiags"
"github.com/hashicorp/terraform/internal/tfdiags"
"github.com/zclconf/go-cty/cty"
)

Expand Down
2 changes: 1 addition & 1 deletion addrs/parse_target.go → internal/addrs/parse_target.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/hashicorp/hcl/v2/hclsyntax"

"github.com/hashicorp/hcl/v2"
"github.com/hashicorp/terraform/tfdiags"
"github.com/hashicorp/terraform/internal/tfdiags"
)

// Target describes a targeted address with source location information.
Expand Down
2 changes: 1 addition & 1 deletion addrs/parse_target_test.go → internal/addrs/parse_target_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/go-test/deep"
"github.com/hashicorp/hcl/v2"
"github.com/hashicorp/hcl/v2/hclsyntax"
"github.com/hashicorp/terraform/tfdiags"
"github.com/hashicorp/terraform/internal/tfdiags"
)

func TestParseTarget(t *testing.T) {
Expand Down
0 addrs/path_attr.go → internal/addrs/path_attr.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion addrs/provider.go → internal/addrs/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/hashicorp/hcl/v2"
svchost "github.com/hashicorp/terraform-svchost"
"github.com/hashicorp/terraform/tfdiags"
"github.com/hashicorp/terraform/internal/tfdiags"
)

// Provider encapsulates a single provider type. In the future this will be
Expand Down
2 changes: 1 addition & 1 deletion addrs/provider_config.go → internal/addrs/provider_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"strings"

"github.com/hashicorp/terraform/tfdiags"
"github.com/hashicorp/terraform/internal/tfdiags"
"github.com/zclconf/go-cty/cty"

"github.com/hashicorp/hcl/v2"
Expand Down
0 addrs/provider_config_test.go → internal/addrs/provider_config_test.go
View file
Open in desktop
File renamed without changes.
0 addrs/provider_test.go → internal/addrs/provider_test.go
View file
Open in desktop
File renamed without changes.
0 addrs/referenceable.go → internal/addrs/referenceable.go
View file
Open in desktop
File renamed without changes.
0 addrs/resource.go → internal/addrs/resource.go
View file
Open in desktop
File renamed without changes.
0 addrs/resource_phase.go → internal/addrs/resource_phase.go
View file
Open in desktop
File renamed without changes.
0 addrs/resource_test.go → internal/addrs/resource_test.go
View file
Open in desktop
File renamed without changes.
0 addrs/resourcemode_string.go → internal/addrs/resourcemode_string.go
View file
Open in desktop
File renamed without changes.
0 addrs/self.go → internal/addrs/self.go
View file
Open in desktop
File renamed without changes.
0 addrs/target_test.go → internal/addrs/target_test.go
View file
Open in desktop
File renamed without changes.
0 addrs/targetable.go → internal/addrs/targetable.go
View file
Open in desktop
File renamed without changes.
0 addrs/terraform_attr.go → internal/addrs/terraform_attr.go
View file
Open in desktop
File renamed without changes.
24 changes: 12 additions & 12 deletions backend/backend.go → internal/backend/backend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ import (
"log"
"os"

"github.com/hashicorp/terraform/addrs"
"github.com/hashicorp/terraform/command/clistate"
"github.com/hashicorp/terraform/command/views"
"github.com/hashicorp/terraform/configs"
"github.com/hashicorp/terraform/configs/configload"
"github.com/hashicorp/terraform/configs/configschema"
"github.com/hashicorp/terraform/plans"
"github.com/hashicorp/terraform/plans/planfile"
"github.com/hashicorp/terraform/states"
"github.com/hashicorp/terraform/states/statemgr"
"github.com/hashicorp/terraform/terraform"
"github.com/hashicorp/terraform/tfdiags"
"github.com/hashicorp/terraform/internal/addrs"
"github.com/hashicorp/terraform/internal/command/clistate"
"github.com/hashicorp/terraform/internal/command/views"
"github.com/hashicorp/terraform/internal/configs"
"github.com/hashicorp/terraform/internal/configs/configload"
"github.com/hashicorp/terraform/internal/configs/configschema"
"github.com/hashicorp/terraform/internal/plans"
"github.com/hashicorp/terraform/internal/plans/planfile"
"github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/internal/states/statemgr"
"github.com/hashicorp/terraform/internal/terraform"
"github.com/hashicorp/terraform/internal/tfdiags"
"github.com/mitchellh/go-homedir"
"github.com/zclconf/go-cty/cty"
)
Expand Down
0 backend/backend_test.go → internal/backend/backend_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion backend/cli.go → internal/backend/cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"github.com/mitchellh/colorstring"

"github.com/hashicorp/terraform/internal/terminal"
"github.com/hashicorp/terraform/terraform"
"github.com/hashicorp/terraform/internal/terraform"
)

// CLI is an optional interface that can be implemented to be initialized
Expand Down
2 changes: 1 addition & 1 deletion backend/init/deprecate_test.go → internal/backend/init/deprecate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package init
import (
"testing"

"github.com/hashicorp/terraform/backend/remote-state/inmem"
"github.com/hashicorp/terraform/internal/backend/remote-state/inmem"
"github.com/zclconf/go-cty/cty"
)

Expand Down
38 changes: 19 additions & 19 deletions backend/init/init.go → internal/backend/init/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,27 @@ import (
"sync"

"github.com/hashicorp/terraform-svchost/disco"
"github.com/hashicorp/terraform/backend"
"github.com/hashicorp/terraform/tfdiags"
"github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/internal/tfdiags"
"github.com/zclconf/go-cty/cty"

backendLocal "github.com/hashicorp/terraform/backend/local"
backendRemote "github.com/hashicorp/terraform/backend/remote"
backendArtifactory "github.com/hashicorp/terraform/backend/remote-state/artifactory"
backendAzure "github.com/hashicorp/terraform/backend/remote-state/azure"
backendConsul "github.com/hashicorp/terraform/backend/remote-state/consul"
backendCos "github.com/hashicorp/terraform/backend/remote-state/cos"
backendEtcdv2 "github.com/hashicorp/terraform/backend/remote-state/etcdv2"
backendEtcdv3 "github.com/hashicorp/terraform/backend/remote-state/etcdv3"
backendGCS "github.com/hashicorp/terraform/backend/remote-state/gcs"
backendHTTP "github.com/hashicorp/terraform/backend/remote-state/http"
backendInmem "github.com/hashicorp/terraform/backend/remote-state/inmem"
backendKubernetes "github.com/hashicorp/terraform/backend/remote-state/kubernetes"
backendManta "github.com/hashicorp/terraform/backend/remote-state/manta"
backendOSS "github.com/hashicorp/terraform/backend/remote-state/oss"
backendPg "github.com/hashicorp/terraform/backend/remote-state/pg"
backendS3 "github.com/hashicorp/terraform/backend/remote-state/s3"
backendSwift "github.com/hashicorp/terraform/backend/remote-state/swift"
backendLocal "github.com/hashicorp/terraform/internal/backend/local"
backendRemote "github.com/hashicorp/terraform/internal/backend/remote"
backendArtifactory "github.com/hashicorp/terraform/internal/backend/remote-state/artifactory"
backendAzure "github.com/hashicorp/terraform/internal/backend/remote-state/azure"
backendConsul "github.com/hashicorp/terraform/internal/backend/remote-state/consul"
backendCos "github.com/hashicorp/terraform/internal/backend/remote-state/cos"
backendEtcdv2 "github.com/hashicorp/terraform/internal/backend/remote-state/etcdv2"
backendEtcdv3 "github.com/hashicorp/terraform/internal/backend/remote-state/etcdv3"
backendGCS "github.com/hashicorp/terraform/internal/backend/remote-state/gcs"
backendHTTP "github.com/hashicorp/terraform/internal/backend/remote-state/http"
backendInmem "github.com/hashicorp/terraform/internal/backend/remote-state/inmem"
backendKubernetes "github.com/hashicorp/terraform/internal/backend/remote-state/kubernetes"
backendManta "github.com/hashicorp/terraform/internal/backend/remote-state/manta"
backendOSS "github.com/hashicorp/terraform/internal/backend/remote-state/oss"
backendPg "github.com/hashicorp/terraform/internal/backend/remote-state/pg"
backendS3 "github.com/hashicorp/terraform/internal/backend/remote-state/s3"
backendSwift "github.com/hashicorp/terraform/internal/backend/remote-state/swift"
)

// backends is the list of available backends. This is a global variable
Expand Down
0 backend/init/init_test.go → internal/backend/init/init_test.go
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions backend/local/backend.go → internal/backend/local/backend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ import (
"sort"
"sync"

"github.com/hashicorp/terraform/backend"
"github.com/hashicorp/terraform/command/views"
"github.com/hashicorp/terraform/configs/configschema"
"github.com/hashicorp/terraform/states/statemgr"
"github.com/hashicorp/terraform/terraform"
"github.com/hashicorp/terraform/tfdiags"
"github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/internal/command/views"
"github.com/hashicorp/terraform/internal/configs/configschema"
"github.com/hashicorp/terraform/internal/states/statemgr"
"github.com/hashicorp/terraform/internal/terraform"
"github.com/hashicorp/terraform/internal/tfdiags"
"github.com/zclconf/go-cty/cty"
)

Expand Down
16 changes: 8 additions & 8 deletions backend/local/backend_apply.go → internal/backend/local/backend_apply.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ import (
"log"

"github.com/hashicorp/errwrap"
"github.com/hashicorp/terraform/backend"
"github.com/hashicorp/terraform/command/views"
"github.com/hashicorp/terraform/plans"
"github.com/hashicorp/terraform/states"
"github.com/hashicorp/terraform/states/statefile"
"github.com/hashicorp/terraform/states/statemgr"
"github.com/hashicorp/terraform/terraform"
"github.com/hashicorp/terraform/tfdiags"
"github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/internal/command/views"
"github.com/hashicorp/terraform/internal/plans"
"github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/internal/states/statefile"
"github.com/hashicorp/terraform/internal/states/statemgr"
"github.com/hashicorp/terraform/internal/terraform"
"github.com/hashicorp/terraform/internal/tfdiags"
)

func (b *Local) opApply(
Expand Down
22 changes: 11 additions & 11 deletions backend/local/backend_apply_test.go → internal/backend/local/backend_apply_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@ import (

"github.com/zclconf/go-cty/cty"

"github.com/hashicorp/terraform/backend"
"github.com/hashicorp/terraform/command/arguments"
"github.com/hashicorp/terraform/command/clistate"
"github.com/hashicorp/terraform/command/views"
"github.com/hashicorp/terraform/configs/configschema"
"github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/internal/command/arguments"
"github.com/hashicorp/terraform/internal/command/clistate"
"github.com/hashicorp/terraform/internal/command/views"
"github.com/hashicorp/terraform/internal/configs/configschema"
"github.com/hashicorp/terraform/internal/initwd"
"github.com/hashicorp/terraform/internal/plans"
"github.com/hashicorp/terraform/internal/providers"
"github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/internal/states/statemgr"
"github.com/hashicorp/terraform/internal/terminal"
"github.com/hashicorp/terraform/plans"
"github.com/hashicorp/terraform/providers"
"github.com/hashicorp/terraform/states"
"github.com/hashicorp/terraform/states/statemgr"
"github.com/hashicorp/terraform/terraform"
"github.com/hashicorp/terraform/tfdiags"
"github.com/hashicorp/terraform/internal/terraform"
"github.com/hashicorp/terraform/internal/tfdiags"
)

func TestLocal_applyBasic(t *testing.T) {
Expand Down
14 changes: 7 additions & 7 deletions backend/local/backend_local.go → internal/backend/local/backend_local.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ import (
"sort"

"github.com/hashicorp/errwrap"
"github.com/hashicorp/terraform/backend"
"github.com/hashicorp/terraform/configs"
"github.com/hashicorp/terraform/configs/configload"
"github.com/hashicorp/terraform/plans/planfile"
"github.com/hashicorp/terraform/states/statemgr"
"github.com/hashicorp/terraform/terraform"
"github.com/hashicorp/terraform/tfdiags"
"github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/internal/configs"
"github.com/hashicorp/terraform/internal/configs/configload"
"github.com/hashicorp/terraform/internal/plans/planfile"
"github.com/hashicorp/terraform/internal/states/statemgr"
"github.com/hashicorp/terraform/internal/terraform"
"github.com/hashicorp/terraform/internal/tfdiags"
"github.com/zclconf/go-cty/cty"
)

Expand Down
8 changes: 4 additions & 4 deletions backend/local/backend_local_test.go → internal/backend/local/backend_local_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package local
import (
"testing"

"github.com/hashicorp/terraform/backend"
"github.com/hashicorp/terraform/command/arguments"
"github.com/hashicorp/terraform/command/clistate"
"github.com/hashicorp/terraform/command/views"
"github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/internal/command/arguments"
"github.com/hashicorp/terraform/internal/command/clistate"
"github.com/hashicorp/terraform/internal/command/views"
"github.com/hashicorp/terraform/internal/initwd"
"github.com/hashicorp/terraform/internal/terminal"
)
Expand Down
14 changes: 7 additions & 7 deletions backend/local/backend_plan.go → internal/backend/local/backend_plan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import (
"fmt"
"log"

"github.com/hashicorp/terraform/backend"
"github.com/hashicorp/terraform/plans"
"github.com/hashicorp/terraform/plans/planfile"
"github.com/hashicorp/terraform/states/statefile"
"github.com/hashicorp/terraform/states/statemgr"
"github.com/hashicorp/terraform/terraform"
"github.com/hashicorp/terraform/tfdiags"
"github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/internal/plans"
"github.com/hashicorp/terraform/internal/plans/planfile"
"github.com/hashicorp/terraform/internal/states/statefile"
"github.com/hashicorp/terraform/internal/states/statemgr"
"github.com/hashicorp/terraform/internal/terraform"
"github.com/hashicorp/terraform/internal/tfdiags"
)

func (b *Local) opPlan(
Expand Down
20 changes: 10 additions & 10 deletions backend/local/backend_plan_test.go → internal/backend/local/backend_plan_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@ import (
"strings"
"testing"

"github.com/hashicorp/terraform/addrs"
"github.com/hashicorp/terraform/backend"
"github.com/hashicorp/terraform/command/arguments"
"github.com/hashicorp/terraform/command/clistate"
"github.com/hashicorp/terraform/command/views"
"github.com/hashicorp/terraform/configs/configschema"
"github.com/hashicorp/terraform/internal/addrs"
"github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/internal/command/arguments"
"github.com/hashicorp/terraform/internal/command/clistate"
"github.com/hashicorp/terraform/internal/command/views"
"github.com/hashicorp/terraform/internal/configs/configschema"
"github.com/hashicorp/terraform/internal/initwd"
"github.com/hashicorp/terraform/internal/plans"
"github.com/hashicorp/terraform/internal/plans/planfile"
"github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/internal/terminal"
"github.com/hashicorp/terraform/plans"
"github.com/hashicorp/terraform/plans/planfile"
"github.com/hashicorp/terraform/states"
"github.com/hashicorp/terraform/terraform"
"github.com/hashicorp/terraform/internal/terraform"
"github.com/zclconf/go-cty/cty"
)

Expand Down
8 changes: 4 additions & 4 deletions backend/local/backend_refresh.go → internal/backend/local/backend_refresh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"os"

"github.com/hashicorp/errwrap"
"github.com/hashicorp/terraform/backend"
"github.com/hashicorp/terraform/states"
"github.com/hashicorp/terraform/states/statemgr"
"github.com/hashicorp/terraform/tfdiags"
"github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/internal/states/statemgr"
"github.com/hashicorp/terraform/internal/tfdiags"
)

func (b *Local) opRefresh(
Expand Down
Loading