-
Notifications
You must be signed in to change notification settings - Fork 8
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.
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
Credential contents api call #1249
Merged
ale8k
merged 2 commits into
canonical:v3-slim-jimm
from
ale8k:credential-contents-api-call
Jul 12, 2024
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -309,3 +309,27 @@ func (c Connection) UpdateCloud(ctx context.Context, tag names.CloudTag, cloud j | |
} | ||
return nil | ||
} | ||
|
||
// CredentialContents returns the specified cloud credentials, | ||
// including the secrets if requested. | ||
// If no specific credential name/cloud was passed in, all credentials for this user | ||
// are returned. | ||
// Only credential owner can see its contents as well as what models use it. | ||
// Controller admin has no special superpowers here and is treated the same as all other users. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Wouldn't a controller admin be able to see all cloud creds on the controller? |
||
func (c Connection) CredentialContents(ctx context.Context, args jujuparams.CloudCredentialArgs) (jujuparams.CredentialContentResults, error) { | ||
const op = errors.Op("jujuclient.CredentialContents") | ||
|
||
resp := jujuparams.CredentialContentResults{ | ||
Results: []jujuparams.CredentialContentResult{}, | ||
} | ||
|
||
err := c.Call(ctx, "Cloud", 7, "", "CredentialContents", &args, &resp) | ||
if err != nil { | ||
return resp, errors.E(op, jujuerrors.Cause(err)) | ||
} | ||
if resp.Results[0].Error != nil { | ||
return resp, errors.E(op, resp.Results[0].Error) | ||
} | ||
return resp, nil | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -464,3 +464,11 @@ func (s *cloudSuite) TestUpdateCloud(c *gc.C) { | |
c.Assert(err, gc.Equals, nil) | ||
c.Check(cloud2, jc.DeepEquals, cloud) | ||
} | ||
|
||
func (s *cloudSuite) TestCredentialContents(c *gc.C) { | ||
ctx := context.Background() | ||
args := jujuparams.CloudCredentialArgs{} | ||
res, err := s.API.CredentialContents(ctx, args) | ||
c.Assert(err, gc.Equals, nil) | ||
c.Assert(res.Results, gc.HasLen, 1) | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can you please add a test that looks up for a specific cloud credential? |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we keep this comment in one place or duplicate it?