chore: parse cluster from cmd args (#319)

KusionStack · Apr 13, 2023 · 103d18b · 103d18b
1 parent 1cbc10e
commit 103d18b
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 6 deletions.
diff --git a/pkg/cmd/apply/options.go b/pkg/cmd/apply/options.go
@@ -12,6 +12,7 @@ import (
 
 	previewcmd "kusionstack.io/kusion/pkg/cmd/preview"
 	"kusionstack.io/kusion/pkg/cmd/spec"
+	"kusionstack.io/kusion/pkg/cmd/util"
 	"kusionstack.io/kusion/pkg/engine/backend"
 	_ "kusionstack.io/kusion/pkg/engine/backend/init"
 	"kusionstack.io/kusion/pkg/engine/models"
@@ -283,7 +284,8 @@ func Apply(
 		}
 		close(ac.MsgCh)
 	} else {
-		cluster := planResources.ParseCluster()
+		// parse cluster in arguments
+		cluster := util.ParseClusterArgument(o.Arguments)
 		_, st := ac.Apply(&operation.ApplyRequest{
 			Request: opsmodels.Request{
 				Tenant:   changes.Project().Tenant,
@@ -321,7 +323,8 @@ func Apply(
 //	if err != nil {
 //	    return err
 //	}
-func Watch(o *ApplyOptions,
+func Watch(
+	o *ApplyOptions,
 	planResources *models.Spec,
 	changes *opsmodels.Changes,
 ) error {

diff --git a/pkg/cmd/preview/options.go b/pkg/cmd/preview/options.go
@@ -8,6 +8,7 @@ import (
 
 	compilecmd "kusionstack.io/kusion/pkg/cmd/compile"
 	"kusionstack.io/kusion/pkg/cmd/spec"
+	"kusionstack.io/kusion/pkg/cmd/util"
 	"kusionstack.io/kusion/pkg/engine/backend"
 	"kusionstack.io/kusion/pkg/engine/models"
 	"kusionstack.io/kusion/pkg/engine/operation"
@@ -62,7 +63,7 @@ func (o *PreviewOptions) Run() error {
 	}
 
 	// Get compile result
-	spec, err := spec.GenerateSpecWithSpinner(&generator.Options{
+	sp, err := spec.GenerateSpecWithSpinner(&generator.Options{
 		WorkDir:     o.WorkDir,
 		Filenames:   o.Filenames,
 		Settings:    o.Settings,
@@ -77,7 +78,7 @@ func (o *PreviewOptions) Run() error {
 	}
 
 	// return immediately if no resource found in stack
-	if spec == nil || len(spec.Resources) == 0 {
+	if sp == nil || len(sp.Resources) == 0 {
 		fmt.Println(pretty.GreenBold("\nNo resource found in this stack."))
 		return nil
 	}
@@ -89,7 +90,7 @@ func (o *PreviewOptions) Run() error {
 	}
 
 	// Compute changes for preview
-	changes, err := Preview(o, stateStorage, spec, project, stack)
+	changes, err := Preview(o, stateStorage, sp, project, stack)
 	if err != nil {
 		return err
 	}
@@ -168,7 +169,8 @@ func Preview(
 
 	log.Info("Start call pc.Preview() ...")
 
-	cluster := planResources.ParseCluster()
+	// parse cluster in arguments
+	cluster := util.ParseClusterArgument(o.Arguments)
 	rsp, s := pc.Preview(&operation.PreviewRequest{
 		Request: opsmodels.Request{
 			Tenant:   project.Tenant,

diff --git a/pkg/cmd/util/helpers.go b/pkg/cmd/util/helpers.go
@@ -2,6 +2,7 @@ package util
 
 import (
 	"errors"
+	"strings"
 )
 
 func RecoverErr(err *error) {
@@ -22,3 +23,15 @@ func CheckErr(err error) {
 		panic(err)
 	}
 }
+
+func ParseClusterArgument(args []string) string {
+	var cluster string
+	for _, argument := range args {
+		// e.g. cluster=xxx
+		if strings.HasPrefix(argument, "cluster=") {
+			split := strings.Split(argument, "=")
+			cluster = split[1]
+		}
+	}
+	return cluster
+}
diff --git a/pkg/cmd/util/helpers_test.go b/pkg/cmd/util/helpers_test.go
@@ -32,3 +32,28 @@ func TestCheckErr(t *testing.T) {
 		CheckErr(err)
 	})
 }
+
+func TestParseClusterArgument(t *testing.T) {
+	type args struct {
+		args []string
+	}
+	tests := []struct {
+		name string
+		args args
+		want string
+	}{
+		{
+			name: "parse_cluster",
+			args: args{args: []string{"cluster=fake"}},
+			want: "fake",
+		},
+		{name: "parse_empty", args: args{args: nil}, want: ""},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := ParseClusterArgument(tt.args.args); got != tt.want {
+				t.Errorf("ParseClusterArgument() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}