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

Move registry/ to internal/registry/ 

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 09:45:36 -07:00
parent 2bd2568ad8
commit 4c5b866dea
27 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
command/command_test.go
View File

@ -18,18 +18,22 @@ import (
"testing"
svchost "github.com/hashicorp/terraform-svchost"
"github.com/hashicorp/terraform-svchost/disco"
"github.com/hashicorp/terraform/command/views"
"github.com/hashicorp/terraform/internal/getproviders"
"github.com/hashicorp/terraform/internal/initwd"
"github.com/hashicorp/terraform/internal/terminal"
"github.com/hashicorp/terraform/registry"
"github.com/hashicorp/terraform-svchost/disco"
"github.com/hashicorp/terraform/addrs"
"github.com/hashicorp/terraform/command/views"
"github.com/hashicorp/terraform/configs"
"github.com/hashicorp/terraform/configs/configload"
"github.com/hashicorp/terraform/configs/configschema"
backendInit "github.com/hashicorp/terraform/internal/backend/init"
backendLocal "github.com/hashicorp/terraform/internal/backend/local"
"github.com/hashicorp/terraform/internal/copy"
"github.com/hashicorp/terraform/internal/getproviders"
"github.com/hashicorp/terraform/internal/initwd"
legacy "github.com/hashicorp/terraform/internal/legacy/terraform"
_ "github.com/hashicorp/terraform/internal/logging"
"github.com/hashicorp/terraform/internal/registry"
"github.com/hashicorp/terraform/internal/terminal"
"github.com/hashicorp/terraform/plans"
"github.com/hashicorp/terraform/plans/planfile"
"github.com/hashicorp/terraform/providers"
@ -39,11 +43,6 @@ import (
"github.com/hashicorp/terraform/terraform"
"github.com/hashicorp/terraform/version"
"github.com/zclconf/go-cty/cty"
backendInit "github.com/hashicorp/terraform/internal/backend/init"
backendLocal "github.com/hashicorp/terraform/internal/backend/local"
legacy "github.com/hashicorp/terraform/internal/legacy/terraform"
_ "github.com/hashicorp/terraform/internal/logging"
)
// These are the directories for our test data and fixtures.

2
command/meta_config.go
View File

@ -15,7 +15,7 @@ import (
"github.com/hashicorp/terraform/configs/configschema"
"github.com/hashicorp/terraform/internal/earlyconfig"
"github.com/hashicorp/terraform/internal/initwd"
"github.com/hashicorp/terraform/registry"
"github.com/hashicorp/terraform/internal/registry"
"github.com/hashicorp/terraform/terraform"
"github.com/hashicorp/terraform/tfdiags"
"github.com/zclconf/go-cty/cty"

2
configs/configload/loader.go
View File

@ -6,7 +6,7 @@ import (
"github.com/hashicorp/terraform-svchost/disco"
"github.com/hashicorp/terraform/configs"
"github.com/hashicorp/terraform/registry"
"github.com/hashicorp/terraform/internal/registry"
"github.com/spf13/afero"
)

2
configs/configload/module_mgr.go
View File

@ -6,7 +6,7 @@ import (
"github.com/hashicorp/terraform-svchost/disco"
"github.com/hashicorp/terraform/internal/modsdir"
"github.com/hashicorp/terraform/registry"
"github.com/hashicorp/terraform/internal/registry"
"github.com/spf13/afero"
)

2
internal/initwd/from_module.go
View File

@ -15,7 +15,7 @@ import (
version "github.com/hashicorp/go-version"
"github.com/hashicorp/terraform-config-inspect/tfconfig"
"github.com/hashicorp/terraform/internal/modsdir"
"github.com/hashicorp/terraform/registry"
"github.com/hashicorp/terraform/internal/registry"
"github.com/hashicorp/terraform/tfdiags"
)

2
internal/initwd/from_module_test.go
View File

@ -12,7 +12,7 @@ import (
"github.com/hashicorp/terraform/configs"
"github.com/hashicorp/terraform/configs/configload"
"github.com/hashicorp/terraform/internal/copy"
"github.com/hashicorp/terraform/registry"
"github.com/hashicorp/terraform/internal/registry"
"github.com/hashicorp/terraform/tfdiags"
)

2
internal/initwd/getter.go
View File

@ -10,7 +10,7 @@ import (
cleanhttp "github.com/hashicorp/go-cleanhttp"
getter "github.com/hashicorp/go-getter"
"github.com/hashicorp/terraform/internal/copy"
"github.com/hashicorp/terraform/registry/regsrc"
"github.com/hashicorp/terraform/internal/registry/regsrc"
)
// We configure our own go-getter detector and getter sets here, because

6
internal/initwd/module_install.go
View File

@ -12,9 +12,9 @@ import (
"github.com/hashicorp/terraform/addrs"
"github.com/hashicorp/terraform/internal/earlyconfig"
"github.com/hashicorp/terraform/internal/modsdir"
"github.com/hashicorp/terraform/registry"
"github.com/hashicorp/terraform/registry/regsrc"
"github.com/hashicorp/terraform/registry/response"
"github.com/hashicorp/terraform/internal/registry"
"github.com/hashicorp/terraform/internal/registry/regsrc"
"github.com/hashicorp/terraform/internal/registry/response"
"github.com/hashicorp/terraform/tfdiags"
)

2
internal/initwd/module_install_test.go
View File

@ -14,7 +14,7 @@ import (
"github.com/hashicorp/terraform/configs"
"github.com/hashicorp/terraform/configs/configload"
"github.com/hashicorp/terraform/internal/copy"
"github.com/hashicorp/terraform/registry"
"github.com/hashicorp/terraform/internal/registry"
"github.com/hashicorp/terraform/tfdiags"
_ "github.com/hashicorp/terraform/internal/logging"

2
internal/initwd/testing.go
View File

@ -1,11 +1,11 @@
package initwd
import (
"github.com/hashicorp/terraform/registry"
"testing"
"github.com/hashicorp/terraform/configs"
"github.com/hashicorp/terraform/configs/configload"
"github.com/hashicorp/terraform/internal/registry"
"github.com/hashicorp/terraform/tfdiags"
)

4
registry/client.go → internal/registry/client.go
View File

@ -18,8 +18,8 @@ import (
"github.com/hashicorp/terraform-svchost/disco"
"github.com/hashicorp/terraform/httpclient"
"github.com/hashicorp/terraform/internal/logging"
"github.com/hashicorp/terraform/registry/regsrc"
"github.com/hashicorp/terraform/registry/response"
"github.com/hashicorp/terraform/internal/registry/regsrc"
"github.com/hashicorp/terraform/internal/registry/response"
"github.com/hashicorp/terraform/version"
)

4
registry/client_test.go → internal/registry/client_test.go
View File

@ -11,8 +11,8 @@ import (
version "github.com/hashicorp/go-version"
"github.com/hashicorp/terraform-svchost/disco"
"github.com/hashicorp/terraform/httpclient"
"github.com/hashicorp/terraform/registry/regsrc"
"github.com/hashicorp/terraform/registry/test"
"github.com/hashicorp/terraform/internal/registry/regsrc"
"github.com/hashicorp/terraform/internal/registry/test"
tfversion "github.com/hashicorp/terraform/version"
)

2
registry/errors.go → internal/registry/errors.go
View File

@ -4,7 +4,7 @@ import (
"fmt"
"github.com/hashicorp/terraform-svchost/disco"
"github.com/hashicorp/terraform/registry/regsrc"
"github.com/hashicorp/terraform/internal/registry/regsrc"
)
type errModuleNotFound struct {

0
registry/regsrc/friendly_host.go → internal/registry/regsrc/friendly_host.go
View File

0
registry/regsrc/friendly_host_test.go → internal/registry/regsrc/friendly_host_test.go
View File

0
registry/regsrc/module.go → internal/registry/regsrc/module.go
View File

0
registry/regsrc/module_test.go → internal/registry/regsrc/module_test.go
View File

0
registry/regsrc/regsrc.go → internal/registry/regsrc/regsrc.go
View File

0
registry/response/module.go → internal/registry/response/module.go
View File

0
registry/response/module_list.go → internal/registry/response/module_list.go
View File

0
registry/response/module_provider.go → internal/registry/response/module_provider.go
View File

0
registry/response/module_versions.go → internal/registry/response/module_versions.go
View File

0
registry/response/pagination.go → internal/registry/response/pagination.go
View File

0
registry/response/pagination_test.go → internal/registry/response/pagination_test.go
View File

0
registry/response/redirect.go → internal/registry/response/redirect.go
View File

4
registry/test/mock_registry.go → internal/registry/test/mock_registry.go
View File

@ -14,8 +14,8 @@ import (
"github.com/hashicorp/terraform-svchost/auth"
"github.com/hashicorp/terraform-svchost/disco"
"github.com/hashicorp/terraform/httpclient"
"github.com/hashicorp/terraform/registry/regsrc"
"github.com/hashicorp/terraform/registry/response"
"github.com/hashicorp/terraform/internal/registry/regsrc"
"github.com/hashicorp/terraform/internal/registry/response"
tfversion "github.com/hashicorp/terraform/version"
)

2
terraform/terraform_test.go
View File

@ -17,10 +17,10 @@ import (
"github.com/hashicorp/terraform/configs"
"github.com/hashicorp/terraform/configs/configload"
"github.com/hashicorp/terraform/internal/initwd"
"github.com/hashicorp/terraform/internal/registry"
"github.com/hashicorp/terraform/plans"
"github.com/hashicorp/terraform/providers"
"github.com/hashicorp/terraform/provisioners"
"github.com/hashicorp/terraform/registry"
"github.com/hashicorp/terraform/states"
_ "github.com/hashicorp/terraform/internal/logging"