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.
This commit is contained in:
Martin Atkins 2021-05-17 09:54:53 -07:00
parent 415ab31db8
commit 4c254cc2be
19 changed files with 15 additions and 15 deletions

View File

@ -21,7 +21,7 @@ import (
svcauth "github.com/hashicorp/terraform-svchost/auth" svcauth "github.com/hashicorp/terraform-svchost/auth"
"github.com/hashicorp/terraform-svchost/disco" "github.com/hashicorp/terraform-svchost/disco"
"github.com/hashicorp/terraform/command/cliconfig" "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/terraform"
"github.com/hashicorp/terraform/tfdiags" "github.com/hashicorp/terraform/tfdiags"

View File

@ -17,7 +17,7 @@ import (
oauthserver "github.com/hashicorp/terraform/command/testdata/login-oauth-server" oauthserver "github.com/hashicorp/terraform/command/testdata/login-oauth-server"
tfeserver "github.com/hashicorp/terraform/command/testdata/login-tfe-server" tfeserver "github.com/hashicorp/terraform/command/testdata/login-tfe-server"
"github.com/hashicorp/terraform/command/webbrowser" "github.com/hashicorp/terraform/command/webbrowser"
"github.com/hashicorp/terraform/httpclient" "github.com/hashicorp/terraform/internal/httpclient"
"github.com/hashicorp/terraform/version" "github.com/hashicorp/terraform/version"
) )

View File

@ -10,8 +10,8 @@ import (
"github.com/apparentlymart/go-versions/versions" "github.com/apparentlymart/go-versions/versions"
"github.com/hashicorp/go-getter" "github.com/hashicorp/go-getter"
"github.com/hashicorp/terraform/httpclient"
"github.com/hashicorp/terraform/internal/getproviders" "github.com/hashicorp/terraform/internal/getproviders"
"github.com/hashicorp/terraform/internal/httpclient"
"github.com/hashicorp/terraform/tfdiags" "github.com/hashicorp/terraform/tfdiags"
) )

View File

@ -8,7 +8,7 @@ import (
"net/url" "net/url"
"sync" "sync"
"github.com/hashicorp/terraform/httpclient" "github.com/hashicorp/terraform/internal/httpclient"
) )
// NewMockLauncher creates and returns a mock implementation of Launcher, // NewMockLauncher creates and returns a mock implementation of Launcher,

View File

