feat: update logic

Signed-off-by: Chen Keinan <hen.keinan@gmail.com>

Author: chen-keinan

pkg/cmd/release/promote/promote.go

@@ -254,43 +254,16 @@ func promoteRun(cmd *cobra.Command, f factory.Factory, flags *PromoteFlags) erro
 			}
 		}
 	} else {
-		projectResource, err := proj.GetByName(octopus, f.GetCurrentSpace().Resource.ID, options.ProjectName)
+		release, err := getPromotionReleaseVersion(octopus,
+			f.GetCurrentSpace(),
+			options.ProjectName,
+			options.SourceEnvironment,
+			options.LatestSuccessful)
 		if err != nil {
 			return err
 		}
-		environmentResource, err := env.Get(octopus, f.GetCurrentSpace().Resource.ID, env.EnvironmentsQuery{
-			Name: options.SourceEnvironment,
-		})
-		if err != nil {
-			return err
-		}
-		dashboardItem, err := dashboard.GetDynamicDashboardItem(octopus, f.GetCurrentSpace().Resource.ID, dashboard.DashboardDynamicQuery{
-			Environments:    []string{environmentResource.Items[0].ID},
-			Projects:        []string{projectResource.ID},
-			IncludePrevious: options.LatestSuccessful,
-		})
-		if err != nil {
-			return err
-		}
-		sort.Slice(dashboardItem.Items, func(i, j int) bool {
-			return dashboardItem.Items[i].ReleaseVersion < dashboardItem.Items[j].ReleaseVersion
-		})
-		var version string
-		if options.LatestSuccessful {
-			for _, item := range dashboardItem.Items {
-				if item.State == "Success" {
-					version = item.ReleaseVersion
-					break
-				}
-			}
-		} else {
-			version = dashboardItem.Items[0].ReleaseVersion
-		}
-		releaseResource, err := releases.GetReleaseInProject(octopus, f.GetCurrentSpace().Resource.ID, projectResource.ID, version)
-		if err != nil {
-			return err
-		}
-		options.ReleaseVersion = releaseResource.Version
+		options.ReleaseVersion = release.Version
+		options.ReleaseID = release.ID
 	}
 
 	// the executor will raise errors if any required options are missing
@@ -399,30 +372,22 @@ func AskQuestions(octopus *octopusApiClient.Client, stdout io.Writer, asker ques
 	// Find release from source environment
 	var selectedRelease *releases.Release
 	var selectedChannel *channels.Channel
-	if options.ReleaseVersion == "" {
-		// Find release from source environment using dashboard API
-		selectedRelease, err = findReleaseFromSourceEnvironment(octopus, space, selectedProject, options.SourceEnvironment, options.LatestSuccessful)
-		if err != nil {
-			return err
-		}
-		selectedChannel, err = channels.GetByID(octopus, space.ID, selectedRelease.ChannelID)
-		if err != nil {
-			return err
-		}
-		_, _ = fmt.Fprintf(stdout, "Release %s\n", output.Cyan(selectedRelease.Version))
-	} else {
-		selectedRelease, err = releases.GetReleaseInProject(octopus, space.ID, selectedProject.ID, options.ReleaseVersion)
-		if err != nil {
-			return err
-		}
-		selectedChannel, err = channels.GetByID(octopus, space.ID, selectedRelease.ChannelID)
-		if err != nil {
-			return err
-		}
-		_, _ = fmt.Fprintf(stdout, "Release %s\n", output.Cyan(selectedRelease.Version))
+
+	release, err := getPromotionReleaseVersion(octopus, space, selectedProject.Name, options.SourceEnvironment, options.LatestSuccessful)
+	if err != nil {
+		return err
 	}
-	options.ReleaseVersion = selectedRelease.Version
-	options.ReleaseID = selectedRelease.ID
+	if err != nil {
+		return err
+	}
+	_, _ = fmt.Fprintf(stdout, "Release %s\n", output.Cyan(release.Version))
+	selectedRelease = release
+	selectedChannel, err = channels.GetByID(octopus, space.ID, selectedRelease.ChannelID)
+	if err != nil {
+		return err
+	}
+	options.ReleaseVersion = release.Version
+	options.ReleaseID = release.ID
 
 	indicateMissingPackagesForReleaseFeatureToggleValue, err := featuretoggle.IsToggleEnabled(octopus, "indicate-missing-packages-for-release")
 	if indicateMissingPackagesForReleaseFeatureToggleValue {
@@ -1124,3 +1089,48 @@ func determineIsTenanted(project *projects.Project, ask question.Asker) (bool, e
 		return false, fmt.Errorf("unhandled tenanted deployment mode %s", project.TenantedDeploymentMode)
 	}
 }
+
+func getPromotionReleaseVersion(octopus *octopusApiClient.Client,
+	space *spaces.Space,
+	projectName string,
+	sourceEnvironmentName string,
+	latestSuccessful bool) (*releases.Release, error) {
+
+	projectResource, err := proj.GetByName(octopus, space.Resource.ID, projectName)
+	if err != nil {
+		return nil, err
+	}
+	environmentResource, err := env.Get(octopus, space.Resource.ID, env.EnvironmentsQuery{
+		Name: sourceEnvironmentName,
+	})
+	if err != nil {
+		return nil, err
+	}
+	dashboardItem, err := dashboard.GetDynamicDashboardItem(octopus, space.Resource.ID, dashboard.DashboardDynamicQuery{
+		Environments:    []string{environmentResource.Items[0].ID},
+		Projects:        []string{projectResource.ID},
+		IncludePrevious: latestSuccessful,
+	})
+	if err != nil {
+		return nil, err
+	}
+	sort.Slice(dashboardItem.Items, func(i, j int) bool {
+		return dashboardItem.Items[i].ReleaseVersion < dashboardItem.Items[j].ReleaseVersion
+	})
+	var version string
+	if latestSuccessful {
+		for _, item := range dashboardItem.Items {
+			if item.State == "Success" {
+				version = item.ReleaseVersion
+				break
+			}
+		}
+	} else {
+		version = dashboardItem.Items[0].ReleaseVersion
+	}
+	releaseResource, err := releases.GetReleaseInProject(octopus, space.Resource.ID, projectResource.ID, version)
+	if err != nil {
+		return nil, err
+	}
+	return releaseResource, nil
+}