fix lints

cpanato · cpanato · commit 1af9686a3f6c · 2025-07-03T11:22:51.000+02:00
Signed-off-by: Carlos Panato &lt;ctadeu@gmail.com&gt;
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -24,6 +24,7 @@ jobs:
       contents: read
 
     strategy:
+      fail-fast: false
       matrix:
         go-version:
           - '1.23'
diff --git a/.golangci.yml b/.golangci.yml
@@ -10,7 +10,7 @@ linters:
     - importas
     - misspell
     - prealloc
-    - revive
+    # - revive # disabled due becasue ask to change some variables and functions that might break the api compatibility
     - staticcheck
     - tparallel
     - unconvert
diff --git a/pkg/api/bindings.go b/pkg/api/bindings.go
@@ -108,7 +108,7 @@ func AsCloudEvent(event CDEventReader) (*cloudevents.Event, error) {
 	// Validate the event
 	err := Validate(event)
 	if err != nil {
-		return nil, fmt.Errorf("cannot validate CDEvent %v", err)
+		return nil, fmt.Errorf("cannot validate CDEvent %w", err)
 	}
 	ce := cloudevents.NewEvent()
 	ce.SetID(event.GetId())
@@ -149,10 +149,10 @@ func Validate(event CDEventReader) error {
 	var v interface{}
 	jsonString, err := AsJsonString(event)
 	if err != nil {
-		return fmt.Errorf("cannot render the event %s as json %s", event, err)
+		return fmt.Errorf("cannot render the event %s as json %w", event, err)
 	}
 	if err := json.Unmarshal([]byte(jsonString), &v); err != nil {
-		return fmt.Errorf("cannot unmarshal event json: %v", err)
+		return fmt.Errorf("cannot unmarshal event json: %w", err)
 	}
 	// Validate the "validate" tags
 	if err := validate.Struct(event); err != nil {
diff --git a/pkg/api/bindings_test.go b/pkg/api/bindings_test.go
@@ -143,7 +143,7 @@ func setContext(event api.CDEventWriter, subjectId string) {
 	event.SetSubjectId(subjectId)
 }
 
-func setContextV04(event api.CDEventWriterV04, chainId, schemaUri bool) {
+func setContextV04(event api.CDEventWriterV04, chainId, schemaUri bool) { //nolint: unparam
 	if chainId {
 		event.SetChainId(testChainId)
 	}
@@ -239,7 +239,6 @@ func init() {
 // TestAsCloudEvent produces a CloudEvent from a CDEvent using `AsCloudEvent`
 // and then attempts to parse the CloudEvent payload back into a specific CDEvent
 func TestAsCloudEvent(t *testing.T) {
-
 	tests := []struct {
 		name  string
 		event api.CDEventReader
@@ -309,7 +308,6 @@ func TestAsCloudEvent(t *testing.T) {
 }
 
 func TestAsCloudEventInvalid(t *testing.T) {
-
 	tests := []struct {
 		name  string
 		event api.CDEventReader
@@ -353,7 +351,6 @@ func TestAsCloudEventInvalid(t *testing.T) {
 // rendered JSON depends on a number of factors, and is not deterministic
 // so we must compare events unmarshalled to an interface
 func TestAsJsonBytes(t *testing.T) {
-
 	tests := []struct {
 		name     string
 		event    api.CDEvent
@@ -393,7 +390,7 @@ func TestAsJsonBytes(t *testing.T) {
 			if err != nil {
 				t.Fatalf("didn't expected it to fail, but it did: %v", err)
 			}
-			err = json.Unmarshal([]byte(obtainedJsonString), &obtainedInteface)
+			err = json.Unmarshal(obtainedJsonString, &obtainedInteface)
 			if err != nil {
 				t.Fatalf("didn't expected it to fail, but it did: %v", err)
 			}
@@ -409,7 +406,6 @@ func TestAsJsonBytes(t *testing.T) {
 }
 
 func TestInvalidEvent(t *testing.T) {
-
 	// mandatory source missing
 	eventNoSource, _ := testapi.NewFooSubjectBarPredicateEvent()
 	eventNoSource.SetSubjectId(testSubjectId)
@@ -506,7 +502,6 @@ func TestAsJsonStringEmpty(t *testing.T) {
 }
 
 func TestNewFromJsonString(t *testing.T) {
-
 	tests := []struct {
 		name     string
 		event    api.CDEventV04
@@ -582,7 +577,6 @@ func TestNewFromJsonString(t *testing.T) {
 }
 
 func TestParseType(t *testing.T) {
-
 	tests := []struct {
 		name      string
 		eventType string
@@ -668,7 +662,6 @@ func testEventWithVersion(eventVersion string, specVersion string) *testapi.FooS
 }
 
 func TestNewFromJsonBytes(t *testing.T) {
-
 	minorVersion := testEventWithVersion("2.999.1", testapi.SpecVersion)
 	patchVersion := testEventWithVersion("2.2.999", testapi.SpecVersion)
 	pastPatchVersion := testEventWithVersion("2.2.0", testapi.SpecVersion)
diff --git a/pkg/api/factory.go b/pkg/api/factory.go
@@ -28,7 +28,7 @@ import (
 var timeNow = time.Now
 var uuidNewRandom = uuid.NewRandom
 
-func initCDEvent(e CDEvent) (CDEvent, error) {
+func initCDEvent(e CDEvent) (CDEvent, error) { //nolint: unparam
 	eventUUID, err := uuidNewRandom()
 	if err != nil {
 		return nil, err
diff --git a/pkg/api/types.go b/pkg/api/types.go
@@ -290,28 +290,29 @@ func (ela *EmbeddedLinksArray) UnmarshalJSON(b []byte) error {
 		if err != nil {
 			return err
 		}
-		if m.LinkType == LinkTypeEnd {
+		switch m.LinkType {
+		case LinkTypeEnd:
 			var e embeddedLinkEnd
 			err = json.Unmarshal(*rawEmbeddedLink, &e)
 			if err != nil {
 				return err
 			}
 			receiver[index] = &e
-		} else if m.LinkType == LinkTypePath {
+		case LinkTypePath:
 			var e embeddedLinkPath
 			err = json.Unmarshal(*rawEmbeddedLink, &e)
 			if err != nil {
 				return err
 			}
 			receiver[index] = &e
-		} else if m.LinkType == LinkTypeRelation {
+		case LinkTypeRelation:
 			var e embeddedLinkRelation
 			err = json.Unmarshal(*rawEmbeddedLink, &e)
 			if err != nil {
 				return err
 			}
 			receiver[index] = &e
-		} else {
+		default:
 			return fmt.Errorf("unsupported link type %s found", m.LinkType)
 		}
 	}
diff --git a/pkg/api/types_test.go b/pkg/api/types_test.go
@@ -76,7 +76,6 @@ type testWrongType struct {
 }
 
 func TestGetCustomDataAsNonJson(t *testing.T) {
-
 	receiver := &testType{}
 	expectedError := "cannot unmarshal content-type application/xml"
 
@@ -91,7 +90,6 @@ func TestGetCustomDataAsNonJson(t *testing.T) {
 }
 
 func TestGetCustomDataAsJson(t *testing.T) {
-
 	receiver := &testType{}
 	expectedValue := "testValue"
 
@@ -127,7 +125,6 @@ func TestGetCustomDataAsJson(t *testing.T) {
 }
 
 func TestGetCustomDataAsJsonInvalidReceiver(t *testing.T) {
-
 	receiver := &testWrongType{}
 	expectedReceiver := &testWrongType{}
 
@@ -163,7 +160,6 @@ func TestGetCustomDataAsJsonInvalidReceiver(t *testing.T) {
 }
 
 func TestSetCustomData(t *testing.T) {
-
 	tests := []struct {
 		name         string
 		contentType  string
@@ -215,7 +211,6 @@ func TestSetCustomDataInvalid(t *testing.T) {
 }
 
 func TestGetCustomData(t *testing.T) {
-
 	tests := []struct {
 		name         string
 		contentType  string
@@ -302,7 +297,6 @@ func TestGetCustomDataXmlNotBytes(t *testing.T) {
 }
 
 func TestGetCustomDataRaw(t *testing.T) {
-
 	tests := []struct {
 		name         string
 		contentType  string
@@ -327,7 +321,7 @@ func TestGetCustomDataRaw(t *testing.T) {
 		name:         "json, interface",
 		contentType:  "application/json",
 		data:         testType{TestData: "testValue"},
-		expectedData: []byte(testJsonString),
+		expectedData: testJsonString,
 	}}
 
 	for _, tc := range tests {
diff --git a/pkg/api/v03/examples_test.go b/pkg/api/v03/examples_test.go
@@ -376,7 +376,6 @@ func exampleTestOutputPublishedEvent(e *apiv03.TestOutputPublishedEvent) {
 }
 
 func init() {
-
 	// Load event examples from the spec
 	examplesConsumed = make(map[string][]byte)
 
@@ -394,7 +393,6 @@ func init() {
 // - it parses the examples into a CDEvent and
 // - it verifies that produced and consumed CDEvent match
 func TestExamples(t *testing.T) {
-
 	for name, exampleConsumed := range examplesConsumed {
 		t.Run(name, func(t *testing.T) {
 			produced, ok := examplesProduced[name]
diff --git a/pkg/api/v03/factory_test.go b/pkg/api/v03/factory_test.go
@@ -129,7 +129,6 @@ func TestNewCDEvent(t *testing.T) {
 }
 
 func TestNewCDEventFailed(t *testing.T) {
-
 	_, err := cdevents.NewCDEvent(api.CDEventType{Subject: "not supported"}.String(), testSpecVersion)
 	if err == nil {
 		t.Fatalf("expected it to fail, but it didn't")
diff --git a/pkg/api/v04/conformance_test.go b/pkg/api/v04/conformance_test.go
@@ -562,7 +562,6 @@ func exampleCustomTypeEvent(e *apiv04.CustomTypeEvent) {
 // - it parses the examples into a CDEvent and
 // - it verifies that produced and consumed CDEvent match
 func TestExamples(t *testing.T) {
-
 	for name, exampleConsumed := range examplesConsumed {
 		t.Run(name, func(t *testing.T) {
 			produced, ok := examplesProduced[name]
diff --git a/pkg/api/v04/factory_test.go b/pkg/api/v04/factory_test.go
@@ -129,7 +129,6 @@ func TestNewCDEvent(t *testing.T) {
 }
 
 func TestNewCDEventFailed(t *testing.T) {
-
 	_, err := cdevents.NewCDEvent(api.CDEventType{Subject: "not supported"}.String(), testSpecVersion)
 	if err == nil {
 		t.Fatalf("expected it to fail, but it didn't")
diff --git a/tools/generator.go b/tools/generator.go
@@ -329,7 +329,7 @@ func loadSchemas(schemaFolder string, schemas *Schemas) error {
 			return nil
 		} else {
 			// Something else went wrong
-			return fmt.Errorf("error loading schemas from %s: %s", schemaFolder, err)
+			return fmt.Errorf("error loading schemas from %s: %w", schemaFolder, err)
 		}
 	}
 	return fs.WalkDir(os.DirFS(schemaFolder), ".", getSchemasWalkProcessor(schemaFolder, schemas))
@@ -343,7 +343,7 @@ func generate(schemaFolders []string, genFolder, prefix, specVersion string, tem
 		Slice:            make([]Data, 0),
 		SpecVersion:      specVersion,
 		SpecVersionShort: shortSpecVersion,
-		SpecVersionName:  strings.Replace(shortSpecVersion, ".", "", -1),
+		SpecVersionName:  strings.ReplaceAll(shortSpecVersion, ".", ""),
 		IsTestData:       isTestMode,
 	}
 
@@ -410,7 +410,7 @@ func executeTemplate(templates *template.Template, templateName, outputFileName
 	}
 
 	// Prepare the output file
-	return os.WriteFile(outputFileName, src, 0644)
+	return os.WriteFile(outputFileName, src, 0644) //nolint: gosec
 }
 
 func getSchemasWalkProcessor(rootDir string, schemas *Schemas) fs.WalkDirFunc {
@@ -433,14 +433,14 @@ func getSchemasWalkProcessor(rootDir string, schemas *Schemas) fs.WalkDirFunc {
 		schemaPath := filepath.Join(rootDir, path)
 		schemaBytes, err := os.ReadFile(schemaPath)
 		if err != nil {
-			return fmt.Errorf("cannot read schema file at %s: %v", schemaPath, err)
+			return fmt.Errorf("cannot read schema file at %s: %w", schemaPath, err)
 		}
 		schema := struct {
 			Id string `json:"$id"`
 		}{}
 		// Load the jsonschema from the spec
 		if err := json.Unmarshal(schemaBytes, &schema); err != nil {
-			return fmt.Errorf("cannot unmarshal schema file at %s: %v", schemaPath, err)
+			return fmt.Errorf("cannot unmarshal schema file at %s: %w", schemaPath, err)
 		}
 		// If no $id is defined ignore this file
 		if schema.Id == "" {
@@ -451,7 +451,7 @@ func getSchemasWalkProcessor(rootDir string, schemas *Schemas) fs.WalkDirFunc {
 		for original, fixed := range JSON_SCHEMA_NAMES {
 			schemaId = strings.Replace(schemaId, original, fixed, 1)
 		}
-		(*schemas).Data[schemaId] = schemaBytes
+		schemas.Data[schemaId] = schemaBytes
 		return nil
 	}
 }
@@ -578,7 +578,7 @@ func DataFromSchema(schema *jsonschema.Schema, mappings map[string]string, specV
 		if eventTypeString == "" {
 			return nil, fmt.Errorf("empty value defined for type in schema %s", eventTypeSchema.Location)
 		}
-		eventType, err = cdeventTypeFromString(string(eventTypeString))
+		eventType, err = cdeventTypeFromString(eventTypeString)
 		if err != nil {
 			return nil, err
 		}
diff --git a/tools/generator_test.go b/tools/generator_test.go
@@ -72,7 +72,6 @@ func init() {
 }
 
 func TestDataFromSchema(t *testing.T) {
-
 	want := &Data{
 		Subject:        testSubject,
 		Predicate:      testPredicate,
@@ -121,7 +120,7 @@ func TestDataFromSchema(t *testing.T) {
 	}
 	got, err := DataFromSchema(testSchema, mappings, "0.1.2")
 	if err != nil {
-		t.Fatalf(err.Error())
+		t.Fatal(err.Error())
 	}
 	less := func(a, b ContentField) bool { return a.Name < b.Name }
 	if d := cmp.Diff(want, got, cmpopts.SortSlices(less)); d != "" {
@@ -221,7 +220,6 @@ func TestExecuteTemplate_Error(t *testing.T) {
 
 // TestValidateStringEnumAnyOf tests the validation of the string enum anyOf case.
 func TestValidateStringEnumAnyOf(t *testing.T) {
-
 	var boolType jsonschema.Types = 4
 	var stringType jsonschema.Types = 32
 	tests := []struct {

Original file line number	Diff line number	Diff line change
`@@ -290,28 +290,29 @@ func (ela *EmbeddedLinksArray) UnmarshalJSON(b []byte) error {`
`290`	`290`	`if err != nil {`
`291`	`291`	`return err`
`292`	`292`	`}`
`293`		`- if m.LinkType == LinkTypeEnd {`
	`293`	`+ switch m.LinkType {`
	`294`	`+ case LinkTypeEnd:`
`294`	`295`	`var e embeddedLinkEnd`
`295`	`296`	`err = json.Unmarshal(*rawEmbeddedLink, &e)`
`296`	`297`	`if err != nil {`
`297`	`298`	`return err`
`298`	`299`	`}`
`299`	`300`	`receiver[index] = &e`
`300`		`- } else if m.LinkType == LinkTypePath {`
	`301`	`+ case LinkTypePath:`
`301`	`302`	`var e embeddedLinkPath`
`302`	`303`	`err = json.Unmarshal(*rawEmbeddedLink, &e)`
`303`	`304`	`if err != nil {`
`304`	`305`	`return err`
`305`	`306`	`}`
`306`	`307`	`receiver[index] = &e`
`307`		`- } else if m.LinkType == LinkTypeRelation {`
	`308`	`+ case LinkTypeRelation:`
`308`	`309`	`var e embeddedLinkRelation`
`309`	`310`	`err = json.Unmarshal(*rawEmbeddedLink, &e)`
`310`	`311`	`if err != nil {`
`311`	`312`	`return err`
`312`	`313`	`}`
`313`	`314`	`receiver[index] = &e`
`314`		`- } else {`
	`315`	`+ default:`
`315`	`316`	`return fmt.Errorf("unsupported link type %s found", m.LinkType)`
`316`	`317`	`}`
`317`	`318`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,6 @@ func TestNewCDEvent(t *testing.T) {`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`func TestNewCDEventFailed(t *testing.T) {`
`132`		`-`
`133`	`132`	`_, err := cdevents.NewCDEvent(api.CDEventType{Subject: "not supported"}.String(), testSpecVersion)`
`134`	`133`	`if err == nil {`
`135`	`134`	`t.Fatalf("expected it to fail, but it didn't")`