Rewrite interface{} to any (#3263)

* chore: Rewrite `interface{}` to `any` * chore: Rewrite `interface{}` to `any` * chore: Rewirte `interface{}` to `any` * chore: Rewrite `interface{}` to `any` * chore: Rewrite `interface{}` to `any` * chore: Rewrite `interface{}` to `any` * chore: Rewirte `interface{}` to `any` * chore: Adjust tests * chore: Rewrite `interface{}` to `any` * chore: Rewrite `interface{}` to `any` * chore: Adjust tests
goadesign · Mar 20, 2023 · 8888068 · 8888068
1 parent 825bd01
commit 8888068
Show file tree

Hide file tree

Showing 142 changed files with 1,774 additions and 1,774 deletions.
diff --git a/cmd/goa/gen.go b/cmd/goa/gen.go
@@ -115,7 +115,7 @@ func (g *Generator) Write(debug bool) error {
 
 	var sections []*codegen.SectionTemplate
 	{
-		data := map[string]interface{}{
+		data := map[string]any{
 			"Command":       g.Command,
 			"CleanupDirs":   cleanupDirs(g.Command, g.Output),
 			"DesignVersion": g.DesignVersion,
@@ -330,7 +330,7 @@ const mainT = `func main() {
 	fmt.Println(strings.Join(outputs, "\n"))
 }
 
-func fail(msg string, vals ...interface{}) {
+func fail(msg string, vals ...any) {
 	fmt.Fprintf(os.Stderr, msg, vals...)
 	os.Exit(1)
 }

diff --git a/codegen/cli/cli.go b/codegen/cli/cli.go
@@ -75,7 +75,7 @@ type (
 		// Example returns a JSON serialized example value.
 		Example string
 		// Default returns the default value if any.
-		Default interface{}
+		Default any
 	}
 
 	// BuildFunctionData contains the data needed to generate a constructor
@@ -264,7 +264,7 @@ func FlagsCode(data []*CommandData) string {
 		Name:    "parse-endpoint-flags",
 		Source:  parseFlagsT,
 		Data:    data,
-		FuncMap: map[string]interface{}{"printDescription": printDescription},
+		FuncMap: map[string]any{"printDescription": printDescription},
 	}
 	var flagsCode bytes.Buffer
 	err := section.Write(&flagsCode)
@@ -282,7 +282,7 @@ func CommandUsage(data *CommandData) *codegen.SectionTemplate {
 		Name:    "cli-command-usage",
 		Source:  commandUsageT,
 		Data:    data,
-		FuncMap: map[string]interface{}{"printDescription": printDescription},
+		FuncMap: map[string]any{"printDescription": printDescription},
 	}
 }
 
@@ -293,7 +293,7 @@ func PayloadBuilderSection(buildFunction *BuildFunctionData) *codegen.SectionTem
 		Name:   "cli-build-payload",
 		Source: buildPayloadT,
 		Data:   buildFunction,
-		FuncMap: map[string]interface{}{
+		FuncMap: map[string]any{
 			"fieldCode": fieldCode,
 		},
 	}
@@ -308,7 +308,7 @@ func PayloadBuilderSection(buildFunction *BuildFunctionData) *codegen.SectionTem
 // description is the flag description
 // required determines if the flag is required
 // example is an example value for the flag
-func NewFlagData(svcn, en, name, typeName, description string, required bool, example, def interface{}) *FlagData {
+func NewFlagData(svcn, en, name, typeName, description string, required bool, example, def any) *FlagData {
 	ex := jsonExample(example)
 	fn := goifyTerms(svcn, en, name)
 	return &FlagData{
@@ -326,7 +326,7 @@ func NewFlagData(svcn, en, name, typeName, description string, required bool, ex
 // FieldLoadCode returns the code used in the build payload function that
 // initializes one of the payload object fields. It returns the initialization
 // code and a boolean indicating whether the code requires an "err" variable.
-func FieldLoadCode(f *FlagData, argName, argTypeName, validate string, defaultValue interface{}, payload expr.DataType, payloadRef string) (string, bool) {
+func FieldLoadCode(f *FlagData, argName, argTypeName, validate string, defaultValue any, payload expr.DataType, payloadRef string) (string, bool) {
 	var (
 		code    string
 		declErr bool
@@ -410,13 +410,13 @@ func flagType(tname string) string {
 }
 
 // jsonExample generates a json example
-func jsonExample(v interface{}) string {
+func jsonExample(v any) string {
 	// In JSON, keys must be a string. But goa allows map keys to be anything.
 	r := reflect.ValueOf(v)
 	if r.Kind() == reflect.Map {
 		keys := r.MapKeys()
 		if keys[0].Kind() != reflect.String {
-			a := make(map[string]interface{}, len(keys))
+			a := make(map[string]any, len(keys))
 			var kstr string
 			for _, k := range keys {
 				switch t := k.Interface().(type) {

diff --git a/codegen/example/example_cli.go b/codegen/example/example_cli.go
@@ -45,30 +45,30 @@ func exampleCLIMain(genpkg string, root *expr.RootExpr, svr *expr.ServerExpr) *c
 		&codegen.SectionTemplate{
 			Name:   "cli-main-start",
 			Source: cliMainStartT,
-			Data: map[string]interface{}{
+			Data: map[string]any{
 				"Server": svrdata,
 			},
-			FuncMap: map[string]interface{}{
+			FuncMap: map[string]any{
 				"join": strings.Join,
 			},
 		},
 		&codegen.SectionTemplate{
 			Name:   "cli-main-var-init",
 			Source: cliMainVarInitT,
-			Data: map[string]interface{}{
+			Data: map[string]any{
 				"Server": svrdata,
 			},
-			FuncMap: map[string]interface{}{
+			FuncMap: map[string]any{
 				"join": strings.Join,
 			},
 		},
 		&codegen.SectionTemplate{
 			Name:   "cli-main-endpoint-init",
 			Source: cliMainEndpointInitT,
-			Data: map[string]interface{}{
+			Data: map[string]any{
 				"Server": svrdata,
 			},
-			FuncMap: map[string]interface{}{
+			FuncMap: map[string]any{
 				"join":    strings.Join,
 				"toUpper": strings.ToUpper,
 			},
@@ -77,11 +77,11 @@ func exampleCLIMain(genpkg string, root *expr.RootExpr, svr *expr.ServerExpr) *c
 		&codegen.SectionTemplate{
 			Name:   "cli-main-usage",
 			Source: cliMainUsageT,
-			Data: map[string]interface{}{
+			Data: map[string]any{
 				"APIName": root.API.Name,
 				"Server":  svrdata,
 			},
-			FuncMap: map[string]interface{}{
+			FuncMap: map[string]any{
 				"toUpper": strings.ToUpper,
 				"join":    strings.Join,
 			},
@@ -91,7 +91,7 @@ func exampleCLIMain(genpkg string, root *expr.RootExpr, svr *expr.ServerExpr) *c
 }
 
 const (
-	// input: map[string]interface{}{"Server": *Data}
+	// input: map[string]any{"Server": *Data}
 	cliMainStartT = `func main() {
 	var (
 		hostF = flag.String("host", {{ printf "%q" .Server.DefaultHost.Name }}, "Server host (valid values: {{ (join .Server.AvailableHosts ", ") }})")
@@ -107,7 +107,7 @@ const (
 	flag.Parse()
 `
 
-	// input: map[string]interface{}{"Server": *Data}
+	// input: map[string]any{"Server": *Data}
 	cliMainVarInitT = `var (
 		addr string
 		timeout int
@@ -163,10 +163,10 @@ const (
 	}
 `
 
-	// input: map[string]interface{}{"Server": *Data}
+	// input: map[string]any{"Server": *Data}
 	cliMainEndpointInitT = `var(
 		endpoint goa.Endpoint
-		payload interface{}
+		payload any
 		err error
 	)
 	{
@@ -204,7 +204,7 @@ const (
 }
 `
 
-	// input: map[string]interface{}{"APIName": string, "Server": *Data}
+	// input: map[string]any{"APIName": string, "Server": *Data}
 	cliMainUsageT = `
 func usage() {
   fmt.Fprintf(os.Stderr, ` + "`" + `%s is a command line client for the {{ .APIName }} API.

diff --git a/codegen/example/example_server.go b/codegen/example/example_server.go
@@ -79,35 +79,35 @@ func exampleSvrMain(genpkg string, root *expr.RootExpr, svr *expr.ServerExpr) *c
 		{
 			Name:   "server-main-start",
 			Source: mainStartT,
-			Data: map[string]interface{}{
+			Data: map[string]any{
 				"Server": svrdata,
 			},
-			FuncMap: map[string]interface{}{
+			FuncMap: map[string]any{
 				"join": strings.Join,
 			},
 		}, {
 			Name:   "server-main-logger",
 			Source: mainLoggerT,
-			Data: map[string]interface{}{
+			Data: map[string]any{
 				"APIPkg": apiPkg,
 			},
 		}, {
 			Name:   "server-main-services",
 			Source: mainSvcsT,
-			Data: map[string]interface{}{
+			Data: map[string]any{
 				"APIPkg":   apiPkg,
 				"Services": svcData,
 			},
-			FuncMap: map[string]interface{}{
+			FuncMap: map[string]any{
 				"mustInitServices": mustInitServices,
 			},
 		}, {
 			Name:   "server-main-endpoints",
 			Source: mainEndpointsT,
-			Data: map[string]interface{}{
+			Data: map[string]any{
 				"Services": svcData,
 			},
-			FuncMap: map[string]interface{}{
+			FuncMap: map[string]any{
 				"mustInitServices": mustInitServices,
 			},
 		}, {
@@ -116,11 +116,11 @@ func exampleSvrMain(genpkg string, root *expr.RootExpr, svr *expr.ServerExpr) *c
 		}, {
 			Name:   "server-main-handler",
 			Source: mainServerHndlrT,
-			Data: map[string]interface{}{
+			Data: map[string]any{
 				"Server":   svrdata,
 				"Services": svcData,
 			},
-			FuncMap: map[string]interface{}{
+			FuncMap: map[string]any{
 				"goify":   codegen.Goify,
 				"join":    strings.Join,
 				"toUpper": strings.ToUpper,

diff --git a/codegen/example/server_data.go b/codegen/example/server_data.go
@@ -333,7 +333,7 @@ func buildHostData(host *expr.HostExpr) *HostData {
 }
 
 // convertToString converts primitive type to a string.
-func convertToString(vals ...interface{}) []string {
+func convertToString(vals ...any) []string {
 	str := make([]string, len(vals))
 	for i, v := range vals {
 		switch t := v.(type) {

diff --git a/codegen/example/testdata/example_cli_code.go b/codegen/example/testdata/example_cli_code.go
@@ -47,7 +47,7 @@ const (
 	}
 	var (
 		endpoint goa.Endpoint
-		payload  interface{}
+		payload  any
 		err      error
 	)
 	{
@@ -157,7 +157,7 @@ func indent(s string) string {
 	}
 	var (
 		endpoint goa.Endpoint
-		payload  interface{}
+		payload  any
 		err      error
 	)
 	{
@@ -285,7 +285,7 @@ func indent(s string) string {
 	}
 	var (
 		endpoint goa.Endpoint
-		payload  interface{}
+		payload  any
 		err      error
 	)
 	{
@@ -404,7 +404,7 @@ func indent(s string) string {
 	}
 	var (
 		endpoint goa.Endpoint
-		payload  interface{}
+		payload  any
 		err      error
 	)
 	{
@@ -533,7 +533,7 @@ func indent(s string) string {
 	}
 	var (
 		endpoint goa.Endpoint
-		payload  interface{}
+		payload  any
 		err      error
 	)
 	{

diff --git a/codegen/file.go b/codegen/file.go
@@ -48,9 +48,9 @@ type (
 		// renders the section text.
 		Source string
 		// FuncMap lists the functions used to render the templates.
-		FuncMap map[string]interface{}
+		FuncMap map[string]any
 		// Data used as input of template.
-		Data interface{}
+		Data any
 	}
 )
 

diff --git a/codegen/funcs.go b/codegen/funcs.go
@@ -32,8 +32,8 @@ type (
 )
 
 // TemplateFuncs lists common template helper functions.
-func TemplateFuncs() map[string]interface{} {
-	return map[string]interface{}{
+func TemplateFuncs() map[string]any {
+	return map[string]any{
 		"commandLine": CommandLine,
 		"comment":     Comment,
 	}

diff --git a/codegen/go_transform.go b/codegen/go_transform.go
@@ -299,7 +299,7 @@ func transformArray(source, target *expr.Array, sourceVar, targetVar string, new
 	if err := IsCompatible(source.ElemType.Type, target.ElemType.Type, sourceVar+"[0]", targetVar+"[0]"); err != nil {
 		return "", err
 	}
-	data := map[string]interface{}{
+	data := map[string]any{
 		"ElemTypeRef":    ta.TargetCtx.Scope.Ref(target.ElemType, ta.TargetCtx.Pkg(target.ElemType)),
 		"SourceElem":     source.ElemType,
 		"TargetElem":     target.ElemType,
@@ -325,7 +325,7 @@ func transformMap(source, target *expr.Map, sourceVar, targetVar string, newVar
 	if err := IsCompatible(source.ElemType.Type, target.ElemType.Type, sourceVar+"[*]", targetVar+"[*]"); err != nil {
 		return "", err
 	}
-	data := map[string]interface{}{
+	data := map[string]any{
 		"KeyTypeRef":     ta.TargetCtx.Scope.Ref(target.KeyType, ta.TargetCtx.Pkg(target.KeyType)),
 		"ElemTypeRef":    ta.TargetCtx.Scope.Ref(target.ElemType, ta.TargetCtx.Pkg(target.ElemType)),
 		"SourceKey":      source.KeyType,
@@ -382,7 +382,7 @@ func transformUnion(source, target *expr.AttributeExpr, sourceVar, targetVar str
 	// Need to type assert targetVar before assigning field values.
 	ta.TargetCtx.IsInterface = true
 
-	data := map[string]interface{}{
+	data := map[string]any{
 		"SourceTypeRefs": sourceTypeRefs,
 		"SourceTypes":    srcUnion.Values,
 		"TargetTypes":    tgtUnion.Values,
@@ -415,7 +415,7 @@ func transformUnionToObject(source, target *expr.AttributeExpr, sourceVar, targe
 		sourceTypeRefs[i] = ta.SourceCtx.Scope.Ref(st.Attribute, ta.SourceCtx.Pkg(st.Attribute))
 		sourceTypeNames[i] = st.Name
 	}
-	data := map[string]interface{}{
+	data := map[string]any{
 		"NewVar":          newVar,
 		"TargetVar":       targetVar,
 		"TypeRef":         ta.TargetCtx.Scope.Ref(target, ta.TargetCtx.Pkg(target)),
@@ -451,7 +451,7 @@ func transformObjectToUnion(source, target *expr.AttributeExpr, sourceVar, targe
 		unionTypes[i] = tt.Name
 		targetTypeRefs[i] = ta.TargetCtx.Scope.Ref(tt.Attribute, ta.TargetCtx.Pkg(tt.Attribute))
 	}
-	data := map[string]interface{}{
+	data := map[string]any{
 		"NewVar":         newVar,
 		"TargetVar":      targetVar,
 		"TypeRef":        ta.TargetCtx.Scope.Ref(target, ta.TargetCtx.Pkg(target)),

diff --git a/codegen/go_transform_test.go b/codegen/go_transform_test.go
@@ -765,7 +765,7 @@ const (
 		}
 	}
 	{
-		var zero interface{}
+		var zero any
 		if target.Any == zero {
 			target.Any = "something"
 		}

diff --git a/codegen/header.go b/codegen/header.go
@@ -9,7 +9,7 @@ func Header(title, pack string, imports []*ImportSpec) *SectionTemplate {
 	return &SectionTemplate{
 		Name:   "source-header",
 		Source: headerT,
-		Data: map[string]interface{}{
+		Data: map[string]any{
 			"Title":       title,
 			"ToolVersion": goa.Version(),
 			"Pkg":         pack,
@@ -25,7 +25,7 @@ func AddImport(section *SectionTemplate, imprts ...*ImportSpec) {
 		return
 	}
 	var specs []*ImportSpec
-	if data, ok := section.Data.(map[string]interface{}); ok {
+	if data, ok := section.Data.(map[string]any); ok {
 		if imports, ok := data["Imports"]; ok {
 			specs = imports.([]*ImportSpec)
 		}

diff --git a/codegen/service/client.go b/codegen/service/client.go
@@ -87,7 +87,7 @@ const serviceClientMethodT = `
 {{- end }}
 func (c *{{ .ClientVarName }}) {{ .VarName }}(ctx context.Context, {{ if .PayloadRef }}p {{ .PayloadRef }}{{ end }}{{ if .MethodData.SkipRequestBodyEncodeDecode}}, req io.ReadCloser{{ end }}) ({{ if $resultType }}res {{ $resultType }}, {{ end }}{{ if .MethodData.SkipResponseBodyEncodeDecode }}resp io.ReadCloser, {{ end }}err error) {
 	{{- if or $resultType .MethodData.SkipResponseBodyEncodeDecode }}
-	var ires interface{}
+	var ires any
 	{{- end }}
 	{{ if or $resultType .MethodData.SkipResponseBodyEncodeDecode }}ires{{ else }}_{{ end }}, err = c.{{ .VarName}}Endpoint(ctx, {{ if .MethodData.SkipRequestBodyEncodeDecode }}&{{ .RequestStruct }}{ {{ if .PayloadRef }}Payload: p, {{ end }}Body: req }{{ else if .PayloadRef }}p{{ else }}nil{{ end }})
 	{{- if not (or $resultType .MethodData.SkipResponseBodyEncodeDecode) }}