Update linter configuration and fix linting issues (#3694)

Author: raphael

.golangci.yml

@@ -1,3 +1,7 @@
+version: "2"
 linters:
   enable:
     - errorlint
+    - errcheck
+    - staticcheck
+

Makefile

@@ -70,9 +70,7 @@ depend:
 
 lint:
 ifneq ($(GOOS),windows)
-	@if [ "`golangci-lint run ./... | grep -v ".pb.go" | tee /dev/stderr`" ]; then \
-		echo "^ - lint errors!" && echo && exit 1; \
-	fi
+	@golangci-lint run ./... || (echo "^ - lint errors!" && echo && exit 1)
 endif
 
 test:

cmd/goa/gen.go

@@ -226,7 +226,7 @@ func (g *Generator) Run() ([]string, error) {
 // Remove deletes the package files.
 func (g *Generator) Remove() {
 	if g.tmpDir != "" {
-		os.RemoveAll(g.tmpDir)
+		_ = os.RemoveAll(g.tmpDir)
 		g.tmpDir = ""
 	}
 }
@@ -237,7 +237,7 @@ func (g *Generator) runGoCmd(args ...string) error {
 		return fmt.Errorf(`failed to find a go compiler, looked in "%s"`, os.Getenv("PATH"))
 	}
 	if g.DesignVersion > 2 {
-		os.Setenv("GO111MODULE", "on")
+		_ = os.Setenv("GO111MODULE", "on")
 	}
 	c := exec.Cmd{
 		Path: gobin,

codegen/file.go

@@ -165,7 +165,9 @@ func finalizeGoSource(path string) error {
 	if err := format.Node(w, fset, file); err != nil {
 		return err
 	}
-	w.Close()
+	if err := w.Close(); err != nil {
+		return err
+	}
 
 	// Format code using goimport standard
 	bs, err := os.ReadFile(path)

codegen/go_transform.go

@@ -197,7 +197,7 @@ func transformObject(source, target *expr.AttributeExpr, sourceVar, targetVar st
 		assign = ":="
 	}
 	name := ta.TargetCtx.Scope.Name(target, ta.TargetCtx.Pkg(target), ta.TargetCtx.Pointer, ta.TargetCtx.UseDefault)
-	buffer.WriteString(fmt.Sprintf("%s %s %s%s{%s}\n", targetVar, assign, deref, name, initCode))
+	fmt.Fprintf(buffer, "%s %s %s%s{%s}\n", targetVar, assign, deref, name, initCode)
 	buffer.WriteString(postInitCode)
 
 	// iterate through attributes to initialize rest of the struct fields and

codegen/service/convert_test.go

@@ -308,7 +308,7 @@ func objRecursive() *expr.UserTypeExpr {
 		},
 		TypeName: "objRecursiveT",
 	}
-	obj := res.AttributeExpr.Type.(*expr.Object)
+	obj := res.Type.(*expr.Object)
 	*obj = append(*obj, &expr.NamedAttributeExpr{
 		Name:      "Rec",
 		Attribute: &expr.AttributeExpr{Type: res}})

codegen/service/service_data.go

@@ -1018,11 +1018,11 @@ func collectUnionMethods(att *expr.AttributeExpr, scope *codegen.NameScope, loc
 
 // buildErrorInitData creates the data needed to generate code around endpoint error return values.
 func buildErrorInitData(er *expr.ErrorExpr, scope *codegen.NameScope) *ErrorInitData {
-	_, temporary := er.AttributeExpr.Meta["goa:error:temporary"]
-	_, timeout := er.AttributeExpr.Meta["goa:error:timeout"]
-	_, fault := er.AttributeExpr.Meta["goa:error:fault"]
+	_, temporary := er.Meta["goa:error:temporary"]
+	_, timeout := er.Meta["goa:error:timeout"]
+	_, fault := er.Meta["goa:error:fault"]
 	var pkg string
-	if ut, ok := er.AttributeExpr.Type.(expr.UserType); ok {
+	if ut, ok := er.Type.(expr.UserType); ok {
 		pkg = codegen.UserTypeLocation(ut).PackageName()
 	}
 	return &ErrorInitData{
@@ -1098,7 +1098,7 @@ func buildMethodData(m *expr.MethodExpr, scope *codegen.NameScope) *MethodData {
 		errorLocs = make(map[string]*codegen.Location, len(m.Errors))
 		for i, er := range m.Errors {
 			errors[i] = buildErrorInitData(er, scope)
-			errorLocs[er.Name] = codegen.UserTypeLocation(er.AttributeExpr.Type)
+			errorLocs[er.Name] = codegen.UserTypeLocation(er.Type)
 		}
 	}
 	for _, req := range m.Requirements {
@@ -1638,7 +1638,7 @@ func buildProjectedType(projected, att *expr.AttributeExpr, viewspkg string, sco
 func buildViews(rt *expr.ResultTypeExpr, viewScope *codegen.NameScope) []*ViewData {
 	views := make([]*ViewData, len(rt.Views))
 	for i, view := range rt.Views {
-		vatt := expr.AsObject(view.AttributeExpr.Type)
+		vatt := expr.AsObject(view.Type)
 		attrs := make([]string, len(*vatt))
 		for j, nat := range *vatt {
 			attrs[j] = nat.Name
@@ -2072,7 +2072,7 @@ func buildConstructorCode(src, tgt *expr.AttributeExpr, sourceVar, targetVar str
 		finit := "new" + targetCtx.Scope.Name(nat.Attribute, "", targetCtx.Pointer, targetCtx.UseDefault)
 		if view != "" {
 			v := ""
-			if vatt := rt.View(view).AttributeExpr.Find(nat.Name); vatt != nil {
+			if vatt := rt.View(view).Find(nat.Name); vatt != nil {
 				if attv, ok := vatt.Meta.Last(expr.ViewMetaKey); ok && attv != expr.DefaultView {
 					// view is explicitly set for the result type on the attribute
 					v = attv

codegen/testing.go

@@ -66,7 +66,7 @@ func sectionCodeWithPrefix(t *testing.T, section *SectionTemplate, prefix string
 func FormatTestCode(t *testing.T, code string) string {
 	t.Helper()
 	tmp := CreateTempFile(t, code)
-	defer os.Remove(tmp)
+	defer func() { _ = os.Remove(tmp) }()
 	require.NoError(t, finalizeGoSource(tmp))
 	content, err := os.ReadFile(tmp)
 	require.NoError(t, err)
@@ -81,7 +81,7 @@ func CreateTempFile(t *testing.T, content string) string {
 	require.NoError(t, err)
 	_, err = f.WriteString(content)
 	if err != nil {
-		os.Remove(f.Name())
+		require.NoError(t, os.Remove(f.Name()))
 		t.Fatal(err)
 	}
 	require.NoError(t, f.Close())

dsl/http.go

@@ -914,7 +914,7 @@ func Body(args ...any) {
 		}
 		kind = "Request"
 	case *expr.HTTPErrorExpr:
-		ref = e.ErrorExpr.AttributeExpr
+		ref = e.AttributeExpr
 		setter = func(att *expr.AttributeExpr) {
 			if e.Response == nil {
 				e.Response = &expr.HTTPResponseExpr{}

dsl/result_type_test.go

@@ -84,7 +84,7 @@ func TestView(t *testing.T) {
 						found = true
 						for _, attr := range c.expectedViewAttrs[view] {
 							found2 := false
-							for _, attr2 := range *v.AttributeExpr.Type.(*expr.Object) {
+							for _, attr2 := range *v.Type.(*expr.Object) {
 								if attr2.Name == attr {
 									found2 = true
 									break

expr/attribute.go

@@ -665,7 +665,7 @@ func (a *AttributeExpr) debug(prefix string, seen map[*AttributeExpr]int, indent
 	if rt, ok := a.Type.(*ResultTypeExpr); ok {
 		fmt.Printf("%s%sviews\n", tabs, tab)
 		for _, v := range rt.Views {
-			nats := *AsObject(v.AttributeExpr.Type)
+			nats := *AsObject(v.Type)
 			keys := make([]string, len(nats))
 			for i, n := range nats {
 				keys[i] = n.Name

expr/http_body_types.go

@@ -195,12 +195,12 @@ func httpRequestBody(a *HTTPEndpointExpr) *AttributeExpr {
 	if t, ok := payload.Type.(UserType); ok {
 		// Remember openapi typename for example to generate friendly OpenAPI specs.
 		if m, ok := t.Attribute().Meta["openapi:typename"]; ok {
-			ut.AttributeExpr.AddMeta("openapi:typename", m...)
+			ut.AddMeta("openapi:typename", m...)
 		}
 
 		// Remember additionalProperties.
 		if m, ok := t.Attribute().Meta["openapi:additionalProperties"]; ok {
-			ut.AttributeExpr.AddMeta("openapi:additionalProperties", m...)
+			ut.AddMeta("openapi:additionalProperties", m...)
 		}
 	}
 
@@ -262,7 +262,7 @@ func httpResponseBody(a *HTTPEndpointExpr, resp *HTTPResponseExpr) *AttributeExp
 // parameters.
 func httpErrorResponseBody(e *HTTPEndpointExpr, v *HTTPErrorExpr) *AttributeExpr {
 	name := e.Name() + "_" + v.ErrorExpr.Name
-	return buildHTTPResponseBody(name, v.ErrorExpr.AttributeExpr, v.Response, e.Service)
+	return buildHTTPResponseBody(name, v.AttributeExpr, v.Response, e.Service)
 }
 
 func buildHTTPResponseBody(name string, attr *AttributeExpr, resp *HTTPResponseExpr, svc *HTTPServiceExpr) *AttributeExpr {
@@ -342,14 +342,14 @@ func buildHTTPResponseBody(name string, attr *AttributeExpr, resp *HTTPResponseE
 	if t, ok := attr.Type.(UserType); ok {
 		// Remember original type name and openapi typename for example
 		// to generate friendly OpenAPI specs.
-		userType.AttributeExpr.AddMeta("name:original", t.Name())
+		userType.AddMeta("name:original", t.Name())
 		if m, ok := t.Attribute().Meta["openapi:typename"]; ok {
-			userType.AttributeExpr.AddMeta("openapi:typename", m...)
+			userType.AddMeta("openapi:typename", m...)
 		}
 
 		// Remember additionalProperties.
 		if m, ok := t.Attribute().Meta["openapi:additionalProperties"]; ok {
-			userType.AttributeExpr.AddMeta("openapi:additionalProperties", m...)
+			userType.AddMeta("openapi:additionalProperties", m...)
 		}
 	}
 

expr/http_endpoint_test.go

@@ -72,7 +72,7 @@ func TestHTTPEndpointPrepare(t *testing.T) {
 				root := expr.RunDSL(t, c.DSL)
 				e := root.API.HTTP.Services[len(root.API.HTTP.Services)-1].HTTPEndpoints[0]
 
-				ht := expr.AsObject(e.Headers.AttributeExpr.Type)
+				ht := expr.AsObject(e.Headers.Type)
 				if len(*ht) != len(c.Headers) {
 					t.Errorf("got %d headers, expected %d", len(*ht), len(c.Headers))
 				} else {
@@ -83,7 +83,7 @@ func TestHTTPEndpointPrepare(t *testing.T) {
 					}
 				}
 
-				ct := expr.AsObject(e.Cookies.AttributeExpr.Type)
+				ct := expr.AsObject(e.Cookies.Type)
 				if len(*ct) != len(c.Cookies) {
 					t.Errorf("got %d cookies, expected %d", len(*ct), len(c.Cookies))
 				} else {
@@ -94,7 +94,7 @@ func TestHTTPEndpointPrepare(t *testing.T) {
 					}
 				}
 
-				pt := expr.AsObject(e.Params.AttributeExpr.Type)
+				pt := expr.AsObject(e.Params.Type)
 				if len(*pt) != len(c.Params) {
 					t.Errorf("got %d params, expected %d", len(*pt), len(c.Params))
 				} else {

expr/mapped_attribute.go

@@ -77,7 +77,7 @@ func (ma *MappedAttributeExpr) Remap() {
 	}
 
 	// Conserve examples defined on user type
-	ma.AttributeExpr.UserExamples = ma.ExtractUserExamples()
+	ma.UserExamples = ma.ExtractUserExamples()
 
 	ma.Type = n
 }

expr/method.go

@@ -227,7 +227,7 @@ func (m *MethodExpr) validateErrors() *eval.ValidationErrors {
 					return nil
 				})
 				if !found {
-					verr.Add(e, "type %q is used to define multiple errors and must identify the attribute containing the error name with ErrorName", e.AttributeExpr.Type.Name())
+					verr.Add(e, "type %q is used to define multiple errors and must identify the attribute containing the error name with ErrorName", e.Type.Name())
 					break
 				}
 			}

expr/project_test.go

@@ -59,13 +59,13 @@ func TestProject(t *testing.T) {
 				t.Fatal(err)
 			}
 			if !Equal(projected, k.Expected) {
-				projected.AttributeExpr.Debug("got")
-				k.Expected.AttributeExpr.Debug("expected")
+				projected.Debug("got")
+				k.Expected.Debug("expected")
 				t.Errorf("got: %s, expected: %s\n", Hash(projected, false, true, true), Hash(k.Expected, false, true, true))
 			}
-			if pobj := AsObject(projected.AttributeExpr.Type); pobj != nil {
+			if pobj := AsObject(projected.Type); pobj != nil {
 				for _, att := range *pobj {
-					att2 := k.Expected.AttributeExpr.Find(att.Name)
+					att2 := k.Expected.Find(att.Name)
 					if att2 == nil {
 						continue
 					}

expr/result_type.go

@@ -170,7 +170,7 @@ func (rt *ResultTypeExpr) ViewHasAttribute(view, attr string) bool {
 	if v == nil {
 		return false
 	}
-	return v.AttributeExpr.Find(attr) != nil
+	return v.Find(attr) != nil
 }
 
 // Finalize builds the default view if not explicitly defined and finalizes
@@ -195,7 +195,7 @@ func (rt *ResultTypeExpr) Finalize() {
 // useExplicitView projects the result type using the view explicitly set on the
 // attribute if any.
 func (rt *ResultTypeExpr) useExplicitView() {
-	if view, ok := rt.AttributeExpr.Meta.Last(ViewMetaKey); ok {
+	if view, ok := rt.Meta.Last(ViewMetaKey); ok {
 		p, err := Project(rt, view)
 		if err != nil {
 			panic(err) // bug - presence of view meta should have been validated before
@@ -300,8 +300,8 @@ func projectSingle(rt *ResultTypeExpr, view string, seen map[string]*AttributeEx
 	}
 	ut.TypeName = typeName
 	ut.UID = id
-	ut.AttributeExpr.Type = Dup(v.Type)
-	ut.AttributeExpr.UserExamples = v.UserExamples
+	ut.Type = Dup(v.Type)
+	ut.UserExamples = v.UserExamples
 	projected := &ResultTypeExpr{
 		Identifier:   id,
 		UserTypeExpr: ut,

expr/service.go

@@ -109,14 +109,14 @@ func (e *ErrorExpr) Validate() error {
 	walkAttribute(e.AttributeExpr, func(name string, att *AttributeExpr) error { // nolint: errcheck
 		if _, ok := att.Meta["struct:error:name"]; ok {
 			if errField != "" {
-				verr.Add(e, "duplicate error names in type %q", e.AttributeExpr.Type.Name())
+				verr.Add(e, "duplicate error names in type %q", e.Type.Name())
 			}
 			errField = name
 			if att.Type != String {
-				verr.Add(e, "error name %q must be a string in type %q", name, e.AttributeExpr.Type.Name())
+				verr.Add(e, "error name %q must be a string in type %q", name, e.Type.Name())
 			}
-			if !e.AttributeExpr.IsRequired(name) {
-				verr.Add(e, "error name %q must be required in type %q", name, e.AttributeExpr.Type.Name())
+			if !e.IsRequired(name) {
+				verr.Add(e, "error name %q must be required in type %q", name, e.Type.Name())
 			}
 		}
 		return nil

expr/testing.go

@@ -57,7 +57,7 @@ func CreateTempFile(t *testing.T, content string) string {
 	}
 	_, err = f.WriteString(content)
 	if err != nil {
-		os.Remove(f.Name())
+		_ = os.Remove(f.Name())
 		t.Fatal(err)
 	}
 	if err := f.Close(); err != nil {

expr/user_type.go

@@ -33,7 +33,7 @@ func (u *UserTypeExpr) Name() string {
 	if u.AttributeExpr == nil {
 		return u.TypeName
 	}
-	if n, ok := u.AttributeExpr.Meta["struct:type:name"]; ok {
+	if n, ok := u.Meta["struct:type:name"]; ok {
 		return n[0]
 	}
 	return u.TypeName
@@ -42,8 +42,8 @@ func (u *UserTypeExpr) Name() string {
 // Rename changes the type name to the given value.
 func (u *UserTypeExpr) Rename(n string) {
 	// Remember original name for example to generate friendly docs.
-	u.AttributeExpr.AddMeta("name:original", u.TypeName)
-	delete(u.AttributeExpr.Meta, "struct:type:name")
+	u.AddMeta("name:original", u.TypeName)
+	delete(u.Meta, "struct:type:name")
 	u.TypeName = n
 }
 

grpc/codegen/protobuf_transform.go

@@ -85,12 +85,12 @@ func protoBufTransform(source, target *expr.AttributeExpr, sourceVar, targetVar
 	if proto {
 		target = expr.DupAtt(target)
 		removeMeta(target)
-		ta.TransformAttrs.Prefix = "svc"
+		ta.Prefix = "svc"
 		ta.proto = true
 	} else {
 		source = expr.DupAtt(source)
 		removeMeta(source)
-		ta.TransformAttrs.Prefix = "protobuf"
+		ta.Prefix = "protobuf"
 		ta.proto = false
 	}
 
@@ -268,7 +268,7 @@ func transformObject(source, target *expr.AttributeExpr, sourceVar, targetVar st
 		assign = ":="
 	}
 	tname := ta.TargetCtx.Scope.Name(target, ta.TargetCtx.Pkg(target), ta.TargetCtx.Pointer, ta.TargetCtx.UseDefault)
-	buffer.WriteString(fmt.Sprintf("%s %s %s%s{%s}\n", targetVar, assign, deref, tname, initCode))
+	fmt.Fprintf(buffer, "%s %s %s%s{%s}\n", targetVar, assign, deref, tname, initCode)
 	buffer.WriteString(postInitCode)
 
 	// iterate through attributes to initialize rest of the struct fields and