Handle nils

Author: cnunciato

pkg/buildkite/pipelines.go

@@ -283,7 +283,7 @@ type CreatePipelineArgs struct {
 	SkipQueuedBranchBuilds    bool     `json:"skip_queued_branch_builds"`
 	CancelRunningBranchBuilds bool     `json:"cancel_running_branch_builds"`
 	Tags                      []string `json:"tags"`
-	CreateWebhook             bool     `json:"create_webhook"`
+	CreateWebhook             *bool    `json:"create_webhook"`
 }
 
 func CreatePipeline(client PipelinesClient) (tool mcp.Tool, handler mcp.TypedToolHandlerFunc[CreatePipelineArgs], scopes []string) {
@@ -389,7 +389,13 @@ func CreatePipeline(client PipelinesClient) (tool mcp.Tool, handler mcp.TypedToo
 				return mcp.NewToolResultError(err.Error()), nil
 			}
 
-			if args.CreateWebhook {
+			// create webhooks by default to align with the behavior in the dashboard
+			createWebhook := true
+			if args.CreateWebhook != nil {
+				createWebhook = *args.CreateWebhook
+			}
+
+			if createWebhook {
 				_, err := client.AddWebhook(ctx, args.OrgSlug, pipeline.Slug)
 				if err != nil {
 					result := map[string]any{

pkg/buildkite/pipelines_test.go

@@ -147,6 +147,7 @@ steps:
 `
 
 	ctx := context.Background()
+	webhookCalled := false
 	client := &MockPipelinesClient{
 		CreateFunc: func(ctx context.Context, org string, p buildkite.CreatePipeline) (buildkite.Pipeline, *buildkite.Response, error) {
 
@@ -170,6 +171,16 @@ steps:
 					},
 				}, nil
 		},
+		AddWebhookFunc: func(ctx context.Context, org string, slug string) (*buildkite.Response, error) {
+			assert.Equal("org", org)
+			assert.Equal("test-pipeline", slug)
+			webhookCalled = true
+			return &buildkite.Response{
+				Response: &http.Response{
+					StatusCode: 201,
+				},
+			}, nil
+		},
 	}
 
 	tool, handler, _ := CreatePipeline(client)
@@ -186,12 +197,16 @@ steps:
 		Description:   "A test pipeline",
 		Configuration: testPipelineDefinition,
 		Tags:          []string{"tag1", "tag2"},
+		CreateWebhook: nil,
 	}
 
 	result, err := handler(ctx, request, args)
 	assert.NoError(err)
+	assert.True(webhookCalled, "AddWebhook should have been called when CreateWebhook is nil")
+
 	textContent := getTextResult(t, result)
-	assert.Equal(`{"id":"123","name":"Test Pipeline","slug":"test-pipeline","created_at":"0001-01-01T00:00:00Z","skip_queued_branch_builds":false,"cancel_running_branch_builds":false,"cluster_id":"cluster-123","tags":["tag1","tag2"],"provider":{"id":"","webhook_url":"","settings":null}}`, textContent.Text)
+	assert.Contains(textContent.Text, `"webhook":{"created":true,"note":"Pipeline and webhook created successfully."}`)
+	assert.Contains(textContent.Text, `"pipeline":{"id":"123","name":"Test Pipeline","slug":"test-pipeline"`)
 }
 
 func TestCreatePipelineWithWebhook(t *testing.T) {
@@ -210,6 +225,7 @@ steps:
 
 	ctx := context.Background()
 	webhookCalled := false
+	createWebhook := true
 	client := &MockPipelinesClient{
 		CreateFunc: func(ctx context.Context, org string, p buildkite.CreatePipeline) (buildkite.Pipeline, *buildkite.Response, error) {
 
@@ -262,7 +278,7 @@ steps:
 		Description:   "A test pipeline",
 		Configuration: testPipelineDefinition,
 		Tags:          []string{"tag1", "tag2"},
-		CreateWebhook: true,
+		CreateWebhook: &createWebhook,
 	}
 
 	result, err := handler(ctx, request, args)
@@ -290,6 +306,7 @@ steps:
 
 	ctx := context.Background()
 	webhookCalled := false
+	createWebhook := true
 	client := &MockPipelinesClient{
 		CreateFunc: func(ctx context.Context, org string, p buildkite.CreatePipeline) (buildkite.Pipeline, *buildkite.Response, error) {
 
@@ -333,7 +350,7 @@ steps:
 		Description:   "A test pipeline",
 		Configuration: testPipelineDefinition,
 		Tags:          []string{"tag1", "tag2"},
-		CreateWebhook: true,
+		CreateWebhook: &createWebhook,
 	}
 
 	result, err := handler(ctx, request, args)