fix: correct lint issues

snapp-incubator · Feb 12, 2024 · b418ce4 · b418ce4
1 parent 1d1a8aa
commit b418ce4
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 7 deletions.
diff --git a/internal/api/api_test.go b/internal/api/api_test.go
@@ -102,13 +102,11 @@ func TestExtractVendorToken(t *testing.T) {
 
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
+
 			vendor, token := api.ExtractVendorToken(tt.fields.Token, tt.fields.Username, tt.fields.Password)
-			if vendor != tt.vendor {
+			if vendor != tt.vendor || token != tt.token {
 				t.Errorf("ExtractVendorToken() vendor = %v, vendor %v", vendor, tt.vendor)
 			}
-			if token != tt.token {
-				t.Errorf("ExtractVendorToken() token = %v, vendor %v", token, tt.token)
-			}
 		})
 	}
 }
@@ -176,7 +174,7 @@ func (suite *APITestSuite) ValidToken() {
 
 	body, err := json.Marshal(api.AuthRequest{
 		Token:    "",
-		Username: fmt.Sprintf("snapp-admin:%s", token),
+		Username: "snapp-admin:" + token,
 		Password: "",
 	})
 	require.NoError(err)

diff --git a/internal/authenticator/admin_authenticator.go b/internal/authenticator/admin_authenticator.go
@@ -27,6 +27,7 @@ func (a AdminAuthenticator) Auth(tokenString string) error {
 		if !ok {
 			return nil, ErrInvalidClaims
 		}
+
 		if claims[a.JwtConfig.IssName] == nil {
 			return nil, ErrIssNotFound
 		}

diff --git a/internal/authenticator/auto_authenticator.go b/internal/authenticator/auto_authenticator.go
@@ -32,7 +32,7 @@ func (a AutoAuthenticator) Auth(tokenString string) error {
 		"X-APP-Version":             []string{""},
 		"X-APP-Name":                []string{"soteria"},
 		"locale":                    []string{"en-US"},
-	}, fmt.Sprintf("bearer %s", tokenString)); err != nil {
+	}, "bearer "+tokenString); err != nil {
 		return fmt.Errorf("token is invalid: %w", err)
 	}
 

diff --git a/internal/authenticator/auto_authenticator_test.go b/internal/authenticator/auto_authenticator_test.go
@@ -63,7 +63,7 @@ func (suite *AutoAuthenticatorTestSuite) SetupSuite() {
 		tokenString := strings.TrimPrefix(authHeader, "bearer ")
 
 		_, err := jwt.Parse(tokenString, func(
-			token *jwt.Token,
+			_ *jwt.Token,
 		) (interface{}, error) {
 			return pkey0, nil
 		})
@@ -128,6 +128,7 @@ func TestAutoAuthenticator_ValidateTopicBySender(t *testing.T) {
 
 	t.Run("testing valid driver cab event", func(t *testing.T) {
 		t.Parallel()
+
 		topicTemplate := authenticator.TopicManager.ParseTopic(validDriverCabEventTopic, topics.DriverIss, "DXKgaNQa7N5Y7bo")
 		require.NotNil(t, topicTemplate)
 	})

diff --git a/internal/authenticator/manual_authenticator.go b/internal/authenticator/manual_authenticator.go
@@ -29,11 +29,13 @@ func (a ManualAuthenticator) Auth(tokenString string) error {
 		if !ok {
 			return nil, ErrInvalidClaims
 		}
+
 		if claims[a.JWTConfig.IssName] == nil {
 			return nil, ErrIssNotFound
 		}
 
 		issuer := fmt.Sprintf("%v", claims[a.JWTConfig.IssName])
+
 		key := a.Keys[issuer]
 		if key == nil {
 			return nil, KeyNotFoundError{Issuer: issuer}
@@ -64,14 +66,17 @@ func (a ManualAuthenticator) ACL(
 		if !ok {
 			return nil, ErrInvalidClaims
 		}
+
 		if claims[a.JWTConfig.IssName] == nil {
 			return nil, ErrIssNotFound
 		}
+
 		if claims[a.JWTConfig.SubName] == nil {
 			return nil, ErrSubNotFound
 		}
 
 		issuer := fmt.Sprintf("%v", claims[a.JWTConfig.IssName])
+
 		key := a.Keys[issuer]
 		if key == nil {
 			return nil, KeyNotFoundError{Issuer: issuer}

diff --git a/internal/authenticator/manual_authenticator_test.go b/internal/authenticator/manual_authenticator_test.go
@@ -336,6 +336,7 @@ func TestManualAuthenticator_ValidateTopicBySender(t *testing.T) {
 
 	t.Run("testing valid driver cab event", func(t *testing.T) {
 		t.Parallel()
+
 		topicTemplate := authenticator.TopicManager.ParseTopic(validDriverCabEventTopic, topics.DriverIss, "DXKgaNQa7N5Y7bo")
 		require.NotNil(t, topicTemplate)
 	})

diff --git a/internal/topics/manager_test.go b/internal/topics/manager_test.go
@@ -146,6 +146,7 @@ func TestTopicManager(t *testing.T) {
 			t.Parallel()
 
 			topic := tc.arg
+
 			topicTemplate := topicManager.ParseTopic(topic, tc.issuer, sub)
 			if topicTemplate != nil {
 				if len(tc.want) == 0 {