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

Merge pull request #27557 from hashicorp/jbardin/helper-packages 

Move remaining helper/ packages to internal/
This commit is contained in:
James Bardin 2021-01-20 14:20:06 -05:00 committed by GitHub
parent a7d50d3264 9f2a6d33be
commit 08560ee77a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/remote-state/azure/backend_test.go
View File

@ -6,7 +6,7 @@ import (
"testing" "testing"
"github.com/hashicorp/terraform/backend" "github.com/hashicorp/terraform/backend"
"github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/internal/legacy/helper/acctest"
) )
func TestBackend_impl(t *testing.T) { func TestBackend_impl(t *testing.T) {

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

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

2
command/clistate/state.go
View File

@ -13,7 +13,7 @@ import (
"github.com/hashicorp/errwrap" "github.com/hashicorp/errwrap"
multierror "github.com/hashicorp/go-multierror" multierror "github.com/hashicorp/go-multierror"
"github.com/hashicorp/terraform/helper/slowmessage" "github.com/hashicorp/terraform/internal/helper/slowmessage"
"github.com/hashicorp/terraform/states/statemgr" "github.com/hashicorp/terraform/states/statemgr"
"github.com/mitchellh/cli" "github.com/mitchellh/cli"
"github.com/mitchellh/colorstring" "github.com/mitchellh/colorstring"

2
command/console.go
View File

@ -7,7 +7,7 @@ import (
"github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/addrs"
"github.com/hashicorp/terraform/backend" "github.com/hashicorp/terraform/backend"
"github.com/hashicorp/terraform/helper/wrappedstreams" "github.com/hashicorp/terraform/internal/helper/wrappedstreams"
"github.com/hashicorp/terraform/repl" "github.com/hashicorp/terraform/repl"
"github.com/hashicorp/terraform/tfdiags" "github.com/hashicorp/terraform/tfdiags"

2
command/console_interactive.go
View File

@ -9,7 +9,7 @@ import (
"fmt" "fmt"
"io" "io"
"github.com/hashicorp/terraform/helper/wrappedreadline" "github.com/hashicorp/terraform/internal/helper/wrappedreadline"
"github.com/hashicorp/terraform/repl" "github.com/hashicorp/terraform/repl"
"github.com/chzyer/readline" "github.com/chzyer/readline"

9
helper/README.md
View File

@ -1,9 +0,0 @@
# Legacy Helper Libraries
The packages in this directory are all legacy code. Some of them are legacy
because they are now maintained in
[the Terraform SDK](https://github.com/hashicorp/terraform-plugin-sdk),
while others are just obsolete codepaths that we intend to migrate away
from over time.
Avoid using functions from packages under `helper/` in new projects.

0
helper/slowmessage/slowmessage.go → internal/helper/slowmessage/slowmessage.go
View File

0
helper/slowmessage/slowmessage_test.go → internal/helper/slowmessage/slowmessage_test.go
View File

2
helper/wrappedreadline/wrappedreadline.go → internal/helper/wrappedreadline/wrappedreadline.go
View File

@ -14,7 +14,7 @@ import (
"github.com/chzyer/readline" "github.com/chzyer/readline"
"github.com/hashicorp/terraform/helper/wrappedstreams" "github.com/hashicorp/terraform/internal/helper/wrappedstreams"
) )
// Override overrides the values in readline.Config that need to be // Override overrides the values in readline.Config that need to be

2
helper/wrappedreadline/wrappedreadline_unix.go → internal/helper/wrappedreadline/wrappedreadline_unix.go
View File

@ -6,7 +6,7 @@ import (
"syscall" "syscall"
"unsafe" "unsafe"
"github.com/hashicorp/terraform/helper/wrappedstreams" "github.com/hashicorp/terraform/internal/helper/wrappedstreams"
) )
// getWidth impl for Unix // getWidth impl for Unix

0
helper/wrappedreadline/wrappedreadline_windows.go → internal/helper/wrappedreadline/wrappedreadline_windows.go
View File

0
helper/wrappedstreams/streams.go → internal/helper/wrappedstreams/streams.go
View File

0
helper/wrappedstreams/streams_other.go → internal/helper/wrappedstreams/streams_other.go
View File

0
helper/wrappedstreams/streams_windows.go → internal/helper/wrappedstreams/streams_windows.go
View File

0
helper/acctest/acctest.go → internal/legacy/helper/acctest/acctest.go
View File

0
helper/acctest/random.go → internal/legacy/helper/acctest/random.go
View File

0
helper/acctest/random_test.go → internal/legacy/helper/acctest/random_test.go
View File

0
helper/acctest/remotetests.go → internal/legacy/helper/acctest/remotetests.go
View File

0
helper/hashcode/hashcode.go → internal/legacy/helper/hashcode/hashcode.go
View File

0
helper/hashcode/hashcode_test.go → internal/legacy/helper/hashcode/hashcode_test.go
View File

2
internal/legacy/helper/schema/field_reader_config_test.go
View File

@ -7,7 +7,7 @@ import (
"testing" "testing"
"github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/configs/hcl2shim"
"github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/internal/legacy/helper/hashcode"
"github.com/hashicorp/terraform/internal/legacy/terraform" "github.com/hashicorp/terraform/internal/legacy/terraform"
) )

2
internal/legacy/helper/schema/schema_test.go
View File

@ -12,7 +12,7 @@ import (
"testing" "testing"
"github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/configs/hcl2shim"
"github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/internal/legacy/helper/hashcode"
"github.com/hashicorp/terraform/internal/legacy/terraform" "github.com/hashicorp/terraform/internal/legacy/terraform"
) )

2
internal/legacy/helper/schema/set.go
View File

@ -8,7 +8,7 @@ import (
"strconv" "strconv"
"sync" "sync"
"github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/internal/legacy/helper/hashcode"
) )
// HashString hashes strings. If you want a Set of strings, this is the // HashString hashes strings. If you want a Set of strings, this is the

2
internal/legacy/helper/schema/shims_test.go
View File

@ -13,7 +13,7 @@ import (
"github.com/google/go-cmp/cmp/cmpopts" "github.com/google/go-cmp/cmp/cmpopts"
"github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/configs/configschema"
"github.com/hashicorp/terraform/configs/hcl2shim" "github.com/hashicorp/terraform/configs/hcl2shim"
"github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/internal/legacy/helper/hashcode"
"github.com/hashicorp/terraform/internal/legacy/terraform" "github.com/hashicorp/terraform/internal/legacy/terraform"
"github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/providers"
"github.com/hashicorp/terraform/tfdiags" "github.com/hashicorp/terraform/tfdiags"