Merge branch 'v3' into 3522-writerto-skipresponsebodyencodedecode

Author: raphael

.github/FUNDING.yml

@@ -1,4 +1,4 @@
 # These are supported funding model platforms
 
 patreon: goadesign
-github: raphael
+github: [raphael, tchssk]

.github/workflows/report-coverage.yml

@@ -18,7 +18,7 @@ jobs:
           ref: ${{ github.event.workflow_run.head_sha }}
 
       - name: Download test coverage
-        uses: dawidd6/action-download-artifact@v3
+        uses: dawidd6/action-download-artifact@v6
         with:
           workflow: test.yml
           name: coverage

README.md

@@ -71,11 +71,29 @@ promoting reuse and standardization across services.
 # Sponsors
 
 <table width="100%">
+    <tr>
+        <td>
+            <img width="1000" height="0" />
+            <a href="https://zuplo.link/goa-web">
+            <picture>
+                <source media="(prefers-color-scheme: dark)" srcset="docs/zuplo-dark.png">
+                <img src="docs/zuplo.png" alt="Zuplo" width="260" align="right">
+            </picture>
+            </a>
+            <h3>Zuplo: Scale, Protect, and Productize your Goa API</h3>
+            <p>
+                Our API Gateway allows you to secure your API, scale it
+                globally, generate documentation from your OpenAPI, and add
+                monetization.
+            </p>
+            <a href="https://zuplo.link/goa-web">Start for Free</a>
+        </td>
+    </tr>
     <tr>
         <td>
             <img width="1000" height="0" />
             <a href="https://www.incident.io">
-                <img src="https://incident.io/_next/static/media/logo-social-dark.6a523ace.png" alt="incident.io" width="260" align="right" />
+                <img src="docs/incidentio.png" alt="incident.io" width="260" align="right" />
             </a>
             <h3>incident.io: Bounce back stronger after every incident</h3>
             <p>

codegen/cli/cli.go

@@ -178,7 +178,7 @@ func BuildSubcommandData(svcName string, m *service.MethodData, buildFunction *B
 			description = fmt.Sprintf("Make request to the %q endpoint", m.Name)
 		}
 
