From 38de8cf7c3b097e96becc96abcfbf010a96204ce Mon Sep 17 00:00:00 2001 From: Patrik Cyvoct Date: Fri, 10 Apr 2020 09:21:12 +0200 Subject: [PATCH 1/3] fix(core): change profile flag precedence Signed-off-by: Patrik Cyvoct --- internal/core/client.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/internal/core/client.go b/internal/core/client.go index 3cf1efab2e..323b2858e4 100644 --- a/internal/core/client.go +++ b/internal/core/client.go @@ -24,15 +24,18 @@ func createClient(meta *meta) (*scw.Client, error) { return nil, err } - if meta != nil && meta.ProfileFlag != "" { - config.ActiveProfile = scw.StringPtr(meta.ProfileFlag) - } - activeProfile, err := config.GetActiveProfile() if err != nil { return nil, err } + if meta != nil && meta.ProfileFlag != "" { + activeProfile, err = config.GetProfile(meta.ProfileFlag) + if err != nil { + return nil, err + } + } + envProfile := scw.LoadEnvProfile() profile := scw.MergeProfiles(activeProfile, envProfile) From 16e74d9711f9a594808ac0828f1f9a34d7ce6dbc Mon Sep 17 00:00:00 2001 From: Patrik Cyvoct Date: Fri, 10 Apr 2020 16:22:03 +0200 Subject: [PATCH 2/3] fix precedence Signed-off-by: Patrik Cyvoct --- internal/core/client.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/internal/core/client.go b/internal/core/client.go index 323b2858e4..e7f4e83c7f 100644 --- a/internal/core/client.go +++ b/internal/core/client.go @@ -24,16 +24,18 @@ func createClient(meta *meta) (*scw.Client, error) { return nil, err } - activeProfile, err := config.GetActiveProfile() - if err != nil { - return nil, err - } + activeProfile := &config.Profile if meta != nil && meta.ProfileFlag != "" { activeProfile, err = config.GetProfile(meta.ProfileFlag) if err != nil { return nil, err } + } else { + activeProfile, err = config.GetActiveProfile() + if err != nil { + return nil, err + } } envProfile := scw.LoadEnvProfile() From bb1cd3ed4895666236d75dabdc5ab69f8f5a8383 Mon Sep 17 00:00:00 2001 From: Patrik Cyvoct Date: Fri, 10 Apr 2020 16:48:32 +0200 Subject: [PATCH 3/3] fix golint Signed-off-by: Patrik Cyvoct --- internal/core/client.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/core/client.go b/internal/core/client.go index e7f4e83c7f..c05ff37081 100644 --- a/internal/core/client.go +++ b/internal/core/client.go @@ -24,7 +24,7 @@ func createClient(meta *meta) (*scw.Client, error) { return nil, err } - activeProfile := &config.Profile + var activeProfile *scw.Profile if meta != nil && meta.ProfileFlag != "" { activeProfile, err = config.GetProfile(meta.ProfileFlag)