Fix the bug for upgrade flag (#7896)

* Fixed the bug for upgrade Signed-off-by: SahithiMy <sahithi.mylangam@progress.com> * Fix for upgrade Signed-off-by: SahithiMy <sahithi.mylangam@progress.com> * updated error msg Signed-off-by: SahithiMy <sahithi.mylangam@progress.com> --------- Signed-off-by: SahithiMy <sahithi.mylangam@progress.com> Co-authored-by: SahithiMy <sahithi.mylangam@progress.com>
chef · May 24, 2023 · 502ffe3 · 502ffe3
1 parent 9a33cf7
commit 502ffe3
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/components/automate-cli/cmd/chef-automate/automateClusterCtlUtil.go b/components/automate-cli/cmd/chef-automate/automateClusterCtlUtil.go
@@ -140,7 +140,7 @@ func tailFile(logFilePath string, executed chan struct{}) {
 
 	}
 }
-func doBootstrapEnv(airgapBundlePath string, saas bool) error {
+func doBootstrapEnv(airgapBundlePath string, saas bool, frontend bool, backend bool) error {
 	conf := new(dc.AutomateConfig)
 	if err := mergeFlagOverrides(conf); err != nil {
 		return status.Wrap(
@@ -184,9 +184,21 @@ func doBootstrapEnv(airgapBundlePath string, saas bool) error {
 		return status.Annotate(err, status.DeployError)
 	}
 	if offlineMode {
-		err := moveFrontendBackendAirgapToTransferDir(airgapMetadata, airgapBundlePath)
-		if err != nil {
-			return status.Annotate(err, status.DeployError)
+		if frontend {
+			err := moveAirgapFrontendBundlesOnlyToTransferDir(airgapMetadata, upgradeRunCmdFlags.airgap)
+			if err != nil {
+				return status.Annotate(err, status.DeployError)
+			}
+		} else if backend {
+			err := moveAirgapBackendBundlesOnlyToTransferDir(airgapMetadata, upgradeRunCmdFlags.airgap)
+			if err != nil {
+				return status.Annotate(err, status.DeployError)
+			}
+		} else {
+			err := moveFrontendBackendAirgapToTransferDir(airgapMetadata, upgradeRunCmdFlags.airgap)
+			if err != nil {
+				return status.Annotate(err, status.DeployError)
+			}
 		}
 	}
 	return nil
@@ -203,7 +215,7 @@ func bootstrapEnv(dm deployManager, airgapBundlePath string, saas bool) error {
 			return status.New(status.InvalidCommandArgsError, errMLSA)
 		}
 	}
-	err := doBootstrapEnv(airgapBundlePath, saas)
+	err := doBootstrapEnv(airgapBundlePath, saas, upgradeRunCmdFlags.upgradefrontends, upgradeRunCmdFlags.upgradebackends)
 	if err != nil {
 		return err
 	}

diff --git a/components/automate-cli/cmd/chef-automate/upgrade.go b/components/automate-cli/cmd/chef-automate/upgrade.go
@@ -444,7 +444,7 @@ func runAutomateHAFlow(args []string, offlineMode bool) error {
 	if offlineMode {
 		// Always upgrade the workspace
 		upgradeRunCmdFlags.upgradeHAWorkspace = "yes"
-		uperr, upgraded := upgradeWorspace(upgradeRunCmdFlags.airgap, upgradeRunCmdFlags.saas)
+		uperr, upgraded := upgradeWorspace(upgradeRunCmdFlags.airgap, upgradeRunCmdFlags.saas, upgradeRunCmdFlags.upgradefrontends, upgradeRunCmdFlags.upgradebackends)
 		if uperr != nil {
 			return status.Annotate(uperr, status.UpgradeError)
 		}

diff --git a/components/automate-cli/cmd/chef-automate/workspaceUpgrade.go b/components/automate-cli/cmd/chef-automate/workspaceUpgrade.go
@@ -45,7 +45,7 @@ func worspaceUpgradeCmdExecute(cmd *cobra.Command, args []string) error {
 		return status.Wrap(errors.New("Incorrect command usage"), 0, workspaceUpgradeHelpDocs)
 	}
 	if isA2HARBFileExist() {
-		err, upgraded := upgradeWorspace(args[0], upgradeRunCmdFlags.saas)
+		err, upgraded := upgradeWorspace(args[0], upgradeRunCmdFlags.saas, upgradeRunCmdFlags.upgradefrontends, upgradeRunCmdFlags.upgradebackends)
 		if err != nil {
 			return status.Annotate(err, status.UpgradeError)
 		}
@@ -59,7 +59,7 @@ func worspaceUpgradeCmdExecute(cmd *cobra.Command, args []string) error {
 	return errors.New(AUTOMATE_HA_INVALID_BASTION)
 }
 
-func upgradeWorspace(bundle string, saas bool) (error, bool) {
+func upgradeWorspace(bundle string, saas bool, frontend bool, backend bool) (error, bool) {
 	updateAvailabe, err := checkIfNewBundleHaveWorkspaceUpdate(bundle, saas)
 	if err != nil {
 		writer.Println(err.Error())
@@ -86,7 +86,7 @@ func upgradeWorspace(bundle string, saas bool) (error, bool) {
 		}
 		if upgradeAccepted {
 			writer.Println("Bootstraping for new version.")
-			err := doBootstrapEnv(bundle, upgradeRunCmdFlags.saas)
+			err := doBootstrapEnv(bundle, upgradeRunCmdFlags.saas, frontend, backend)
 			if err != nil {
 				writer.Println(err.Error())
 				return nil, false