add response trailers to cli http requests

Author: squashd

checks/checks.go

@@ -105,14 +105,20 @@ func runHTTPRequest(
 		headers[k] = strings.Join(v, ",")
 	}
 
+	trailers := make(map[string]string)
+	for k, v := range resp.Trailer {
+		trailers[k] = strings.Join(v, ",")
+	}
+
 	parseVariables(body, requestStep.ResponseVariables, variables)
 
 	result = api.HTTPRequestResult{
-		StatusCode:      resp.StatusCode,
-		ResponseHeaders: headers,
-		BodyString:      truncateAndStringifyBody(body),
-		Variables:       variables,
-		Request:         requestStep,
+		StatusCode:       resp.StatusCode,
+		ResponseHeaders:  headers,
+		ResponseTrailers: trailers,
+		BodyString:       truncateAndStringifyBody(body),
+		Variables:        variables,
+		Request:          requestStep,
 	}
 	return result
 }

client/lessons.go

@@ -68,6 +68,7 @@ type HTTPRequestTest struct {
 	BodyContains     *string
 	BodyContainsNone *string
 	HeadersContain   *HTTPRequestTestHeader
+	TrailersContain  *HTTPRequestTestHeader
 	JSONValue        *HTTPRequestTestJSONValue
 }
 
@@ -120,12 +121,13 @@ type CLICommandResult struct {
 }
 
 type HTTPRequestResult struct {
-	Err             string `json:"-"`
-	StatusCode      int
-	ResponseHeaders map[string]string
-	BodyString      string
-	Variables       map[string]string
-	Request         CLIStepHTTPRequest
+	Err              string `json:"-"`
+	StatusCode       int
+	ResponseHeaders  map[string]string
+	ResponseTrailers map[string]string
+	BodyString       string
+	Variables        map[string]string
+	Request          CLIStepHTTPRequest
 }
 
 type lessonSubmissionCLI struct {

render/render.go

@@ -289,6 +289,20 @@ func printHTTPRequestResult(result api.HTTPRequestResult) string {
 		}
 	}
 
+	filteredTrailers := make(map[string]string)
+	for respK, respV := range result.ResponseTrailers {
+		for _, test := range result.Request.Tests {
+			if test.TrailersContain == nil {
+				continue
+			}
+
+			interpolatedTestTrailerKey := checks.InterpolateVariables(test.TrailersContain.Key, result.Variables)
+			if strings.EqualFold(respK, interpolatedTestTrailerKey) {
+				filteredTrailers[respK] = respV
+			}
+		}
+	}
+
 	if len(filteredHeaders) > 0 {
 		str += "  Response Headers: \n"
 		for k, v := range filteredHeaders {
@@ -317,6 +331,13 @@ func printHTTPRequestResult(result api.HTTPRequestResult) string {
 	}
 	str += "\n"
 
+	if len(filteredTrailers) > 0 {
+		str += "  Response Trailers: \n"
+		for k, v := range filteredTrailers {
+			str += fmt.Sprintf("   - %v: %v\n", k, v)
+		}
+	}
+
 	if len(result.Variables) > 0 {
 		str += "  Variables available: \n"
 		for k, v := range result.Variables {
@@ -554,6 +575,11 @@ func prettyPrintHTTPTest(test api.HTTPRequestTest, variables map[string]string)
 		interpolatedValue := checks.InterpolateVariables(test.HeadersContain.Value, variables)
 		return fmt.Sprintf("Expecting headers to contain: '%s: %v'", interpolatedKey, interpolatedValue)
 	}
+	if test.TrailersContain != nil {
+		interpolatedKey := checks.InterpolateVariables(test.TrailersContain.Key, variables)
+		interpolatedValue := checks.InterpolateVariables(test.TrailersContain.Value, variables)
+		return fmt.Sprintf("Expecting trailers to contain: '%s: %v'", interpolatedKey, interpolatedValue)
+	}
 	if test.JSONValue != nil {
 		var val any
 		var op any