fix(stovepipe): match reversed BuildRunner.Trigger arg order in backends

Author: roychying

stovepipe/extension/buildrunner/buildkite/buildkite.go

@@ -106,7 +106,7 @@ func newRunner(cfg buildrunner.Config, c *platformbuildkite.Client, logger *zap.
 // Trigger calls the Buildkite API to create the build and returns the
 // Buildkite build number as the build ID. Errors are propagated to the
 // caller so the queue consumer can nack and retry.
-func (r *runner) Trigger(ctx context.Context, headURI, baseURI string, metadata entity.BuildMetadata) (entity.BuildID, error) {
+func (r *runner) Trigger(ctx context.Context, baseURI, headURI string, metadata entity.BuildMetadata) (entity.BuildID, error) {
 	env := map[string]string{
 		EnvKeyHeadURI: headURI,
 		EnvKeyBaseURI: baseURI,

stovepipe/extension/buildrunner/buildkite/buildkite_test.go

@@ -79,7 +79,7 @@ func TestTrigger_SubmitsCorrectPayloadAndReturnsBuildkiteNumber(t *testing.T) {
 		_, _ = w.Write(buildJSON(42, "scheduled", "https://buildkite.com/test-org/my-pipeline/builds/42"))
 	}))
 
-	id, err := r.Trigger(context.Background(), "github://repo/head/aaa", "github://repo/base/bbb", nil)
+	id, err := r.Trigger(context.Background(), "github://repo/base/bbb", "github://repo/head/aaa", nil)
 	require.NoError(t, err)
 	assert.Equal(t, platformbuildkite.EncodeBuildNumber(42), id.ID)
 
@@ -100,7 +100,7 @@ func TestTrigger_EmptyBaseURI_FullBuild(t *testing.T) {
 		_, _ = w.Write(buildJSON(1, "scheduled", ""))
 	}))
 
-	_, err := r.Trigger(context.Background(), "github://repo/head/aaa", "", nil)
+	_, err := r.Trigger(context.Background(), "", "github://repo/head/aaa", nil)
 	require.NoError(t, err)
 
 	var req platformbuildkite.CreateBuildRequest
@@ -113,7 +113,7 @@ func TestTrigger_BuildkiteError_ReturnsError(t *testing.T) {
 		w.WriteHeader(http.StatusInternalServerError)
 	}))
 
-	_, err := r.Trigger(context.Background(), "github://repo/head/aaa", "", nil)
+	_, err := r.Trigger(context.Background(), "", "github://repo/head/aaa", nil)
 	require.Error(t, err)
 }
 
@@ -126,7 +126,7 @@ func TestTrigger_WithMetadata_SetsEnvVar(t *testing.T) {
 	}))
 
 	metadata := entity.BuildMetadata{"requester": "alice", "ticket": "SQ-42"}
-	_, err := r.Trigger(context.Background(), "github://repo/head/aaa", "", metadata)
+	_, err := r.Trigger(context.Background(), "", "github://repo/head/aaa", metadata)
 	require.NoError(t, err)
 
 	var req platformbuildkite.CreateBuildRequest
@@ -146,7 +146,7 @@ func TestTrigger_NilMetadata_NoMetadataEnvVar(t *testing.T) {
 		_, _ = w.Write(buildJSON(11, "scheduled", ""))
 	}))
 
-	_, err := r.Trigger(context.Background(), "github://repo/head/aaa", "", nil)
+	_, err := r.Trigger(context.Background(), "", "github://repo/head/aaa", nil)
 	require.NoError(t, err)
 
 	var req platformbuildkite.CreateBuildRequest

stovepipe/extension/buildrunner/githubactions/githubactions.go

