From 6f577abc72cc7dbfbb6d8e516fbabc9d0dc1ffef Mon Sep 17 00:00:00 2001 From: James Bardin Date: Tue, 1 Dec 2020 10:42:07 -0500 Subject: [PATCH] unused --- command/apply.go | 6 +++--- command/apply_test.go | 48 ------------------------------------------- 2 files changed, 3 insertions(+), 51 deletions(-) diff --git a/command/apply.go b/command/apply.go index 36b66f677..6e2d536c4 100644 --- a/command/apply.go +++ b/command/apply.go @@ -70,7 +70,7 @@ func (c *ApplyCommand) Run(args []string) int { return 1 } if c.Destroy && planFile != nil { - c.Ui.Error(fmt.Sprintf("Destroy can't be called with a plan file.")) + c.Ui.Error("Destroy can't be called with a plan file.") return 1 } if planFile != nil { @@ -118,7 +118,7 @@ func (c *ApplyCommand) Run(args []string) int { diags = diags.Append(tfdiags.Sourceless( tfdiags.Error, "Failed to read plan from plan file", - fmt.Sprintf("The given plan file does not have a valid backend configuration. This is a bug in the Terraform command that generated this plan file."), + "The given plan file does not have a valid backend configuration. This is a bug in the Terraform command that generated this plan file.", )) c.showDiagnostics(diags) return 1 @@ -335,7 +335,7 @@ func outputsAsString(state *states.State, modPath addrs.ModuleInstance, includeH // Output the outputs in alphabetical order keyLen := 0 ks := make([]string, 0, len(outputs)) - for key, _ := range outputs { + for key := range outputs { ks = append(ks, key) if len(key) > keyLen { keyLen = len(key) diff --git a/command/apply_test.go b/command/apply_test.go index 1f75fc6fa..cf2935eaf 100644 --- a/command/apply_test.go +++ b/command/apply_test.go @@ -4,9 +4,6 @@ import ( "bytes" "fmt" "io/ioutil" - "net" - "net/http" - "net/url" "os" "path/filepath" "strings" @@ -1538,31 +1535,6 @@ output = test testStateOutput(t, statePath, expected) } -func testHttpServer(t *testing.T) net.Listener { - ln, err := net.Listen("tcp", "127.0.0.1:0") - if err != nil { - t.Fatalf("err: %s", err) - } - - mux := http.NewServeMux() - mux.HandleFunc("/header", testHttpHandlerHeader) - - var server http.Server - server.Handler = mux - go server.Serve(ln) - - return ln -} - -func testHttpHandlerHeader(w http.ResponseWriter, r *http.Request) { - var url url.URL - url.Scheme = "file" - url.Path = filepath.ToSlash(testFixturePath("init")) - - w.Header().Add("X-Terraform-Get", url.String()) - w.WriteHeader(200) -} - // applyFixtureSchema returns a schema suitable for processing the // configuration in testdata/apply . This schema should be // assigned to a mock provider named "test". @@ -1649,23 +1621,3 @@ foo = "bar" const applyVarFileJSON = ` { "foo": "bar" } ` - -const testApplyDisableBackupStr = ` -ID = bar -Tainted = false -` - -const testApplyDisableBackupStateStr = ` -ID = bar -Tainted = false -` - -const testApplyStateStr = ` -ID = bar -Tainted = false -` - -const testApplyStateDiffStr = ` -ID = bar -Tainted = false -`