Merge pull request #1139 from duglin/upgradeLint

upgrade-lint

Author: embano1

.github/workflows/go-lint.yaml

@@ -33,8 +33,7 @@ jobs:
 
       - name: Go Lint on ./v2
         if: steps.golangci_configuration.outputs.files_exists == 'true'
-        uses: golangci/golangci-lint-action@55c2c1448f86e01eaae002a5a3a9624417608d84 # v6.5.2
+        uses: golangci/golangci-lint-action@1481404843c368bc19ca9406f87d6e0fc97bdcfd # v7.0.0
         with:
-          version: v1.61
+          version: v2.0
           working-directory: v2
-

.golangci.yaml

@@ -1,3 +1,4 @@
+version: "2"
 run:
   timeout: 5m
 

v2/binding/buffering/copy_message.go

@@ -44,11 +44,12 @@ func CopyMessage(ctx context.Context, m binding.Message, transformers ...binding
 	bm := binaryBufferedMessage{}
 
 	encoding, err := binding.DirectWrite(ctx, m, &sm, &bm, transformers...)
-	if encoding == binding.EncodingStructured {
+	switch encoding {
+	case binding.EncodingStructured:
 		return &sm, err
-	} else if encoding == binding.EncodingBinary {
+	case binding.EncodingBinary:
 		return &bm, err
-	} else {
+	default:
 		e, err := binding.ToEvent(ctx, m, transformers...)
 		if err != nil {
 			return nil, err

v2/binding/test/transformer.go

@@ -45,15 +45,17 @@ func RunTransformerTests(t *testing.T, ctx context.Context, tests []TransformerT
 			require.NoError(t, err)
 
 			var e *event.Event
-			if enc == binding.EncodingStructured {
+			switch enc {
+			case binding.EncodingStructured:
 				e, err = binding.ToEvent(ctx, &mockStructured)
 				require.NoError(t, err)
-			} else if enc == binding.EncodingBinary {
+			case binding.EncodingBinary:
 				e, err = binding.ToEvent(ctx, &mockBinary)
 				require.NoError(t, err)
-			} else {
+			default:
 				t.Fatalf("Unexpected encoding %v", enc)
 			}
+
 			require.NoError(t, err)
 			if tt.AssertFunc != nil {
 				tt.AssertFunc(t, *e)

v2/event/extensions.go

@@ -49,7 +49,7 @@ func validateExtensionName(key string) error {
 	}
 
 	for _, c := range key {
-		if !((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9')) {
+		if (c < 'a' || c > 'z') && (c < 'A' || c > 'Z') && (c < '0' || c > '9') {
 			return errors.New("bad key, CloudEvents attribute names MUST consist of lower-case letters ('a' to 'z'), upper-case letters ('A' to 'Z') or digits ('0' to '9') from the ASCII character set")
 		}
 	}

v2/protocol/http/message_test.go

@@ -39,9 +39,10 @@ func TestNewMessageFromHttpRequest(t *testing.T) {
 		test.EachEvent(t, test.Events(), func(t *testing.T, eventIn event.Event) {
 			t.Run(tt.name, func(t *testing.T) {
 				ctx := context.TODO()
-				if tt.encoding == binding.EncodingStructured {
+				switch tt.encoding {
+				case binding.EncodingStructured:
 					ctx = binding.WithForceStructured(ctx)
-				} else if tt.encoding == binding.EncodingBinary {
+				case binding.EncodingBinary:
 					ctx = binding.WithForceBinary(ctx)
 				}
 

v2/protocol/http/protocol.go

@@ -326,7 +326,7 @@ func (p *Protocol) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
 
 	if !ok {
 		rw.Header().Add("Retry-After", strconv.Itoa(int(reset)))
-		http.Error(rw, "limit exceeded", 429)
+		http.Error(rw, "limit exceeded", http.StatusTooManyRequests)
 		return
 	}
 

v2/protocol/http/utility_test.go

@@ -38,9 +38,10 @@ func TestNewEventFromHttpRequest(t *testing.T) {
 		test.EachEvent(t, test.Events(), func(t *testing.T, eventIn event.Event) {
 			t.Run(tt.name, func(t *testing.T) {
 				ctx := context.TODO()
-				if tt.encoding == binding.EncodingStructured {
+				switch tt.encoding {
+				case binding.EncodingStructured:
 					ctx = binding.WithForceStructured(ctx)
-				} else if tt.encoding == binding.EncodingBinary {
+				case binding.EncodingBinary:
 					ctx = binding.WithForceBinary(ctx)
 				}