ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move states/ to internal/states/ 

This is part of a general effort to move all of Terraform's non-library
package surface under internal in order to reinforce that these are for
internal use within Terraform only.

If you were previously importing packages under this prefix into an
external codebase, you could pin to an earlier release tag as an interim
solution until you've make a plan to achieve the same functionality some
other way.
This commit is contained in:
Martin Atkins 2021-05-17 12:43:35 -07:00
parent b40a4fb741
commit f40800b3a4
301 changed files with 332 additions and 332 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/backend/backend.go
View File

@ -19,9 +19,9 @@ import (
"github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/configs/configschema"
"github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/plans"
"github.com/hashicorp/terraform/internal/plans/planfile" "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/tfdiags" "github.com/hashicorp/terraform/internal/tfdiags"
"github.com/hashicorp/terraform/states"
"github.com/hashicorp/terraform/states/statemgr"
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
"github.com/mitchellh/go-homedir" "github.com/mitchellh/go-homedir"
"github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty"

2
internal/backend/local/backend.go
View File

@ -14,8 +14,8 @@ import (
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/command/views"
"github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/configs/configschema"
"github.com/hashicorp/terraform/internal/states/statemgr"
"github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/internal/tfdiags"
"github.com/hashicorp/terraform/states/statemgr"
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
"github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty"
) )

6
internal/backend/local/backend_apply.go
View File

@ -9,10 +9,10 @@ import (
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/command/views"
"github.com/hashicorp/terraform/internal/plans" "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/tfdiags" "github.com/hashicorp/terraform/internal/tfdiags"
"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/terraform"
) )

4
internal/backend/local/backend_apply_test.go
View File

@ -19,10 +19,10 @@ import (
"github.com/hashicorp/terraform/internal/initwd" "github.com/hashicorp/terraform/internal/initwd"
"github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/plans"
"github.com/hashicorp/terraform/internal/providers" "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/internal/terminal"
"github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/internal/tfdiags"
"github.com/hashicorp/terraform/states"
"github.com/hashicorp/terraform/states/statemgr"
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
) )

2
internal/backend/local/backend_local.go
View File

@ -11,8 +11,8 @@ import (
"github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/configs"
"github.com/hashicorp/terraform/internal/configs/configload" "github.com/hashicorp/terraform/internal/configs/configload"
"github.com/hashicorp/terraform/internal/plans/planfile" "github.com/hashicorp/terraform/internal/plans/planfile"
"github.com/hashicorp/terraform/internal/states/statemgr"
"github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/internal/tfdiags"
"github.com/hashicorp/terraform/states/statemgr"
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
"github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty"
) )

4
internal/backend/local/backend_plan.go
View File

@ -8,9 +8,9 @@ import (
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/plans"
"github.com/hashicorp/terraform/internal/plans/planfile" "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/tfdiags" "github.com/hashicorp/terraform/internal/tfdiags"
"github.com/hashicorp/terraform/states/statefile"
"github.com/hashicorp/terraform/states/statemgr"
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
) )

2
internal/backend/local/backend_plan_test.go
View File

@ -16,8 +16,8 @@ import (
"github.com/hashicorp/terraform/internal/initwd" "github.com/hashicorp/terraform/internal/initwd"
"github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/plans"
"github.com/hashicorp/terraform/internal/plans/planfile" "github.com/hashicorp/terraform/internal/plans/planfile"
"github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/internal/terminal"
"github.com/hashicorp/terraform/states"
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
"github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty"
) )

4
internal/backend/local/backend_refresh.go
View File

