removed not used code

On-behalf-of: @SAP [email protected]
Signed-off-by: Artem Shcherbatiuk <[email protected]>

Author: vertex451

listener/reconciler/clusteraccess/config_builder_test.go

@@ -14,6 +14,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	gatewayv1alpha1 "github.com/openmfp/kubernetes-graphql-gateway/common/apis/v1alpha1"
+	"github.com/openmfp/kubernetes-graphql-gateway/common/auth"
 	"github.com/openmfp/kubernetes-graphql-gateway/common/mocks"
 	"github.com/openmfp/kubernetes-graphql-gateway/listener/reconciler/clusteraccess"
 )
@@ -304,7 +305,7 @@ func TestExtractCAData(t *testing.T) {
 			mockClient := mocks.NewMockClient(t)
 			tt.mockSetup(mockClient)
 
-			got, err := clusteraccess.ExtractCAData(t.Context(), tt.ca, mockClient)
+			got, err := auth.ExtractCAData(t.Context(), tt.ca, mockClient)
 
 			if tt.wantErr {
 				assert.Error(t, err)

listener/reconciler/clusteraccess/export_test.go

@@ -3,59 +3,13 @@ package clusteraccess
 import (
 	"context"
 
-	"k8s.io/client-go/rest"
-	"k8s.io/client-go/tools/clientcmd/api"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/openmfp/golang-commons/logger"
 	gatewayv1alpha1 "github.com/openmfp/kubernetes-graphql-gateway/common/apis/v1alpha1"
-	"github.com/openmfp/kubernetes-graphql-gateway/common/auth"
 )
 
-// Exported functions for testing private functions
-
-// Config builder exports
-// ExtractCAData exposes the common auth ExtractCAData function for testing
-func ExtractCAData(ctx context.Context, ca *gatewayv1alpha1.CAConfig, k8sClient client.Client) ([]byte, error) {
-	return auth.ExtractCAData(ctx, ca, k8sClient)
-}
-
-// ConfigureAuthentication exposes the common auth ConfigureAuthentication function for testing
-func ConfigureAuthentication(ctx context.Context, config *rest.Config, authConfig *gatewayv1alpha1.AuthConfig, k8sClient client.Client) error {
-	return auth.ConfigureAuthentication(ctx, config, authConfig, k8sClient)
-}
-
-func ExtractAuthFromKubeconfig(config *rest.Config, authInfo *api.AuthInfo) error {
-	return auth.ExtractAuthFromKubeconfig(config, authInfo)
-}
-
 // Metadata injector exports - now all delegated to common auth package
-func InjectClusterMetadata(ctx context.Context, schemaJSON []byte, clusterAccess gatewayv1alpha1.ClusterAccess, k8sClient client.Client, log logger.Logger) ([]byte, error) {
+func InjectClusterMetadata(ctx context.Context, schemaJSON []byte, clusterAccess gatewayv1alpha1.ClusterAccess, k8sClient client.Client, log *logger.Logger) ([]byte, error) {
 	return injectClusterMetadata(ctx, schemaJSON, clusterAccess, k8sClient, log)
 }
-
-// The following functions are now part of the common auth package
-// and can be accessed directly from there for testing if needed
-
-// Subroutines exports
-type GenerateSchemaSubroutine = generateSchemaSubroutine
-
-func NewGenerateSchemaSubroutine(reconciler *ExportedClusterAccessReconciler) *GenerateSchemaSubroutine {
-	return &generateSchemaSubroutine{reconciler: reconciler}
-}
-
-// Type and constant exports
-type ExportedCRDStatus = CRDStatus
-type ExportedClusterAccessReconciler = ClusterAccessReconciler
-type ClusterAccessReconcilerPublic = ClusterAccessReconciler
-
-const (
-	ExportedCRDNotRegistered = CRDNotRegistered
-	ExportedCRDRegistered    = CRDRegistered
-)
-
-// Error exports
-var (
-	ExportedErrCRDNotRegistered = ErrCRDNotRegistered
-	ExportedErrCRDCheckFailed   = ErrCRDCheckFailed
-)

listener/reconciler/clusteraccess/export_test_integration.go

@@ -10,7 +10,7 @@ import (
 	"github.com/openmfp/kubernetes-graphql-gateway/common/auth"
 )
 
-func injectClusterMetadata(ctx context.Context, schemaJSON []byte, clusterAccess gatewayv1alpha1.ClusterAccess, k8sClient client.Client, log logger.Logger) ([]byte, error) {
+func injectClusterMetadata(ctx context.Context, schemaJSON []byte, clusterAccess gatewayv1alpha1.ClusterAccess, k8sClient client.Client, log *logger.Logger) ([]byte, error) {
 	// Determine the path
 	path := clusterAccess.Spec.Path
 	if path == "" {
@@ -26,5 +26,5 @@ func injectClusterMetadata(ctx context.Context, schemaJSON []byte, clusterAccess
 	}
 
 	// Use the common metadata injection function
-	return auth.InjectClusterMetadata(ctx, schemaJSON, config, k8sClient, &log)
+	return auth.InjectClusterMetadata(ctx, schemaJSON, config, k8sClient, log)
 }

listener/reconciler/clusteraccess/metadata_injector.go

@@ -217,7 +217,7 @@ func TestInjectClusterMetadata(t *testing.T) {
 			mockClient := mocks.NewMockClient(t)
 			tt.mockSetup(mockClient)
 
-			result, err := clusteraccess.InjectClusterMetadata(t.Context(), tt.schemaJSON, tt.clusterAccess, mockClient, *mockLogger)
+			result, err := clusteraccess.InjectClusterMetadata(t.Context(), tt.schemaJSON, tt.clusterAccess, mockClient, mockLogger)
 
 			if tt.wantErr {
 				assert.Error(t, err)
@@ -253,7 +253,8 @@ func TestInjectClusterMetadata(t *testing.T) {
 }
 
 func TestInjectClusterMetadata_PathLogic(t *testing.T) {
-	mockLogger, _ := logger.New(logger.DefaultConfig())
+	mockLogger, err := logger.New(logger.DefaultConfig())
+	require.NoError(t, err)
 	mockClient := mocks.NewMockClient(t)
 	schemaJSON := []byte(`{"openapi": "3.0.0", "info": {"title": "Test"}}`)
 
@@ -266,7 +267,7 @@ func TestInjectClusterMetadata_PathLogic(t *testing.T) {
 			},
 		}
 
-		result, err := clusteraccess.InjectClusterMetadata(t.Context(), schemaJSON, clusterAccess, mockClient, *mockLogger)
+		result, err := clusteraccess.InjectClusterMetadata(t.Context(), schemaJSON, clusterAccess, mockClient, mockLogger)
 		require.NoError(t, err)
 
 		var resultData map[string]interface{}
@@ -286,7 +287,7 @@ func TestInjectClusterMetadata_PathLogic(t *testing.T) {
 			},
 		}
 
-		result, err := clusteraccess.InjectClusterMetadata(t.Context(), schemaJSON, clusterAccess, mockClient, *mockLogger)
+		result, err := clusteraccess.InjectClusterMetadata(t.Context(), schemaJSON, clusterAccess, mockClient, mockLogger)
 		require.NoError(t, err)
 
 		var resultData map[string]interface{}

listener/reconciler/clusteraccess/metadata_injector_test.go

@@ -24,7 +24,7 @@ func TestCheckClusterAccessCRDStatus(t *testing.T) {
 	tests := []struct {
 		name      string
 		mockSetup func(*mocks.MockClient)
-		want      clusteraccess.ExportedCRDStatus
+		want      clusteraccess.CRDStatus
 		wantErr   bool
 	}{
 		{
@@ -44,7 +44,7 @@ func TestCheckClusterAccessCRDStatus(t *testing.T) {
 						return nil
 					}).Once()
 			},
-			want:    clusteraccess.ExportedCRDRegistered,
+			want:    clusteraccess.CRDRegistered,
 			wantErr: false,
 		},
 
@@ -60,7 +60,7 @@ func TestCheckClusterAccessCRDStatus(t *testing.T) {
 						},
 					}).Once()
 			},
-			want:    clusteraccess.ExportedCRDNotRegistered,
+			want:    clusteraccess.CRDNotRegistered,
 			wantErr: false,
 		},
 		{
@@ -69,7 +69,7 @@ func TestCheckClusterAccessCRDStatus(t *testing.T) {
 				m.EXPECT().List(mock.Anything, mock.AnythingOfType("*v1alpha1.ClusterAccessList")).
 					Return(errors.New("API server connection failed")).Once()
 			},
-			want:    clusteraccess.ExportedCRDNotRegistered,
+			want:    clusteraccess.CRDNotRegistered,
 			wantErr: false,
 		},
 	}
@@ -114,7 +114,7 @@ func TestCreateMultiClusterReconciler(t *testing.T) {
 
 func TestConstants(t *testing.T) {
 	t.Run("error_variables", func(t *testing.T) {
-		assert.Equal(t, "ClusterAccess CRD not registered", clusteraccess.ExportedErrCRDNotRegistered.Error())
-		assert.Equal(t, "failed to check ClusterAccess CRD status", clusteraccess.ExportedErrCRDCheckFailed.Error())
+		assert.Equal(t, "ClusterAccess CRD not registered", clusteraccess.ErrCRDNotRegistered.Error())
+		assert.Equal(t, "failed to check ClusterAccess CRD status", clusteraccess.ErrCRDCheckFailed.Error())
 	})
 }