Fix GitLab integration test failures from PR #339

Fixes go vet errors introduced in the GitLab integration PR that merged
with failing tests. Changes improve code testability by using interfaces
instead of concrete types.

Changes:
- Fix test assertions to use correct struct fields (result.User.Username
  instead of result.Username, result.User.ID instead of result.GitLabUserID)
- Change kubernetes.Clientset to kubernetes.Interface in function signatures
  to support both real and fake clients for testing
- Fix GetCurrentUser call to use package-level function instead of method
- Remove unused imports (time, corev1)

Updated functions:
- k8s.StoreGitLabToken, k8s.GetGitLabToken, k8s.DeleteGitLabToken
- k8s.HasGitLabToken, k8s.StoreGitLabConnection, k8s.GetGitLabConnection
- k8s.DeleteGitLabConnection, k8s.HasGitLabConnection
- k8s.ListGitLabConnections, git.GetGitLabToken
- gitlab.NewConnectionManager and ConnectionManager.clientset field

This follows Go best practices (accept interfaces, return structs) and
makes the code more testable without changing runtime behavior.

Related: PR #339 (GitLab integration)

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <[email protected]>
Signed-off-by: sallyom <[email protected]>

Author: claude

components/backend/git/operations.go

@@ -114,7 +114,7 @@ func GetGitHubToken(ctx context.Context, k8sClient *kubernetes.Clientset, dynCli
 }
 
 // GetGitLabToken retrieves a GitLab Personal Access Token for a user
