Clean up and makes things that can be private

Author: Christian Doucette

internal/client/client.go

@@ -77,7 +77,7 @@ func getTokenFromCreds(services *disco.Disco, hostname svchost.Hostname) string
 // TFE Client along with other necessary information for the provider to run it
 type ProviderClient struct {
 	TfeClient   *tfe.Client
-	tokenSource TokenSource
+	tokenSource tokenSource
 }
 
 // Using presence of TFC_AGENT_VERSION to determine if this provider is running on HCP Terraform / enterprise
@@ -87,7 +87,7 @@ func providerRunningInCloud() bool {
 }
 
 func (pc *ProviderClient) SendAuthenticationWarning() bool {
-	return pc.tokenSource == CredentialFiles && providerRunningInCloud()
+	return pc.tokenSource == credentialFiles && providerRunningInCloud()
 
 }
 
@@ -100,7 +100,6 @@ func (pc *ProviderClient) SendAuthenticationWarning() bool {
 // parameters
 func GetClient(tfeHost, token string, insecure bool) (*ProviderClient, error) {
 	config, err := configure(tfeHost, token, insecure)
-
 	if err != nil {
 		return nil, err
 	}
@@ -111,7 +110,7 @@ func GetClient(tfeHost, token string, insecure bool) (*ProviderClient, error) {
 	// Try to retrieve the client from cache
 	cached := clientCache.GetByConfig(config)
 	if cached != nil {
-		return &ProviderClient{cached, config.TokenSource}, nil
+		return &ProviderClient{cached, config.tokenSource}, nil
 	}
 
 	// Discover the Terraform Enterprise address.
@@ -175,7 +174,7 @@ func GetClient(tfeHost, token string, insecure bool) (*ProviderClient, error) {
 	client.RetryServerErrors(true)
 	clientCache.Set(client, config)
 
-	return &ProviderClient{client, config.TokenSource}, nil
+	return &ProviderClient{client, config.tokenSource}, nil
 }
 
 // CheckConstraints checks service version constrains against our own

internal/client/config.go

@@ -41,12 +41,12 @@ type ConfigHost struct {
 	Services map[string]interface{} `hcl:"services"`
 }
 
-type TokenSource int
+type tokenSource int
 
 const (
-	ProviderArgument TokenSource = iota
-	EnvironmentVariable
-	CredentialFiles
+	providerArgument tokenSource = iota
+	environmentVariable
+	credentialFiles
 )
 
 // ClientConfiguration is the refined information needed to configureClient a tfe.Client
@@ -55,7 +55,7 @@ type ClientConfiguration struct {
 	HTTPClient  *http.Client
 	TFEHost     svchost.Hostname
 	Token       string
-	TokenSource TokenSource
+	tokenSource tokenSource
 	Insecure    bool
 }
 
@@ -242,14 +242,14 @@ func configure(tfeHost, token string, insecure bool) (*ClientConfiguration, erro
 	// If a token wasn't set in the provider configuration block, try and fetch it
 	// from the environment or from Terraform's CLI configuration or configured credential helper.
 
-	tokenSource := ProviderArgument
+	tokenSource := providerArgument
 	if token == "" {
 		if os.Getenv("TFE_TOKEN") != "" {
 			token = getTokenFromEnv()
-			tokenSource = EnvironmentVariable
+			tokenSource = environmentVariable
 		} else {
 			token = getTokenFromCreds(services, hostname)
-			tokenSource = CredentialFiles
+			tokenSource = credentialFiles
 		}
 	}
 
@@ -263,7 +263,7 @@ func configure(tfeHost, token string, insecure bool) (*ClientConfiguration, erro
 		HTTPClient:  httpClient,
 		TFEHost:     hostname,
 		Token:       token,
-		TokenSource: tokenSource,
+		tokenSource: tokenSource,
 		Insecure:    insecure,
 	}, nil
 }

internal/provider/provider.go

@@ -164,7 +164,7 @@ func configure() schema.ConfigureContextFunc {
 			diagnosticWarnings = diag.Diagnostics{
 				diag.Diagnostic{
 					Severity: diag.Warning,
-					Summary:  "Authentication with configuration file is invalid for TFE Provider running on HCP Terraform or Terraform Enterprise",
+					Summary:  "Authentication with configuration files is invalid for TFE Provider running on HCP Terraform or Terraform Enterprise",
 					Detail:   "Use a TFE_TOKEN variable in the workspace or the token argument for the provider. This authentication method will be deprecated in a future version.",
 				},
 			}