Merge pull request #84 from zeabur/yisheng/zea-2542-fix-cli-variable-…

…mutation fix(cmd/variable,api/variable): Fix variable update bug due to update readonly vars
zeabur · Feb 1, 2024 · ca1064d · ca1064d
2 parents b9fc674 + 133c98e
commit ca1064d
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 13 deletions.
diff --git a/internal/cmd/variable/create/create.go b/internal/cmd/variable/create/create.go
@@ -98,7 +98,7 @@ func runCreateVariableNonInteractive(f *cmdutil.Factory, opts *Options) error {
 	)
 	s.Start()
 
-	varList, err := f.ApiClient.ListVariables(context.Background(), opts.id, opts.environmentID)
+	varList, _, err := f.ApiClient.ListVariables(context.Background(), opts.id, opts.environmentID)
 	if err != nil {
 		return err
 	}
@@ -122,8 +122,8 @@ func runCreateVariableNonInteractive(f *cmdutil.Factory, opts *Options) error {
 	}
 	s.Stop()
 
-	f.Log.Infof("Successfully created variables of service: %s", opts.name)
-	
+	f.Log.Infof("Successfully created variables of service: %s\n", opts.name)
+
 	table := make([][]string, 0, len(varMap))
 	for k, v := range varMap {
 		table = append(table, []string{k, v})

diff --git a/internal/cmd/variable/delete/delete.go b/internal/cmd/variable/delete/delete.go
@@ -71,7 +71,7 @@ func runDeleteVariableInteractive(f *cmdutil.Factory, opts *Options) error {
 	)
 	s.Start()
 
-	varList, err := f.ApiClient.ListVariables(context.Background(), opts.id, opts.environmentID)
+	varList, _, err := f.ApiClient.ListVariables(context.Background(), opts.id, opts.environmentID)
 	if err != nil {
 		return err
 	}
@@ -137,7 +137,7 @@ func runDeleteVariableNonInteractive(f *cmdutil.Factory, opts *Options) error {
 	}
 	s.Stop()
 
-	f.Log.Infof("Successfully deleted variables of service: %s", opts.name)
+	f.Log.Infof("Successfully deleted variables of service: %s\n", opts.name)
 
 	table := make([][]string, 0, len(opts.keys))
 	for k, v := range opts.keys {

diff --git a/internal/cmd/variable/list/list.go b/internal/cmd/variable/list/list.go
@@ -73,18 +73,25 @@ func runListVariablesNonInteractive(f *cmdutil.Factory, opts *Options) error {
 		spinner.WithSuffix(fmt.Sprintf(" Fetching environment variablesof service %s ...", opts.name)),
 	)
 	s.Start()
-	variableList, err := f.ApiClient.ListVariables(context.Background(), opts.id, opts.environmentID)
+	variableList, readonlyVariableList, err := f.ApiClient.ListVariables(context.Background(), opts.id, opts.environmentID)
 	if err != nil {
 		return err
 	}
 	s.Stop()
 
-	if len(variableList) == 0 {
+	if len(variableList) == 0 && len(readonlyVariableList) == 0 {
 		f.Log.Infof("No variables found")
 		return nil
 	}
 
+	f.Log.Infof("Variables of service: %s\n", opts.name)
 	f.Printer.Table(variableList.Header(), variableList.Rows())
 
+	if len(readonlyVariableList) != 0 {
+		fmt.Println()
+		f.Log.Infof("Readonly variables of service: %s\n", opts.name)
+		f.Printer.Table(readonlyVariableList.Header(), readonlyVariableList.Rows())
+	}
+
 	return nil
 }
diff --git a/internal/cmd/variable/update/update.go b/internal/cmd/variable/update/update.go
@@ -67,7 +67,7 @@ func runUpdateVariableInteractive(f *cmdutil.Factory, opts *Options) error {
 	)
 	s.Start()
 
-	varList, err := f.ApiClient.ListVariables(context.Background(), opts.id, opts.environmentID)
+	varList, _, err := f.ApiClient.ListVariables(context.Background(), opts.id, opts.environmentID)
 	if err != nil {
 		return err
 	}
@@ -126,7 +126,7 @@ func runUpdateVariableNonInteractive(f *cmdutil.Factory, opts *Options) error {
 	}
 	s.Stop()
 
-	f.Log.Infof("Successfully updated variables of service: %s", opts.name)
+	f.Log.Infof("Successfully updated variables of service: %s\n", opts.name)
 
 	table := make([][]string, 0, len(opts.keys))
 	for k, v := range opts.keys {

diff --git a/pkg/api/interface.go b/pkg/api/interface.go
@@ -65,7 +65,7 @@ type (
 	}
 
 	VariableAPI interface {
-		ListVariables(ctx context.Context, serviceID string, environmentID string) (model.Variables, error)
+		ListVariables(ctx context.Context, serviceID string, environmentID string) (model.Variables, model.Variables, error)
 		UpdateVariables(ctx context.Context, serviceID string, environmentID string, data map[string]string) (bool, error)
 	}
 

diff --git a/pkg/api/variable.go b/pkg/api/variable.go
@@ -5,7 +5,7 @@ import (
 	"github.com/zeabur/cli/pkg/model"
 )
 
-func (c *client) ListVariables(ctx context.Context, serviceID string, environmentID string) (model.Variables, error) {
+func (c *client) ListVariables(ctx context.Context, serviceID string, environmentID string) (model.Variables, model.Variables, error) {
 	var query struct {
 		Service struct {
 			Variables model.Variables `graphql:"variables(environmentID: $environmentID, exposed: true)"`
@@ -18,10 +18,20 @@ func (c *client) ListVariables(ctx context.Context, serviceID string, environmen
 	})
 
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 
-	return query.Service.Variables, nil
+	variableList := make(model.Variables, 0, len(query.Service.Variables))
+	readonlyVariableList := make(model.Variables, 0, len(query.Service.Variables))
+	for _, variable := range query.Service.Variables {
+		if variable.ServiceID == serviceID {
+			variableList = append(variableList, variable)
+		} else {
+			readonlyVariableList = append(readonlyVariableList, variable)
+		}
+	}
+
+	return variableList, readonlyVariableList, nil
 }
 
 func (c *client) UpdateVariables(ctx context.Context, serviceID string, environmentID string, data map[string]string) (bool, error) {