@ -8,9 +8,9 @@ import (
"github.com/hashicorp/errwrap" "github.com/hashicorp/errwrap"
"github.com/hashicorp/terraform/internal/backend" "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" "github.com/hashicorp/terraform/internal/tfdiags"
"github.com/hashicorp/terraform/states"
"github.com/hashicorp/terraform/states/statemgr"
) )
func (b *Local) opRefresh( func (b *Local) opRefresh(

2
internal/backend/local/backend_refresh_test.go
View File

@ -14,8 +14,8 @@ import (
"github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/configs/configschema"
"github.com/hashicorp/terraform/internal/initwd" "github.com/hashicorp/terraform/internal/initwd"
"github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/providers"
"github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/internal/terminal"
"github.com/hashicorp/terraform/states"
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
"github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty"

4
internal/backend/local/backend_test.go
View File

@ -10,8 +10,8 @@ import (
"testing" "testing"
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/states/statefile" "github.com/hashicorp/terraform/internal/states/statefile"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
) )
func TestLocal_impl(t *testing.T) { func TestLocal_impl(t *testing.T) {

4
internal/backend/local/hook_state.go
View File

@ -3,8 +3,8 @@ package local
import ( import (
"sync" "sync"
"github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
) )

2
internal/backend/local/hook_state_test.go
View File

@ -3,7 +3,7 @@ package local
import ( import (
"testing" "testing"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
) )

4
internal/backend/local/testing.go
View File

@ -12,8 +12,8 @@ import (
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/configs/configschema"
"github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/providers"
"github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
) )

4
internal/backend/remote-state/artifactory/backend.go
View File

@ -6,8 +6,8 @@ import (
cleanhttp "github.com/hashicorp/go-cleanhttp" cleanhttp "github.com/hashicorp/go-cleanhttp"
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/internal/legacy/helper/schema" "github.com/hashicorp/terraform/internal/legacy/helper/schema"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
artifactory "github.com/lusis/go-artifactory/src/artifactory.v401" artifactory "github.com/lusis/go-artifactory/src/artifactory.v401"
) )

2
internal/backend/remote-state/artifactory/client.go
View File

@ -5,7 +5,7 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
artifactory "github.com/lusis/go-artifactory/src/artifactory.v401" artifactory "github.com/lusis/go-artifactory/src/artifactory.v401"
) )

2
internal/backend/remote-state/artifactory/client_test.go
View File

@ -5,7 +5,7 @@ import (
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/configs"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
"github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty"
) )

6
internal/backend/remote-state/azure/backend_state.go
View File

@ -7,9 +7,9 @@ import (
"strings" "strings"
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
"github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/blobs" "github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/blobs"
"github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/containers" "github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/containers"
) )

4
internal/backend/remote-state/azure/client.go
View File

@ -12,8 +12,8 @@ import (
"github.com/hashicorp/go-uuid" "github.com/hashicorp/go-uuid"
"github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/blobs" "github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/blobs"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
) )
const ( const (

2
internal/backend/remote-state/azure/client_test.go
View File

@ -7,7 +7,7 @@ import (
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/internal/legacy/helper/acctest" "github.com/hashicorp/terraform/internal/legacy/helper/acctest"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
"github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/blobs" "github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/blobs"
) )

6
internal/backend/remote-state/consul/backend_state.go
View File

@ -5,9 +5,9 @@ import (
"strings" "strings"
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
) )
const ( const (

4
internal/backend/remote-state/consul/client.go
View File

@ -15,8 +15,8 @@ import (
consulapi "github.com/hashicorp/consul/api" consulapi "github.com/hashicorp/consul/api"
multierror "github.com/hashicorp/go-multierror" multierror "github.com/hashicorp/go-multierror"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
) )
const ( const (

4
internal/backend/remote-state/consul/client_test.go
View File

@ -14,8 +14,8 @@ import (
"time" "time"
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
) )
func TestRemoteClient_impl(t *testing.T) { func TestRemoteClient_impl(t *testing.T) {

6
internal/backend/remote-state/cos/backend_state.go
View File

@ -8,9 +8,9 @@ import (
"strings" "strings"
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
"github.com/likexian/gokit/assert" "github.com/likexian/gokit/assert"
) )

2
internal/backend/remote-state/cos/backend_test.go
View File

@ -8,7 +8,7 @@ import (
"time" "time"
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
"github.com/likexian/gokit/assert" "github.com/likexian/gokit/assert"
) )

4
internal/backend/remote-state/cos/client.go
View File

@ -13,8 +13,8 @@ import (
"time" "time"
multierror "github.com/hashicorp/go-multierror" multierror "github.com/hashicorp/go-multierror"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
tag "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tag/v20180813" tag "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tag/v20180813"
"github.com/tencentyun/cos-go-sdk-v5" "github.com/tencentyun/cos-go-sdk-v5"
) )

4
internal/backend/remote-state/etcdv2/backend.go
View File

@ -9,8 +9,8 @@ import (
etcdapi "github.com/coreos/etcd/client" etcdapi "github.com/coreos/etcd/client"
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/internal/legacy/helper/schema" "github.com/hashicorp/terraform/internal/legacy/helper/schema"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
) )
func New() backend.Backend { func New() backend.Backend {

2
internal/backend/remote-state/etcdv2/client.go
View File

@ -6,7 +6,7 @@ import (
"fmt" "fmt"
etcdapi "github.com/coreos/etcd/client" etcdapi "github.com/coreos/etcd/client"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
) )
// EtcdClient is a remote client that stores data in etcd. // EtcdClient is a remote client that stores data in etcd.

2
internal/backend/remote-state/etcdv2/client_test.go
View File

@ -8,7 +8,7 @@ import (
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/configs"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
"github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty"
) )

