From 78c6cdd714f5eeac25429b008f771e6e2d5b78fc Mon Sep 17 00:00:00 2001 From: numcys Date: Tue, 30 Jul 2024 20:17:39 +0530 Subject: [PATCH 1/3] removed app unique params from import --- pkg/cli/apps.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkg/cli/apps.go b/pkg/cli/apps.go index 3ab9105124..313361d793 100644 --- a/pkg/cli/apps.go +++ b/pkg/cli/apps.go @@ -576,10 +576,16 @@ func appImport(rack sdk.Interface, c *stdcli.Context, app string, r io.Reader) e change := false + // Remove app unique parameters from being copied over + uniqueParams := []string{"Rack","LogBucket","ResourcePassword"} + + for _,val := range uniqueParams{ + delete(a.Parameters, val); + } + for k, v := range a.Parameters { if v != ae.Parameters[k] { change = true - break } } From 490943f39cde4d0fe36e30407bf14d0be2a3b8c9 Mon Sep 17 00:00:00 2001 From: numcys Date: Tue, 30 Jul 2024 20:39:53 +0530 Subject: [PATCH 2/3] remove unique app params before exporting app --- pkg/cli/apps.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkg/cli/apps.go b/pkg/cli/apps.go index 313361d793..ed139ffb9b 100644 --- a/pkg/cli/apps.go +++ b/pkg/cli/apps.go @@ -411,10 +411,11 @@ func appExport(rack sdk.Interface, c *stdcli.Context, app string, w io.Writer) e return err } - for k, v := range a.Parameters { - if v == "****" { - delete(a.Parameters, k) - } + // Remove app unique parameters before exporting app + uniqueParams := []string{"Rack","LogBucket","ResourcePassword"} + + for _,param := range uniqueParams{ + delete(a.Parameters, param); } data, err := json.Marshal(a) @@ -579,8 +580,8 @@ func appImport(rack sdk.Interface, c *stdcli.Context, app string, r io.Reader) e // Remove app unique parameters from being copied over uniqueParams := []string{"Rack","LogBucket","ResourcePassword"} - for _,val := range uniqueParams{ - delete(a.Parameters, val); + for _,param := range uniqueParams{ + delete(a.Parameters, param); } for k, v := range a.Parameters { From a27d899393700708eff1530ba9f7e591197be79f Mon Sep 17 00:00:00 2001 From: numcys Date: Wed, 7 Aug 2024 12:41:26 +0530 Subject: [PATCH 3/3] adding param in list for failing test --- pkg/cli/apps.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/cli/apps.go b/pkg/cli/apps.go index ed139ffb9b..c1a8cc6fd4 100644 --- a/pkg/cli/apps.go +++ b/pkg/cli/apps.go @@ -412,7 +412,7 @@ func appExport(rack sdk.Interface, c *stdcli.Context, app string, w io.Writer) e } // Remove app unique parameters before exporting app - uniqueParams := []string{"Rack","LogBucket","ResourcePassword"} + uniqueParams := []string{"Rack","LogBucket","ResourcePassword","ParamPassword"} for _,param := range uniqueParams{ delete(a.Parameters, param); @@ -587,6 +587,7 @@ func appImport(rack sdk.Interface, c *stdcli.Context, app string, r io.Reader) e for k, v := range a.Parameters { if v != ae.Parameters[k] { change = true + break } }