Apply modernize (#3750)

* go run golang.org/x/tools/gopls/internal/analysis/modernize/cmd/modernize@latest -fix -test ./...

* Use copy()

* Combine types of function parameters

* Use http.NoBody

* Avoid shadowing builtins

* Fix file permissions

* Apply suggestion from @Copilot

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Raphael Simon <simon.raphael@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: 3 people

codegen/file.go

@@ -9,6 +9,7 @@ import (
 	"go/scanner"
 	"go/token"
 	"io"
+	"maps"
 	"os"
 	"path/filepath"
 	"strings"
@@ -123,9 +124,7 @@ func (f *File) Render(dir string) (string, error) {
 // Write writes the section to the given writer.
 func (s *SectionTemplate) Write(w io.Writer) error {
 	funcs := TemplateFuncs()
-	for k, v := range s.FuncMap {
-		funcs[k] = v
-	}
+	maps.Copy(funcs, s.FuncMap)
 	tmpl := template.Must(template.New(s.Name).Funcs(funcs).Parse(s.Source))
 	return tmpl.Execute(w, s.Data)
 }
@@ -158,7 +157,7 @@ func finalizeGoSource(path string) error {
 		}
 	}
 	ast.SortImports(fset, file)
-	w, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, os.ModePerm)
+	w, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
 	if err != nil {
 		return err
 	}

codegen/funcs.go

@@ -98,7 +98,7 @@ var toLower = map[string]string{"OAuth": "oauth"}
 // If acronym is true and a part of the string is a common acronym
 // then it keeps the part capitalized (firstUpper = true)
 // (e.g. APIVersion) or lowercase (firstUpper = false) (e.g. apiVersion).
-func CamelCase(name string, firstUpper bool, acronym bool) string {
+func CamelCase(name string, firstUpper, acronym bool) string {
 	if name == "" {
 		return ""
 	}
@@ -342,7 +342,7 @@ func runeSpacePosRev(r []rune) int {
 }
 
 func runeSpacePos(r []rune) int {
-	for i := 0; i < len(r); i++ {
+	for i := range r {
 		if unicode.IsSpace(r[i]) {
 			return i
 		}

codegen/service/interceptors.go

@@ -105,7 +105,7 @@ func interceptorFile(svc *Data, server bool) *codegen.File {
 		sections = append(sections, &codegen.SectionTemplate{
 			Name:   section,
 			Source: readTemplate(template),
-			Data: map[string]interface{}{
+			Data: map[string]any{
 				"MethodVarName": m.VarName,
 				"Method":        m.Name,
 				"Service":       svc.Name,
@@ -148,7 +148,7 @@ func wrapperFile(svc *Data) *codegen.File {
 			sections = append(sections, &codegen.SectionTemplate{
 				Name:   "server-interceptor-stream-wrapper-types",
 				Source: readTemplate("server_interceptor_stream_wrapper_types"),
-				Data: map[string]interface{}{
+				Data: map[string]any{
 					"WrappedServerStreams": wrappedServerStreams,
 				},
 			})
@@ -160,7 +160,7 @@ func wrapperFile(svc *Data) *codegen.File {
 			sections = append(sections, &codegen.SectionTemplate{
 				Name:   "client-interceptor-stream-wrapper-types",
 				Source: readTemplate("client_interceptor_stream_wrapper_types"),
-				Data: map[string]interface{}{
+				Data: map[string]any{
 					"WrappedClientStreams": wrappedClientStreams,
 				},
 			})
@@ -172,7 +172,7 @@ func wrapperFile(svc *Data) *codegen.File {
 		sections = append(sections, &codegen.SectionTemplate{
 			Name:   "server-interceptor-wrappers",
 			Source: readTemplate("server_interceptor_wrappers"),
-			Data: map[string]interface{}{
+			Data: map[string]any{
 				"Service":            svc.Name,
 				"ServerInterceptors": svc.ServerInterceptors,
 			},
@@ -182,7 +182,7 @@ func wrapperFile(svc *Data) *codegen.File {
 		sections = append(sections, &codegen.SectionTemplate{
 			Name:   "client-interceptor-wrappers",
 			Source: readTemplate("client_interceptor_wrappers"),
-			Data: map[string]interface{}{
+			Data: map[string]any{
 				"Service":            svc.Name,
 				"ClientInterceptors": svc.ClientInterceptors,
 			},
@@ -194,7 +194,7 @@ func wrapperFile(svc *Data) *codegen.File {
 		sections = append(sections, &codegen.SectionTemplate{
 			Name:   "server-interceptor-stream-wrappers",
 			Source: readTemplate("server_interceptor_stream_wrappers"),
-			Data: map[string]interface{}{
+			Data: map[string]any{
 				"WrappedServerStreams": wrappedServerStreams,
 			},
 		})
@@ -203,7 +203,7 @@ func wrapperFile(svc *Data) *codegen.File {
 		sections = append(sections, &codegen.SectionTemplate{
 			Name:   "client-interceptor-stream-wrappers",
 			Source: readTemplate("client_interceptor_stream_wrappers"),
-			Data: map[string]interface{}{
+			Data: map[string]any{
 				"WrappedClientStreams": wrappedClientStreams,
 			},
 		})

codegen/service/service_data.go

@@ -3,6 +3,7 @@ package service
 import (
 	"bytes"
 	"fmt"
+	"slices"
 	"sort"
 	"strings"
 	"text/template"
@@ -754,11 +755,8 @@ func (d *ServicesData) analyze(service *expr.ServiceExpr) *Data {
 		att := &expr.AttributeExpr{Type: t}
 		if len(svcs) > 0 {
 			// Force generate type only in the specified services
-			for _, svc := range svcs {
-				if svc == service.Name {
-					types = append(types, collectTypes(att, scope, seen)...)
-					break
-				}
+			if slices.Contains(svcs, service.Name) {
+				types = append(types, collectTypes(att, scope, seen)...)
 			}
 			continue
 		}

dsl/meta_test.go

@@ -1,6 +1,7 @@
 package dsl_test
 
 import (
+	"slices"
 	"testing"
 
 	. "goa.design/goa/v3/dsl"
@@ -51,12 +52,7 @@ func TestMetaData(t *testing.T) {
 }
 
 func hasValue(vals []string, val string) bool {
-	for _, v := range vals {
-		if v == val {
-			return true
-		}
-	}
-	return false
+	return slices.Contains(vals, val)
 }
 func apiExprMeta(e eval.Expression) expr.MetaExpr    { return e.(*expr.APIExpr).Meta }
 func userTypeMeta(e eval.Expression) expr.MetaExpr   { return e.(*expr.UserTypeExpr).Meta }

dsl/result_type.go

@@ -371,10 +371,7 @@ func CollectionOf(v any, adsl ...func()) *expr.ResultTypeExpr {
 			// at all) then inherit the views from the collection
 			// element.
 			rt.Views = make([]*expr.ViewExpr, len(m.Views))
-			for i, v := range m.Views {
-				v := v
-				rt.Views[i] = v
-			}
+			copy(rt.Views, m.Views)
 		}
 	})
 	// do not execute the DSL right away, will be done last to make sure

expr/attribute.go

@@ -2,6 +2,7 @@ package expr
 
 import (
 	"fmt"
+	"slices"
 	"strings"
 
 	"goa.design/goa/v3/eval"
@@ -419,12 +420,7 @@ func (a *AttributeExpr) AllRequired() []string {
 // attribute, false otherwise. This method only applies to attributes of type
 // Object.
 func (a *AttributeExpr) IsRequired(attName string) bool {
-	for _, name := range a.AllRequired() {
-		if name == attName {
-			return true
-		}
-	}
-	return false
+	return slices.Contains(a.AllRequired(), attName)
 }
 
 // IsRequiredNoDefault returns true if the given string matches the name of a
@@ -716,11 +712,8 @@ func (a *AttributeExpr) validateEnumDefault(ctx string, parent eval.Expression)
 	verr := new(eval.ValidationErrors)
 	if a.DefaultValue != nil && a.Validation != nil && a.Validation.Values != nil {
 		var found bool
-		for _, e := range a.Validation.Values {
-			if e == a.DefaultValue {
-				found = true
-				break
-			}
+		if slices.Contains(a.Validation.Values, a.DefaultValue) {
+			found = true
 		}
 		if !found {
 			verr.Add(
@@ -865,13 +858,7 @@ func (v *ValidationExpr) Merge(other *ValidationExpr) {
 // AddRequired merges the required fields into v.
 func (v *ValidationExpr) AddRequired(required ...string) {
 	for _, r := range required {
-		found := false
-		for _, rr := range v.Required {
-			if r == rr {
-				found = true
-				break
-			}
-		}
+		found := slices.Contains(v.Required, r)
 		if !found {
 			v.Required = append(v.Required, r)
 		}