sdk/testing: fix parsing of flags

Signed-off-by: Dr. Stefan Schimanski <stefan.schimanski@gmail.com>

Author: sttts

sdk/testing/config.go

@@ -17,6 +17,8 @@ limitations under the License.
 package testing
 
 import (
+	"sync"
+
 	kcptestingserver "github.com/kcp-dev/kcp/sdk/testing/server"
 )
 
@@ -32,6 +34,9 @@ var (
 		kubeconfigPath       string
 		shardKubeconfigPaths map[string]string
 	}{}
+
+	externalSetupOnce sync.Once
+	externalSetupFn   func() (kubeconfigPath string, shardKubeconfigPaths map[string]string)
 )
 
 // InitSharedKcpServer initializes a shared kcp server fixture. It must be
@@ -45,7 +50,14 @@ func InitSharedKcpServer(opts ...kcptestingserver.Option) {
 // InitExternalServer configures a potentially pre-existing shared external kcp
 // server. It must be called before SharedKcpServer is called. The shard
 // kubeconfigs are optional, but the kubeconfigPath must be provided.
-func InitExternalServer(kubeconfigPath string, shardKubeconfigPaths map[string]string) {
-	externalConfig.kubeconfigPath = kubeconfigPath
-	externalConfig.shardKubeconfigPaths = shardKubeconfigPaths
+func InitExternalServer(fn func() (kubeconfigPath string, shardKubeconfigPaths map[string]string)) {
+	externalSetupFn = fn
+}
+
+func setupExternal() {
+	externalSetupOnce.Do(func() {
+		if externalSetupFn != nil {
+			externalConfig.kubeconfigPath, externalConfig.shardKubeconfigPaths = externalSetupFn()
+		}
+	})
 }

sdk/testing/kcp.go

@@ -74,10 +74,11 @@ func PrivateKcpServer(t *testing.T, options ...kcptestingserver.Option) kcptesti
 func SharedKcpServer(t *testing.T) kcptestingserver.RunningServer {
 	t.Helper()
 
+	setupExternal()
 	if len(externalConfig.kubeconfigPath) > 0 {
 		// Use a pre-existing external server
 
-		t.Logf("shared kcp server will target configuration %q", externalConfig.kubeconfigPath)
+		t.Logf("Shared kcp server will target configuration %q", externalConfig.kubeconfigPath)
 		s, err := kcptestingserver.NewExternalKCPServer(sharedConfig.Name, externalConfig.kubeconfigPath, externalConfig.shardKubeconfigPaths, filepath.Join(kcptestinghelpers.RepositoryDir(), ".kcp"))
 		require.NoError(t, err, "failed to create persistent server fixture")
 

test/e2e/framework/flags.go

@@ -20,7 +20,6 @@ import (
 	"errors"
 	"flag"
 	"path/filepath"
-	"testing"
 
 	cliflag "k8s.io/component-base/cli/flag"
 	"k8s.io/klog/v2"
@@ -30,13 +29,6 @@ import (
 	kcptestinghelpers "github.com/kcp-dev/kcp/sdk/testing/helpers"
 )
 
-func init() {
-	klog.InitFlags(flag.CommandLine)
-	if err := flag.Lookup("v").Value.Set("4"); err != nil {
-		panic(err)
-	}
-}
-
 var testConfig = struct {
 	kcpKubeconfig       string
 	shardKubeconfigs    map[string]string
@@ -57,15 +49,18 @@ func complete() {
 }
 
 func init() {
+	klog.InitFlags(flag.CommandLine)
+	if err := flag.Lookup("v").Value.Set("4"); err != nil {
+		panic(err)
+	}
+
 	flag.StringVar(&testConfig.kcpKubeconfig, "kcp-kubeconfig", "", "Path to the kubeconfig for a kcp server.")
 	flag.Var(cliflag.NewMapStringString(&testConfig.shardKubeconfigs), "shard-kubeconfigs", "Paths to the kubeconfigs for a kcp shard server in the format <shard-name>=<kubeconfig-path>. If unset, kcp-kubeconfig is used.")
 	flag.BoolVar(&testConfig.useDefaultKCPServer, "use-default-kcp-server", false, "Whether to use server configuration from .kcp/admin.kubeconfig.")
 	flag.StringVar(&testConfig.suites, "suites", "control-plane", "A comma-delimited list of suites to run.")
 
-	// Make testing package call flags.Parse()
-	testing.Init()
-
-	complete()
-
-	kcptesting.InitExternalServer(testConfig.kcpKubeconfig, testConfig.shardKubeconfigs)
+	kcptesting.InitExternalServer(func() (string, map[string]string) {
+		complete()
+		return testConfig.kcpKubeconfig, testConfig.shardKubeconfigs
+	})
 }