@ -16,7 +16,7 @@ import (
"github.com/Azure/go-autorest/autorest/azure" "github.com/Azure/go-autorest/autorest/azure"
"github.com/hashicorp/go-azure-helpers/authentication" "github.com/hashicorp/go-azure-helpers/authentication"
"github.com/hashicorp/go-azure-helpers/sender" "github.com/hashicorp/go-azure-helpers/sender"
"github.com/hashicorp/terraform/httpclient" "github.com/hashicorp/terraform/internal/httpclient"
) )
type ArmClient struct { type ArmClient struct {

View File

@ -9,8 +9,8 @@ import (
"strings" "strings"
"cloud.google.com/go/storage" "cloud.google.com/go/storage"
"github.com/hashicorp/terraform/httpclient"
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/internal/httpclient"
"github.com/hashicorp/terraform/internal/legacy/helper/schema" "github.com/hashicorp/terraform/internal/legacy/helper/schema"
"golang.org/x/oauth2" "golang.org/x/oauth2"
"google.golang.org/api/impersonate" "google.golang.org/api/impersonate"

View File

@ -15,8 +15,8 @@ import (
"github.com/hashicorp/terraform-svchost/disco" "github.com/hashicorp/terraform-svchost/disco"
"github.com/hashicorp/terraform/configs" "github.com/hashicorp/terraform/configs"
"github.com/hashicorp/terraform/configs/configschema" "github.com/hashicorp/terraform/configs/configschema"
"github.com/hashicorp/terraform/httpclient"
"github.com/hashicorp/terraform/internal/backend" "github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/internal/httpclient"
"github.com/hashicorp/terraform/providers" "github.com/hashicorp/terraform/providers"
"github.com/hashicorp/terraform/states/remote" "github.com/hashicorp/terraform/states/remote"
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"

View File

@ -18,7 +18,7 @@ import (
"golang.org/x/net/idna" "golang.org/x/net/idna"
"github.com/hashicorp/terraform/addrs" "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/internal/logging"
"github.com/hashicorp/terraform/version" "github.com/hashicorp/terraform/version"
) )

View File

@ -21,7 +21,7 @@ import (
svcauth "github.com/hashicorp/terraform-svchost/auth" svcauth "github.com/hashicorp/terraform-svchost/auth"
"github.com/hashicorp/terraform/addrs" "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/internal/logging"
"github.com/hashicorp/terraform/version" "github.com/hashicorp/terraform/version"
) )

View File

@ -10,9 +10,9 @@ import (
getter "github.com/hashicorp/go-getter" getter "github.com/hashicorp/go-getter"
"github.com/hashicorp/terraform/httpclient"
"github.com/hashicorp/terraform/internal/copy" "github.com/hashicorp/terraform/internal/copy"
"github.com/hashicorp/terraform/internal/getproviders" "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 // We borrow the "unpack a zip file into a target directory" logic from

View File

@ -16,7 +16,7 @@ import (
"github.com/hashicorp/go-retryablehttp" "github.com/hashicorp/go-retryablehttp"
svchost "github.com/hashicorp/terraform-svchost" svchost "github.com/hashicorp/terraform-svchost"
"github.com/hashicorp/terraform-svchost/disco" "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/logging"
"github.com/hashicorp/terraform/internal/registry/regsrc" "github.com/hashicorp/terraform/internal/registry/regsrc"
"github.com/hashicorp/terraform/internal/registry/response" "github.com/hashicorp/terraform/internal/registry/response"

View File

@ -10,7 +10,7 @@ import (
version "github.com/hashicorp/go-version" version "github.com/hashicorp/go-version"
"github.com/hashicorp/terraform-svchost/disco" "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/regsrc"
"github.com/hashicorp/terraform/internal/registry/test" "github.com/hashicorp/terraform/internal/registry/test"
tfversion "github.com/hashicorp/terraform/version" tfversion "github.com/hashicorp/terraform/version"

View File

@ -13,7 +13,7 @@ import (
svchost "github.com/hashicorp/terraform-svchost" svchost "github.com/hashicorp/terraform-svchost"
"github.com/hashicorp/terraform-svchost/auth" "github.com/hashicorp/terraform-svchost/auth"
"github.com/hashicorp/terraform-svchost/disco" "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/regsrc"
"github.com/hashicorp/terraform/internal/registry/response" "github.com/hashicorp/terraform/internal/registry/response"
tfversion "github.com/hashicorp/terraform/version" tfversion "github.com/hashicorp/terraform/version"

View File

@ -16,8 +16,8 @@ import (
"github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/addrs"
"github.com/hashicorp/terraform/command/cliconfig" "github.com/hashicorp/terraform/command/cliconfig"
"github.com/hashicorp/terraform/command/format" "github.com/hashicorp/terraform/command/format"
"github.com/hashicorp/terraform/httpclient"
"github.com/hashicorp/terraform/internal/didyoumean" "github.com/hashicorp/terraform/internal/didyoumean"
"github.com/hashicorp/terraform/internal/httpclient"
"github.com/hashicorp/terraform/internal/logging" "github.com/hashicorp/terraform/internal/logging"
"github.com/hashicorp/terraform/internal/terminal" "github.com/hashicorp/terraform/internal/terminal"
"github.com/hashicorp/terraform/version" "github.com/hashicorp/terraform/version"

View File

@ -16,9 +16,9 @@ import (
getter "github.com/hashicorp/go-getter" getter "github.com/hashicorp/go-getter"
"github.com/hashicorp/terraform-svchost/disco" "github.com/hashicorp/terraform-svchost/disco"
"github.com/hashicorp/terraform/addrs" "github.com/hashicorp/terraform/addrs"
"github.com/hashicorp/terraform/httpclient"
"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/httpclient"
"github.com/hashicorp/terraform/internal/providercache" "github.com/hashicorp/terraform/internal/providercache"
discovery "github.com/hashicorp/terraform/plugin/discovery" discovery "github.com/hashicorp/terraform/plugin/discovery"
"github.com/hashicorp/terraform/tfdiags" "github.com/hashicorp/terraform/tfdiags"