Merge 1.14 into master (#3579)

Signed-off-by: Samantha Coyle <[email protected]>
Signed-off-by: Elena Kolevska <[email protected]>
Signed-off-by: yaron2 <[email protected]>
Signed-off-by: Artur Souza <[email protected]>
Signed-off-by: Anton Troshin <[email protected]>
Co-authored-by: Sam <[email protected]>
Co-authored-by: Artur Souza <[email protected]>
Co-authored-by: yaron2 <[email protected]>
Co-authored-by: Anton Troshin <[email protected]>
Co-authored-by: Bernd Verst <[email protected]>

Author: 6 people

.golangci.yml

@@ -261,6 +261,11 @@ linters-settings:
     allow-case-traling-whitespace: true
     # Allow declarations (var) to be cuddled.
     allow-cuddle-declarations: false
+  testifylint:
+    disable:
+      - float-compare
+      - negative-positive
+      - go-require
 
 linters:
   fast: false
@@ -317,3 +322,5 @@ linters:
     - goconst
     - tagalign
     - inamedparam
+    - canonicalheader
+    - fatcontext

Makefile

@@ -119,9 +119,9 @@ test:
 lint: verify-linter-installed verify-linter-version
 ifdef LINT_BASE
 	@echo "LINT_BASE is set to "$(LINT_BASE)". Linter will only check diff."
-	$(GOLANGCI_LINT) run --timeout=20m --new-from-rev $(shell git rev-parse $(LINT_BASE))
+	$(GOLANGCI_LINT) run --timeout=20m --max-same-issues 0 --max-issues-per-linter 0 --new-from-rev $(shell git rev-parse $(LINT_BASE))
 else
-	$(GOLANGCI_LINT) run --timeout=20m
+	$(GOLANGCI_LINT) run --timeout=20m --max-same-issues 0 --max-issues-per-linter 0
 endif
 
 ################################################################################

bindings/alicloud/sls/sls.go

@@ -3,7 +3,7 @@ package sls
 import (
 	"context"
 	"encoding/json"
-	"fmt"
+	"errors"
 	"reflect"
 	"time"
 
@@ -61,16 +61,16 @@ func NewAliCloudSlsLogstorage(logger logger.Logger) bindings.OutputBinding {
 func (s *AliCloudSlsLogstorage) Invoke(ctx context.Context, req *bindings.InvokeRequest) (*bindings.InvokeResponse, error) {
 	// verify the metadata property
 	if logProject := req.Metadata["project"]; logProject == "" {
-		return nil, fmt.Errorf("SLS binding error: project property not supplied")
+		return nil, errors.New("SLS binding error: project property not supplied")
 	}
 	if logstore := req.Metadata["logstore"]; logstore == "" {
-		return nil, fmt.Errorf("SLS binding error: logstore property not supplied")
+		return nil, errors.New("SLS binding error: logstore property not supplied")
 	}
 	if topic := req.Metadata["topic"]; topic == "" {
-		return nil, fmt.Errorf("SLS binding error: topic property not supplied")
+		return nil, errors.New("SLS binding error: topic property not supplied")
 	}
 	if source := req.Metadata["source"]; source == "" {
-		return nil, fmt.Errorf("SLS binding error: source property not supplied")
+		return nil, errors.New("SLS binding error: source property not supplied")
 	}
 
 	log, err := s.parseLog(req)
@@ -96,6 +96,7 @@ func (s *AliCloudSlsLogstorage) parseLog(req *bindings.InvokeRequest) (*sls.Log,
 	if err != nil {
 		return nil, err
 	}
+	//nolint:gosec
 	return producer.GenerateLog(uint32(time.Now().Unix()), logInfo), nil
 }
 

bindings/alicloud/tablestore/tablestore.go

@@ -271,7 +271,6 @@ func (s *AliCloudTableStore) create(req *bindings.InvokeRequest, resp *bindings.
 	}
 
 	_, err = s.client.PutRow(putRequest)
-
 	if err != nil {
 		return err
 	}
@@ -302,7 +301,6 @@ func (s *AliCloudTableStore) delete(req *bindings.InvokeRequest, resp *bindings.
 	change.SetCondition(tablestore.RowExistenceExpectation_IGNORE) //nolint:nosnakecase
 	deleteReq := &tablestore.DeleteRowRequest{DeleteRowChange: change}
 	_, err = s.client.DeleteRow(deleteReq)
-
 	if err != nil {
 		return err
 	}

bindings/aws/kinesis/kinesis.go

@@ -300,7 +300,6 @@ func (a *AWSKinesis) registerConsumer(ctx context.Context, streamARN *string) (*
 		ConsumerName: &a.metadata.ConsumerName,
 		StreamARN:    streamARN,
 	})
-
 	if err != nil {
 		return nil, err
 	}

bindings/aws/s3/s3.go

@@ -313,7 +313,7 @@ func (s *AWSS3) get(ctx context.Context, req *bindings.InvokeRequest) (*bindings
 	if err != nil {
 		var awsErr awserr.Error
 		if errors.As(err, &awsErr) && awsErr.Code() == s3.ErrCodeNoSuchKey {
-			return nil, fmt.Errorf("object not found")
+			return nil, errors.New("object not found")
 		}
 		return nil, fmt.Errorf("s3 binding error: error downloading S3 object: %w", err)
 	}
@@ -348,7 +348,7 @@ func (s *AWSS3) delete(ctx context.Context, req *bindings.InvokeRequest) (*bindi
 	if err != nil {
 		var awsErr awserr.Error
 		if errors.As(err, &awsErr) && awsErr.Code() == s3.ErrCodeNoSuchKey {
-			return nil, fmt.Errorf("object not found")
+			return nil, errors.New("object not found")
 		}
 		return nil, fmt.Errorf("s3 binding error: delete operation failed: %w", err)
 	}

bindings/aws/ses/ses.go

@@ -15,6 +15,7 @@ package ses
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"reflect"
 	"strconv"
@@ -92,13 +93,13 @@ func (a *AWSSES) Invoke(ctx context.Context, req *bindings.InvokeRequest) (*bind
 	metadata := a.metadata.mergeWithRequestMetadata(req)
 
 	if metadata.EmailFrom == "" {
-		return nil, fmt.Errorf("SES binding error: emailFrom property not supplied in configuration- or request-metadata")
+		return nil, errors.New("SES binding error: emailFrom property not supplied in configuration- or request-metadata")
 	}
 	if metadata.EmailTo == "" {
-		return nil, fmt.Errorf("SES binding error: emailTo property not supplied in configuration- or request-metadata")
+		return nil, errors.New("SES binding error: emailTo property not supplied in configuration- or request-metadata")
 	}
 	if metadata.Subject == "" {
-		return nil, fmt.Errorf("SES binding error: subject property not supplied in configuration- or request-metadata")
+		return nil, errors.New("SES binding error: subject property not supplied in configuration- or request-metadata")
 	}
 
 	body, err := strconv.Unquote(string(req.Data))

bindings/azure/blobstorage/blobstorage.go

@@ -154,7 +154,6 @@ func (a *AzureBlobStorage) create(ctx context.Context, req *bindings.InvokeReque
 
 	blockBlobClient := a.containerClient.NewBlockBlobClient(blobName)
 	_, err = blockBlobClient.UploadBuffer(ctx, req.Data, &uploadOptions)
-
 	if err != nil {
 		return nil, fmt.Errorf("error uploading az blob: %w", err)
 	}
@@ -192,7 +191,7 @@ func (a *AzureBlobStorage) get(ctx context.Context, req *bindings.InvokeRequest)
 	blobDownloadResponse, err := blockBlobClient.DownloadStream(ctx, &downloadOptions)
 	if err != nil {
 		if bloberror.HasCode(err, bloberror.BlobNotFound) {
-			return nil, fmt.Errorf("blob not found")
+			return nil, errors.New("blob not found")
 		}
 		return nil, fmt.Errorf("error downloading az blob: %w", err)
 	}
@@ -261,7 +260,7 @@ func (a *AzureBlobStorage) delete(ctx context.Context, req *bindings.InvokeReque
 	_, err := blockBlobClient.Delete(ctx, &deleteOptions)
 
 	if bloberror.HasCode(err, bloberror.BlobNotFound) {
-		return nil, fmt.Errorf("blob not found")
+		return nil, errors.New("blob not found")
 	}
 
 	return nil, err

bindings/azure/cosmosdb/cosmosdb.go

@@ -16,6 +16,7 @@ package cosmosdb
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"reflect"
 	"strings"
@@ -158,7 +159,7 @@ func (c *CosmosDB) getPartitionKeyValue(key string, obj interface{}) (string, er
 	}
 	val, ok := valI.(string)
 	if !ok {
-		return "", fmt.Errorf("partition key is not a string")
+		return "", errors.New("partition key is not a string")
 	}
 
 	if val == "" {
@@ -172,7 +173,7 @@ func (c *CosmosDB) lookup(m map[string]interface{}, ks []string) (val interface{
 	var ok bool
 
 	if len(ks) == 0 {
-		return nil, fmt.Errorf("needs at least one key")
+		return nil, errors.New("needs at least one key")
 	}
 
 	if val, ok = m[ks[0]]; !ok {

bindings/azure/signalr/signalr.go

@@ -156,7 +156,7 @@ func (s *SignalR) parseMetadata(md map[string]string) (err error) {
 					s.accessKey = connectionValue[i+1:]
 				case "AuthType":
 					if connectionValue[i+1:] != "aad" {
-						return fmt.Errorf("invalid value for AuthType in the connection string; only 'aad' is supported")
+						return errors.New("invalid value for AuthType in the connection string; only 'aad' is supported")
 					}
 					useAAD = true
 				case "ClientId", "ClientSecret", "TenantId":
@@ -171,14 +171,14 @@ func (s *SignalR) parseMetadata(md map[string]string) (err error) {
 					}
 				}
 			} else if len(connectionValue) != 0 {
-				return fmt.Errorf("the connection string is invalid or malformed")
+				return errors.New("the connection string is invalid or malformed")
 			}
 		}
 
 		// Check here because if we use a connection string, we'd have an explicit "AuthType=aad" option
 		// We would otherwise catch this issue later, but here we can be more explicit with the error
 		if s.accessKey == "" && !useAAD {
-			return fmt.Errorf("missing AccessKey in the connection string")
+			return errors.New("missing AccessKey in the connection string")
 		}
 	}
 
@@ -198,7 +198,7 @@ func (s *SignalR) parseMetadata(md map[string]string) (err error) {
 
 	// Check for required values
 	if s.endpoint == "" {
-		return fmt.Errorf("missing endpoint in the metadata or connection string")
+		return errors.New("missing endpoint in the metadata or connection string")
 	}
 
 	return nil
@@ -333,7 +333,7 @@ func (s *SignalR) GetAadClientAccessToken(ctx context.Context, hub string, user
 
 	u := fmt.Sprintf("%s/api/hubs/%s/:generateToken?api-version=%s", s.endpoint, hub, apiVersion)
 	if user != "" {
-		u += fmt.Sprintf("&userId=%s", url.QueryEscape(user))
+		u += "&userId=" + url.QueryEscape(user)
 	}
 
 	body, err := s.sendRequestToSignalR(ctx, u, aadToken, nil)