From c2c8ab170d3573745324c2b0bbdbe93dede2290d Mon Sep 17 00:00:00 2001
From: unclegedd <gedd@defenseunicorns.com>
Date: Tue, 26 Mar 2024 17:16:45 -0500
Subject: [PATCH] fix: err when deploying with BubbleTea with no cluster

---
 src/pkg/bundle/common.go              | 20 ++++++--------------
 src/pkg/bundle/tui/deploy/handlers.go | 14 +++++++++++---
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/pkg/bundle/common.go b/src/pkg/bundle/common.go
index 5130f356b..d6a2548eb 100644
--- a/src/pkg/bundle/common.go
+++ b/src/pkg/bundle/common.go
@@ -16,7 +16,6 @@ import (
 	"github.com/defenseunicorns/uds-cli/src/config"
 	"github.com/defenseunicorns/uds-cli/src/pkg/bundler/fetcher"
 	"github.com/defenseunicorns/uds-cli/src/types"
-	"github.com/defenseunicorns/zarf/src/config/lang"
 	"github.com/defenseunicorns/zarf/src/pkg/cluster"
 	"github.com/defenseunicorns/zarf/src/pkg/message"
 	"github.com/defenseunicorns/zarf/src/pkg/oci"
@@ -264,22 +263,15 @@ func ValidateBundleSignature(bundleYAMLPath, signaturePath, publicKeyPath string
 	return zarfUtils.CosignVerifyBlob(bundleYAMLPath, signaturePath, publicKeyPath)
 }
 
-// GetDeployedPackages returns packages that have been deployed
-func GetDeployedPackages() ([]zarfTypes.DeployedPackage, error) {
-	cluster := cluster.NewClusterOrDie()
-	deployedPackages, errs := cluster.GetDeployedZarfPackages()
-	if len(errs) > 0 {
-		return nil, lang.ErrUnableToGetPackages
-	}
-	return deployedPackages, nil
-}
-
 // GetDeployedPackageNames returns the names of the packages that have been deployed
 func GetDeployedPackageNames() []string {
 	var deployedPackageNames []string
-	deployedPackages, _ := GetDeployedPackages()
-	for _, pkg := range deployedPackages {
-		deployedPackageNames = append(deployedPackageNames, pkg.Name)
+	c, _ := cluster.NewCluster()
+	if c != nil {
+		deployedPackages, _ := c.GetDeployedZarfPackages()
+		for _, pkg := range deployedPackages {
+			deployedPackageNames = append(deployedPackageNames, pkg.Name)
+		}
 	}
 	return deployedPackageNames
 }
diff --git a/src/pkg/bundle/tui/deploy/handlers.go b/src/pkg/bundle/tui/deploy/handlers.go
index 5f6ebe76b..fedf5bf9a 100644
--- a/src/pkg/bundle/tui/deploy/handlers.go
+++ b/src/pkg/bundle/tui/deploy/handlers.go
@@ -19,8 +19,11 @@ import (
 )
 
 func (m *model) handleNewPackage(pkgName string, currentPkgIdx int) tea.Cmd {
-	// see if pkg has already been deployed
-	deployedPkg, _ := c.GetDeployedPackage(pkgName)
+	// check if pkg has already been deployed
+	var deployedPkg *zarfTypes.DeployedPackage
+	if c != nil {
+		deployedPkg, _ = c.GetDeployedPackage(pkgName)
+	}
 	newPkg := pkgState{
 		name: pkgName,
 	}
@@ -141,7 +144,12 @@ func (m *model) handleDeployTick() (tea.Model, tea.Cmd) {
 		if p.complete {
 			continue
 		}
-		deployedPkg, _ := c.GetDeployedPackage(p.name)
+
+		var deployedPkg *zarfTypes.DeployedPackage
+		if c != nil {
+			deployedPkg, _ = c.GetDeployedPackage(p.name)
+		}
+
 		// if deployedPkg is nil, the package hasn't been deployed yet
 		if deployedPkg == nil {
 			break