Merge pull request #111 from flashcatcloud/codex/cli-v1.3.31-sdk

feat: sync SDK and validate required request fields

Author: ysyneu

go.mod

@@ -3,7 +3,7 @@ module github.com/flashcatcloud/flashduty-cli
 go 1.25.1
 
 require (
-	github.com/flashcatcloud/go-flashduty v0.5.8
+	github.com/flashcatcloud/go-flashduty v0.5.9
 	github.com/mattn/go-runewidth v0.0.24
 	github.com/spf13/cobra v1.10.2
 	github.com/spf13/pflag v1.0.10

go.sum

@@ -1,8 +1,8 @@
 github.com/clipperhouse/uax29/v2 v2.2.0 h1:ChwIKnQN3kcZteTXMgb1wztSgaU+ZemkgWdohwgs8tY=
 github.com/clipperhouse/uax29/v2 v2.2.0/go.mod h1:EFJ2TJMRUaplDxHKj1qAEhCtQPW2tJSwu5BF98AuoVM=
 github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
-github.com/flashcatcloud/go-flashduty v0.5.8 h1:hOQtseanaASXrpQsFfzuSonBK5EzoGQWdhzsZO4pWNQ=
-github.com/flashcatcloud/go-flashduty v0.5.8/go.mod h1:aA0RtZEs0AYOwwdNKdtVeD8YMOdnmVY1zAlVD+9Ovx8=
+github.com/flashcatcloud/go-flashduty v0.5.9 h1:3KigI41yWz4dD1U26GZBxoOZ4RzeRiPjeXQZKjb71zo=
+github.com/flashcatcloud/go-flashduty v0.5.9/go.mod h1:aA0RtZEs0AYOwwdNKdtVeD8YMOdnmVY1zAlVD+9Ovx8=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/mattn/go-runewidth v0.0.24 h1:cpokDiIn0MGnhdHwuWnJBITySJ20QyNGnY2kR/ay2DU=

internal/cli/gen_support.go

@@ -138,8 +138,10 @@ func genFoldPositional(args []string, body map[string]any, wire, kind string) er
 	return nil
 }
 
-// genBindBody marshals the assembled body map into the typed request struct so
-// the call benefits from the SDK's wire encoding (nullable pointers, etc.).
+// genBindBody validates and marshals the assembled body map into the typed
+// request struct. SDK request tags without omitempty/omitzero represent required
+// OpenAPI fields; checking their presence before unmarshalling distinguishes an
+// omitted field from an explicitly supplied zero value.
 //
 // POST request structs tag fields with `json`, so json.Unmarshal binds them.
 // GET query structs tag fields with `url` and carry NO json tag, so the
@@ -148,6 +150,53 @@ func genFoldPositional(args []string, body map[string]any, wire, kind string) er
 // field from the body by its url wire-name. For POST structs the url pass is a
 // no-op, so existing behavior is unchanged.
 func genBindBody(body map[string]any, req any) error {
+	var missing []string
+	var inspect func(reflect.Type)
+	inspect = func(rt reflect.Type) {
+		for rt.Kind() == reflect.Ptr {
+			rt = rt.Elem()
+		}
+		if rt.Kind() != reflect.Struct {
+			return
+		}
+		for i := 0; i < rt.NumField(); i++ {
+			field := rt.Field(i)
+			if field.PkgPath != "" {
+				continue
+			}
+			if field.Anonymous {
+				inspect(field.Type)
+				continue
+			}
+
+			tag := field.Tag.Get("json")
+			if tag == "" {
+				tag = field.Tag.Get("url")
+			}
+			parts := strings.Split(tag, ",")
+			if parts[0] == "" || parts[0] == "-" {
+				continue
+			}
+			optional := false
+			for _, option := range parts[1:] {
+				if option == "omitempty" || option == "omitzero" {
+					optional = true
+					break
+				}
+			}
+			if !optional {
+				value, ok := body[parts[0]]
+				if !ok || (value == nil && field.Type.Kind() != reflect.Ptr) {
+					missing = append(missing, parts[0])
+				}
+			}
+		}
+	}
+	inspect(reflect.TypeOf(req))
+	if len(missing) > 0 {
+		return fmt.Errorf("missing required request fields: %s", strings.Join(missing, ", "))
+	}
+
 	b, err := json.Marshal(body)
 	if err != nil {
 		return fmt.Errorf("failed to encode request: %w", err)

internal/cli/gen_support_test.go

@@ -0,0 +1,16 @@
+package cli
+
+import "testing"
+
+func TestGenBindBodyAllowsNullForRequiredNullableField(t *testing.T) {
+	req := new(struct {
+		Value *bool `json:"value"`
+	})
+
+	if err := genBindBody(map[string]any{"value": nil}, req); err != nil {
+		t.Fatalf("genBindBody required nullable field: %v", err)
+	}
+	if req.Value != nil {
+		t.Fatalf("Value = %v, want nil", req.Value)
+	}
+}

internal/cli/incident_test.go

@@ -60,3 +60,70 @@ func TestCommandIncidentListHelpSurfacesInsightIncidentExport(t *testing.T) {
 		t.Fatalf("help output missing incident export discovery hint:\n%s", out)
 	}
 }
+
+func TestCommandIncidentPostMortemContentResetRejectsMissingRequiredFields(t *testing.T) {
+	tests := []struct {
+		name string
+		args []string
+	}{
+		{
+			name: "missing expected revision",
+			args: []string{
+				"incident", "post-mortem-content-reset", "postmortem-1",
+				"--idempotency-key", "retry-1",
+				"--markdown", "# Test",
+			},
+		},
+		{
+			name: "empty data object",
+			args: []string{
+				"incident", "post-mortem-content-reset",
+				"--data", "{}",
+			},
+		},
+		{
+			name: "null expected revision",
+			args: []string{
+				"incident", "post-mortem-content-reset",
+				"--data", `{"expected_revision":null,"idempotency_key":"retry-1","markdown":"# Test","post_mortem_id":"postmortem-1"}`,
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			saveAndResetGlobals(t)
+			stub := newGFStub(t)
+
+			_, err := execCommand(tt.args...)
+			if err == nil || !strings.Contains(err.Error(), "missing required request field") {
+				t.Fatalf("error = %v, want missing required request field", err)
+			}
+			if stub.lastPath != "" {
+				t.Fatalf("request reached %q despite missing required request fields", stub.lastPath)
+			}
+		})
+	}
+}
+
+func TestCommandIncidentPostMortemContentResetAcceptsExplicitZeroRevision(t *testing.T) {
+	saveAndResetGlobals(t)
+	stub := newGFStub(t)
+
+	_, err := execCommand(
+		"incident", "post-mortem-content-reset", "postmortem-1",
+		"--expected-revision", "0",
+		"--idempotency-key", "retry-1",
+		"--markdown", "# Test",
+	)
+	if err != nil {
+		t.Fatalf("execCommand: %v", err)
+	}
+	if stub.lastPath != "/incident/post-mortem/content/reset" {
+		t.Fatalf("path = %q, want /incident/post-mortem/content/reset", stub.lastPath)
+	}
+	got, ok := stub.lastBody["expected_revision"]
+	if !ok || got != float64(0) {
+		t.Fatalf("expected_revision = %#v (present=%v), want explicit 0", got, ok)
+	}
+}