Browse Source

chore: remove split-only cleanup artifacts

Moritz Johner 1 month ago
parent
commit
c72beceba3

+ 1 - 40
cmd/controller/root_test.go

@@ -16,14 +16,7 @@ limitations under the License.
 
 package controller
 
-import (
-	"testing"
-
-	awsv2 "github.com/external-secrets/external-secrets/apis/provider/aws/v2alpha1"
-	fakev2alpha1 "github.com/external-secrets/external-secrets/apis/provider/fake/v2alpha1"
-	k8sv2alpha1 "github.com/external-secrets/external-secrets/apis/provider/kubernetes/v2alpha1"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-)
+import "testing"
 
 func TestStoreRequeueIntervalDefault(t *testing.T) {
 	flag := rootCmd.Flags().Lookup("store-requeue-interval")
@@ -35,35 +28,3 @@ func TestStoreRequeueIntervalDefault(t *testing.T) {
 		t.Fatalf("expected store-requeue-interval default 30s, got %q", flag.DefValue)
 	}
 }
-
-func TestSchemeIncludesProviderV2Kinds(t *testing.T) {
-	t.Helper()
-
-	testCases := []struct {
-		name string
-		gvk  schema.GroupVersionKind
-	}{
-		{
-			name: "aws secretsmanager",
-			gvk:  awsv2.GroupVersion.WithKind(awsv2.SecretsManagerKind),
-		},
-		{
-			name: "aws parameterstore",
-			gvk:  awsv2.GroupVersion.WithKind(awsv2.ParameterStoreKind),
-		},
-		{
-			name: "fake",
-			gvk:  fakev2alpha1.GroupVersion.WithKind(fakev2alpha1.Kind),
-		},
-		{
-			name: "kubernetes",
-			gvk:  k8sv2alpha1.GroupVersion.WithKind(k8sv2alpha1.Kind),
-		},
-	}
-
-	for _, tc := range testCases {
-		if _, err := scheme.New(tc.gvk); err != nil {
-			t.Fatalf("%s kind not registered in controller scheme: %v", tc.name, err)
-		}
-	}
-}

+ 0 - 31
pkg/controllers/secretstore/client_manager.go

@@ -1,31 +0,0 @@
-/*
-Copyright © The ESO Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    https://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package secretstore
-
-import (
-	"sigs.k8s.io/controller-runtime/pkg/client"
-
-	"github.com/external-secrets/external-secrets/runtime/clientmanager"
-)
-
-// Manager is kept as a compatibility alias while call sites migrate to runtime/clientmanager.
-type Manager = clientmanager.Manager
-
-// NewManager returns the shared runtime client manager implementation.
-func NewManager(ctrlClient client.Client, controllerClass string, enableFloodgate bool) *Manager {
-	return clientmanager.NewManager(ctrlClient, controllerClass, enableFloodgate)
-}

+ 0 - 62
pkg/register/generators_test.go

@@ -1,62 +0,0 @@
-/*
-Copyright © The ESO Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    https://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package register
-
-import (
-	"reflect"
-	"testing"
-
-	genv1alpha1 "github.com/external-secrets/external-secrets/apis/generators/v1alpha1"
-	awsgen "github.com/external-secrets/external-secrets/providers/v2/aws/generator"
-	fakegen "github.com/external-secrets/external-secrets/providers/v2/fake/generator"
-)
-
-func TestProviderOwnedGeneratorsAreRegistered(t *testing.T) {
-	t.Helper()
-
-	testCases := []struct {
-		kind string
-		want any
-	}{
-		{
-			kind: string(genv1alpha1.GeneratorKindECRAuthorizationToken),
-			want: &awsgen.ECRGenerator{},
-		},
-		{
-			kind: string(genv1alpha1.GeneratorKindSTSSessionToken),
-			want: &awsgen.STSGenerator{},
-		},
-		{
-			kind: string(genv1alpha1.GeneratorKindFake),
-			want: &fakegen.Generator{},
-		},
-	}
-
-	for _, tc := range testCases {
-		got, ok := genv1alpha1.GetGeneratorByName(tc.kind)
-		if !ok {
-			t.Fatalf("generator %q not registered", tc.kind)
-		}
-		if tName, gName := typeName(tc.want), typeName(got); tName != gName {
-			t.Fatalf("generator %q = %s, want %s", tc.kind, gName, tName)
-		}
-	}
-}
-
-func typeName(v any) string {
-	return reflect.TypeOf(v).String()
-}