feat: allow direct upload of spec/config to v0 builds api when merging/rebasing

Author: stainless-app[bot]

.stats.yml

@@ -1,4 +1,4 @@
 configured_endpoints: 22
-openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/stainless/stainless-v0-4dbed62ce27b115068721f69e83b644ca0b7922e5be12b6469c0c054a371a170.yml
-openapi_spec_hash: f4a68de1cb28c33de769c08f68f543ab
+openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/stainless/stainless-v0-21e9e0ca130a61ba2ba52d51980a6f4b726708fe8094b45045a8ac0ceb7e544c.yml
+openapi_spec_hash: 752810fe6848884333c1bcacf28bc777
 config_hash: 63178ec4b1d2ea5636c8619cffcf129b

pkg/cmd/build_test.go

@@ -17,7 +17,7 @@ func TestBuildsCreate(t *testing.T) {
 			"builds", "create",
 			"--wait", "none",
 			"--project", "project",
-			"--revision", "string",
+			"--revision", "{files: {foo: {content: content}}, merge: merge}",
 			"--allow-empty=true",
 			"--branch", "branch",
 			"--commit-message", "commit_message",
@@ -38,7 +38,7 @@ func TestBuildsCreate(t *testing.T) {
 			"builds", "create",
 			"--wait", "none",
 			"--project", "project",
-			"--revision", "string",
+			"--revision", "{files: {foo: {content: content}}, merge: merge}",
 			"--allow-empty=true",
 			"--branch", "branch",
 			"--commit-message", "commit_message",
@@ -64,7 +64,11 @@ func TestBuildsCreate(t *testing.T) {
 		// Test piping YAML data over stdin
 		pipeData := []byte("" +
 			"project: project\n" +
-			"revision: string\n" +
+			"revision:\n" +
+			"  files:\n" +
+			"    foo:\n" +
+			"      content: content\n" +
+			"  merge: merge\n" +
 			"allow_empty: true\n" +
 			"branch: branch\n" +
 			"commit_message: commit_message\n" +
@@ -127,8 +131,8 @@ func TestBuildsCompare(t *testing.T) {
 			t,
 			"--api-key", "string",
 			"builds", "compare",
-			"--base", "{branch: branch, revision: string, commit_message: commit_message}",
-			"--head", "{branch: branch, revision: string, commit_message: commit_message}",
+			"--base", "{branch: branch, revision: {files: {foo: {content: content}}, merge: merge}, commit_message: commit_message}",
+			"--head", "{branch: branch, revision: {files: {foo: {content: content}}, merge: merge}, commit_message: commit_message}",
 			"--project", "project",
 			"--target", "node",
 		)
@@ -144,10 +148,10 @@ func TestBuildsCompare(t *testing.T) {
 			"--api-key", "string",
 			"builds", "compare",
 			"--base.branch", "branch",
-			"--base.revision", "string",
+			"--base.revision", "{files: {foo: {content: content}}, merge: merge}",
 			"--base.commit-message", "commit_message",
 			"--head.branch", "branch",
-			"--head.revision", "string",
+			"--head.revision", "{files: {foo: {content: content}}, merge: merge}",
 			"--head.commit-message", "commit_message",
 			"--project", "project",
 			"--target", "node",
@@ -159,11 +163,19 @@ func TestBuildsCompare(t *testing.T) {
 		pipeData := []byte("" +
 			"base:\n" +
 			"  branch: branch\n" +
-			"  revision: string\n" +
+			"  revision:\n" +
+			"    files:\n" +
+			"      foo:\n" +
+			"        content: content\n" +
+			"    merge: merge\n" +
 			"  commit_message: commit_message\n" +
 			"head:\n" +
 			"  branch: branch\n" +
-			"  revision: string\n" +
+			"  revision:\n" +
+			"    files:\n" +
+			"      foo:\n" +
+			"        content: content\n" +
+			"    merge: merge\n" +
 			"  commit_message: commit_message\n" +
 			"project: project\n" +
 			"targets:\n" +

pkg/cmd/projectbranch.go

@@ -135,6 +135,16 @@ var projectsBranchesRebase = cli.Command{
 			DefaultText: "main",
 			QueryPath:   "base",
 		},
+		&requestflag.Flag[string]{
+			Name:     "commit-message",
+			Usage:    "Optional commit message to use when `files` is provided.",
+			BodyPath: "commit_message",
+		},
+		&requestflag.Flag[map[string]any]{
+			Name:     "files",
+			Usage:    "File contents to commit directly on top of `base`. When provided,\nthe auto-rebase is skipped and the branch is hard-reset to `base`\nbefore the files are committed.",
+			BodyPath: "files",
+		},
 	},
 	Action:          handleProjectsBranchesRebase,
 	HideHelpCommand: true,
@@ -381,7 +391,7 @@ func handleProjectsBranchesRebase(ctx context.Context, cmd *cli.Command) error {
 		cmd,
 		apiquery.NestedQueryFormatBrackets,
 		apiquery.ArrayQueryFormatComma,
-		EmptyBody,
+		ApplicationJSON,
 		false,
 	)
 	if err != nil {

pkg/cmd/projectbranch_test.go

@@ -83,6 +83,25 @@ func TestProjectsBranchesRebase(t *testing.T) {
 			"--project", "project",
 			"--branch", "branch",
 			"--base", "base",
+			"--commit-message", "commit_message",
+			"--files", "{foo: {content: content}}",
+		)
+	})
+
+	t.Run("piping data", func(t *testing.T) {
+		// Test piping YAML data over stdin
+		pipeData := []byte("" +
+			"commit_message: commit_message\n" +
+			"files:\n" +
+			"  foo:\n" +
+			"    content: content\n")
+		mocktest.TestRunMockTestWithPipeAndFlags(
+			t, pipeData,
+			"--api-key", "string",
+			"projects:branches", "rebase",
+			"--project", "project",
+			"--branch", "branch",
+			"--base", "base",
 		)
 	})
 }