6
internal/backend/remote-state/etcdv3/backend_state.go
View File

@ -9,9 +9,9 @@ import (
etcdv3 "github.com/coreos/etcd/clientv3" etcdv3 "github.com/coreos/etcd/clientv3"
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
) )
func (b *Backend) Workspaces() ([]string, error) { func (b *Backend) Workspaces() ([]string, error) {

4
internal/backend/remote-state/etcdv3/client.go
View File

@ -11,8 +11,8 @@ import (
etcdv3 "github.com/coreos/etcd/clientv3" etcdv3 "github.com/coreos/etcd/clientv3"
etcdv3sync "github.com/coreos/etcd/clientv3/concurrency" etcdv3sync "github.com/coreos/etcd/clientv3/concurrency"
"github.com/hashicorp/go-multierror" "github.com/hashicorp/go-multierror"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
) )
const ( const (

4
internal/backend/remote-state/etcdv3/client_test.go
View File

@ -7,8 +7,8 @@ import (
"time" "time"
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
) )
func TestRemoteClient_impl(t *testing.T) { func TestRemoteClient_impl(t *testing.T) {

6
internal/backend/remote-state/gcs/backend_state.go
View File

@ -10,9 +10,9 @@ import (
"google.golang.org/api/iterator" "google.golang.org/api/iterator"
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
) )
const ( const (

2
internal/backend/remote-state/gcs/backend_test.go
View File

@ -10,7 +10,7 @@ import (
"cloud.google.com/go/storage" "cloud.google.com/go/storage"
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
) )
const ( const (

4
internal/backend/remote-state/gcs/client.go
View File

@ -8,8 +8,8 @@ import (
"cloud.google.com/go/storage" "cloud.google.com/go/storage"
multierror "github.com/hashicorp/go-multierror" multierror "github.com/hashicorp/go-multierror"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
"golang.org/x/net/context" "golang.org/x/net/context"
) )

4
internal/backend/remote-state/http/backend.go
View File

@ -12,8 +12,8 @@ import (
"github.com/hashicorp/go-retryablehttp" "github.com/hashicorp/go-retryablehttp"
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/internal/legacy/helper/schema" "github.com/hashicorp/terraform/internal/legacy/helper/schema"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
) )
func New() backend.Backend { func New() backend.Backend {

4
internal/backend/remote-state/http/client.go
View File

@ -12,8 +12,8 @@ import (
"net/url" "net/url"
"github.com/hashicorp/go-retryablehttp" "github.com/hashicorp/go-retryablehttp"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
) )
// httpClient is a remote client that stores data in Consul or HTTP REST. // httpClient is a remote client that stores data in Consul or HTTP REST.

2
internal/backend/remote-state/http/client_test.go
View File

@ -11,7 +11,7 @@ import (
"testing" "testing"
"github.com/hashicorp/go-retryablehttp" "github.com/hashicorp/go-retryablehttp"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
) )
func TestHTTPClient_impl(t *testing.T) { func TestHTTPClient_impl(t *testing.T) {

6
internal/backend/remote-state/inmem/backend.go
View File

@ -10,9 +10,9 @@ import (
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/internal/legacy/helper/schema" "github.com/hashicorp/terraform/internal/legacy/helper/schema"
statespkg "github.com/hashicorp/terraform/states" statespkg "github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
) )
// we keep the states and locks in package-level variables, so that they can be // we keep the states and locks in package-level variables, so that they can be

4
internal/backend/remote-state/inmem/backend_test.go
View File

@ -8,8 +8,8 @@ import (
"github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2"
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
statespkg "github.com/hashicorp/terraform/states" statespkg "github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
_ "github.com/hashicorp/terraform/internal/logging" _ "github.com/hashicorp/terraform/internal/logging"
) )

4
internal/backend/remote-state/inmem/client.go
View File

@ -3,8 +3,8 @@ package inmem
import ( import (
"crypto/md5" "crypto/md5"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
) )
// RemoteClient is a remote client that stores data in memory for testing. // RemoteClient is a remote client that stores data in memory for testing.

2
internal/backend/remote-state/inmem/client_test.go
View File

@ -5,7 +5,7 @@ import (
"github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2"
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
) )
func TestRemoteClient_impl(t *testing.T) { func TestRemoteClient_impl(t *testing.T) {

6
internal/backend/remote-state/kubernetes/backend_state.go
View File

@ -6,9 +6,9 @@ import (
"sort" "sort"
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
) )

2
internal/backend/remote-state/kubernetes/backend_test.go
View File

@ -9,7 +9,7 @@ import (
"time" "time"
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
) )

4
internal/backend/remote-state/kubernetes/client.go
View File

@ -10,8 +10,8 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
k8serrors "k8s.io/apimachinery/pkg/api/errors" k8serrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"

4
internal/backend/remote-state/kubernetes/client_test.go
View File

@ -4,8 +4,8 @@ import (
"testing" "testing"
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
) )
func TestRemoteClient_impl(t *testing.T) { func TestRemoteClient_impl(t *testing.T) {

6
internal/backend/remote-state/manta/backend_state.go
View File

@ -12,9 +12,9 @@ import (
"github.com/joyent/triton-go/storage" "github.com/joyent/triton-go/storage"
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
) )
func (b *Backend) Workspaces() ([]string, error) { func (b *Backend) Workspaces() ([]string, error) {

4
internal/backend/remote-state/manta/client.go
View File

@ -10,8 +10,8 @@ import (
"path" "path"
uuid "github.com/hashicorp/go-uuid" uuid "github.com/hashicorp/go-uuid"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
tritonErrors "github.com/joyent/triton-go/errors" tritonErrors "github.com/joyent/triton-go/errors"
"github.com/joyent/triton-go/storage" "github.com/joyent/triton-go/storage"
) )

2
internal/backend/remote-state/manta/client_test.go
View File

@ -7,7 +7,7 @@ import (
"time" "time"
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
) )
func TestRemoteClient_impl(t *testing.T) { func TestRemoteClient_impl(t *testing.T) {

6
internal/backend/remote-state/oss/backend_state.go
View File

@ -8,9 +8,9 @@ import (
"github.com/aliyun/aliyun-oss-go-sdk/oss" "github.com/aliyun/aliyun-oss-go-sdk/oss"
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
"log" "log"
"path" "path"

4
internal/backend/remote-state/oss/client.go
View File

@ -16,8 +16,8 @@ import (
"github.com/aliyun/aliyun-tablestore-go-sdk/tablestore" "github.com/aliyun/aliyun-tablestore-go-sdk/tablestore"
"github.com/hashicorp/go-multierror" "github.com/hashicorp/go-multierror"
uuid "github.com/hashicorp/go-uuid" uuid "github.com/hashicorp/go-uuid"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
"github.com/pkg/errors" "github.com/pkg/errors"
) )

6
internal/backend/remote-state/oss/client_test.go
View File

@ -10,9 +10,9 @@ import (
"crypto/md5" "crypto/md5"
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
"github.com/hashicorp/terraform/states/statefile" "github.com/hashicorp/terraform/internal/states/statefile"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
) )
// NOTE: Before running this testcase, please create a OTS instance called 'tf-oss-remote' // NOTE: Before running this testcase, please create a OTS instance called 'tf-oss-remote'

6
internal/backend/remote-state/pg/backend_state.go
View File

@ -4,9 +4,9 @@ import (
"fmt" "fmt"
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
) )
func (b *Backend) Workspaces() ([]string, error) { func (b *Backend) Workspaces() ([]string, error) {

4
internal/backend/remote-state/pg/backend_test.go
View File

@ -10,8 +10,8 @@ import (
"testing" "testing"
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
"github.com/lib/pq" "github.com/lib/pq"
_ "github.com/lib/pq" _ "github.com/lib/pq"
) )

4
internal/backend/remote-state/pg/client.go
View File

@ -6,8 +6,8 @@ import (
"fmt" "fmt"
uuid "github.com/hashicorp/go-uuid" uuid "github.com/hashicorp/go-uuid"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
_ "github.com/lib/pq" _ "github.com/lib/pq"
) )

2
internal/backend/remote-state/pg/client_test.go
View File

@ -9,7 +9,7 @@ import (
"testing" "testing"
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
) )
func TestRemoteClient_impl(t *testing.T) { func TestRemoteClient_impl(t *testing.T) {

6
internal/backend/remote-state/s3/backend_state.go
View File

@ -12,9 +12,9 @@ import (
"github.com/aws/aws-sdk-go/service/s3" "github.com/aws/aws-sdk-go/service/s3"
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
) )
func (b *Backend) Workspaces() ([]string, error) { func (b *Backend) Workspaces() ([]string, error) {

4
internal/backend/remote-state/s3/backend_test.go
View File

@ -14,8 +14,8 @@ import (
awsbase "github.com/hashicorp/aws-sdk-go-base" awsbase "github.com/hashicorp/aws-sdk-go-base"
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/internal/configs/hcl2shim" "github.com/hashicorp/terraform/internal/configs/hcl2shim"
"github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
) )
var ( var (

4
internal/backend/remote-state/s3/client.go
View File

@ -18,8 +18,8 @@ import (
"github.com/aws/aws-sdk-go/service/s3" "github.com/aws/aws-sdk-go/service/s3"
multierror "github.com/hashicorp/go-multierror" multierror "github.com/hashicorp/go-multierror"
uuid "github.com/hashicorp/go-uuid" uuid "github.com/hashicorp/go-uuid"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
) )
// Store the last saved serial in dynamo with this suffix for consistency checks. // Store the last saved serial in dynamo with this suffix for consistency checks.

6
internal/backend/remote-state/s3/client_test.go
View File

@ -9,9 +9,9 @@ import (
"time" "time"
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
"github.com/hashicorp/terraform/states/statefile" "github.com/hashicorp/terraform/internal/states/statefile"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
) )
func TestRemoteClient_impl(t *testing.T) { func TestRemoteClient_impl(t *testing.T) {

6
internal/backend/remote-state/swift/backend_state.go
View File

@ -5,9 +5,9 @@ import (
"strings" "strings"
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
) )
const ( const (

4
internal/backend/remote-state/swift/client.go
View File

@ -14,8 +14,8 @@ import (
"github.com/gophercloud/gophercloud/openstack/objectstorage/v1/containers" "github.com/gophercloud/gophercloud/openstack/objectstorage/v1/containers"
"github.com/gophercloud/gophercloud/openstack/objectstorage/v1/objects" "github.com/gophercloud/gophercloud/openstack/objectstorage/v1/objects"
"github.com/gophercloud/gophercloud/pagination" "github.com/gophercloud/gophercloud/pagination"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
) )
const ( const (

2
internal/backend/remote-state/swift/client_test.go
View File

@ -6,7 +6,7 @@ import (
"time" "time"
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
) )
func TestRemoteClient_impl(t *testing.T) { func TestRemoteClient_impl(t *testing.T) {

4
internal/backend/remote/backend.go
View File

@ -18,9 +18,9 @@ import (
"github.com/hashicorp/terraform-svchost/disco" "github.com/hashicorp/terraform-svchost/disco"
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/configs/configschema"
"github.com/hashicorp/terraform/internal/states/remote"
"github.com/hashicorp/terraform/internal/states/statemgr"
"github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/internal/tfdiags"
"github.com/hashicorp/terraform/states/remote"
"github.com/hashicorp/terraform/states/statemgr"
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
tfversion "github.com/hashicorp/terraform/version" tfversion "github.com/hashicorp/terraform/version"
"github.com/mitchellh/cli" "github.com/mitchellh/cli"

2
internal/backend/remote/backend_apply_test.go
View File

@ -20,8 +20,8 @@ import (
"github.com/hashicorp/terraform/internal/initwd" "github.com/hashicorp/terraform/internal/initwd"
"github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/plans"
"github.com/hashicorp/terraform/internal/plans/planfile" "github.com/hashicorp/terraform/internal/plans/planfile"
"github.com/hashicorp/terraform/internal/states/statemgr"
"github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/internal/terminal"
"github.com/hashicorp/terraform/states/statemgr"
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
tfversion "github.com/hashicorp/terraform/version" tfversion "github.com/hashicorp/terraform/version"
"github.com/mitchellh/cli" "github.com/mitchellh/cli"

2
internal/backend/remote/backend_context.go
View File

@ -12,8 +12,8 @@ import (
"github.com/hashicorp/hcl/v2/hclsyntax" "github.com/hashicorp/hcl/v2/hclsyntax"
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/configs"
"github.com/hashicorp/terraform/internal/states/statemgr"
"github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/internal/tfdiags"
"github.com/hashicorp/terraform/states/statemgr"
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
"github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty"
) )

2
internal/backend/remote/backend_context_test.go
View File

@ -11,8 +11,8 @@ import (
"github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/command/views"
"github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/configs"
"github.com/hashicorp/terraform/internal/initwd" "github.com/hashicorp/terraform/internal/initwd"
"github.com/hashicorp/terraform/internal/states/statemgr"
"github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/internal/terminal"
"github.com/hashicorp/terraform/states/statemgr"
"github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty"
) )

2
internal/backend/remote/backend_plan_test.go
View File

@ -19,8 +19,8 @@ import (
"github.com/hashicorp/terraform/internal/initwd" "github.com/hashicorp/terraform/internal/initwd"
"github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/plans"
"github.com/hashicorp/terraform/internal/plans/planfile" "github.com/hashicorp/terraform/internal/plans/planfile"
"github.com/hashicorp/terraform/internal/states/statemgr"
"github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/internal/terminal"
"github.com/hashicorp/terraform/states/statemgr"
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
"github.com/mitchellh/cli" "github.com/mitchellh/cli"
) )

6
internal/backend/remote/backend_state.go
View File

@ -8,9 +8,9 @@ import (
"fmt" "fmt"
tfe "github.com/hashicorp/go-tfe" tfe "github.com/hashicorp/go-tfe"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
"github.com/hashicorp/terraform/states/statefile" "github.com/hashicorp/terraform/internal/states/statefile"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
) )
type remoteClient struct { type remoteClient struct {

6
internal/backend/remote/backend_state_test.go
View File

@ -6,9 +6,9 @@ import (
"testing" "testing"
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/internal/states/remote"
"github.com/hashicorp/terraform/states/statefile" "github.com/hashicorp/terraform/internal/states/statefile"
) )
func TestRemoteClient_impl(t *testing.T) { func TestRemoteClient_impl(t *testing.T) {

2
internal/backend/remote/testing.go
View File

@ -18,8 +18,8 @@ import (
"github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/configs/configschema"
"github.com/hashicorp/terraform/internal/httpclient" "github.com/hashicorp/terraform/internal/httpclient"
"github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/providers"
"github.com/hashicorp/terraform/internal/states/remote"
"github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/internal/tfdiags"
"github.com/hashicorp/terraform/states/remote"
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
"github.com/hashicorp/terraform/version" "github.com/hashicorp/terraform/version"
"github.com/mitchellh/cli" "github.com/mitchellh/cli"

4
internal/backend/testing.go
View File

@ -12,9 +12,9 @@ import (
"github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/addrs"
"github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/configs"
"github.com/hashicorp/terraform/internal/configs/hcl2shim" "github.com/hashicorp/terraform/internal/configs/hcl2shim"
"github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/internal/states/statemgr"
"github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/internal/tfdiags"
"github.com/hashicorp/terraform/states"
"github.com/hashicorp/terraform/states/statemgr"
) )
// TestBackendConfig validates and configures the backend with the // TestBackendConfig validates and configures the backend with the

2
internal/builtin/providers/terraform/data_source_state_test.go
View File

@ -8,8 +8,8 @@ import (
"github.com/apparentlymart/go-dump/dump" "github.com/apparentlymart/go-dump/dump"
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/configs/configschema"
"github.com/hashicorp/terraform/internal/states/statemgr"
"github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/internal/tfdiags"
"github.com/hashicorp/terraform/states/statemgr"
"github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty"
) )

4
internal/command/apply_destroy_test.go
View File

@ -12,8 +12,8 @@ import (
"github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/addrs"
"github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/configs/configschema"
"github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/providers"
"github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/states/statefile" "github.com/hashicorp/terraform/internal/states/statefile"
) )
func TestApply_destroy(t *testing.T) { func TestApply_destroy(t *testing.T) {

4
internal/command/apply_test.go
View File

@ -25,9 +25,9 @@ import (
"github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/configs/configschema"
"github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/plans"
"github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/providers"
"github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/internal/states/statemgr"
"github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/internal/tfdiags"
"github.com/hashicorp/terraform/states"
"github.com/hashicorp/terraform/states/statemgr"
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
tfversion "github.com/hashicorp/terraform/version" tfversion "github.com/hashicorp/terraform/version"
) )

2
internal/command/clistate/local_state.go
View File

@ -13,7 +13,7 @@ import (
multierror "github.com/hashicorp/go-multierror" multierror "github.com/hashicorp/go-multierror"
"github.com/hashicorp/terraform/internal/legacy/terraform" "github.com/hashicorp/terraform/internal/legacy/terraform"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
) )
// LocalState manages a state storage that is local to the filesystem. // LocalState manages a state storage that is local to the filesystem.

2
internal/command/clistate/state.go
View File

@ -12,8 +12,8 @@ import (
"github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/command/views"
"github.com/hashicorp/terraform/internal/helper/slowmessage" "github.com/hashicorp/terraform/internal/helper/slowmessage"
"github.com/hashicorp/terraform/internal/states/statemgr"
"github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/internal/tfdiags"
"github.com/hashicorp/terraform/states/statemgr"
) )
const ( const (

2
internal/command/clistate/state_test.go
View File

@ -5,8 +5,8 @@ import (
"github.com/hashicorp/terraform/internal/command/arguments" "github.com/hashicorp/terraform/internal/command/arguments"
"github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/command/views"
"github.com/hashicorp/terraform/internal/states/statemgr"
"github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/internal/terminal"
"github.com/hashicorp/terraform/states/statemgr"
) )
func TestUnlock(t *testing.T) { func TestUnlock(t *testing.T) {

6
internal/command/command_test.go
View File

@ -36,10 +36,10 @@ import (
"github.com/hashicorp/terraform/internal/plans/planfile" "github.com/hashicorp/terraform/internal/plans/planfile"
"github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/providers"
"github.com/hashicorp/terraform/internal/registry" "github.com/hashicorp/terraform/internal/registry"
"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/terminal" "github.com/hashicorp/terraform/internal/terminal"
"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/terraform"
"github.com/hashicorp/terraform/version" "github.com/hashicorp/terraform/version"
"github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty"

2
internal/command/format/diff.go
View File

@ -16,7 +16,7 @@ import (
"github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/configs/configschema"
"github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/plans"
"github.com/hashicorp/terraform/internal/plans/objchange" "github.com/hashicorp/terraform/internal/plans/objchange"
"github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/internal/states"
) )
// ResourceChange returns a string representation of a change to a particular // ResourceChange returns a string representation of a change to a particular

2
internal/command/format/diff_test.go
View File

@ -8,7 +8,7 @@ import (
"github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/addrs"
"github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/configs/configschema"
"github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/plans"
"github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/internal/states"
"github.com/mitchellh/colorstring" "github.com/mitchellh/colorstring"
"github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty"
) )

2
internal/command/format/state.go
View File

@ -11,7 +11,7 @@ import (
"github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/addrs"
"github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/configs/configschema"
"github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/plans"
"github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
"github.com/mitchellh/colorstring" "github.com/mitchellh/colorstring"
) )

2
internal/command/format/state_test.go
View File

@ -7,7 +7,7 @@ import (
"github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/addrs"
"github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/configs/configschema"
"github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/providers"
"github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
"github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty"
) )

2
internal/command/graph_test.go
View File

@ -10,7 +10,7 @@ import (
"github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/addrs"
"github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/plans"
"github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/internal/states"
) )
func TestGraph(t *testing.T) { func TestGraph(t *testing.T) {

2
internal/command/init.go
View File

@ -19,8 +19,8 @@ import (
"github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/configs/configschema"
"github.com/hashicorp/terraform/internal/getproviders" "github.com/hashicorp/terraform/internal/getproviders"
"github.com/hashicorp/terraform/internal/providercache" "github.com/hashicorp/terraform/internal/providercache"
"github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/internal/tfdiags"
"github.com/hashicorp/terraform/states"
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
tfversion "github.com/hashicorp/terraform/version" tfversion "github.com/hashicorp/terraform/version"
) )

4
internal/command/init_test.go
View File

@ -23,8 +23,8 @@ import (
"github.com/hashicorp/terraform/internal/depsfile" "github.com/hashicorp/terraform/internal/depsfile"
"github.com/hashicorp/terraform/internal/getproviders" "github.com/hashicorp/terraform/internal/getproviders"
"github.com/hashicorp/terraform/internal/providercache" "github.com/hashicorp/terraform/internal/providercache"
"github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
) )
func TestInit_empty(t *testing.T) { func TestInit_empty(t *testing.T) {

4
internal/command/jsonplan/plan.go
View File

@ -13,8 +13,8 @@ import (
"github.com/hashicorp/terraform/internal/command/jsonstate" "github.com/hashicorp/terraform/internal/command/jsonstate"
"github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/configs"
"github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/plans"
"github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/states/statefile" "github.com/hashicorp/terraform/internal/states/statefile"
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
"github.com/hashicorp/terraform/version" "github.com/hashicorp/terraform/version"
) )

4
internal/command/jsonstate/state.go
View File

@ -9,8 +9,8 @@ import (
ctyjson "github.com/zclconf/go-cty/cty/json" ctyjson "github.com/zclconf/go-cty/cty/json"
"github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/addrs"
"github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/states/statefile" "github.com/hashicorp/terraform/internal/states/statefile"
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
) )

2
internal/command/jsonstate/state_test.go
View File

@ -7,7 +7,7 @@ import (
"github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/addrs"
"github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/configs/configschema"
"github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
"github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty"
) )

2
internal/command/meta_backend.go
View File

@ -22,8 +22,8 @@ import (
"github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/command/views"
"github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/configs"
"github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/plans"
"github.com/hashicorp/terraform/internal/states/statemgr"
"github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/internal/tfdiags"
"github.com/hashicorp/terraform/states/statemgr"
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
"github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty"
ctyjson "github.com/zclconf/go-cty/cty/json" ctyjson "github.com/zclconf/go-cty/cty/json"

4
internal/command/meta_backend_migrate.go
View File

@ -15,8 +15,8 @@ import (
"github.com/hashicorp/terraform/internal/command/arguments" "github.com/hashicorp/terraform/internal/command/arguments"
"github.com/hashicorp/terraform/internal/command/clistate" "github.com/hashicorp/terraform/internal/command/clistate"
"github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/command/views"
"github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
) )

6
internal/command/meta_backend_test.go
View File

@ -13,9 +13,9 @@ import (
"github.com/hashicorp/terraform/internal/configs" "github.com/hashicorp/terraform/internal/configs"
"github.com/hashicorp/terraform/internal/copy" "github.com/hashicorp/terraform/internal/copy"
"github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/plans"
"github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/states/statefile" "github.com/hashicorp/terraform/internal/states/statefile"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/internal/states/statemgr"
"github.com/mitchellh/cli" "github.com/mitchellh/cli"
"github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty"

2
internal/command/output.go
View File

@ -6,8 +6,8 @@ import (
"github.com/hashicorp/terraform/internal/command/arguments" "github.com/hashicorp/terraform/internal/command/arguments"
"github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/command/views"
"github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/internal/tfdiags"
"github.com/hashicorp/terraform/states"
) )
// OutputCommand is a Command implementation that reads an output // OutputCommand is a Command implementation that reads an output

2
internal/command/output_test.go
View File

@ -9,7 +9,7 @@ import (
"github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty"
"github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/addrs"
"github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/internal/states"
) )
func TestOutput(t *testing.T) { func TestOutput(t *testing.T) {

2
internal/command/plan_test.go
View File

@ -21,8 +21,8 @@ import (
"github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/configs/configschema"
"github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/plans"
"github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/providers"
"github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/internal/tfdiags"
"github.com/hashicorp/terraform/states"
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
) )

6
internal/command/refresh_test.go
View File

@ -19,10 +19,10 @@ import (
"github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/addrs"
"github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/configs/configschema"
"github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/providers"
"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/tfdiags" "github.com/hashicorp/terraform/internal/tfdiags"
"github.com/hashicorp/terraform/states"
"github.com/hashicorp/terraform/states/statefile"
"github.com/hashicorp/terraform/states/statemgr"
) )
var equateEmpty = cmpopts.EquateEmpty() var equateEmpty = cmpopts.EquateEmpty()

4
internal/command/show.go
View File

@ -13,9 +13,9 @@ import (
"github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/command/views"
"github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/plans"
"github.com/hashicorp/terraform/internal/plans/planfile" "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/tfdiags" "github.com/hashicorp/terraform/internal/tfdiags"
"github.com/hashicorp/terraform/states/statefile"
"github.com/hashicorp/terraform/states/statemgr"
) )
// ShowCommand is a Command implementation that reads and outputs the // ShowCommand is a Command implementation that reads and outputs the

2
internal/command/show_test.go
View File

@ -14,7 +14,7 @@ import (
"github.com/hashicorp/terraform/internal/configs/configschema" "github.com/hashicorp/terraform/internal/configs/configschema"
"github.com/hashicorp/terraform/internal/plans" "github.com/hashicorp/terraform/internal/plans"
"github.com/hashicorp/terraform/internal/providers" "github.com/hashicorp/terraform/internal/providers"
"github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
"github.com/mitchellh/cli" "github.com/mitchellh/cli"
"github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty"

2
internal/command/state_list.go
View File

@ -5,8 +5,8 @@ import (
"strings" "strings"
"github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/addrs"
"github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/internal/tfdiags"
"github.com/hashicorp/terraform/states"
"github.com/mitchellh/cli" "github.com/mitchellh/cli"
) )

4
internal/command/state_meta.go
View File

@ -6,9 +6,9 @@ import (
"time" "time"
"github.com/hashicorp/terraform/internal/addrs" "github.com/hashicorp/terraform/internal/addrs"
"github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/internal/states/statemgr"
"github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/internal/tfdiags"
"github.com/hashicorp/terraform/states"
"github.com/hashicorp/terraform/states/statemgr"
backendLocal "github.com/hashicorp/terraform/internal/backend/local" backendLocal "github.com/hashicorp/terraform/internal/backend/local"
) )

2
internal/command/state_mv.go
View File

@ -8,8 +8,8 @@ import (
"github.com/hashicorp/terraform/internal/command/arguments" "github.com/hashicorp/terraform/internal/command/arguments"
"github.com/hashicorp/terraform/internal/command/clistate" "github.com/hashicorp/terraform/internal/command/clistate"
"github.com/hashicorp/terraform/internal/command/views" "github.com/hashicorp/terraform/internal/command/views"
"github.com/hashicorp/terraform/internal/states"
"github.com/hashicorp/terraform/internal/tfdiags" "github.com/hashicorp/terraform/internal/tfdiags"
"github.com/hashicorp/terraform/states"
"github.com/mitchellh/cli" "github.com/mitchellh/cli"
) )

Some files were not shown because too many files have changed in this diff Show More