Merge branch 'development' into FE/migrations_clickhouse

Author: aryanmehrotra

go.mod

@@ -37,7 +37,7 @@ require (
 	github.com/hamba/avro/v2 v2.18.0
 	github.com/jlaffaye/ftp v0.2.0
 	github.com/jmoiron/sqlx v1.3.5
-	github.com/joho/godotenv v1.5.1
+	github.com/joho/godotenv v1.4.0
 	github.com/lib/pq v1.10.9
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/newrelic/go-agent v3.20.2+incompatible

go.sum

@@ -342,8 +342,8 @@ github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfC
 github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g=
 github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ=
 github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
-github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
-github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
+github.com/joho/godotenv v1.4.0 h1:3l4+N6zfMWnkbPEXKng2o2/MR5mSwTrBih4ZEkkz1lg=
+github.com/joho/godotenv v1.4.0/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=

pkg/file/azure.go

@@ -3,6 +3,7 @@ package file
 import (
 	"context"
 	"fmt"
+	"math"
 	"math/rand"
 	"net/url"
 	"os"
@@ -62,7 +63,7 @@ func newAzureFile(c *AzureConfig, filename string, mode Mode) (*azure, error) {
 			return nil, err
 		}
 
-		azFile.parallelism = uint16(pl)
+		azFile.parallelism = validateAndConvertToUint16(pl)
 	}
 
 	return azFile, nil
@@ -100,3 +101,11 @@ func randomString() string {
 	r := rand.New(rand.NewSource(time.Now().UnixNano())) //nolint:gosec //  Use of weak random number generator
 	return strconv.Itoa(r.Int())
 }
+
+func validateAndConvertToUint16(num int) uint16 {
+	if num >= 0 && num <= math.MaxUint16 {
+		return uint16(num)
+	}
+
+	return uint16(0)
+}

pkg/file/azure_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/base64"
 	"errors"
+	"math"
 	"net/url"
 	"strconv"
 	"testing"
@@ -102,6 +103,26 @@ func Test_azure_push(t *testing.T) {
 	_ = localFile.Close()
 }
 
+func TestValidateAndConvertToUint16(t *testing.T) {
+	tests := []struct {
+		desc   string
+		input  int
+		output uint16
+	}{
+		{"less than 0", -1, uint16(0)},
+		{"is 0", 0, uint16(0)},
+		{"is max uint16", math.MaxUint16, uint16(math.MaxUint16)},
+		{"in uint16 range", 10, uint16(10)},
+		{"greater than uint16 range", math.MaxUint16 + 1, uint16(0)},
+	}
+
+	for _, tc := range tests {
+		result := validateAndConvertToUint16(tc.input)
+
+		assert.Equal(t, tc.output, result)
+	}
+}
+
 func Test_azure_fetch(t *testing.T) {
 	testPipelineMock := testPipeline{}