Grammar nit: "setup" as a verb should be spelled "set up"
This commit is contained in:
parent
5682f55908
commit
49ee3d3ef8
|
@ -64,7 +64,7 @@ The Terraform team is not merging PRs for new state storage backends at the curr
|
||||||
|
|
||||||
Please see the [CODEOWNERS](https://github.com/hashicorp/terraform/blob/master/CODEOWNERS) file for the status of a given backend. Community members with an interest in a particular standard backend are welcome to help maintain it.
|
Please see the [CODEOWNERS](https://github.com/hashicorp/terraform/blob/master/CODEOWNERS) file for the status of a given backend. Community members with an interest in a particular standard backend are welcome to help maintain it.
|
||||||
|
|
||||||
Currently, merging state storage backends places a significant burden on the Terraform team. The team must setup an environment and cloud service provider account, or a new database/storage/key-value service, in order to build and test remote state storage backends. The time and complexity of doing so prevents us from moving Terraform forward in other ways.
|
Currently, merging state storage backends places a significant burden on the Terraform team. The team must set up an environment and cloud service provider account, or a new database/storage/key-value service, in order to build and test remote state storage backends. The time and complexity of doing so prevents us from moving Terraform forward in other ways.
|
||||||
|
|
||||||
We are working to remove ourselves from the critical path of state storage backends by moving them towards a plugin model. In the meantime, we won't be accepting new remote state backends into Terraform.
|
We are working to remove ourselves from the critical path of state storage backends by moving them towards a plugin model. In the meantime, we won't be accepting new remote state backends into Terraform.
|
||||||
|
|
||||||
|
|
|
@ -39,7 +39,7 @@ func (b *Local) opApply(
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// Setup our count hook that keeps track of resource changes
|
// Set up our count hook that keeps track of resource changes
|
||||||
countHook := new(CountHook)
|
countHook := new(CountHook)
|
||||||
stateHook := new(StateHook)
|
stateHook := new(StateHook)
|
||||||
if b.ContextOpts == nil {
|
if b.ContextOpts == nil {
|
||||||
|
@ -137,7 +137,7 @@ func (b *Local) opApply(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Setup our hook for continuous state updates
|
// Set up our hook for continuous state updates
|
||||||
stateHook.StateMgr = opState
|
stateHook.StateMgr = opState
|
||||||
|
|
||||||
// Start the apply in a goroutine so that we can be interrupted.
|
// Start the apply in a goroutine so that we can be interrupted.
|
||||||
|
|
|
@ -59,7 +59,7 @@ func (b *Local) opPlan(
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// Setup our count hook that keeps track of resource changes
|
// Set up our count hook that keeps track of resource changes
|
||||||
countHook := new(CountHook)
|
countHook := new(CountHook)
|
||||||
if b.ContextOpts == nil {
|
if b.ContextOpts == nil {
|
||||||
b.ContextOpts = new(terraform.ContextOpts)
|
b.ContextOpts = new(terraform.ContextOpts)
|
||||||
|
|
|
@ -125,7 +125,7 @@ func TestLocalProvider(t *testing.T, b *Local, name string, schema *terraform.Pr
|
||||||
b.ContextOpts = &terraform.ContextOpts{}
|
b.ContextOpts = &terraform.ContextOpts{}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Setup our provider
|
// Set up our provider
|
||||||
b.ContextOpts.Providers = map[addrs.Provider]providers.Factory{
|
b.ContextOpts.Providers = map[addrs.Provider]providers.Factory{
|
||||||
addrs.NewDefaultProvider(name): providers.FactoryFixed(p),
|
addrs.NewDefaultProvider(name): providers.FactoryFixed(p),
|
||||||
}
|
}
|
||||||
|
|
|
@ -49,7 +49,7 @@ func (c *httpClient) httpRequest(method string, url *url.URL, data *[]byte, what
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("Failed to make %s HTTP request: %s", what, err)
|
return nil, fmt.Errorf("Failed to make %s HTTP request: %s", what, err)
|
||||||
}
|
}
|
||||||
// Setup basic auth
|
// Set up basic auth
|
||||||
if c.Username != "" {
|
if c.Username != "" {
|
||||||
req.SetBasicAuth(c.Username, c.Password)
|
req.SetBasicAuth(c.Username, c.Password)
|
||||||
}
|
}
|
||||||
|
|
|
@ -110,7 +110,7 @@ func (p *provisioner) ProvisionResource(req provisioners.ProvisionResourceReques
|
||||||
workingdir = wdVal.AsString()
|
workingdir = wdVal.AsString()
|
||||||
}
|
}
|
||||||
|
|
||||||
// Setup the reader that will read the output from the command.
|
// Set up the reader that will read the output from the command.
|
||||||
// We use an os.Pipe so that the *os.File can be passed directly to the
|
// We use an os.Pipe so that the *os.File can be passed directly to the
|
||||||
// process, and not rely on goroutines copying the data which may block.
|
// process, and not rely on goroutines copying the data which may block.
|
||||||
// See golang.org/issue/18874
|
// See golang.org/issue/18874
|
||||||
|
@ -124,7 +124,7 @@ func (p *provisioner) ProvisionResource(req provisioners.ProvisionResourceReques
|
||||||
cmdEnv = os.Environ()
|
cmdEnv = os.Environ()
|
||||||
cmdEnv = append(cmdEnv, env...)
|
cmdEnv = append(cmdEnv, env...)
|
||||||
|
|
||||||
// Setup the command
|
// Set up the command
|
||||||
cmd := exec.CommandContext(p.ctx, cmdargs[0], cmdargs[1:]...)
|
cmd := exec.CommandContext(p.ctx, cmdargs[0], cmdargs[1:]...)
|
||||||
cmd.Stderr = pw
|
cmd.Stderr = pw
|
||||||
cmd.Stdout = pw
|
cmd.Stdout = pw
|
||||||
|
|
|
@ -31,7 +31,7 @@ func homeDir() (string, error) {
|
||||||
// First prefer the HOME environmental variable
|
// First prefer the HOME environmental variable
|
||||||
if home := os.Getenv("HOME"); home != "" {
|
if home := os.Getenv("HOME"); home != "" {
|
||||||
// FIXME: homeDir gets called from globalPluginDirs during init, before
|
// FIXME: homeDir gets called from globalPluginDirs during init, before
|
||||||
// the logging is setup. We should move meta initializtion outside of
|
// the logging is set up. We should move meta initializtion outside of
|
||||||
// init, but in the meantime we just need to silence this output.
|
// init, but in the meantime we just need to silence this output.
|
||||||
//log.Printf("[DEBUG] Detected home directory from env var: %s", home)
|
//log.Printf("[DEBUG] Detected home directory from env var: %s", home)
|
||||||
|
|
||||||
|
|
|
@ -630,7 +630,7 @@ func testInteractiveInput(t *testing.T, answers []string) func() {
|
||||||
// Disable test mode so input is called
|
// Disable test mode so input is called
|
||||||
test = false
|
test = false
|
||||||
|
|
||||||
// Setup reader/writers
|
// Set up reader/writers
|
||||||
testInputResponse = answers
|
testInputResponse = answers
|
||||||
defaultInputReader = bytes.NewBufferString("")
|
defaultInputReader = bytes.NewBufferString("")
|
||||||
defaultInputWriter = new(bytes.Buffer)
|
defaultInputWriter = new(bytes.Buffer)
|
||||||
|
@ -651,7 +651,7 @@ func testInputMap(t *testing.T, answers map[string]string) func() {
|
||||||
// Disable test mode so input is called
|
// Disable test mode so input is called
|
||||||
test = false
|
test = false
|
||||||
|
|
||||||
// Setup reader/writers
|
// Set up reader/writers
|
||||||
defaultInputReader = bytes.NewBufferString("")
|
defaultInputReader = bytes.NewBufferString("")
|
||||||
defaultInputWriter = new(bytes.Buffer)
|
defaultInputWriter = new(bytes.Buffer)
|
||||||
|
|
||||||
|
|
|
@ -110,7 +110,7 @@ func (c *ConsoleCommand) Run(args []string) int {
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
// Setup the UI so we can output directly to stdout
|
// Set up the UI so we can output directly to stdout
|
||||||
ui := &cli.BasicUi{
|
ui := &cli.BasicUi{
|
||||||
Writer: wrappedstreams.Stdout(),
|
Writer: wrappedstreams.Stdout(),
|
||||||
ErrorWriter: wrappedstreams.Stderr(),
|
ErrorWriter: wrappedstreams.Stderr(),
|
||||||
|
|
|
@ -123,7 +123,7 @@ func (c *InitCommand) Run(args []string) int {
|
||||||
c.Ui.Output("")
|
c.Ui.Output("")
|
||||||
}
|
}
|
||||||
|
|
||||||
// If our directory is empty, then we're done. We can't get or setup
|
// If our directory is empty, then we're done. We can't get or set up
|
||||||
// the backend with an empty directory.
|
// the backend with an empty directory.
|
||||||
empty, err := configs.IsEmptyDir(path)
|
empty, err := configs.IsEmptyDir(path)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -102,7 +102,7 @@ func (m *Meta) Backend(opts *BackendOpts) (backend.Enhanced, tfdiags.Diagnostics
|
||||||
log.Printf("[TRACE] Meta.Backend: instantiated backend of type %T", b)
|
log.Printf("[TRACE] Meta.Backend: instantiated backend of type %T", b)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Setup the CLI opts we pass into backends that support it.
|
// Set up the CLI opts we pass into backends that support it.
|
||||||
cliOpts, err := m.backendCLIOpts()
|
cliOpts, err := m.backendCLIOpts()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
diags = diags.Append(err)
|
diags = diags.Append(err)
|
||||||
|
@ -1206,7 +1206,7 @@ Terraform configuration you're using is using a custom configuration for
|
||||||
the Terraform backend.
|
the Terraform backend.
|
||||||
|
|
||||||
Changes to backend configurations require reinitialization. This allows
|
Changes to backend configurations require reinitialization. This allows
|
||||||
Terraform to setup the new configuration, copy existing state, etc. This is
|
Terraform to set up the new configuration, copy existing state, etc. This is
|
||||||
only done during "terraform init". Please run that command now then try again.
|
only done during "terraform init". Please run that command now then try again.
|
||||||
|
|
||||||
If the change reason above is incorrect, please verify your configuration
|
If the change reason above is incorrect, please verify your configuration
|
||||||
|
|
|
@ -65,7 +65,7 @@ func (m *Meta) backendMigrateState(opts *backendMigrateOpts) error {
|
||||||
errMigrateLoadStates), opts.TwoType, err)
|
errMigrateLoadStates), opts.TwoType, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Setup defaults
|
// Set up defaults
|
||||||
opts.oneEnv = backend.DefaultStateName
|
opts.oneEnv = backend.DefaultStateName
|
||||||
opts.twoEnv = backend.DefaultStateName
|
opts.twoEnv = backend.DefaultStateName
|
||||||
opts.force = m.forceInitCopy
|
opts.force = m.forceInitCopy
|
||||||
|
|
|
@ -285,7 +285,7 @@ func TestPlan_outBackend(t *testing.T) {
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
|
|
||||||
// Setup our backend state
|
// Set up our backend state
|
||||||
dataState, srv := testBackendState(t, originalState, 200)
|
dataState, srv := testBackendState(t, originalState, 200)
|
||||||
defer srv.Close()
|
defer srv.Close()
|
||||||
testStateFileRemote(t, dataState)
|
testStateFileRemote(t, dataState)
|
||||||
|
|
|
@ -110,7 +110,7 @@ func TestStatePush_replaceMatchStdin(t *testing.T) {
|
||||||
|
|
||||||
expected := testStateRead(t, "replace.tfstate")
|
expected := testStateRead(t, "replace.tfstate")
|
||||||
|
|
||||||
// Setup the replacement to come from stdin
|
// Set up the replacement to come from stdin
|
||||||
var buf bytes.Buffer
|
var buf bytes.Buffer
|
||||||
if err := writeStateForTesting(expected, &buf); err != nil {
|
if err := writeStateForTesting(expected, &buf); err != nil {
|
||||||
t.Fatalf("err: %s", err)
|
t.Fatalf("err: %s", err)
|
||||||
|
|
|
@ -19,7 +19,7 @@ import (
|
||||||
// Communicator is an interface that must be implemented by all communicators
|
// Communicator is an interface that must be implemented by all communicators
|
||||||
// used for any of the provisioners
|
// used for any of the provisioners
|
||||||
type Communicator interface {
|
type Communicator interface {
|
||||||
// Connect is used to setup the connection
|
// Connect is used to set up the connection
|
||||||
Connect(provisioners.UIOutput) error
|
Connect(provisioners.UIOutput) error
|
||||||
|
|
||||||
// Disconnect is used to terminate the connection
|
// Disconnect is used to terminate the connection
|
||||||
|
|
|
@ -97,7 +97,7 @@ func New(v cty.Value) (*Communicator, error) {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// Setup the random number generator once. The seed value is the
|
// Set up the random number generator once. The seed value is the
|
||||||
// time multiplied by the PID. This can overflow the int64 but that
|
// time multiplied by the PID. This can overflow the int64 but that
|
||||||
// is okay. We multiply by the PID in case we have multiple processes
|
// is okay. We multiply by the PID in case we have multiple processes
|
||||||
// grabbing this at the same time. This is possible with Terraform and
|
// grabbing this at the same time. This is possible with Terraform and
|
||||||
|
@ -342,7 +342,7 @@ func (c *Communicator) Start(cmd *remote.Cmd) error {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
// Setup our session
|
// Set up our session
|
||||||
session.Stdin = cmd.Stdin
|
session.Stdin = cmd.Stdin
|
||||||
session.Stdout = cmd.Stdout
|
session.Stdout = cmd.Stdout
|
||||||
session.Stderr = cmd.Stderr
|
session.Stderr = cmd.Stderr
|
||||||
|
|
|
@ -16,7 +16,7 @@ import (
|
||||||
|
|
||||||
// verify that we can locate public key data
|
// verify that we can locate public key data
|
||||||
func TestFindKeyData(t *testing.T) {
|
func TestFindKeyData(t *testing.T) {
|
||||||
// setup a test directory
|
// set up a test directory
|
||||||
td, err := ioutil.TempDir("", "ssh")
|
td, err := ioutil.TempDir("", "ssh")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
|
|
|
@ -298,7 +298,7 @@ func (w *Walker) Update(g *AcyclicGraph) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Start all the new vertices. We do this at the end so that all
|
// Start all the new vertices. We do this at the end so that all
|
||||||
// the edge waiters and changes are setup above.
|
// the edge waiters and changes are set up above.
|
||||||
for _, raw := range newVerts {
|
for _, raw := range newVerts {
|
||||||
v := raw.(Vertex)
|
v := raw.(Vertex)
|
||||||
go w.walkVertex(v, w.vertexMap[v])
|
go w.walkVertex(v, w.vertexMap[v])
|
||||||
|
|
|
@ -35,7 +35,7 @@ func fds() (stdin, stdout, stderr *os.File) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// These are the wrapped standard streams. These are setup by the
|
// These are the wrapped standard streams. These are set up by the
|
||||||
// platform specific code in initPlatform.
|
// platform specific code in initPlatform.
|
||||||
var (
|
var (
|
||||||
wrappedStdin *os.File
|
wrappedStdin *os.File
|
||||||
|
|
|
@ -1286,7 +1286,7 @@ func (m schemaMap) diffString(
|
||||||
|
|
||||||
if os == ns && !all && !computed {
|
if os == ns && !all && !computed {
|
||||||
// They're the same value. If there old value is not blank or we
|
// They're the same value. If there old value is not blank or we
|
||||||
// have an ID, then return right away since we're already setup.
|
// have an ID, then return right away since we're already set up.
|
||||||
if os != "" || d.Id() != "" {
|
if os != "" || d.Id() != "" {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -45,7 +45,7 @@ func init() {
|
||||||
logger = newHCLogger("")
|
logger = newHCLogger("")
|
||||||
logWriter = logger.StandardWriter(&hclog.StandardLoggerOptions{InferLevels: true})
|
logWriter = logger.StandardWriter(&hclog.StandardLoggerOptions{InferLevels: true})
|
||||||
|
|
||||||
// setup the default std library logger to use our output
|
// set up the default std library logger to use our output
|
||||||
log.SetFlags(0)
|
log.SetFlags(0)
|
||||||
log.SetPrefix("")
|
log.SetPrefix("")
|
||||||
log.SetOutput(logWriter)
|
log.SetOutput(logWriter)
|
||||||
|
|
2
main.go
2
main.go
|
@ -71,7 +71,7 @@ func realMain() int {
|
||||||
// there is a panic. Otherwise, we delete it.
|
// there is a panic. Otherwise, we delete it.
|
||||||
logTempFile, err := ioutil.TempFile("", "terraform-log")
|
logTempFile, err := ioutil.TempFile("", "terraform-log")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Fprintf(os.Stderr, "Couldn't setup logging tempfile: %s", err)
|
fmt.Fprintf(os.Stderr, "Couldn't set up logging tempfile: %s", err)
|
||||||
return 1
|
return 1
|
||||||
}
|
}
|
||||||
// Now that we have the file, close it and leave it for the wrapped
|
// Now that we have the file, close it and leave it for the wrapped
|
||||||
|
|
12
main_test.go
12
main_test.go
|
@ -10,14 +10,14 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestMain_cliArgsFromEnv(t *testing.T) {
|
func TestMain_cliArgsFromEnv(t *testing.T) {
|
||||||
// Setup the state. This test really messes with the environment and
|
// Set up the state. This test really messes with the environment and
|
||||||
// global state so we set things up to be restored.
|
// global state so we set things up to be restored.
|
||||||
|
|
||||||
// Restore original CLI args
|
// Restore original CLI args
|
||||||
oldArgs := os.Args
|
oldArgs := os.Args
|
||||||
defer func() { os.Args = oldArgs }()
|
defer func() { os.Args = oldArgs }()
|
||||||
|
|
||||||
// Setup test command and restore that
|
// Set up test command and restore that
|
||||||
Commands = make(map[string]cli.CommandFactory)
|
Commands = make(map[string]cli.CommandFactory)
|
||||||
defer func() {
|
defer func() {
|
||||||
Commands = nil
|
Commands = nil
|
||||||
|
@ -122,7 +122,7 @@ func TestMain_cliArgsFromEnv(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Setup the args
|
// Set up the args
|
||||||
args := make([]string, len(tc.Args)+1)
|
args := make([]string, len(tc.Args)+1)
|
||||||
args[0] = oldArgs[0] // process name
|
args[0] = oldArgs[0] // process name
|
||||||
copy(args[1:], tc.Args)
|
copy(args[1:], tc.Args)
|
||||||
|
@ -153,7 +153,7 @@ func TestMain_cliArgsFromEnvAdvanced(t *testing.T) {
|
||||||
oldArgs := os.Args
|
oldArgs := os.Args
|
||||||
defer func() { os.Args = oldArgs }()
|
defer func() { os.Args = oldArgs }()
|
||||||
|
|
||||||
// Setup test command and restore that
|
// Set up test command and restore that
|
||||||
Commands = make(map[string]cli.CommandFactory)
|
Commands = make(map[string]cli.CommandFactory)
|
||||||
defer func() {
|
defer func() {
|
||||||
Commands = nil
|
Commands = nil
|
||||||
|
@ -211,7 +211,7 @@ func TestMain_cliArgsFromEnvAdvanced(t *testing.T) {
|
||||||
|
|
||||||
for i, tc := range cases {
|
for i, tc := range cases {
|
||||||
t.Run(fmt.Sprintf("%d-%s", i, tc.Name), func(t *testing.T) {
|
t.Run(fmt.Sprintf("%d-%s", i, tc.Name), func(t *testing.T) {
|
||||||
// Setup test command and restore that
|
// Set up test command and restore that
|
||||||
testCommandName := tc.Command
|
testCommandName := tc.Command
|
||||||
testCommand := &testCommandCLI{}
|
testCommand := &testCommandCLI{}
|
||||||
defer func() { delete(Commands, testCommandName) }()
|
defer func() { delete(Commands, testCommandName) }()
|
||||||
|
@ -229,7 +229,7 @@ func TestMain_cliArgsFromEnvAdvanced(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Setup the args
|
// Set up the args
|
||||||
args := make([]string, len(tc.Args)+1)
|
args := make([]string, len(tc.Args)+1)
|
||||||
args[0] = oldArgs[0] // process name
|
args[0] = oldArgs[0] // process name
|
||||||
copy(args[1:], tc.Args)
|
copy(args[1:], tc.Args)
|
||||||
|
|
Loading…
Reference in New Issue