-		if buildFunction == nil && len(flags) > 0 {
+		if m.Payload != "" && buildFunction == nil && len(flags) > 0 {
 			// No build function, just convert the arg to the body type
 			var convPre, convSuff string
 			target := "data"

docs/incidentio.png

@@ -222,7 +222,8 @@ func Field(tag any, name string, args ...any) {
 //	})
 func OneOf(name string, args ...any) {
 	if len(args) > 2 {
-		eval.ReportError("OneOf: wrong number of arguments")
+		eval.TooManyArgError()
+		return
 	}
 	fn, ok := args[len(args)-1].(func())
 	if !ok {
@@ -315,7 +316,7 @@ func Example(args ...any) {
 		var ok bool
 		summary, ok = args[0].(string)
 		if !ok {
-			eval.InvalidArgError("summary (string)", summary)
+			eval.InvalidArgError("summary (string)", args[0])
 			return
 		}
 		arg = args[1]

docs/zuplo-dark.png

@@ -1,7 +1,6 @@
 package dsl
 
 import (
-	"fmt"
 	"strconv"
 	"strings"
 
@@ -146,7 +145,7 @@ const (
 //	})
 func HTTP(fns ...func()) {
 	if len(fns) > 1 {
-		eval.InvalidArgError("zero or one function", fmt.Sprintf("%d functions", len(fns)))
+		eval.TooManyArgError()
 		return
 	}
 	fn := func() {}

docs/zuplo.png

@@ -247,7 +247,7 @@ func parseResponseArgs(val any, args ...any) (code int, fn func()) {
 		}
 	case func():
 		if len(args) > 0 {
-			eval.InvalidArgError("int (HTTP status code)", val)
+			eval.TooManyArgError()
 			return
 		}
 		fn = t

dsl/attribute.go

@@ -94,7 +94,7 @@ func Type(name string, args ...any) expr.UserType {
 		base = &expr.Object{}
 		fn = a
 		if len(args) == 2 {
-			eval.ReportError("only one argument allowed when it is a function")
+			eval.TooManyArgError()
 			return nil
 		}
 	default:

dsl/http.go

@@ -240,20 +240,26 @@ func finalizeSet(set ExpressionSet) {
 
 // caller returns the name of calling function.
 func caller() string {
-	for skip := 2; skip <= 4; skip++ {
+	var latest string
+	for skip := 2; skip <= 5; skip++ {
 		pc, _, _, ok := runtime.Caller(skip)
 		if !ok {
 			break
 		}
 		name := runtime.FuncForPC(pc).Name()
-		elems := strings.Split(name, ".")
-		caller := elems[len(elems)-1]
+		if !strings.HasPrefix(name, "goa.design/goa/v3/dsl.") {
+			break
+		}
+		caller := strings.Split(strings.TrimPrefix(name, "goa.design/goa/v3/dsl."), ".")[0]
 		for _, first := range caller {
 			if unicode.IsUpper(first) {
-				return caller
+				latest = caller
 			}
 			break
 		}
 	}
+	if latest != "" {
+		return latest
+	}
 	return "<unknown>"
 }

dsl/response.go

@@ -9,30 +9,76 @@ import (
 	"goa.design/goa/v3/expr"
 )
 
-func TestTooManyArgError(t *testing.T) {
-	cases := map[string]struct {
-		DSL   func()
-		Error string
+func TestInvalidArgError(t *testing.T) {
+	dsls := map[string]struct {
+		dsl  func()
+		want string
 	}{
-		"ArrayOf":          {func() { ArrayOf(String, func() {}, func() {}) }, "too many arguments given to ArrayOf"},
-		"Attribute":        {func() { Type("name", func() { Attribute("name", 1, 2, 3, 4) }) }, "too many arguments given to Attribute"},
-		"Example":          {func() { Example(1, 2, 3) }, "too many arguments given to Example"},
-		"Files":            {func() { Files("path", "filename", func() {}, func() {}) }, "too many arguments given to Files"},
-		"MapOf":            {func() { MapOf(String, String, func() {}, func() {}) }, "too many arguments given to MapOf"},
-		"MapParams":        {func() { MapParams(1, 2) }, "too many arguments given to MapParams"},
-		"Payload":          {func() { Payload(String, 1, 2, 3) }, "too many arguments given to Payload"},
-		"Response":         {func() { API("name", func() { HTTP(func() { Response(StatusOK, "name", 1, 2) }) }) }, "too many arguments given to Response"},
-		"Result":           {func() { Result(String, 1, 2, 3) }, "too many arguments given to Result"},
-		"ResultType":       {func() { ResultType("identifier", "name", func() {}, func() {}) }, "too many arguments given to ResultType"},
-		"Scope":            {func() { BasicAuthSecurity("name", func() { Scope("name", "1", "2") }) }, "too many arguments given to Scope"},
-		"Server":           {func() { Server("name", func() {}, func() {}) }, "too many arguments given to Server"},
-		"StreamingPayload": {func() { StreamingPayload(String, 1, 2, 3) }, "too many arguments given to StreamingPayload"},
-		"StreamingResult":  {func() { StreamingResult(String, 1, 2, 3) }, "too many arguments given to StreamingResult"},
-		"Type":             {func() { Type("name", 1, 2, 3) }, "too many arguments given to Type"},
+		"Attribute":        {func() { Type("name", func() { Attribute("name", String, "description", 1) }) }, "cannot use 1 (type int) as type func()"},
+		"Body":             {func() { Service("s", func() { Method("m", func() { HTTP(func() { Body(1) }) }) }) }, "cannot use 1 (type int) as type attribute name, user type or DSL"},
+		"ErrorName (bool)": {func() { Type("name", func() { ErrorName(true) }) }, "cannot use true (type bool) as type name or position"},
+		"ErrorName (int)":  {func() { Type("name", func() { ErrorName(1, 2) }) }, "cannot use 2 (type int) as type name"},
+		"Example":          {func() { Example(1, 2) }, "cannot use 1 (type int) as type summary (string)"},
+		"Headers":          {func() { Headers(1) }, "cannot use 1 (type int) as type function"},
+		"Param":            {func() { API("name", func() { HTTP(func() { Params(1) }) }) }, "cannot use 1 (type int) as type function"},
+		"Response":         {func() { Service("s", func() { HTTP(func() { Response(1) }) }) }, "cannot use 1 (type int) as type name of error"},
+		"ResultType":       {func() { ResultType("identifier", 1) }, "cannot use 1 (type int) as type function or string"},
+		"Security":         {func() { Security(1) }, "cannot use 1 (type int) as type security scheme or security scheme name"},
+		"Type":             {func() { Type("name", 1) }, "cannot use 1 (type int) as type type or function"},
+	}
+	for name, tc := range dsls {
+		t.Run(name, func(t *testing.T) {
+			err := expr.RunInvalidDSL(t, tc.dsl)
+			assert.Len(t, strings.Split(err.Error(), "\n"), 1)
+			assert.Contains(t, err.Error(), tc.want)
+		})
+	}
+}
+
+func TestTooManyArgError(t *testing.T) {
+	dsls := map[string]func(){
+		"APIKey":           func() { Type("name", func() { APIKey("scheme", "name", 1, 2, 3) }) },
+		"APIKeyField":      func() { Type("name", func() { APIKeyField("tag", "scheme", "name", 1, 2, 3) }) },
+		"AccessToken":      func() { Type("name", func() { AccessToken("name", 1, 2, 3) }) },
+		"AccessTokenField": func() { Type("name", func() { AccessTokenField("tag", "name", 1, 2, 3) }) },
+		"ArrayOf":          func() { ArrayOf(String, func() {}, func() {}) },
+		"Attribute":        func() { Type("name", func() { Attribute("name", 1, 2, 3, 4) }) },
+		"Cookie":           func() { API("name", func() { HTTP(func() { Cookie("name", 1, 2, 3, 4) }) }) },
+		"Error":            func() { API("name", func() { Error("name", 1, 2, 3, 4) }) },
+		"ErrorName":        func() { Type("name", func() { ErrorName("name", 1, 2, 3) }) },
+		"Example":          func() { Example(1, 2, 3) },
+		"Field":            func() { Type("name", func() { Field("tag", "name", 1, 2, 3, 4) }) },
+		"Files":            func() { Files("path", "filename", func() {}, func() {}) },
+		"HTTP":             func() { API("name", func() { HTTP(func() {}, func() {}) }) },
+		"Header":           func() { API("name", func() { HTTP(func() { Header("name", 1, 2, 3, 4) }) }) },
+		"MapOf":            func() { MapOf(String, String, func() {}, func() {}) },
+		"MapParams":        func() { MapParams(1, 2) },
+		"OneOf":            func() { OneOf("name", 1, 2, 3) },
+		"Param":            func() { API("name", func() { HTTP(func() { Param("name", 1, 2, 3, 4) }) }) },
+		"Password":         func() { Type("name", func() { Password("name", 1, 2, 3) }) },
+		"PasswordField":    func() { Type("name", func() { PasswordField("tag", "name", 1, 2, 3) }) },
+		"Payload":          func() { Payload(String, 1, 2, 3) },
+		"Response (int)":   func() { API("name", func() { HTTP(func() { Response(StatusOK, "name", 1, 2) }) }) },
+		"Response (func)":  func() { API("name", func() { HTTP(func() { Response("name", func() {}, func() {}) }) }) },
+		"Result":           func() { Result(String, 1, 2, 3) },
+		"ResultType":       func() { ResultType("identifier", "name", func() {}, func() {}) },
+		"Scope":            func() { BasicAuthSecurity("name", func() { Scope("name", "1", "2") }) },
+		"Server":           func() { Server("name", func() {}, func() {}) },
+		"StreamingPayload": func() { StreamingPayload(String, 1, 2, 3) },
+		"StreamingResult":  func() { StreamingResult(String, 1, 2, 3) },
+		"Token":            func() { Type("name", func() { Token("name", 1, 2, 3) }) },
+		"TokenField":       func() { Type("name", func() { TokenField("tag", "name", 1, 2, 3) }) },
+		"Type":             func() { Type("name", 1, 2, 3) },
+		"Type (func)":      func() { Type("name", func() {}, func() {}) },
+		"Username":         func() { Type("name", func() { Username("name", 1, 2, 3) }) },
+		"UsernameField":    func() { Type("name", func() { UsernameField("tag", "name", 1, 2, 3) }) },
+		"Variable":         func() { API("a", func() { Server("s", func() { Host("h", func() { Variable("v", 1, 2, 3, 4) }) }) }) },
 	}
-	for _, tc := range cases {
-		err := expr.RunInvalidDSL(t, tc.DSL)
-		assert.Len(t, strings.Split(err.Error(), "\n"), 1)
-		assert.Contains(t, err.Error(), tc.Error)
+	for name, dsl := range dsls {
+		t.Run(name, func(t *testing.T) {
+			err := expr.RunInvalidDSL(t, dsl)
+			assert.Len(t, strings.Split(err.Error(), "\n"), 1)
+			assert.Contains(t, err.Error(), "too many arguments given to "+strings.Split(name, " ")[0])
+		})
 	}
 }

dsl/user_type.go

@@ -222,8 +222,6 @@ func ParseEndpoint(cc *grpc.ClientConn, opts ...grpc.CallOption) (goa.Endpoint,
 				data, err = {{ $pkgName}}.{{ .BuildFunction.Name }}({{ range .BuildFunction.ActualParams }}*{{ . }}Flag, {{ end }})
 			{{- else if .Conversion }}
 				{{ .Conversion }}
-			{{- else }}
-				data = nil
 			{{- end }}
 		{{- end }}
 			}

eval/eval.go

@@ -23,6 +23,7 @@ func TestClientCLIFiles(t *testing.T) {
 		{"simple-parse", testdata.MultiSimpleDSL, testdata.MultiSimpleParseCode, 0, 3},
 		{"multi-parse", testdata.MultiDSL, testdata.MultiParseCode, 0, 3},
 		{"multi-required-payload", testdata.MultiRequiredPayloadDSL, testdata.MultiRequiredPayloadParseCode, 0, 3},
+		{"skip-request-body-encode-decode", testdata.SkipRequestBodyEncodeDecodeDSL, testdata.SkipRequestBodyEncodeDecodeParseCode, 0, 3},
 		{"streaming-parse", testdata.StreamingMultipleServicesDSL, testdata.StreamingParseCode, 0, 3},
 		{"simple-build", testdata.MultiSimpleDSL, testdata.MultiSimpleBuildCode, 1, 1},
 		{"multi-build", testdata.MultiDSL, testdata.MultiBuildCode, 1, 1},

eval/eval_test.go

@@ -41,8 +41,6 @@ func ParseEndpoint(
 				data, err = {{ $pkgName}}.{{ .BuildFunction.Name }}({{ range .BuildFunction.ActualParams }}*{{ . }}Flag, {{ end }})
 			{{- else if .Conversion }}
 				{{ .Conversion }}
-			{{- else }}
-				data = nil
 			{{- end }}
 			{{- if .StreamFlag }}
 				{{- if .BuildFunction }}