Tweak how GetControllerCredentials works #1025
Merged
Conversation
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
ale8k
reviewed
Aug 22, 2023
internal/db/secrets.go
Outdated
| @@ -130,6 +130,10 @@ func (d *Database) GetControllerCredentials(ctx context.Context, controllerName | |||
| const op = errors.Op("database.GetControllerCredentials") | |||
| secret := dbmodel.NewSecret(names.ControllerTagKind, controllerName, nil) | |||
| err := d.GetSecret(ctx, &secret) | |||
| // It is expected for this interface that a non-existent controller credential return empty username/password. | |||
There was a problem hiding this comment.
I think perhaps put this in the godoc too as it's an interesting behaviour
ale8k
reviewed
Aug 22, 2023
internal/db/secrets_test.go
Outdated
| c.Assert(err, qt.Equals, nil) | ||
| ctx := context.Background() | ||
| controllerName := "beef1beef2-0000-0000-000011112222" | ||
| // Get ControllerCred |
There was a problem hiding this comment.
The comment? No I'll remove it
ale8k
approved these changes
Aug 22, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
The GetControllerCredentials implementation in Vault will not return an error when controller credentials are not found, this updates the Postgres secret store to match Vault. If it doesn't work like that then one is unable to add a controller to JIMM.
Engineering checklist
Check only items that apply