Skip to content

Commit 146c738

Browse files
committed
Fix small issue with logging into cloud provider
1 parent 62da4d3 commit 146c738

2 files changed

Lines changed: 8 additions & 4 deletions

File tree

cmd/init.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -372,11 +372,13 @@ func (cmd *InitCmd) useCloudProvider() bool {
372372
cloudProvider += ")"
373373
cloudProviderSelected := ""
374374

375-
for _, ok := providerConfig[cloudProviderSelected]; ok == false && cloudProviderSelected != "no"; {
376-
cloudProviderSelected = *stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
375+
for ok := false; ok == false && cloudProviderSelected != "no"; {
376+
cloudProviderSelected = strings.TrimSpace(*stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
377377
Question: "Do you want to use a cloud provider? (no to skip) " + cloudProvider,
378378
DefaultValue: cloud.DevSpaceCloudProviderName,
379-
})
379+
}))
380+
381+
_, ok = providerConfig[cloudProviderSelected]
380382
}
381383

382384
if cloudProviderSelected != "no" {

pkg/devspace/cloud/login.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package cloud
22

33
import (
4+
"context"
45
"encoding/json"
56
"fmt"
67
"io/ioutil"
@@ -81,6 +82,7 @@ func GetClusterConfig(provider *Provider) (string, *api.Cluster, *api.AuthInfo,
8182

8283
// Login logs the user into the devspace cloud
8384
func Login(provider *Provider) (string, *api.Cluster, *api.AuthInfo, error) {
85+
ctx := context.Background()
8486
tokenChannel := make(chan string)
8587

8688
log.StartWait("Logging into cloud " + provider.Host + LoginEndpoint + " ...")
@@ -91,7 +93,7 @@ func Login(provider *Provider) (string, *api.Cluster, *api.AuthInfo, error) {
9193
token := <-tokenChannel
9294
close(tokenChannel)
9395

94-
err := server.Shutdown(nil)
96+
err := server.Shutdown(ctx)
9597
if err != nil {
9698
return "", nil, nil, err
9799
}

0 commit comments

Comments
 (0)