From 4c254cc2beb44a1152cd0c6c275896826c89ab7c Mon Sep 17 00:00:00 2001 From: Martin Atkins Date: Mon, 17 May 2021 09:54:53 -0700 Subject: [PATCH] Move httpclient/ to internal/httpclient/ 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. --- command/login.go | 2 +- command/login_test.go | 2 +- command/providers_mirror.go | 2 +- command/webbrowser/mock.go | 2 +- internal/backend/remote-state/azure/arm_client.go | 2 +- internal/backend/remote-state/gcs/backend.go | 2 +- internal/backend/remote/testing.go | 2 +- internal/getproviders/http_mirror_source.go | 2 +- internal/getproviders/registry_client.go | 2 +- {httpclient => internal/httpclient}/client.go | 0 {httpclient => internal/httpclient}/client_test.go | 0 {httpclient => internal/httpclient}/useragent.go | 0 {httpclient => internal/httpclient}/useragent_test.go | 0 internal/providercache/package_install.go | 2 +- internal/registry/client.go | 2 +- internal/registry/client_test.go | 2 +- internal/registry/test/mock_registry.go | 2 +- main.go | 2 +- tools/terraform-bundle/package.go | 2 +- 19 files changed, 15 insertions(+), 15 deletions(-) rename {httpclient => internal/httpclient}/client.go (100%) rename {httpclient => internal/httpclient}/client_test.go (100%) rename {httpclient => internal/httpclient}/useragent.go (100%) rename {httpclient => internal/httpclient}/useragent_test.go (100%) diff --git a/command/login.go b/command/login.go index 3a673b8ee..a519ec799 100644 --- a/command/login.go +++ b/command/login.go @@ -21,7 +21,7 @@ import ( svcauth "github.com/hashicorp/terraform-svchost/auth" "github.com/hashicorp/terraform-svchost/disco" "github.com/hashicorp/terraform/command/cliconfig" - "github.com/hashicorp/terraform/httpclient" + "github.com/hashicorp/terraform/internal/httpclient" "github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/tfdiags" diff --git a/command/login_test.go b/command/login_test.go index 9b0e8de96..409caa92a 100644 --- a/command/login_test.go +++ b/command/login_test.go @@ -17,7 +17,7 @@ import ( oauthserver "github.com/hashicorp/terraform/command/testdata/login-oauth-server" tfeserver "github.com/hashicorp/terraform/command/testdata/login-tfe-server" "github.com/hashicorp/terraform/command/webbrowser" - "github.com/hashicorp/terraform/httpclient" + "github.com/hashicorp/terraform/internal/httpclient" "github.com/hashicorp/terraform/version" ) diff --git a/command/providers_mirror.go b/command/providers_mirror.go index 3922840e0..3aacf1dc1 100644 --- a/command/providers_mirror.go +++ b/command/providers_mirror.go @@ -10,8 +10,8 @@ import ( "github.com/apparentlymart/go-versions/versions" "github.com/hashicorp/go-getter" - "github.com/hashicorp/terraform/httpclient" "github.com/hashicorp/terraform/internal/getproviders" + "github.com/hashicorp/terraform/internal/httpclient" "github.com/hashicorp/terraform/tfdiags" ) diff --git a/command/webbrowser/mock.go b/command/webbrowser/mock.go index ef411ba1e..1245cbede 100644 --- a/command/webbrowser/mock.go +++ b/command/webbrowser/mock.go @@ -8,7 +8,7 @@ import ( "net/url" "sync" - "github.com/hashicorp/terraform/httpclient" + "github.com/hashicorp/terraform/internal/httpclient" ) // NewMockLauncher creates and returns a mock implementation of Launcher, diff --git a/internal/backend/remote-state/azure/arm_client.go b/internal/backend/remote-state/azure/arm_client.go index 53a436641..4d03c3718 100644 --- a/internal/backend/remote-state/azure/arm_client.go +++ b/internal/backend/remote-state/azure/arm_client.go @@ -16,7 +16,7 @@ import ( "github.com/Azure/go-autorest/autorest/azure" "github.com/hashicorp/go-azure-helpers/authentication" "github.com/hashicorp/go-azure-helpers/sender" - "github.com/hashicorp/terraform/httpclient" + "github.com/hashicorp/terraform/internal/httpclient" ) type ArmClient struct { diff --git a/internal/backend/remote-state/gcs/backend.go b/internal/backend/remote-state/gcs/backend.go index 3149e2ee2..af2a667eb 100644 --- a/internal/backend/remote-state/gcs/backend.go +++ b/internal/backend/remote-state/gcs/backend.go @@ -9,8 +9,8 @@ import ( "strings" "cloud.google.com/go/storage" - "github.com/hashicorp/terraform/httpclient" "github.com/hashicorp/terraform/internal/backend" + "github.com/hashicorp/terraform/internal/httpclient" "github.com/hashicorp/terraform/internal/legacy/helper/schema" "golang.org/x/oauth2" "google.golang.org/api/impersonate" diff --git a/internal/backend/remote/testing.go b/internal/backend/remote/testing.go index c903d16e1..af8864d44 100644 --- a/internal/backend/remote/testing.go +++ b/internal/backend/remote/testing.go @@ -15,8 +15,8 @@ import ( "github.com/hashicorp/terraform-svchost/disco" "github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs/configschema" - "github.com/hashicorp/terraform/httpclient" "github.com/hashicorp/terraform/internal/backend" + "github.com/hashicorp/terraform/internal/httpclient" "github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/terraform" diff --git a/internal/getproviders/http_mirror_source.go b/internal/getproviders/http_mirror_source.go index aaf707ee8..4f9e694eb 100644 --- a/internal/getproviders/http_mirror_source.go +++ b/internal/getproviders/http_mirror_source.go @@ -18,7 +18,7 @@ import ( "golang.org/x/net/idna" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/httpclient" + "github.com/hashicorp/terraform/internal/httpclient" "github.com/hashicorp/terraform/internal/logging" "github.com/hashicorp/terraform/version" ) diff --git a/internal/getproviders/registry_client.go b/internal/getproviders/registry_client.go index 7608fb806..93cb51e03 100644 --- a/internal/getproviders/registry_client.go +++ b/internal/getproviders/registry_client.go @@ -21,7 +21,7 @@ import ( svcauth "github.com/hashicorp/terraform-svchost/auth" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/httpclient" + "github.com/hashicorp/terraform/internal/httpclient" "github.com/hashicorp/terraform/internal/logging" "github.com/hashicorp/terraform/version" ) diff --git a/httpclient/client.go b/internal/httpclient/client.go similarity index 100% rename from httpclient/client.go rename to internal/httpclient/client.go diff --git a/httpclient/client_test.go b/internal/httpclient/client_test.go similarity index 100% rename from httpclient/client_test.go rename to internal/httpclient/client_test.go diff --git a/httpclient/useragent.go b/internal/httpclient/useragent.go similarity index 100% rename from httpclient/useragent.go rename to internal/httpclient/useragent.go diff --git a/httpclient/useragent_test.go b/internal/httpclient/useragent_test.go similarity index 100% rename from httpclient/useragent_test.go rename to internal/httpclient/useragent_test.go diff --git a/internal/providercache/package_install.go b/internal/providercache/package_install.go index 57b388888..3aa776d02 100644 --- a/internal/providercache/package_install.go +++ b/internal/providercache/package_install.go @@ -10,9 +10,9 @@ import ( getter "github.com/hashicorp/go-getter" - "github.com/hashicorp/terraform/httpclient" "github.com/hashicorp/terraform/internal/copy" "github.com/hashicorp/terraform/internal/getproviders" + "github.com/hashicorp/terraform/internal/httpclient" ) // We borrow the "unpack a zip file into a target directory" logic from diff --git a/internal/registry/client.go b/internal/registry/client.go index 7a87078ed..b47234f3c 100644 --- a/internal/registry/client.go +++ b/internal/registry/client.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/go-retryablehttp" svchost "github.com/hashicorp/terraform-svchost" "github.com/hashicorp/terraform-svchost/disco" - "github.com/hashicorp/terraform/httpclient" + "github.com/hashicorp/terraform/internal/httpclient" "github.com/hashicorp/terraform/internal/logging" "github.com/hashicorp/terraform/internal/registry/regsrc" "github.com/hashicorp/terraform/internal/registry/response" diff --git a/internal/registry/client_test.go b/internal/registry/client_test.go index 1122e6164..765c3b001 100644 --- a/internal/registry/client_test.go +++ b/internal/registry/client_test.go @@ -10,7 +10,7 @@ import ( version "github.com/hashicorp/go-version" "github.com/hashicorp/terraform-svchost/disco" - "github.com/hashicorp/terraform/httpclient" + "github.com/hashicorp/terraform/internal/httpclient" "github.com/hashicorp/terraform/internal/registry/regsrc" "github.com/hashicorp/terraform/internal/registry/test" tfversion "github.com/hashicorp/terraform/version" diff --git a/internal/registry/test/mock_registry.go b/internal/registry/test/mock_registry.go index 2d590c4d1..079df1bfe 100644 --- a/internal/registry/test/mock_registry.go +++ b/internal/registry/test/mock_registry.go @@ -13,7 +13,7 @@ import ( svchost "github.com/hashicorp/terraform-svchost" "github.com/hashicorp/terraform-svchost/auth" "github.com/hashicorp/terraform-svchost/disco" - "github.com/hashicorp/terraform/httpclient" + "github.com/hashicorp/terraform/internal/httpclient" "github.com/hashicorp/terraform/internal/registry/regsrc" "github.com/hashicorp/terraform/internal/registry/response" tfversion "github.com/hashicorp/terraform/version" diff --git a/main.go b/main.go index 9a1c37284..bc3785511 100644 --- a/main.go +++ b/main.go @@ -16,8 +16,8 @@ import ( "github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/command/cliconfig" "github.com/hashicorp/terraform/command/format" - "github.com/hashicorp/terraform/httpclient" "github.com/hashicorp/terraform/internal/didyoumean" + "github.com/hashicorp/terraform/internal/httpclient" "github.com/hashicorp/terraform/internal/logging" "github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/version" diff --git a/tools/terraform-bundle/package.go b/tools/terraform-bundle/package.go index 35eb25bbd..8a83c69a7 100644 --- a/tools/terraform-bundle/package.go +++ b/tools/terraform-bundle/package.go @@ -16,9 +16,9 @@ import ( getter "github.com/hashicorp/go-getter" "github.com/hashicorp/terraform-svchost/disco" "github.com/hashicorp/terraform/addrs" - "github.com/hashicorp/terraform/httpclient" "github.com/hashicorp/terraform/internal/depsfile" "github.com/hashicorp/terraform/internal/getproviders" + "github.com/hashicorp/terraform/internal/httpclient" "github.com/hashicorp/terraform/internal/providercache" discovery "github.com/hashicorp/terraform/plugin/discovery" "github.com/hashicorp/terraform/tfdiags"