Fix

scaleway · May 27, 2020 · 3ee12ed · 3ee12ed
1 parent 9bd72a4
commit 3ee12ed
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/internal/namespaces/init/init.go b/internal/namespaces/init/init.go
@@ -284,24 +284,24 @@ func initCommand() *core.Command {
 				}
 			}
 
+			profile := &scw.Profile{
+				AccessKey:             &accessKey,
+				SecretKey:             &args.SecretKey,
+				DefaultZone:           scw.StringPtr(args.Zone.String()),
+				DefaultRegion:         scw.StringPtr(args.Region.String()),
+				DefaultOrganizationID: &args.OrganizationID,
+			}
 			// Save the profile as default or as a named profile
 			profileName := core.ExtractProfileName(ctx)
 			_, err = config.GetProfile(profileName)
-			if profileName != "" && err != nil {
-				config.Profiles[profileName] = &scw.Profile{
-					AccessKey: &accessKey,
-					SecretKey: &args.SecretKey,
-					DefaultZone: scw.StringPtr(args.Zone.String()),
-					DefaultRegion: scw.StringPtr(args.Region.String()),
-					DefaultOrganizationID: &args.OrganizationID,
-				}
-			} else {
+			if profileName == "" || err == nil {
 				// Default configuration
-				config.AccessKey = &accessKey
-				config.SecretKey = &args.SecretKey
-				config.DefaultZone = scw.StringPtr(args.Zone.String())
-				config.DefaultRegion = scw.StringPtr(args.Region.String())
-				config.DefaultOrganizationID = &args.OrganizationID
+				config.Profile = *profile
+			} else {
+				if config.Profiles == nil {
+					config.Profiles = make(map[string]*scw.Profile)
+				}
+				config.Profiles[profileName] = profile
 			}
 
 			// Persist configuration on disk

diff --git a/internal/namespaces/init/init_test.go b/internal/namespaces/init/init_test.go
@@ -0,0 +1 @@
+package init