chore(make): merge extra-lint target into lint (#153)

Add extra-lint checks to the lint target to ensure they are always run during CI, removing the need for an additional target that is often neglected. This helps prevent the accumulation of regressions in the main branch. Signed-off-by: Akhilesh Kr. Yadav <[email protected]> Co-authored-by: Akhilesh Kr. Yadav <[email protected]>
veraison · Jan 17, 2025 · 7a541c4 · 7a541c4
1 parent f5d05a0
commit 7a541c4
Show file tree

Hide file tree

Showing 27 changed files with 147 additions and 133 deletions.
diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
@@ -22,5 +22,3 @@ jobs:
         go install github.com/golang/mock/[email protected]
     - name: Run required linters in .golangci.yml plus hard-coded ones here
       run: make lint
-    - name: Run optional linters (not required to pass)
-      run: make lint-extra
diff --git a/Makefile b/Makefile
@@ -12,16 +12,10 @@ GOPKG += github.com/veraison/corim/extensions
 
 GOLINT ?= golangci-lint
 
-ifeq ($(MAKECMDGOALS),lint)
-GOLINT_ARGS ?= run --timeout=3m
-else
-  ifeq ($(MAKECMDGOALS),lint-extra)
-  GOLINT_ARGS ?= run --timeout=3m --issues-exit-code=0 -E dupl -E gocritic -E gosimple -E lll -E prealloc
-  endif
-endif
+GOLINT_ARGS ?= run --timeout=3m -E dupl -E gocritic -E gosimple -E lll -E prealloc
 
-.PHONY: lint lint-extra
-lint lint-extra:
+.PHONY: lint
+lint:
 	$(GOLINT) $(GOLINT_ARGS)
 
 ifeq ($(MAKECMDGOALS),test)
@@ -50,7 +44,7 @@ presubmit:
 	@echo
 	@echo ">>> Fix any lint error"
 	@echo
-	$(MAKE) lint-extra
+	$(MAKE) lint
 
 .PHONY: licenses
 licenses: ; @./scripts/licenses.sh
@@ -60,8 +54,7 @@ help:
 	@echo "Available targets:"
 	@echo "  * test:       run unit tests for $(GOPKG)"
 	@echo "  * test-cover: run unit tests and measure coverage for $(GOPKG)"
-	@echo "  * lint:       lint sources using default configuration"
-	@echo "  * lint-extra: lint sources using default configuration and some extra checkers"
+	@echo "  * lint:       lint sources using default configuration and some extra checkers"
 	@echo "  * presubmit:  check you are ready to push your local branch to remote"
 	@echo "  * help:       print this menu"
 	@echo "  * licenses:   check licenses of dependent packages"
diff --git a/comid/classid.go b/comid/classid.go
@@ -94,6 +94,8 @@ func (o *ClassID) UnmarshalCBOR(data []byte) error {
 //		uuid: standard UUID string representation, e.g. "550e8400-e29b-41d4-a716-446655440000"
 //		int: an integer value, e.g. 7
 //	 bytes: a variable length opaque bytes, example {0x07, 0x12, 0x34}
+
+//nolint:dupl
 func (o *ClassID) UnmarshalJSON(data []byte) error {
 	var tnv encoding.TypeAndValue
 

diff --git a/comid/comid.go b/comid/comid.go
@@ -242,6 +242,7 @@ func (o *Comid) AddDevIdentityKey(val KeyTriple) *Comid {
 	return o
 }
 
+// nolint:gocritic
 func (o Comid) Valid() error {
 	if err := o.TagIdentity.Valid(); err != nil {
 		return fmt.Errorf("tag-identity validation failed: %w", err)
@@ -267,6 +268,7 @@ func (o Comid) Valid() error {
 }
 
 // ToCBOR serializes the target Comid to CBOR
+// nolint:gocritic
 func (o Comid) ToCBOR() ([]byte, error) {
 	if err := o.Valid(); err != nil {
 		return nil, err
@@ -291,6 +293,7 @@ func (o *Comid) FromCBOR(data []byte) error {
 }
 
 // ToJSON serializes the target Comid to JSON
+// nolint:gocritic
 func (o Comid) ToJSON() ([]byte, error) {
 	if err := o.Valid(); err != nil {
 		return nil, err
@@ -314,6 +317,7 @@ func (o *Comid) FromJSON(data []byte) error {
 	return encoding.PopulateStructFromJSON(data, o)
 }
 
+// nolint:gocritic
 func (o Comid) ToJSONPretty(indent string) ([]byte, error) {
 	if err := o.Valid(); err != nil {
 		return nil, err

diff --git a/comid/example_cca_realm_refval_test.go b/comid/example_cca_realm_refval_test.go
@@ -77,12 +77,12 @@ func extractRealmRefVal(rv ValueTriple) error {
 	}
 	return nil
 }
-
 func extractMeasurements(m Measurements) error {
 	if len(m.Values) == 0 {
 		return fmt.Errorf("no measurements")
 	}
-	for i, meas := range m.Values {
+	for i := range m.Values {
+		meas := &m.Values[i]
 		if err := extractMeasurement(meas); err != nil {
 			return fmt.Errorf("extracting measurement at index %d: %w", i, err)
 		}
@@ -91,7 +91,7 @@ func extractMeasurements(m Measurements) error {
 	return nil
 }
 
-func extractMeasurement(m Measurement) error {
+func extractMeasurement(m *Measurement) error {
 	if err := extractRealmPersonalizationValue(m.Val.RawValue); err != nil {
 		return fmt.Errorf("extracting realm personalization value: %w", err)
 	}

diff --git a/comid/example_cca_refval_test.go b/comid/example_cca_refval_test.go
@@ -58,7 +58,8 @@ func extractCCARefVal(rv ValueTriple) error {
 		return fmt.Errorf("extracting impl-id: %w", err)
 	}
 
-	for i, m := range rv.Measurements.Values {
+	for i := range rv.Measurements.Values {
+		m := &rv.Measurements.Values[i]
 		if m.Key == nil {
 			return fmt.Errorf("missing mKey at index %d", i)
 		}
@@ -75,10 +76,10 @@ func extractCCARefVal(rv ValueTriple) error {
 				return fmt.Errorf("extracting cca-refval-id: %w", err)
 			}
 			if err := extractRawValue(m.Val.RawValue); err != nil {
-				return fmt.Errorf("extracting raw vlue: %w", err)
+				return fmt.Errorf("extracting raw value: %w", err)
 			}
 		default:
-			return fmt.Errorf("unexpected  Mkey type: %T", t)
+			return fmt.Errorf("unexpected Mkey type: %T", t)
 		}
 	}
 

diff --git a/comid/example_psa_refval_test.go b/comid/example_psa_refval_test.go
@@ -69,15 +69,16 @@ func extractSwMeasurements(m Measurements) error {
 	if len(m.Values) == 0 {
 		return fmt.Errorf("no measurements")
 	}
-	for i, m := range m.Values {
-		if err := extractSwMeasurement(m); err != nil {
+	for i := range m.Values {
+		meas := &m.Values[i]
+		if err := extractSwMeasurement(meas); err != nil {
 			return fmt.Errorf("extracting measurement at index %d: %w", i, err)
 		}
 	}
 	return nil
 }
 
-func extractSwMeasurement(m Measurement) error {
+func extractSwMeasurement(m *Measurement) error {
 	if err := extractPSARefValID(m.Key); err != nil {
 		return fmt.Errorf("extracting PSA refval id: %w", err)
 	}