maxmustermann/pulumi
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add support for pulumi logout --all (#6101)

Browse source
This commit is contained in:
Paul Stack 2021-01-15 13:38:58 +00:00 committed by GitHub
parent 3853f530d2
commit 61ae57da0c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 78 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
CHANGELOG.md
View file

@ -2,7 +2,9 @@ CHANGELOG
=========
## HEAD (Unreleased)
_(none)_
- [CLI] Add the ability to log out of all Pulumi backends at once.
[#6101](https://github.com/pulumi/pulumi/pull/6101)
## 2.17.2 (2021-01-14)
@ -13,10 +15,10 @@ _(none)_
- [automation/go] Add debug logging settings for common automation API operations
[#6095](https://github.com/pulumi/pulumi/pull/6095)
- [automation/go] Set DryRun on previews so unknowns are identified correctly.
[#6099](https://github.com/pulumi/pulumi/pull/6099)
- [sdk/python] Fix python 3.6 support by removing annotations import.
[#6109](https://github.com/pulumi/pulumi/pull/6109)
@ -53,7 +55,7 @@ _(none)_
- [sdk/dotnet] Moved urn value retrieval into if statement
for MockMonitor
[#6081](https://github.com/pulumi/pulumi/pull/6081)
- [sdk/dotnet] Added `Pulumi.Output.Unsecret` which will
take an existing secret output and
create a non-secret variant with an unwrapped secret value.
@ -635,35 +637,35 @@ _(none)_
## 2.4.0 (2020-06-10)
- Turn program generation NYIs into diagnostic errors
[#4794](https://github.com/pulumi/pulumi/pull/4794)
[#4794](https://github.com/pulumi/pulumi/pull/4794)
- Improve dev version detection logic
[#4732](https://github.com/pulumi/pulumi/pull/4732)
[#4732](https://github.com/pulumi/pulumi/pull/4732)
- Export `CustomTimeouts` in the Python SDK
[#4747](https://github.com/pulumi/pulumi/pull/4747)
[#4747](https://github.com/pulumi/pulumi/pull/4747)
- Add GitHub Actions CI detection
[#4758](https://github.com/pulumi/pulumi/pull/4758)
[#4758](https://github.com/pulumi/pulumi/pull/4758)
- Allow users to specify base64 encoded strings as GOOGLE_CREDENTIALS
[#4773](https://github.com/pulumi/pulumi/pull/4773)
[#4773](https://github.com/pulumi/pulumi/pull/4773)
- Install and use dependencies automatically for new Python projects.
[#4775](https://github.com/pulumi/pulumi/pull/4775)
## 2.3.0 (2020-05-27)
- Add F# operators for InputUnion.
[#4699](https://github.com/pulumi/pulumi/pull/4699)
[#4699](https://github.com/pulumi/pulumi/pull/4699)
- Add support for untagged outputs in Go SDK.
[#4640](https://github.com/pulumi/pulumi/pull/4640)
[#4640](https://github.com/pulumi/pulumi/pull/4640)
- Update go-cloud to support all Azure regions
[#4643](https://github.com/pulumi/pulumi/pull/4643)
[#4643](https://github.com/pulumi/pulumi/pull/4643)
- Fix a Regression in .NET unit testing.
[#4656](https://github.com/pulumi/pulumi/pull/4656)
[#4656](https://github.com/pulumi/pulumi/pull/4656)
- Allow `pulumi.export` calls from Python unit tests.
[#4670](https://github.com/pulumi/pulumi/pull/4670)
@ -676,12 +678,12 @@ _(none)_
## 2.2.1 (2020-05-13)
- Add new brew target to fix homebrew builds
[#4633](https://github.com/pulumi/pulumi/pull/4633)
[#4633](https://github.com/pulumi/pulumi/pull/4633)
## 2.2.0 (2020-05-13)
- Fixed ResourceOptions issue with stack references in Python SDK
[#4553](https://github.com/pulumi/pulumi/pull/4553)
[#4553](https://github.com/pulumi/pulumi/pull/4553)
- Add runTask to F# Deployment module
[#3858](https://github.com/pulumi/pulumi/pull/3858)
@ -749,10 +751,10 @@ _(none)_
- CLI behavior change. Commands in non-interactive mode (i.e. when `pulumi` has its output piped to
another process or running on CI) will not default to assuming that `--yes` was passed in. `--yes` is now
explicitly required to proceed in non-interactive scenarios. This affects:
* `pulumi destroy`
* `pulumi new`
* `pulumi refresh`
* `pulumi up`
* `pulumi destroy`
* `pulumi new`
* `pulumi refresh`
* `pulumi up`
- Fixed [crashes and hangs](https://github.com/pulumi/pulumi/issues/3528) introduced by usage of
another library.
@ -1477,7 +1479,7 @@ _(none)_
## 0.17.23 (2019-07-16)
- `pulumi new` allows specifying a local path to templates (resolves
[#2672](https://github.com/pulumi/pulumi/issues/2672))
[#2672](https://github.com/pulumi/pulumi/issues/2672))
- Fix an issue where a file archive created on Windows would contain back-slashes
[#2784](https://github.com/pulumi/pulumi/issues/2784)
@ -1743,7 +1745,7 @@ Fixes #397
### Improvements
- Correctly handle the case where we would fail to detect an archive type if the filename included a dot in it. (fixes [pulumi/pulumi#2589](https://github.com/pulumi/pulumi/issues/2589))
- Make `Config`'s constructor's `name` argument optional in Python, for consistency with our Node.js SDK. If it isn't
supplied, the current project name is used as the default.
supplied, the current project name is used as the default.
- `pulumi logs` will now display log messages from Google Cloud Functions.
## 0.17.4 (2019-03-26)
@ -1800,7 +1802,7 @@ are compatible. i.e. keep everything on 0.16.x until you are ready to move ever
### Improvements
- `Output<T>` now 'lifts' property members from the value it wraps, simplifying common coding patterns.
For example:
For example:
```ts
interface Widget { text: string, x: number, y: number };
@ -1856,7 +1858,7 @@ Similarly, this only happens for properties. Functions are not lifted.
### Improvements
- Rolling back the change:
"Depending on a Resource will now depend on all other Resource's parented by that Resource."
"Depending on a Resource will now depend on all other Resource's parented by that Resource."
Unforeseen problems cropped up that caused deadlocks. Removing this change until we can
have a high quality solution without these issues.
@ -2089,7 +2091,7 @@ We appologize for the regression. (fixes [pulumi/pulumi#2414](https://github.co
### Improvements
- A new top-level CLI command “pulumi state” was added to assist in making targeted edits to the state of a stack. Two subcommands, “pulumi state delete” and “pulumi state unprotect”, can be used to delete or unprotect individual resources respectively within a Pulumi stack. [pulumi/pulumi#2024](https://github.com/pulumi/pulumi/pull/2024)
- A new top-level CLI command “pulumi state” was added to assist in making targeted edits to the state of a stack. Two subcommands, “pulumi state delete” and “pulumi state unprotect”, can be used to delete or unprotect individual resources respectively within a Pulumi stack. [pulumi/pulumi#2024](https://github.com/pulumi/pulumi/pull/2024)
- Default to allowing as many parallel operations as possible [pulumi/pulumi#2065](https://github.com/pulumi/pulumi/pull/2065)
- Fixed an issue with the generated type for an Unwrap expression when using TypeScript [pulumi/pulumi#2061](https://github.com/pulumi/pulumi/pull/2061)
- Improve error messages when resource plugins can't be loaded or when a checkpoint is invalid [pulumi/pulumi#2078](https://github.com/pulumi/pulumi/pull/2078)
@ -2437,12 +2439,12 @@ GitHub application and configure it with your CI system, please [visit our docum
### Added
- Added the ability to import or export a stack's deployment in the Pulumi CLI. This command can be used for either local or managed stacks. There are two new verbs under the command `stack`:
- `export` writes the current stack's latest deployment to stdout in JSON format.
- `import` reads a new JSON deployment from stdin and applies it to the current stack.
- `export` writes the current stack's latest deployment to stdout in JSON format.
- `import` reads a new JSON deployment from stdin and applies it to the current stack.
- A basic progress spinner is displayed during deployment operations.
- When the Pulumi CLI is run in interactive mode, it displays an animated ASCII spinner
- When run in non-interactive mode, CLI prints a message that it is still working. For CI systems that kill jobs when there is no CLI output (such as TravisCI), this eliminates the need to create shell scripts that periodically print output.
- When the Pulumi CLI is run in interactive mode, it displays an animated ASCII spinner
- When run in non-interactive mode, CLI prints a message that it is still working. For CI systems that kill jobs when there is no CLI output (such as TravisCI), this eliminates the need to create shell scripts that periodically print output.
### Changed
@ -2494,9 +2496,9 @@ Resource naming is now more consistent, but there is a new file format for check
#### Logging
- [**experimental**] Support for the `pulumi logs` command ([pulumi #527](https://github.com/pulumi/pulumi/issues/527)). These features now work:
- To see new logs as they arrive, use `--follow`
- Use `--since` to limit to recent logs, such as `pulumi logs --since=1h`
- Filter to specific resources with `--resource`. This filters to a particular component and its child resources (if any), such as `pulumi logs --resource examples-todoc57917fa --since 1h`
- To see new logs as they arrive, use `--follow`
- Use `--since` to limit to recent logs, such as `pulumi logs --since=1h`
- Filter to specific resources with `--resource`. This filters to a particular component and its child resources (if any), such as `pulumi logs --resource examples-todoc57917fa --since 1h`
#### Other features

2
pkg/backend/backend.go
View file

@ -189,6 +189,8 @@ type Backend interface {
ImportDeployment(ctx context.Context, stack Stack, deployment *apitype.UntypedDeployment) error
// Logout logs you out of the backend and removes any stored credentials.
Logout() error
// LogoutAll logs you out of all the backend and removes any stored credentials.
LogoutAll() error
// Returns the identity of the current user for the backend.
CurrentUser() (string, error)
}

4
pkg/backend/filestate/backend.go
View file

@ -718,6 +718,10 @@ func (b *localBackend) Logout() error {
return workspace.DeleteAccount(b.originalURL)
}
func (b *localBackend) LogoutAll() error {
return workspace.DeleteAllAccounts()
}
func (b *localBackend) CurrentUser() (string, error) {
user, err := user.Current()
if err != nil {

5
pkg/backend/httpstate/backend.go
View file

@ -647,6 +647,11 @@ func (b *cloudBackend) Logout() error {
return workspace.DeleteAccount(b.CloudURL())
}
// LogoutAll logs out of all accounts
func (b *cloudBackend) LogoutAll() error {
return workspace.DeleteAllAccounts()
}
// DoesProjectExist returns true if a project with the given name exists in this backend, or false otherwise.
func (b *cloudBackend) DoesProjectExist(ctx context.Context, projectName string) (bool, error) {
owner, err := b.currentUser(ctx)

8
pkg/backend/mock.go
View file

@ -53,6 +53,7 @@ type MockBackend struct {
ExportDeploymentF func(context.Context, Stack) (*apitype.UntypedDeployment, error)
ImportDeploymentF func(context.Context, Stack, *apitype.UntypedDeployment) error
LogoutF func() error
LogoutAllF func() error
CurrentUserF func() (string, error)
PreviewF func(context.Context, Stack,
UpdateOperation) (engine.ResourceChanges, result.Result)
@ -304,6 +305,13 @@ func (be *MockBackend) Logout() error {
panic("not implemented")
}
func (be *MockBackend) LogoutAll() error {
if be.LogoutAllF != nil {
return be.LogoutAllF()
}
panic("not implemented")
}
func (be *MockBackend) CurrentUser() (string, error) {
if be.CurrentUserF != nil {
return be.CurrentUserF()

21
pkg/cmd/pulumi/logout.go
View file

@ -28,6 +28,7 @@ import (
func newLogoutCmd() *cobra.Command {
var cloudURL string
var localMode bool
var all bool
cmd := &cobra.Command{
Use: "logout <url>",
@ -38,13 +39,16 @@ func newLogoutCmd() *cobra.Command {
"\n" +
"Because you may be logged into multiple backends simultaneously, you can optionally pass\n" +
"a specific URL argument, formatted just as you logged in, to log out of a specific one.\n" +
"If no URL is provided, you will be logged out of the current backend.",
"If no URL is provided, you will be logged out of the current backend." +
"\n\n" +
"If you would like to log out of all backends simultaneously, you can pass `--all`,\n" +
" $ pulumi logout --all",
Args: cmdutil.MaximumNArgs(1),
Run: cmdutil.RunFunc(func(cmd *cobra.Command, args []string) error {
// If a <cloud> was specified as an argument, use it.
if len(args) > 0 {
if cloudURL != "" {
return errors.New("only one of --cloud-url or argument URL may be specified, not both")
if cloudURL != "" || all {
return errors.New("only one of --all, --cloud-url or argument URL may be specified, not both")
}
cloudURL = args[0]
}
@ -75,10 +79,19 @@ func newLogoutCmd() *cobra.Command {
if err != nil {
return err
}
return be.Logout()
var logoutErr error
if all {
logoutErr = be.LogoutAll()
} else {
logoutErr = be.Logout()
}
return logoutErr
}),
}
cmd.PersistentFlags().BoolVar(&all, "all", false,
"Logout of all backends")
cmd.PersistentFlags().StringVarP(&cloudURL, "cloud-url", "c", "",
"A cloud URL to log out of (defaults to current cloud)")
cmd.PersistentFlags().BoolVarP(&localMode, "local", "l", false,

9
sdk/go/common/workspace/creds.go
View file

@ -75,6 +75,15 @@ func DeleteAccount(key string) error {
return StoreCredentials(creds)
}
func DeleteAllAccounts() error {
credsFile, err := getCredsFilePath()
if err != nil {
return err
}
return os.Remove(credsFile)
}
// StoreAccount saves the given account underneath the given key.
func StoreAccount(key string, account Account, current bool) error {
creds, err := GetStoredCredentials()