6dc16a5548
The prior behavior with cloud authentication was a bit confusing when authenticating against anything but https://pulumi.com/. This change fixes a few aspects of this: * Improve error messages to differentiate between "authentication failed" and "you haven't logged into the target cloud URL." * Default to the cloud you're currently authenticated with, rather than unconditionally selecting https://pulumi.com/. This ensures $ pulumi login -c https://api.moolumi.io $ pulumi stack ls works, versus what was currently required $ pulumi login -c https://api.moolumi.io $ pulumi stack ls -c https://api.moolumi.io with confusing error messages if you forgot the second -c. * To do this, our default cloud logic changes to 1) Prefer the explicit -c if supplied; 2) Otherwise, pick the "currently authenticated" cloud; this is the last cloud to have been targeted with pulumi login, or otherwise the single cloud in the list if there is only one; 3) https://pulumi.com/ otherwise.
46 lines
1.3 KiB
Go
46 lines
1.3 KiB
Go
// Copyright 2016-2017, Pulumi Corporation. All rights reserved.
|
|
|
|
package cmd
|
|
|
|
import (
|
|
"github.com/hashicorp/go-multierror"
|
|
"github.com/pkg/errors"
|
|
"github.com/spf13/cobra"
|
|
|
|
"github.com/pulumi/pulumi/pkg/backend/cloud"
|
|
"github.com/pulumi/pulumi/pkg/util/cmdutil"
|
|
)
|
|
|
|
func newLogoutCmd() *cobra.Command {
|
|
var all bool
|
|
var cloudURL string
|
|
cmd := &cobra.Command{
|
|
Use: "logout",
|
|
Short: "Log out of the Pulumi Cloud",
|
|
Long: "Log out of the Pulumi Cloud. Deletes stored credentials on the local machine.",
|
|
Args: cmdutil.NoArgs,
|
|
Run: cmdutil.RunFunc(func(cmd *cobra.Command, args []string) error {
|
|
// If --all is passed, log out of all clouds.
|
|
if all {
|
|
bes, _, err := cloud.CurrentBackends(cmdutil.Diag())
|
|
if err != nil {
|
|
return errors.Wrap(err, "could not read list of current clouds")
|
|
}
|
|
var result error
|
|
for _, be := range bes {
|
|
if err = cloud.Logout(be.CloudURL()); err != nil {
|
|
result = multierror.Append(result, err)
|
|
}
|
|
}
|
|
return result
|
|
}
|
|
|
|
// Otherwise, just log out of a single cloud (either the one specified, or the default).
|
|
return cloud.Logout(cloud.ValueOrDefaultURL(cloudURL))
|
|
}),
|
|
}
|
|
cmd.PersistentFlags().BoolVarP(&all, "all", "a", false, "Log out of all clouds")
|
|
cmd.PersistentFlags().StringVarP(&cloudURL, "cloud-url", "c", "", "A cloud URL to log out of")
|
|
return cmd
|
|
}
|