Merge 026cfd6 into backport/b-fixup-stale-query-parse/mainly-large-pika

hashicorp · Jan 3, 2023 · f43825d · f43825d
2 parents 5a394ee + 026cfd6
commit f43825d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/command/agent/http.go b/command/agent/http.go
@@ -776,13 +776,17 @@ func parseWait(resp http.ResponseWriter, req *http.Request, b *structs.QueryOpti
 func parseConsistency(resp http.ResponseWriter, req *http.Request, b *structs.QueryOptions) {
 	query := req.URL.Query()
 	if staleVal, ok := query["stale"]; ok {
+		if len(staleVal) == 0 || staleVal[0] == "" {
+			b.AllowStale = true
+			return
+		}
 		staleQuery, err := strconv.ParseBool(staleVal[0])
 		if err != nil {
 			resp.WriteHeader(400)
-			resp.Write([]byte(fmt.Sprintf("Expect `true` or `false` for `stale` query string parameter, got %s", staleVal[0])))
+			_, _ = resp.Write([]byte(fmt.Sprintf("Expect `true` or `false` for `stale` query string parameter, got %s", staleVal[0])))
+			return
 		}
-
-		b.AllowStale = staleQuery || staleVal[0] == ""
+		b.AllowStale = staleQuery
 	}
 }
 

diff --git a/command/operator_debug_test.go b/command/operator_debug_test.go
@@ -50,7 +50,7 @@ func runTestCases(t *testing.T, cases testCases) {
 			out := ui.OutputWriter.String()
 			outerr := ui.ErrorWriter.String()
 
-			assert.Equalf(t, code, c.expectedCode, "did not get expected exit code")
+			assert.Equalf(t, c.expectedCode, code, "did not get expected exit code")
 
 			if len(c.expectedOutputs) > 0 {
 				if assert.NotEmpty(t, out, "command output was empty") {
@@ -727,7 +727,7 @@ func TestDebug_CollectConsul(t *testing.T) {
 
 	// Create an embedded Consul server
 	testconsul, err := consultest.NewTestServerConfigT(t, func(c *consultest.TestServerConfig) {
-		c.Peering = nil  // fix for older versions of Consul (<1.13.0) that don't support peering
+		c.Peering = nil // fix for older versions of Consul (<1.13.0) that don't support peering
 		// If -v wasn't specified squelch consul logging
 		if !testing.Verbose() {
 			c.Stdout = ioutil.Discard