add checks for local cluster. minor refactor

cmd/nodecmd/add_dashboard.go

@@ -28,6 +28,13 @@ cluster.`,
 
 func addDashboard(_ *cobra.Command, args []string) error {
 	clusterName := args[0]
+	clusterConfig, err := app.GetClusterConfig(clusterName)
+	if err != nil {
+		return err
+	}
+	if clusterConfig.Local {
+		return notImplementedForLocal("addDashboard")
+	}
 	if customGrafanaDashboardPath != "" {
 		if err := addCustomDashboard(clusterName, blockchainName); err != nil {
 			return err

cmd/nodecmd/create.go

@@ -199,7 +199,14 @@ func preCreateChecks(clusterName string) error {
 	if err := failForExternal(clusterName); err != nil {
 		return err
 	}
-
+	// check for local
+	clusterConfig, err := app.GetClusterConfig(clusterName)
+	if err != nil {
+		return err
+	}
+	if clusterConfig.Local {
+		return notImplementedForLocal("addDashboard")
+	}
 	return nil
 }
 
@@ -833,28 +840,21 @@ func saveExternalHostConfig(externalHostConfig models.RegionConfig, hostRegion,
 }
 
 func getExistingMonitoringInstance(clusterName string) (string, error) {
-	if app.ClustersConfigExists() {
-		clustersConfig, err := app.LoadClustersConfig()
-		if err != nil {
-			return "", err
-		}
-		if _, ok := clustersConfig.Clusters[clusterName]; ok {
-			if clustersConfig.Clusters[clusterName].MonitoringInstance != "" {
-				return clustersConfig.Clusters[clusterName].MonitoringInstance, nil
-			}
-		}
+	// check for local
+	clusterConfig, err := app.GetClusterConfig(clusterName)
+	if err != nil {
+		return "", err
+	}
+	if clusterConfig.MonitoringInstance != "" {
+		return clusterConfig.MonitoringInstance, nil
 	}
 	return "", nil
 }
 
 func updateKeyPairClustersConfig(cloudConfig models.NodeConfig) error {
-	clustersConfig := models.ClustersConfig{}
-	var err error
-	if app.ClustersConfigExists() {
-		clustersConfig, err = app.LoadClustersConfig()
-		if err != nil {
-			return err
-		}
+	clustersConfig, err := app.GetClustersConfig()
+	if err != nil {
+		return err
 	}
 	if clustersConfig.KeyPair == nil {
 		clustersConfig.KeyPair = make(map[string]string)
@@ -887,13 +887,9 @@ func getNodeCloudConfig(node string) (models.RegionConfig, string, error) {
 }
 
 func addNodeToClustersConfig(network models.Network, nodeID, clusterName string, isAPIInstance bool, isExternalHost bool, nodeRole, loadTestName string) error {
-	clustersConfig := models.ClustersConfig{}
-	if app.ClustersConfigExists() {
-		var err error
-		clustersConfig, err = app.LoadClustersConfig()
-		if err != nil {
-			return err
-		}
+	clustersConfig, err := app.GetClustersConfig()
+	if err != nil {
+		return err
 	}
 	if clustersConfig.Clusters == nil {
 		clustersConfig.Clusters = make(map[string]models.ClusterConfig)

cmd/nodecmd/create_gcp.go

@@ -53,16 +53,13 @@ func getGCPCloudCredentials() (*compute.Service, string, string, error) {
 	var err error
 	var gcpCredentialsPath string
 	var gcpProjectName string
-	clustersConfig := models.ClustersConfig{}
-	if app.ClustersConfigExists() {
-		clustersConfig, err = app.LoadClustersConfig()
-		if err != nil {
-			return nil, "", "", err
-		}
-		if clustersConfig.GCPConfig != (models.GCPConfig{}) {
-			gcpProjectName = clustersConfig.GCPConfig.ProjectName
-			gcpCredentialsPath = clustersConfig.GCPConfig.ServiceAccFilePath
-		}
+	clustersConfig, err := app.GetClustersConfig()
+	if err != nil {
+		return nil, "", "", err
+	}
+	if clustersConfig.GCPConfig != (models.GCPConfig{}) {
+		gcpProjectName = clustersConfig.GCPConfig.ProjectName
+		gcpCredentialsPath = clustersConfig.GCPConfig.ServiceAccFilePath
 	}
 	if gcpProjectName == "" {
 		if cmdLineGCPProjectName != "" {
@@ -380,13 +377,9 @@ func createGCPInstance(
 }
 
 func updateClustersConfigGCPKeyFilepath(projectName, serviceAccountKeyFilepath string) error {
-	clustersConfig := models.ClustersConfig{}
-	var err error
-	if app.ClustersConfigExists() {
-		clustersConfig, err = app.LoadClustersConfig()
-		if err != nil {
-			return err
-		}
+	clustersConfig, err := app.GetClustersConfig()
+	if err != nil {
+		return err
 	}
 	if projectName != "" {
 		clustersConfig.GCPConfig.ProjectName = projectName

cmd/nodecmd/deploy.go

@@ -47,11 +47,14 @@ func deploySubnet(cmd *cobra.Command, args []string) error {
 	if _, err := blockchaincmd.ValidateSubnetNameAndGetChains([]string{subnetName}); err != nil {
 		return err
 	}
-	clustersConfig, err := app.LoadClustersConfig()
+	clusterConfig, err := app.GetClusterConfig(clusterName)
 	if err != nil {
 		return err
 	}
-	if clustersConfig.Clusters[clusterName].Network.Kind != models.Devnet {
+	if clusterConfig.Local {
+		return notImplementedForLocal("deploy")
+	}
+	if clusterConfig.Network.Kind != models.Devnet {
 		return fmt.Errorf("node deploy command must be applied to devnet clusters")
 	}
 	hosts, err := ansible.GetInventoryFromAnsibleInventoryFile(app.GetAnsibleInventoryDirPath(clusterName))

cmd/nodecmd/destroy.go

@@ -12,7 +12,6 @@ import (
 	gcpAPI "github.com/ava-labs/avalanche-cli/pkg/cloud/gcp"
 	"github.com/ava-labs/avalanche-cli/pkg/cobrautils"
 	"github.com/ava-labs/avalanche-cli/pkg/constants"
-	"github.com/ava-labs/avalanche-cli/pkg/models"
 	"github.com/ava-labs/avalanche-cli/pkg/utils"
 	"github.com/ava-labs/avalanche-cli/pkg/ux"
 	"golang.org/x/exp/maps"
@@ -49,13 +48,9 @@ If there is a static IP address attached, it will be released.`,
 }
 
 func removeNodeFromClustersConfig(clusterName string) error {
-	clustersConfig := models.ClustersConfig{}
-	var err error
-	if app.ClustersConfigExists() {
-		clustersConfig, err = app.LoadClustersConfig()
-		if err != nil {
-			return err
-		}
+	clustersConfig, err := app.GetClustersConfig()
+	if err != nil {
+		return err
 	}
 	if clustersConfig.Clusters != nil {
 		delete(clustersConfig.Clusters, clusterName)
@@ -124,13 +119,9 @@ func getFirstAvailableNode(nodesToStop []string) (string, bool) {
 }
 
 func Cleanup() error {
-	var err error
-	clustersConfig := models.ClustersConfig{}
-	if app.ClustersConfigExists() {
-		clustersConfig, err = app.LoadClustersConfig()
-		if err != nil {
-			return err
-		}
+	clustersConfig, err := app.GetClustersConfig()
+	if err != nil {
+		return err
 	}
 	clusterNames := maps.Keys(clustersConfig.Clusters)
 	for _, clusterName := range clusterNames {
@@ -158,6 +149,13 @@ func destroyNodes(_ *cobra.Command, args []string) error {
 	if err := checkCluster(clusterName); err != nil {
 		return err
 	}
+	clusterConfig, err := app.GetClusterConfig(clusterName)
+	if err != nil {
+		return err
+	}
+	if clusterConfig.Local {
+		return notImplementedForLocal("destroy")
+	}
 	isExternalCluster, err := checkClusterExternal(clusterName)
 	if err != nil {
 		return err
@@ -315,13 +313,9 @@ func destroyNodes(_ *cobra.Command, args []string) error {
 }
 
 func getClusterMonitoringNode(clusterName string) (string, error) {
-	clustersConfig := models.ClustersConfig{}
-	if app.ClustersConfigExists() {
-		var err error
-		clustersConfig, err = app.LoadClustersConfig()
-		if err != nil {
-			return "", err
-		}
+	clustersConfig, err := app.GetClustersConfig()
+	if err != nil {
+		return "", err
 	}
 	if _, ok := clustersConfig.Clusters[clusterName]; !ok {
 		return "", fmt.Errorf("cluster %q does not exist", clusterName)
@@ -335,13 +329,9 @@ func checkCluster(clusterName string) error {
 }
 
 func checkClusterExists(clusterName string) (bool, error) {
-	clustersConfig := models.ClustersConfig{}
-	if app.ClustersConfigExists() {
-		var err error
-		clustersConfig, err = app.LoadClustersConfig()
-		if err != nil {
-			return false, err
-		}
+	clustersConfig, err := app.GetClustersConfig()
+	if err != nil {
+		return false, err
 	}
 	_, ok := clustersConfig.Clusters[clusterName]
 	return ok, nil

cmd/nodecmd/import.go

@@ -109,13 +109,12 @@ func importFile(_ *cobra.Command, args []string) error {
 	// add cluster
 	clustersConfig := models.ClustersConfig{}
 	clustersConfig.Clusters = make(map[string]models.ClusterConfig)
-	if app.ClustersConfigExists() {
-		clustersConfig, err = app.LoadClustersConfig()
-		if err != nil {
-			ux.Logger.RedXToUser("error loading clusters config: %v", err)
-			return err
-		}
+	clustersConfig, err = app.GetClustersConfig()
+	if err != nil {
+		ux.Logger.RedXToUser("error loading clusters config: %v", err)
+		return err
 	}
+
 	importCluster.ClusterConfig.Network.ClusterName = clusterName
 	clustersConfig.Clusters[clusterName] = importCluster.ClusterConfig
 	if err := app.WriteClustersConfigFile(&clustersConfig); err != nil {

cmd/nodecmd/list.go

@@ -7,7 +7,6 @@ import (
 	"strings"
 
 	"github.com/ava-labs/avalanche-cli/pkg/cobrautils"
-	"github.com/ava-labs/avalanche-cli/pkg/models"
 	"github.com/ava-labs/avalanche-cli/pkg/ux"
 
 	"github.com/spf13/cobra"
@@ -29,13 +28,9 @@ The node list command lists all clusters together with their nodes.`,
 }
 
 func list(_ *cobra.Command, _ []string) error {
-	var err error
-	clustersConfig := models.ClustersConfig{}
-	if app.ClustersConfigExists() {
-		clustersConfig, err = app.LoadClustersConfig()
-		if err != nil {
-			return err
-		}
+	clustersConfig, err := app.GetClustersConfig()
+	if err != nil {
+		return err
 	}
 	if len(clustersConfig.Clusters) == 0 {
 		ux.Logger.PrintToUser("There are no clusters defined.")

cmd/nodecmd/load_test_start.go

@@ -522,15 +522,13 @@ func GetLoadTestScript(app *application.Avalanche) error {
 }
 
 func getExistingLoadTestInstance(clusterName, loadTestName string) (string, error) {
-	if app.ClustersConfigExists() {
-		clustersConfig, err := app.LoadClustersConfig()
-		if err != nil {
-			return "", err
-		}
-		if _, ok := clustersConfig.Clusters[clusterName]; ok {
-			if _, loadTestExists := clustersConfig.Clusters[clusterName].LoadTestInstance[loadTestName]; loadTestExists {
-				return clustersConfig.Clusters[clusterName].LoadTestInstance[loadTestName], nil
-			}
+	clustersConfig, err := app.GetClustersConfig()
+	if err != nil {
+		return "", err
+	}
+	if _, ok := clustersConfig.Clusters[clusterName]; ok {
+		if _, loadTestExists := clustersConfig.Clusters[clusterName].LoadTestInstance[loadTestName]; loadTestExists {
+			return clustersConfig.Clusters[clusterName].LoadTestInstance[loadTestName], nil
 		}
 	}
 	return "", nil

cmd/nodecmd/load_test_stop.go

@@ -40,13 +40,9 @@ separate cloud server created to host the load test.`,
 }
 
 func getLoadTestInstancesInCluster(clusterName string) ([]string, error) {
-	clustersConfig := models.ClustersConfig{}
-	if app.ClustersConfigExists() {
-		var err error
-		clustersConfig, err = app.LoadClustersConfig()
-		if err != nil {
-			return nil, err
-		}
+	clustersConfig, err := app.GetClustersConfig()
+	if err != nil {
+		return nil, err
 	}
 	if _, ok := clustersConfig.Clusters[clusterName]; !ok {
 		return nil, fmt.Errorf("cluster %s doesn't exist", clusterName)
@@ -58,13 +54,9 @@ func getLoadTestInstancesInCluster(clusterName string) ([]string, error) {
 }
 
 func checkLoadTestExists(clusterName, loadTestName string) (bool, error) {
-	clustersConfig := models.ClustersConfig{}
-	if app.ClustersConfigExists() {
-		var err error
-		clustersConfig, err = app.LoadClustersConfig()
-		if err != nil {
-			return false, err
-		}
+	clustersConfig, err := app.GetClustersConfig()
+	if err != nil {
+		return false, err
 	}
 	if _, ok := clustersConfig.Clusters[clusterName]; !ok {
 		return false, fmt.Errorf("cluster %s doesn't exist", clusterName)
@@ -252,13 +244,9 @@ func destroyNode(node, clusterName, loadTestName string, ec2Svc *awsAPI.AwsCloud
 }
 
 func removeLoadTestNodeFromClustersConfig(clusterName, loadTestName string) error {
-	clustersConfig := models.ClustersConfig{}
-	var err error
-	if app.ClustersConfigExists() {
-		clustersConfig, err = app.LoadClustersConfig()
-		if err != nil {
-			return err
-		}
+	clustersConfig, err := app.GetClustersConfig()
+	if err != nil {
+		return err
 	}
 	if clustersConfig.Clusters != nil {
 		if _, ok := clustersConfig.Clusters[clusterName]; !ok {

cmd/nodecmd/local.go

@@ -19,6 +19,7 @@ import (
 	"github.com/ava-labs/avalanche-network-runner/client"
 	anrutils "github.com/ava-labs/avalanche-network-runner/utils"
 	"github.com/ava-labs/avalanchego/ids"
+	"github.com/ava-labs/avalanchego/utils/logging"
 	"github.com/ava-labs/avalanchego/utils/set"
 	"github.com/spf13/cobra"
 )
@@ -446,13 +447,9 @@ func addLocalClusterConfig(network models.Network) error {
 }
 
 func checkClusterIsLocal(clusterName string) (bool, error) {
-	clustersConfig := models.ClustersConfig{}
-	if app.ClustersConfigExists() {
-		var err error
-		clustersConfig, err = app.LoadClustersConfig()
-		if err != nil {
-			return false, err
-		}
+	clustersConfig, err := app.GetClustersConfig()
+	if err != nil {
+		return false, err
 	}
 	clusterConf, ok := clustersConfig.Clusters[clusterName]
 	return ok && clusterConf.Local, nil
@@ -535,3 +532,8 @@ func localTrack(_ *cobra.Command, args []string) error {
 	ux.Logger.GreenCheckmarkToUser("%s successfully tracking %s", clusterName, blockchainName)
 	return nil
 }
+
+func notImplementedForLocal(what string) error {
+	ux.Logger.PrintToUser("Unsupported cmd: %s is not supported by local clusters", logging.LightBlue.Wrap(what))
+	return nil
+}

cmd/nodecmd/resize.go

@@ -56,6 +56,13 @@ func preResizeChecks(clusterName string) error {
 	if err := failForExternal(clusterName); err != nil {
 		return fmt.Errorf("cannot resize external cluster %s", clusterName)
 	}
+	clusterConfig, err := app.GetClusterConfig(clusterName)
+	if err != nil {
+		return err
+	}
+	if clusterConfig.Local {
+		return notImplementedForLocal("resize")
+	}
 	return nil
 }