compare install repo host to isc host (#500)

Author: ATGardner

Makefile

@@ -1,4 +1,4 @@
-VERSION=v0.0.443
+VERSION=v0.0.444
 
 OUT_DIR=dist
 YEAR?=$(shell date +"%Y")

cmd/commands/cluster.go

@@ -398,7 +398,7 @@ func newClusterRemoveCommand() *cobra.Command {
 
 			return nil
 		},
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(cmd *cobra.Command, _ []string) error {
 			// this is a temp solution for too short timeout when removing a cluster
 			// (on app-proxy it is waiting for the isc to finalize which can take a while)
 			// this should be removed after implementing a scalable solution (CR-13259)

cmd/commands/common.go

@@ -311,7 +311,7 @@ func ensureGitPAT(ctx context.Context, opts *RuntimeInstallOptions) error {
 		opts.GitIntegrationRegistrationOpts.Token = opts.InsCloneOpts.Auth.Password
 		currentUser, err := cfConfig.NewClient().Users().GetCurrent(ctx)
 		if err != nil {
-			return fmt.Errorf("failed to retrieve username from platform: %w", err)
+			return fmt.Errorf("failed to get current user from platform: %w", err)
 		}
 
 		log.G(ctx).Infof("Personal git token was not provided. Using runtime git token to register user: \"%s\". You may replace your personal git token at any time from the UI in the user settings", currentUser.Name)
@@ -638,7 +638,20 @@ func isValidationError(err error) bool {
 	return err != nil && err != promptui.ErrInterrupt
 }
 
-func setIscRepo(ctx context.Context, suggestedSharedConfigRepo string) (string, error) {
+func getIscRepo(ctx context.Context) (string, error) {
+	currentUser, err := cfConfig.NewClient().V2().UsersV2().GetCurrent(ctx)
+	if err != nil {
+		return "", fmt.Errorf("failed to get current user from platform: %w", err)
+	}
+
+	if currentUser.ActiveAccount.SharedConfigRepo == nil {
+		return "", nil
+	}
+
+	return *currentUser.ActiveAccount.SharedConfigRepo, nil
+}
+
+func suggestIscRepo(ctx context.Context, suggestedSharedConfigRepo string) (string, error) {
 	setIscRepoResponse, err := cfConfig.NewClient().V2().Runtime().SetSharedConfigRepo(ctx, suggestedSharedConfigRepo)
 	if err != nil {
 		return "", fmt.Errorf("failed to set shared config repo. Error: %w", err)

cmd/commands/runtime.go

@@ -224,7 +224,7 @@ func runtimeUpgradeCommandPreRunHandler(cmd *cobra.Command, args []string, opts
 	}
 
 	if opts.SuggestedSharedConfigRepo != "" {
-		sharedConfigRepo, err := setIscRepo(ctx, opts.SuggestedSharedConfigRepo)
+		sharedConfigRepo, err := suggestIscRepo(ctx, opts.SuggestedSharedConfigRepo)
 		if err != nil {
 			return fmt.Errorf("failed to ensure shared config repo for account: %w", err)
 		}

cmd/commands/runtime_install.go

@@ -299,7 +299,7 @@ func runtimeInstallCommandPreRunHandler(cmd *cobra.Command, opts *RuntimeInstall
 	}
 
 	if opts.SuggestedSharedConfigRepo != "" {
-		sharedConfigRepo, err := setIscRepo(ctx, opts.SuggestedSharedConfigRepo)
+		sharedConfigRepo, err := suggestIscRepo(ctx, opts.SuggestedSharedConfigRepo)
 		if err != nil {
 			return fmt.Errorf("failed to ensure shared config repo: %w", err)
 		}
@@ -1059,10 +1059,17 @@ func installComponents(ctx context.Context, opts *RuntimeInstallOptions, rt *run
 }
 
 func preInstallationChecks(ctx context.Context, opts *RuntimeInstallOptions) error {
+	var err error
 	log.G(ctx).Debug("running pre-installation checks...")
 
 	handleCliStep(reporter.InstallPhaseRunPreCheckStart, "Running pre run installation checks", nil, true, false)
 
+	err = checkIscProvider(ctx, opts.InsCloneOpts)
+	handleCliStep(reporter.InstallStepRunPreCheckGitProvider, "Checking Account Git Provider", err, true, true)
+	if err != nil {
+		return err
+	}
+
 	rt, err := runtime.Download(opts.Version, opts.RuntimeName)
 	handleCliStep(reporter.InstallStepRunPreCheckDownloadRuntimeDefinition, "Downloading runtime definition", err, true, true)
 	if err != nil {
@@ -1102,6 +1109,33 @@ func preInstallationChecks(ctx context.Context, opts *RuntimeInstallOptions) err
 	return nil
 }
 
+func checkIscProvider(ctx context.Context, opts *apgit.CloneOptions) error {
+	iscRepo, err := getIscRepo(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to check account git provider: %w", err)
+	}
+
+	if iscRepo == "" {
+		return nil
+	}
+
+	iscUrl, err := url.Parse(iscRepo)
+	if err != nil {
+		return fmt.Errorf("failed to check account git provider: %w", err)
+	}
+
+	insUrl, err := url.Parse(opts.URL())
+	if err != nil {
+		return fmt.Errorf("failed to check account git provider: %w", err)
+	}
+
+	if iscUrl.Host != insUrl.Host {
+		return fmt.Errorf("cannot install runtime in \"%s\" when Account git provider is in \"%s\"", insUrl.Host, iscUrl.Host)
+	}
+
+	return nil
+}
+
 func checkRuntimeCollisions(ctx context.Context, kube kube.Factory, runtime string) error {
 	log.G(ctx).Debug("checking for argocd collisions in cluster")
 

docs/releases/release_notes.md

@@ -23,7 +23,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.443/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.444/cf-linux-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-linux-amd64 /usr/local/bin/cf
@@ -36,7 +36,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.443/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.444/cf-darwin-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-darwin-amd64 /usr/local/bin/cf

manifests/runtime.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: "{{ namespace }}"
 spec:
   defVersion: 1.0.1
-  version: 0.0.443
+  version: 0.0.444
   bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
   components:
     - name: events

pkg/reporter/reporter.go

@@ -72,6 +72,7 @@ const (
 	InstallStepPreCheckShouldInstallDemoResources     CliStep = "install.pre-check.step.should-install-demo-resources"
 	InstallPhasePreCheckFinish                        CliStep = "install.pre-check.phase.finish"
 	InstallPhaseRunPreCheckStart                      CliStep = "install.run.pre-check.phase.start"
+	InstallStepRunPreCheckGitProvider                 CliStep = "install.run.pre-check.step.check-git-provider"
 	InstallStepRunPreCheckDownloadRuntimeDefinition   CliStep = "install.run.pre-check.step.download-runtime-definition"
 	InstallStepRunPreCheckEnsureCliVersion            CliStep = "install.run.pre-check.step.ensure-cli-version"
 	InstallStepRunPreCheckRuntimeCollision            CliStep = "install.run.pre-check.step.runtime-collision"