address merge conflicts

Author: rlmcpherson

cmd/vclusterctl/cmd/platform/start.go

@@ -87,9 +87,6 @@ before running this command:
 }
 
 func (cmd *StartCmd) Run(ctx context.Context) error {
-<<<<<<< HEAD
-	// get version to deploy
-=======
 	cfg := cmd.LoadedConfig(cmd.Log)
 
 	// Bootstrap defaults to insecure because the platform starts with a
@@ -98,14 +95,7 @@ func (cmd *StartCmd) Run(ctx context.Context) error {
 		cfg.Platform.Insecure = true
 	}
 
-	// automatically use docker mode if the driver is set to docker
-	if cfg.Driver.Type == config.DockerDriver && !cmd.Docker {
-		cmd.Log.Info("Automatically using --docker flag because driver is set to 'docker'")
-		cmd.Docker = true
-	}
-
 	// get the version to deploy
->>>>>>> 1499106e9 (ENGPLAT-399 Add --secure flag for TLS verification (#3781))
 	if cmd.Version == "latest" || cmd.Version == "" {
 		cmd.Version = platform.MinimumVersionTag
 		latestVersion, err := platform.LatestCompatibleVersion(ctx)
@@ -173,8 +163,10 @@ func (cmd *StartCmd) Run(ctx context.Context) error {
 		}
 	}
 
-	if err := cmd.ensureEmailWithDisclaimer(ctx, cmd.KubeClient, cmd.Namespace); err != nil {
-		return err
+	if !cmd.platformUsesNewActivationFlow(cmd.Version) {
+		if err := cmd.ensureEmailWithDisclaimer(ctx, cmd.KubeClient, cmd.Namespace); err != nil {
+			return err
+		}
 	}
 
 	return start.NewLoftStarter(cmd.StartOptions).Start(ctx)
@@ -222,6 +214,26 @@ func promptForEmail(emailAddress string) (string, error) {
 	return emailAddress, nil
 }
 
+// platformUsesNewActivationFlow checks if the platform version supports the new platform activation flow.
+//
+// The new platform activation flow is supported for the platform version 4.6.0-rc.8 and above.
+func (cmd *StartCmd) platformUsesNewActivationFlow(platformVersion string) bool {
+	platformSemVerVersion, err := semver.ParseTolerant(platformVersion)
+	if err != nil {
+		cmd.Log.Warnf("Failed to parse platform version %s, falling back to the old platform activation flow with the admin email prompt", platformVersion)
+		return false
+	}
+
+	const minPlatformVersionWithNewActivationFlow = "4.6.0-rc.8"
+	if platformSemVerVersion.GTE(semver.MustParse(minPlatformVersionWithNewActivationFlow)) {
+		cmd.Log.Debugf("Platform version %s is greater than or equal to %s, platform is using the new activation flow, so skipping admin email prompt", platformVersion, minPlatformVersionWithNewActivationFlow)
+		return true
+	}
+
+	cmd.Log.Debugf("Platform version %s is not using the new activation flow, so admin email is required", platformVersion)
+	return false
+}
+
 func validateEmail(emailAddress string) error {
 	if emailAddress == "" {
 		return fmt.Errorf("admin email address is required")

pkg/cli/start/login.go

@@ -58,8 +58,6 @@ func (l *LoftStarter) login(url string) error {
 }
 
 func (l *LoftStarter) loginViaCLI(url string) error {
-	loginPath := "%s/auth/password/login"
-
 	loginRequest := types.PasswordLoginRequest{
 		Username: defaultUser,
 		Password: l.Password,
@@ -70,12 +68,6 @@ func (l *LoftStarter) loginViaCLI(url string) error {
 		return err
 	}
 
-<<<<<<< HEAD
-	loginRequestBuf := bytes.NewBuffer(loginRequestBytes)
-
-	tr := &http.Transport{
-		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-=======
 	config := l.LoadedConfig(l.Log)
 	httpClient := &http.Client{Transport: &http.Transport{
 		TLSClientConfig: &tls.Config{InsecureSkipVerify: config.Platform.Insecure},
@@ -104,25 +96,9 @@ func (l *LoftStarter) loginViaCLI(url string) error {
 			continue
 		}
 		break
->>>>>>> 1499106e9 (ENGPLAT-399 Add --secure flag for TLS verification (#3781))
-	}
-	httpClient := &http.Client{Transport: tr}
-
-	resp, err := httpClient.Post(fmt.Sprintf(loginPath, url), "application/json", loginRequestBuf)
-	if err != nil {
-		return err
-	}
-	defer resp.Body.Close()
-
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return err
 	}
-
-	accessKey := &types.AccessKey{}
-	err = json.Unmarshal(body, accessKey)
-	if err != nil {
-		return err
+	if accessKey.AccessKey == "" {
+		return fmt.Errorf("couldn't retrieve access key from platform to login")
 	}
 
 	// log into loft