chore: implement yaml parsing for external auth configs #11268
Merged
Conversation
This file contains hidden or 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
johnstcn
reviewed
Dec 19, 2023
Comment on lines
+295
to
+313
| githubCfg := codersdk.ExternalAuthConfig{ | ||
| Type: "github", | ||
| ClientID: "client_id", | ||
| ClientSecret: "client_secret", | ||
| ID: "id", | ||
| AuthURL: "https://example.com/auth", | ||
| TokenURL: "https://example.com/token", | ||
| ValidateURL: "https://example.com/validate", | ||
| AppInstallURL: "https://example.com/install", | ||
| AppInstallationsURL: "https://example.com/installations", | ||
| NoRefresh: true, | ||
| Scopes: []string{"user:email", "read:org"}, | ||
| ExtraTokenKeys: []string{"extra", "token"}, | ||
| DeviceFlow: true, | ||
| DeviceCodeURL: "https://example.com/device", | ||
| Regex: "^https://example.com/.*$", | ||
| DisplayName: "GitHub", | ||
| DisplayIcon: "/static/icons/github.svg", | ||
| } |
There was a problem hiding this comment.
Instead of hard-coding this and having to keep it in sync with the golden file, how about marshalling and unmarshalling the config to/from YAML and asserting that the two are the same byte-for-byte?
There was a problem hiding this comment.
I can do both, but I should still have the golden file imo. The actual struct is clibase.Struct[[]ExternalAuthConfig]. So it might unmarshal/marshal, but the nested key structure could be messed up. We want to make sure the actual Go slice type is at the right yaml level (top level) imo.
johnstcn
approved these changes
Dec 19, 2023
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
What this does
Allows user to configure external auths from a yaml file.