@@ -126,7 +126,7 @@ func newRunner(cfg buildrunner.Config, ref string, extraInputs map[string]string
 // Trigger dispatches the configured GitHub Actions workflow and returns the
 // GitHub workflow run ID as the build ID. Errors are propagated to the caller
 // so the queue consumer can nack and retry.
-func (r *runner) Trigger(ctx context.Context, headURI, baseURI string, metadata entity.BuildMetadata) (entity.BuildID, error) {
+func (r *runner) Trigger(ctx context.Context, baseURI, headURI string, metadata entity.BuildMetadata) (entity.BuildID, error) {
 	inputs := make(map[string]string, len(r.extraInputs)+4)
 	for k, v := range r.extraInputs {
 		inputs[k] = v

stovepipe/extension/buildrunner/githubactions/githubactions_test.go

@@ -71,7 +71,7 @@ func TestTrigger_DispatchesWorkflowAndReturnsRunID(t *testing.T) {
 		_ = json.NewEncoder(w).Encode(platformgithubactions.DispatchWorkflowResponse{WorkflowRunID: 42})
 	}))
 
-	id, err := r.Trigger(context.Background(), "github://repo/head/aaa", "github://repo/base/bbb", nil)
+	id, err := r.Trigger(context.Background(), "github://repo/base/bbb", "github://repo/head/aaa", nil)
 	require.NoError(t, err)
 	assert.Equal(t, platformgithubactions.EncodeRunID(42), id.ID)
 
@@ -95,7 +95,7 @@ func TestTrigger_EmptyBaseURI_FullBuild(t *testing.T) {
 		_ = json.NewEncoder(w).Encode(platformgithubactions.DispatchWorkflowResponse{WorkflowRunID: 1})
 	}))
 
-	_, err := r.Trigger(context.Background(), "github://repo/head/aaa", "", nil)
+	_, err := r.Trigger(context.Background(), "", "github://repo/head/aaa", nil)
 	require.NoError(t, err)
 
 	var req platformgithubactions.DispatchWorkflowRequest
@@ -108,7 +108,7 @@ func TestTrigger_DispatchError_ReturnsError(t *testing.T) {
 		w.WriteHeader(http.StatusInternalServerError)
 	}))
 
-	_, err := r.Trigger(context.Background(), "github://repo/head/aaa", "", nil)
+	_, err := r.Trigger(context.Background(), "", "github://repo/head/aaa", nil)
 	require.Error(t, err)
 }
 
@@ -117,7 +117,7 @@ func TestTrigger_ErrorsWhenDispatchResponseHasNoRunID(t *testing.T) {
 		_ = json.NewEncoder(w).Encode(platformgithubactions.DispatchWorkflowResponse{})
 	}))
 
-	_, err := r.Trigger(context.Background(), "github://repo/head/aaa", "", nil)
+	_, err := r.Trigger(context.Background(), "", "github://repo/head/aaa", nil)
 	require.Error(t, err)
 	assert.Contains(t, err.Error(), "response missing workflow_run_id")
 }
@@ -130,7 +130,7 @@ func TestTrigger_WithMetadata_SetsInput(t *testing.T) {
 	}))
 
 	metadata := entity.BuildMetadata{"requester": "alice", "ticket": "SQ-42"}
-	_, err := r.Trigger(context.Background(), "github://repo/head/aaa", "", metadata)
+	_, err := r.Trigger(context.Background(), "", "github://repo/head/aaa", metadata)
 	require.NoError(t, err)
 
 	var req platformgithubactions.DispatchWorkflowRequest
@@ -149,7 +149,7 @@ func TestTrigger_NilMetadata_NoMetadataInput(t *testing.T) {
 		_ = json.NewEncoder(w).Encode(platformgithubactions.DispatchWorkflowResponse{WorkflowRunID: 11})
 	}))
 
-	_, err := r.Trigger(context.Background(), "github://repo/head/aaa", "", nil)
+	_, err := r.Trigger(context.Background(), "", "github://repo/head/aaa", nil)
 	require.NoError(t, err)
 
 	var req platformgithubactions.DispatchWorkflowRequest