feat: cluster list i egen fil

nais · Jun 20, 2023 · 8997912 · 8997912
1 parent 08c9414
commit 8997912
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 57 deletions.
diff --git a/cmd/commands/clusterCmd/cmds.go b/cmd/commands/clusterCmd/cmds.go
@@ -1,12 +1,7 @@
 package clusterCmd
 
 import (
-	"fmt"
-	"github.com/nais/narcos/pkg/gcp"
-	"github.com/nais/narcos/pkg/naisdevice"
 	"github.com/urfave/cli/v2"
-	"golang.org/x/exp/slices"
-	"strings"
 )
 
 func Command() *cli.Command {
@@ -21,57 +16,6 @@ func Command() *cli.Command {
 
 func subCommands() []*cli.Command {
 	return []*cli.Command{
-		{
-			Name: "list",
-			Flags: []cli.Flag{
-				&cli.BoolFlag{
-					Name:    "includeManagement",
-					Aliases: []string{"m"},
-				},
-				&cli.BoolFlag{
-					Name:    "includeOnprem",
-					Aliases: []string{"o"},
-					Value:   true,
-				},
-				&cli.BoolFlag{
-					Name: "prefixTenant",
-				},
-				&cli.StringFlag{
-					Name:    "tenant",
-					Aliases: []string{"t"},
-					Action: func(context *cli.Context, tenant string) error {
-						if !slices.Contains(naisdevice.Tenants, tenant) {
-							return fmt.Errorf("%v is not a valid tenant", tenant)
-						}
-
-						return nil
-					},
-				},
-			},
-			Before: func(context *cli.Context) error {
-				return gcp.ValidateUserLogin(context.Context)
-			},
-			Action: func(context *cli.Context) error {
-				includeManagement := context.Bool("includeManagement")
-				includeOnprem := context.Bool("includeOnprem")
-				prefixTenant := context.Bool("prefixTenant")
-				tenant := context.String("tenant")
-
-				clusters, err := gcp.GetClusters(context.Context, includeManagement, includeOnprem, tenant)
-				if err != nil {
-					return err
-				}
-
-				for _, cluster := range clusters {
-					name := cluster.Name
-					if prefixTenant {
-						name = cluster.Tenant + "-" + strings.TrimPrefix(name, "nais-")
-					}
-					fmt.Println(name)
-				}
-
-				return nil
-			},
-		},
+		listCmd(),
 	}
 }
diff --git a/cmd/commands/clusterCmd/listCmd.go b/cmd/commands/clusterCmd/listCmd.go
@@ -0,0 +1,65 @@
+package clusterCmd
+
+import (
+	"fmt"
+	"github.com/nais/narcos/pkg/gcp"
+	"github.com/nais/narcos/pkg/naisdevice"
+	"github.com/urfave/cli/v2"
+	"golang.org/x/exp/slices"
+	"strings"
+)
+
+func listCmd() *cli.Command {
+	return &cli.Command{
+		Name: "list",
+		Flags: []cli.Flag{
+			&cli.BoolFlag{
+				Name:    "includeManagement",
+				Aliases: []string{"m"},
+			},
+			&cli.BoolFlag{
+				Name:    "includeOnprem",
+				Aliases: []string{"o"},
+				Value:   true,
+			},
+			&cli.BoolFlag{
+				Name: "prefixTenant",
+			},
+			&cli.StringFlag{
+				Name:    "tenant",
+				Aliases: []string{"t"},
+				Action: func(context *cli.Context, tenant string) error {
+					if !slices.Contains(naisdevice.Tenants, tenant) {
+						return fmt.Errorf("%v is not a valid tenant", tenant)
+					}
+
+					return nil
+				},
+			},
+		},
+		Before: func(context *cli.Context) error {
+			return gcp.ValidateUserLogin(context.Context)
+		},
+		Action: func(context *cli.Context) error {
+			includeManagement := context.Bool("includeManagement")
+			includeOnprem := context.Bool("includeOnprem")
+			prefixTenant := context.Bool("prefixTenant")
+			tenant := context.String("tenant")
+
+			clusters, err := gcp.GetClusters(context.Context, includeManagement, includeOnprem, tenant)
+			if err != nil {
+				return err
+			}
+
+			for _, cluster := range clusters {
+				name := cluster.Name
+				if prefixTenant {
+					name = cluster.Tenant + "-" + strings.TrimPrefix(name, "nais-")
+				}
+				fmt.Println(name)
+			}
+
+			return nil
+		},
+	}
+}