-func GetGitLabToken(ctx context.Context, k8sClient *kubernetes.Clientset, project, userID string) (string, error) {
+func GetGitLabToken(ctx context.Context, k8sClient kubernetes.Interface, project, userID string) (string, error) {
 	if k8sClient == nil {
 		log.Printf("Cannot read GitLab token: k8s client is nil")
 		return "", fmt.Errorf("no GitLab credentials available. Please connect your GitLab account")

components/backend/gitlab/connection.go

@@ -14,12 +14,12 @@ import (
 
 // ConnectionManager handles GitLab connection operations
 type ConnectionManager struct {
-	clientset *kubernetes.Clientset
+	clientset kubernetes.Interface
 	namespace string
 }
 
 // NewConnectionManager creates a new connection manager
-func NewConnectionManager(clientset *kubernetes.Clientset, namespace string) *ConnectionManager {
+func NewConnectionManager(clientset kubernetes.Interface, namespace string) *ConnectionManager {
 	return &ConnectionManager{
 		clientset: clientset,
 		namespace: namespace,

components/backend/k8s/configmap.go

@@ -19,7 +19,7 @@ const (
 )
 
 // StoreGitLabConnection stores GitLab connection metadata in a ConfigMap
-func StoreGitLabConnection(ctx context.Context, clientset *kubernetes.Clientset, namespace string, connection *types.GitLabConnection) error {
+func StoreGitLabConnection(ctx context.Context, clientset kubernetes.Interface, namespace string, connection *types.GitLabConnection) error {
 	configMapsClient := clientset.CoreV1().ConfigMaps(namespace)
 
 	// Serialize connection to JSON
@@ -68,7 +68,7 @@ func StoreGitLabConnection(ctx context.Context, clientset *kubernetes.Clientset,
 }
 
 // GetGitLabConnection retrieves GitLab connection metadata from a ConfigMap
-func GetGitLabConnection(ctx context.Context, clientset *kubernetes.Clientset, namespace, userID string) (*types.GitLabConnection, error) {
+func GetGitLabConnection(ctx context.Context, clientset kubernetes.Interface, namespace, userID string) (*types.GitLabConnection, error) {
 	configMapsClient := clientset.CoreV1().ConfigMaps(namespace)
 
 	configMap, err := configMapsClient.Get(ctx, GitLabConnectionsConfigMapName, metav1.GetOptions{})
@@ -93,7 +93,7 @@ func GetGitLabConnection(ctx context.Context, clientset *kubernetes.Clientset, n
 }
 
 // DeleteGitLabConnection removes GitLab connection metadata from a ConfigMap
-func DeleteGitLabConnection(ctx context.Context, clientset *kubernetes.Clientset, namespace, userID string) error {
+func DeleteGitLabConnection(ctx context.Context, clientset kubernetes.Interface, namespace, userID string) error {
 	configMapsClient := clientset.CoreV1().ConfigMaps(namespace)
 
 	configMap, err := configMapsClient.Get(ctx, GitLabConnectionsConfigMapName, metav1.GetOptions{})
@@ -119,7 +119,7 @@ func DeleteGitLabConnection(ctx context.Context, clientset *kubernetes.Clientset
 }
 
 // HasGitLabConnection checks if a user has a GitLab connection stored
-func HasGitLabConnection(ctx context.Context, clientset *kubernetes.Clientset, namespace, userID string) (bool, error) {
+func HasGitLabConnection(ctx context.Context, clientset kubernetes.Interface, namespace, userID string) (bool, error) {
 	configMapsClient := clientset.CoreV1().ConfigMaps(namespace)
 
 	configMap, err := configMapsClient.Get(ctx, GitLabConnectionsConfigMapName, metav1.GetOptions{})
@@ -135,7 +135,7 @@ func HasGitLabConnection(ctx context.Context, clientset *kubernetes.Clientset, n
 }
 
 // ListGitLabConnections retrieves all GitLab connections from a ConfigMap
-func ListGitLabConnections(ctx context.Context, clientset *kubernetes.Clientset, namespace string) ([]*types.GitLabConnection, error) {
+func ListGitLabConnections(ctx context.Context, clientset kubernetes.Interface, namespace string) ([]*types.GitLabConnection, error) {
 	configMapsClient := clientset.CoreV1().ConfigMaps(namespace)
 
 	configMap, err := configMapsClient.Get(ctx, GitLabConnectionsConfigMapName, metav1.GetOptions{})

components/backend/k8s/secrets.go

@@ -18,7 +18,7 @@ const (
 
 // StoreGitLabToken stores a GitLab Personal Access Token in Kubernetes Secrets
 // Uses optimistic concurrency control with retry to handle concurrent updates
-func StoreGitLabToken(ctx context.Context, clientset *kubernetes.Clientset, namespace, userID, token string) error {
+func StoreGitLabToken(ctx context.Context, clientset kubernetes.Interface, namespace, userID, token string) error {
 	secretsClient := clientset.CoreV1().Secrets(namespace)
 
 	// Retry up to 3 times with exponential backoff
@@ -88,7 +88,7 @@ func StoreGitLabToken(ctx context.Context, clientset *kubernetes.Clientset, name
 }
 
 // GetGitLabToken retrieves a GitLab Personal Access Token from Kubernetes Secrets
-func GetGitLabToken(ctx context.Context, clientset *kubernetes.Clientset, namespace, userID string) (string, error) {
+func GetGitLabToken(ctx context.Context, clientset kubernetes.Interface, namespace, userID string) (string, error) {
 	secretsClient := clientset.CoreV1().Secrets(namespace)
 
 	secret, err := secretsClient.Get(ctx, GitLabTokensSecretName, metav1.GetOptions{})
@@ -109,7 +109,7 @@ func GetGitLabToken(ctx context.Context, clientset *kubernetes.Clientset, namesp
 
 // DeleteGitLabToken removes a GitLab Personal Access Token from Kubernetes Secrets
 // Uses optimistic concurrency control with retry to handle concurrent updates
-func DeleteGitLabToken(ctx context.Context, clientset *kubernetes.Clientset, namespace, userID string) error {
+func DeleteGitLabToken(ctx context.Context, clientset kubernetes.Interface, namespace, userID string) error {
 	secretsClient := clientset.CoreV1().Secrets(namespace)
 
 	// Retry up to 3 times with exponential backoff
@@ -155,7 +155,7 @@ func DeleteGitLabToken(ctx context.Context, clientset *kubernetes.Clientset, nam
 }
 
 // HasGitLabToken checks if a user has a GitLab token stored
-func HasGitLabToken(ctx context.Context, clientset *kubernetes.Clientset, namespace, userID string) (bool, error) {
+func HasGitLabToken(ctx context.Context, clientset kubernetes.Interface, namespace, userID string) (bool, error) {
 	secretsClient := clientset.CoreV1().Secrets(namespace)
 
 	secret, err := secretsClient.Get(ctx, GitLabTokensSecretName, metav1.GetOptions{})

components/backend/tests/integration/gitlab/gitlab_integration_test.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"os"
 	"testing"
-	"time"
 
 	"ambient-code-backend/git"
 	"ambient-code-backend/gitlab"
@@ -14,7 +13,6 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes/fake"
 )
@@ -48,8 +46,9 @@ func TestGitLabIntegrationEnd2End(t *testing.T) {
 			result, err := gitlab.ValidateGitLabToken(ctx, gitlabToken, "https://gitlab.com")
 			require.NoError(t, err, "Token validation should succeed")
 			assert.True(t, result.Valid, "Token should be valid")
-			assert.NotEmpty(t, result.Username, "Username should be populated")
-			assert.NotEmpty(t, result.GitLabUserID, "GitLab user ID should be populated")
+			assert.NotNil(t, result.User, "User should be populated")
+			assert.NotEmpty(t, result.User.Username, "Username should be populated")
+			assert.NotZero(t, result.User.ID, "GitLab user ID should be populated")
 		})
 
 		// Test token storage
@@ -362,7 +361,7 @@ func TestGitLabClientLogging(t *testing.T) {
 	client := gitlab.NewClient("https://gitlab.com/api/v4", token)
 
 	// Make a simple API request
-	resp, err := client.GetCurrentUser(ctx)
+	resp, err := gitlab.GetCurrentUser(ctx, client)
 	require.NoError(t, err, "API call should succeed")
 	assert.NotNil(t, resp, "Response should not be nil")