Remove config.go and update things using its aliases

This commit is contained in:
Pam Selle 2020-01-13 16:50:05 -05:00
parent 37d16b2f79
commit 78b1220558
5 changed files with 11 additions and 44 deletions

View File

@ -7,6 +7,7 @@ import (
"github.com/hashicorp/go-checkpoint" "github.com/hashicorp/go-checkpoint"
"github.com/hashicorp/terraform/command" "github.com/hashicorp/terraform/command"
"github.com/hashicorp/terraform/command/cliconfig"
) )
func init() { func init() {
@ -17,7 +18,7 @@ var checkpointResult chan *checkpoint.CheckResponse
// runCheckpoint runs a HashiCorp Checkpoint request. You can read about // runCheckpoint runs a HashiCorp Checkpoint request. You can read about
// Checkpoint here: https://github.com/hashicorp/go-checkpoint. // Checkpoint here: https://github.com/hashicorp/go-checkpoint.
func runCheckpoint(c *Config) { func runCheckpoint(c *cliconfig.Config) {
// If the user doesn't want checkpoint at all, then return. // If the user doesn't want checkpoint at all, then return.
if c.DisableCheckpoint { if c.DisableCheckpoint {
log.Printf("[INFO] Checkpoint disabled. Not running.") log.Printf("[INFO] Checkpoint disabled. Not running.")
@ -25,7 +26,7 @@ func runCheckpoint(c *Config) {
return return
} }
configDir, err := ConfigDir() configDir, err := cliconfig.ConfigDir()
if err != nil { if err != nil {
log.Printf("[ERR] Checkpoint setup error: %s", err) log.Printf("[ERR] Checkpoint setup error: %s", err)
checkpointResult <- nil checkpointResult <- nil

View File

@ -6,7 +6,7 @@ import (
"github.com/mitchellh/cli" "github.com/mitchellh/cli"
"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/command" "github.com/hashicorp/terraform/command"
@ -37,7 +37,7 @@ const (
OutputPrefix = "o:" OutputPrefix = "o:"
) )
func initCommands(config *Config, services *disco.Disco) { func initCommands(config *cliconfig.Config, services *disco.Disco) {
var inAutomation bool var inAutomation bool
if v := os.Getenv(runningInAutomationEnvName); v != "" { if v := os.Getenv(runningInAutomationEnvName); v != "" {
inAutomation = true inAutomation = true
@ -390,7 +390,7 @@ func makeShutdownCh() <-chan struct{} {
return resultCh return resultCh
} }
func credentialsSource(config *Config) (auth.CredentialsSource, error) { func credentialsSource(config *cliconfig.Config) (auth.CredentialsSource, error) {
helperPlugins := pluginDiscovery.FindPlugins("credentials", globalPluginDirs()) helperPlugins := pluginDiscovery.FindPlugins("credentials", globalPluginDirs())
return config.CredentialsSource(helperPlugins) return config.CredentialsSource(helperPlugins)
} }

View File

@ -1,37 +0,0 @@
package main
// This file has some compatibility aliases/wrappers for functionality that
// has now moved into command/cliconfig .
//
// Don't add anything new here! If new functionality is needed, better to just
// add it in command/cliconfig and then call there directly.
import (
"github.com/hashicorp/terraform/command/cliconfig"
"github.com/hashicorp/terraform/tfdiags"
)
//go:generate go run ./scripts/generate-plugins.go
// Config is the structure of the configuration for the Terraform CLI.
//
// This is not the configuration for Terraform itself. That is in the
// "configs" package.
type Config = cliconfig.Config
// ConfigHost is the structure of the "host" nested block within the CLI
// configuration, which can be used to override the default service host
// discovery behavior for a particular hostname.
type ConfigHost = cliconfig.ConfigHost
// ConfigDir returns the configuration directory for Terraform.
func ConfigDir() (string, error) {
return cliconfig.ConfigDir()
}
// LoadConfig reads the CLI configuration from the various filesystem locations
// and from the environment, returning a merged configuration along with any
// diagnostics (errors and warnings) encountered along the way.
func LoadConfig() (*Config, tfdiags.Diagnostics) {
return cliconfig.LoadConfig()
}

View File

@ -13,6 +13,7 @@ import (
"github.com/hashicorp/go-plugin" "github.com/hashicorp/go-plugin"
"github.com/hashicorp/terraform-svchost/disco" "github.com/hashicorp/terraform-svchost/disco"
"github.com/hashicorp/terraform/command/cliconfig"
"github.com/hashicorp/terraform/command/format" "github.com/hashicorp/terraform/command/format"
"github.com/hashicorp/terraform/helper/logging" "github.com/hashicorp/terraform/helper/logging"
"github.com/hashicorp/terraform/httpclient" "github.com/hashicorp/terraform/httpclient"
@ -125,7 +126,7 @@ func wrappedMain() int {
log.Printf("[INFO] Go runtime version: %s", runtime.Version()) log.Printf("[INFO] Go runtime version: %s", runtime.Version())
log.Printf("[INFO] CLI args: %#v", os.Args) log.Printf("[INFO] CLI args: %#v", os.Args)
config, diags := LoadConfig() config, diags := cliconfig.LoadConfig()
if len(diags) > 0 { if len(diags) > 0 {
// Since we haven't instantiated a command.Meta yet, we need to do // Since we haven't instantiated a command.Meta yet, we need to do
// some things manually here and use some "safe" defaults for things // some things manually here and use some "safe" defaults for things

View File

@ -5,6 +5,8 @@ import (
"log" "log"
"path/filepath" "path/filepath"
"runtime" "runtime"
"github.com/hashicorp/terraform/command/cliconfig"
) )
// globalPluginDirs returns directories that should be searched for // globalPluginDirs returns directories that should be searched for
@ -16,7 +18,7 @@ import (
func globalPluginDirs() []string { func globalPluginDirs() []string {
var ret []string var ret []string
// Look in ~/.terraform.d/plugins/ , or its equivalent on non-UNIX // Look in ~/.terraform.d/plugins/ , or its equivalent on non-UNIX
dir, err := ConfigDir() dir, err := cliconfig.ConfigDir()
if err != nil { if err != nil {
log.Printf("[ERROR] Error finding global config directory: %s", err) log.Printf("[ERROR] Error finding global config directory: %s", err)
} else { } else {