expose baseURL to cli commands

Author: theodore-s-beers

checks/runner.go

@@ -14,7 +14,6 @@ import (
 
 func CLIChecks(cliData api.CLIData, overrideBaseURL string, ch chan tea.Msg) (results []api.CLIStepResult) {
 	client := &http.Client{}
-	variables := make(map[string]string)
 	results = make([]api.CLIStepResult, len(cliData.Steps))
 
 	if cliData.BaseURLDefault == api.BaseURLOverrideRequired && overrideBaseURL == "" {
@@ -25,6 +24,10 @@ func CLIChecks(cliData api.CLIData, overrideBaseURL string, ch chan tea.Msg) (re
 	if overrideBaseURL == "" {
 		baseURL = cliData.BaseURLDefault
 	}
+	variables := make(map[string]string)
+	if baseURL != "" {
+		variables["baseURL"] = strings.TrimSuffix(baseURL, "/")
+	}
 
 	for i, step := range cliData.Steps {
 		// This is the magic of the initial message sent before executing the test

checks/runner_test.go

@@ -8,6 +8,52 @@ import (
 	tea "github.com/charmbracelet/bubbletea"
 )
 
+func TestCLIChecksInterpolatesResolvedBaseURLInCommands(t *testing.T) {
+	tests := []struct {
+		name            string
+		defaultBaseURL  string
+		overrideBaseURL string
+		want            string
+	}{
+		{
+			name:           "manifest default",
+			defaultBaseURL: "http://localhost:3000",
+			want:           "http://localhost:3000",
+		},
+		{
+			name:           "manifest default with trailing slash",
+			defaultBaseURL: "http://localhost:3000/",
+			want:           "http://localhost:3000",
+		},
+		{
+			name:            "configured override",
+			defaultBaseURL:  "http://localhost:3000",
+			overrideBaseURL: "http://localhost:4000/",
+			want:            "http://localhost:4000",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			cliData := api.CLIData{
+				BaseURLDefault: tt.defaultBaseURL,
+				Steps: []api.CLIStep{{
+					CLICommand: &api.CLIStepCLICommand{
+						Command: `echo '${baseURL}'`,
+					},
+				}},
+			}
+			messages := make(chan tea.Msg, 10)
+
+			results := CLIChecks(cliData, tt.overrideBaseURL, messages)
+
+			if got := results[0].CLICommandResult.Stdout; got != tt.want {
+				t.Fatalf("command stdout = %q, want %q", got, tt.want)
+			}
+		})
+	}
+}
+
 func TestApplySubmissionResultsMarksAllStepsAndTestsPassedWhenNoFailure(t *testing.T) {
 	cliData := api.CLIData{Steps: []api.CLIStep{
 		{CLICommand: &api.CLIStepCLICommand{Tests: []api.CLICommandTest{{}, {}}}},