Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[JUJU-736] Fix embedded deploy CLI for external users #13827

Merged
merged 1 commit into from
Mar 11, 2022
Merged

[JUJU-736] Fix embedded deploy CLI for external users #13827

merged 1 commit into from
Mar 11, 2022

Conversation

wallyworld
Copy link
Member

When using the dashboard CLI widget, the deploy command was failing. The deploy command creates a couple of facades, and calls NewAPIRoot() more than once. Each call does a login and then updates the account details. Because the embedded CLI uses an in memory store for these details, the info was being overwritten and the macaroon was cleared.

This fix does 2 things:

  • refactor deploy to only get the api root once
  • make the mem store robust to account updates in case it happens again

QA steps

juju bootstrap aws/ap-southeast-2 ian --config identity-url=https://api.jujucharms.com/identity --config identity-public-key=hmHaPgCC1UfuhYHUSX5+aihSAZesqpVdjRv0mgfIwjo=
juju grant wallyworld@external login
juju grant wallyworld@external write default

then use the dashboard to deploy a charm
also check deploy from the CLI

ycliuhw
ycliuhw approved these changes Mar 11, 2022
View reviewed changes
Copy link
Member

@ycliuhw ycliuhw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, just two suggestions ty

jujuclient/mem.go Show resolved Hide resolved
cmd/juju/application/deploy.go Outdated Show resolved Hide resolved
cmd/juju/application/deploy.go Outdated Show resolved Hide resolved
@wallyworld wallyworld force-pushed the fix-embedded-deploy branch from cb78f8d to 612a3a3 Compare March 11, 2022 06:02
@wallyworld
Copy link
Member Author

$$merge$$

@jujubot jujubot merged commit b9fb403 into juju:2.9 Mar 11, 2022
@alesstimec alesstimec mentioned this pull request Mar 11, 2022
Closed
@wallyworld wallyworld mentioned this pull request Mar 16, 2022
Merged
jujubot added a commit that referenced this pull request Mar 16, 2022
@jujubot
Merge pull request #13840 from wallyworld/merge-2.9-20220315
402ab39 
#13840

Merge 2.9

#13822
#13763
#13810
#13827 
#13830 
#13831 
#13833 
#13835 
#13836 
#13832 
#13838

```
# Conflicts:
# cmd/juju/application/deploy.go
# cmd/juju/application/deployer/interface.go
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ycliuhw ycliuhw ycliuhw approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@wallyworld @ycliuhw @jujubot