Inline marshalActivityPayloads into its single caller

Author: dandavison

internal/temporalcli/commands.activity.go

@@ -282,7 +282,17 @@ func pollActivityOutcome(cctx *CommandContext, cl client.Client, namespace, acti
 
 func printActivityResult(cctx *CommandContext, activityID, runID string, result *common.Payloads) error {
 	if cctx.JSONOutput {
-		resultJSON, err := marshalActivityPayloads(cctx, result)
+		var resultJSON json.RawMessage
+		var err error
+		if cctx.JSONShorthandPayloads {
+			var valuePtr any
+			if err = converter.GetDefaultDataConverter().FromPayloads(result, &valuePtr); err != nil {
+				return fmt.Errorf("failed decoding result: %w", err)
+			}
+			resultJSON, err = json.Marshal(valuePtr)
+		} else {
+			resultJSON, err = cctx.MarshalProtoJSON(result)
+		}
 		if err != nil {
 			return fmt.Errorf("failed marshaling result: %w", err)
 		}
@@ -317,17 +327,6 @@ func printActivityResult(cctx *CommandContext, activityID, runID string, result
 	}, printer.StructuredOptions{})
 }
 
-func marshalActivityPayloads(cctx *CommandContext, payloads *common.Payloads) (json.RawMessage, error) {
-	if cctx.JSONShorthandPayloads {
-		var valuePtr any
-		if err := converter.GetDefaultDataConverter().FromPayloads(payloads, &valuePtr); err != nil {
-			return nil, err
-		}
-		return json.Marshal(valuePtr)
-	}
-	return cctx.MarshalProtoJSON(payloads)
-}
-
 func printActivityFailure(cctx *CommandContext, activityID, runID string, f *failure.Failure) error {
 	if cctx.JSONOutput {
 		failureJSON, err := cctx.MarshalProtoJSON(f)

internal/temporalcli/commands.activity_test.go

@@ -1215,6 +1215,20 @@ func (s *SharedServerSuite) TestActivity_SearchAttributes_Datetime() {
 	}, 5*time.Second, 200*time.Millisecond)
 }
 
+func (s *SharedServerSuite) TestActivity_SearchAttributes_InvalidKeywordList() {
+	res := s.Execute(
+		"activity", "start",
+		"--activity-id", "sa-invalid-kwlist",
+		"--type", "DevActivity",
+		"--task-queue", s.Worker().Options.TaskQueue,
+		"--start-to-close-timeout", "30s",
+		"--search-attribute", `Foo=[1,"a"]`,
+		"--address", s.Address(),
+	)
+	s.Error(res.Err)
+	s.Contains(res.Err.Error(), "array element 0 is float64, not string")
+}
+
 func (s *SharedServerSuite) TestActivity_List_Pagination() {
 	s.Worker().OnDevActivity(func(ctx context.Context, a any) (any, error) {
 		return "paginated", nil