feat: add cluster option (#231)

* feat: add cluster option * allow back when specified cluster * update readme
keidarcy · May 21, 2024 · fa062a4 · fa062a4
1 parent cd72ea6
commit fa062a4
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -60,6 +60,7 @@ Usage:
   e1s [flags]
 
 Flags:
+      --cluster string       specify the default cluster
   -c, --config-file string   config file (default "$HOME/.config/e1s/config.yml")
   -d, --debug                sets debug mode
   -h, --help                 help for e1s
@@ -176,7 +177,8 @@ tail -f /tmp/e1s.log
 <details>
   <summary>features</summary>
 
-  - [x]  config file
+  - [x] Specify config file
+  - [x] Specify the default cluster
   - [x] Read only mode
   - [x] Auto refresh
   - [x] Describe clusters

diff --git a/cmd/e1s/main.go b/cmd/e1s/main.go
@@ -56,6 +56,7 @@ func init() {
 	rootCmd.Flags().String("profile", "", "specify the AWS profile")
 	rootCmd.Flags().String("region", "", "specify the AWS region")
 	rootCmd.Flags().String("theme", "", "specify color theme")
+	rootCmd.Flags().String("cluster", "", "specify the default cluster")
 
 	err := viper.BindPFlags(rootCmd.Flags())
 	if err != nil {
@@ -92,6 +93,7 @@ Check https://github.com/keidarcy/e1s for more details.`,
 		refresh := viper.GetInt("refresh")
 		shell := viper.GetString("shell")
 		theme := viper.GetString("theme")
+		cluster := viper.GetString("cluster")
 
 		option := e1s.Option{
 			ConfigFile: configFile,
@@ -102,6 +104,7 @@ Check https://github.com/keidarcy/e1s for more details.`,
 			Refresh:    refresh,
 			Shell:      shell,
 			Theme:      theme,
+			Cluster:    cluster,
 		}
 
 		if err := e1s.Start(option); err != nil {

diff --git a/internal/view/app.go b/internal/view/app.go
@@ -47,6 +47,8 @@ type Option struct {
 	ConfigFile string
 	// Here for help view
 	Theme string
+	// Default cluster name
+	Cluster string
 }
 
 // tview App
@@ -117,10 +119,12 @@ func newApp(option Option) (*App, error) {
 		profile:       store.Profile,
 		Entity: Entity{
 			cluster: &types.Cluster{
-				ClusterName: aws.String("no cluster"),
+				ClusterName: aws.String("e1s_default_cluster"),
+				ClusterArn:  aws.String("e1s_default_cluster_arn"),
 			},
 			service: &types.Service{
-				ServiceName: aws.String("no service"),
+				ServiceName: aws.String("e1s_default_service"),
+				ServiceArn:  aws.String("e1s_default_service arn"),
 			},
 			task:           &types.Task{},
 			container:      &types.Container{},
@@ -200,6 +204,15 @@ func (app *App) back() {
 
 	slog.Debug("app.Pages navigation", "action", "back", "pageName", pageName, "app", app)
 
+	if prevKind == ClusterKind && app.Option.Cluster != "" {
+		app.Option.Cluster = ""
+		err := app.showPrimaryKindPage(ClusterKind, false)
+		if err != nil {
+			app.Notice.Warn("failed to back to cluster list")
+		}
+		return
+	}
+
 	app.Pages.SwitchToPage(pageName)
 }
 
@@ -222,7 +235,13 @@ func (app *App) getPageHandle() string {
 }
 
 func (app *App) start() error {
-	err := app.showPrimaryKindPage(ClusterKind, false)
+	var err error
+	if app.Option.Cluster == "" {
+		err = app.showPrimaryKindPage(ClusterKind, false)
+	} else {
+		app.cluster.ClusterName = &app.Option.Cluster
+		err = app.showPrimaryKindPage(ServiceKind, false)
+	}
 
 	if app.Option.Refresh > 0 {
 		slog.Debug("Auto refresh rate", "seconds", app.Option.Refresh)

diff --git a/internal/view/help.go b/internal/view/help.go
@@ -53,6 +53,7 @@ func (app *App) showHelpPage() {
 		{key: "shell", description: app.Option.Shell},
 		{key: "refresh", description: strconv.Itoa(app.Option.Refresh)},
 		{key: "theme", description: app.Option.Theme},
+		{key: "cluster", description: app.Option.Cluster},
 	})
 	flex := tview.NewFlex().
 		AddItem(resource, 0, 1, false).