Fix the early parsing of platform flag in init()

Fixes #1147

Signed-off-by: Gabor Dozsa <[email protected]>

cmd/skupper/skupper.go

@@ -1039,12 +1039,34 @@ func addCommands(skupperCli SkupperClient, rootCmd *cobra.Command, cmds ...*cobr
 	}
 }
 
+func parsePlatformFlagOnly(args []string) {
+	// This function is called when not every supported command flag is defined yet
+	for i, p := range args {
+		if p == "--platform" && i < len(args) - 1 {
+			config.Platform = args[i + 1]
+			break
+		} else if strings.HasPrefix(p, "--platform=") {
+			v := strings.Split(p,"=")
+			if len(v) == 2 {
+				config.Platform = v[1]
+			}
+			break
+		}
+	}
+}
+
 func init() {
+	// This enables calling init explicitly in tests
+	initWrapper(os.Args)
+}
+
+func initWrapper(args []string) {
 	rootCmd = &cobra.Command{Use: "skupper"}
 	routev1.AddToScheme(scheme.Scheme)
 
-	rootCmd.PersistentFlags().StringVarP(&config.Platform, "platform", "", "", "The platform type to use [kubernetes, podman]")
-	rootCmd.ParseFlags(os.Args)
+	rootCmd.PersistentFlags().StringVarP(&config.Platform, "platform", "", "", "The platform type t [kubernetes, podman]")
+	// Only the "platform" flag is defined at this point so it is unsafe to call rootCmd.ParseFlags(os.Args) here
+	parsePlatformFlagOnly(args)
 
 	var skupperCli SkupperClient
 	switch config.GetPlatform() {

cmd/skupper/skupper_test.go

@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/skupperproject/skupper/api/types"
+	"github.com/skupperproject/skupper/pkg/config"
 
 	"gotest.tools/assert"
 )
@@ -317,3 +318,17 @@ func TestSkupperInitFlowCollectorParseArgs(t *testing.T) {
 	assert.Equal(t, routerCreateOpts.FlowCollector.MemoryLimit, "3G")
 	assert.Equal(t, routerCreateOpts.FlowCollector.FlowRecordTtl, time.Minute*15)
 }
+
+func TestPlatformFlag(t *testing.T) {
+	t.Setenv("types.ENV_PLATFORM", "") // The platform is expected to be defined by the command line option
+	config.Platform = ""
+	args := []string{ "skupper", "expose", "host", "10.0.0.1", "--address", "test-service", "--port", "8080", "--platform", "podman"}
+	initWrapper(args)
+	assert.Equal(t, config.Platform, types.PlatformPodman)
+
+	config.Platform = ""
+	args = []string{ "skupper", "--platform", "podman", "expose", "host", "10.0.0.1", "--address", "test-service", "--port", "8080"}
+	initWrapper(args)
+	assert.Equal(t, config.Platform, types.PlatformPodman)
+
+}