Skip to content

Commit 9480f8e

Browse files
normana10normana10
committed
Ran prettier, updated goldenfiles and ran "make gen"
1 parent fc12496 commit 9480f8e

File tree

9 files changed

+214
-37
lines changed

9 files changed

+214
-37
lines changed

‎cli/testdata/coder_server_--help.golden

+3-3
Original file line numberDiff line numberDiff line change
@@ -128,12 +128,12 @@ Flags:
128128
OIDC.
129129
Consumes $CODER_OIDC_SCOPES (default
130130
[openid,profile,email])
131-
--oidc-username-field string OIDC claim field to use as the username.
132-
Consumes $CODER_OIDC_USERNAME_FIELD
133-
(default "preferred_username")
134131
--oidc-sign-in-text string The text to show on the OpenID Connect
135132
sign in button
136133
Consumes $CODER_OIDC_SIGN_IN_TEXT
134+
--oidc-username-field string OIDC claim field to use as the username.
135+
Consumes $CODER_OIDC_USERNAME_FIELD
136+
(default "preferred_username")
137137
--postgres-url string URL of a PostgreSQL database. If empty,
138138
PostgreSQL binaries will be downloaded
139139
from Maven

‎coderd/apidoc/docs.go

+31-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/apidoc/swagger.json

+31-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/api/general.md

+22
Original file line numberDiff line numberDiff line change
@@ -518,6 +518,17 @@ curl -X GET http://coder-server:8080/api/v2/config/deployment \
518518
"usage": "string",
519519
"value": ["string"]
520520
},
521+
"icon_url": {
522+
"default": "string",
523+
"enterprise": true,
524+
"flag": "string",
525+
"hidden": true,
526+
"name": "string",
527+
"secret": true,
528+
"shorthand": "string",
529+
"usage": "string",
530+
"value": "string"
531+
},
521532
"ignore_email_verified": {
522533
"default": true,
523534
"enterprise": true,
@@ -551,6 +562,17 @@ curl -X GET http://coder-server:8080/api/v2/config/deployment \
551562
"usage": "string",
552563
"value": ["string"]
553564
},
565+
"sign_in_text": {
566+
"default": "string",
567+
"enterprise": true,
568+
"flag": "string",
569+
"hidden": true,
570+
"name": "string",
571+
"secret": true,
572+
"shorthand": "string",
573+
"usage": "string",
574+
"value": "string"
575+
},
554576
"username_field": {
555577
"default": "string",
556578
"enterprise": true,

‎docs/api/schemas.md

+94-8
Original file line numberDiff line numberDiff line change
@@ -441,23 +441,45 @@
441441
| `audit_logs` | array of [codersdk.AuditLog](#codersdkauditlog) | false | | |
442442
| `count` | integer | false | | |
443443

444+
## codersdk.AuthMethod
445+
446+
```json
447+
{
448+
"enabled": true
449+
}
450+
```
451+
452+
### Properties
453+
454+
| Name | Type | Required | Restrictions | Description |
455+
| --------- | ------- | -------- | ------------ | ----------- |
456+
| `enabled` | boolean | false | | |
457+
444458
## codersdk.AuthMethods
445459

446460
```json
447461
{
448-
"github": true,
449-
"oidc": true,
450-
"password": true
462+
"github": {
463+
"enabled": true
464+
},
465+
"oidc": {
466+
"enabled": true,
467+
"iconUrl": "string",
468+
"signInText": "string"
469+
},
470+
"password": {
471+
"enabled": true
472+
}
451473
}
452474
```
453475

454476
### Properties
455477

456-
| Name | Type | Required | Restrictions | Description |
457-
| ---------- | ------- | -------- | ------------ | ----------- |
458-
| `github` | boolean | false | | |
459-
| `oidc` | boolean | false | | |
460-
| `password` | boolean | false | | |
478+
| Name | Type | Required | Restrictions | Description |
479+
| ---------- | ------------------------------------------ | -------- | ------------ | ----------- |
480+
| `github` | [codersdk.AuthMethod](#codersdkauthmethod) | false | | |
481+
| `oidc` | [codersdk.OIDCMethod](#codersdkoidcmethod) | false | | |
482+
| `password` | [codersdk.AuthMethod](#codersdkauthmethod) | false | | |
461483

462484
## codersdk.AuthorizationCheck
463485

@@ -1591,6 +1613,17 @@ CreateParameterRequest is a structure used to create a new parameter value for a
15911613
"usage": "string",
15921614
"value": ["string"]
15931615
},
1616+
"icon_url": {
1617+
"default": "string",
1618+
"enterprise": true,
1619+
"flag": "string",
1620+
"hidden": true,
1621+
"name": "string",
1622+
"secret": true,
1623+
"shorthand": "string",
1624+
"usage": "string",
1625+
"value": "string"
1626+
},
15941627
"ignore_email_verified": {
15951628
"default": true,
15961629
"enterprise": true,
@@ -1624,6 +1657,17 @@ CreateParameterRequest is a structure used to create a new parameter value for a
16241657
"usage": "string",
16251658
"value": ["string"]
16261659
},
1660+
"sign_in_text": {
1661+
"default": "string",
1662+
"enterprise": true,
1663+
"flag": "string",
1664+
"hidden": true,
1665+
"name": "string",
1666+
"secret": true,
1667+
"shorthand": "string",
1668+
"usage": "string",
1669+
"value": "string"
1670+
},
16271671
"username_field": {
16281672
"default": "string",
16291673
"enterprise": true,
@@ -2977,6 +3021,17 @@ CreateParameterRequest is a structure used to create a new parameter value for a
29773021
"usage": "string",
29783022
"value": ["string"]
29793023
},
3024+
"icon_url": {
3025+
"default": "string",
3026+
"enterprise": true,
3027+
"flag": "string",
3028+
"hidden": true,
3029+
"name": "string",
3030+
"secret": true,
3031+
"shorthand": "string",
3032+
"usage": "string",
3033+
"value": "string"
3034+
},
29803035
"ignore_email_verified": {
29813036
"default": true,
29823037
"enterprise": true,
@@ -3010,6 +3065,17 @@ CreateParameterRequest is a structure used to create a new parameter value for a
30103065
"usage": "string",
30113066
"value": ["string"]
30123067
},
3068+
"sign_in_text": {
3069+
"default": "string",
3070+
"enterprise": true,
3071+
"flag": "string",
3072+
"hidden": true,
3073+
"name": "string",
3074+
"secret": true,
3075+
"shorthand": "string",
3076+
"usage": "string",
3077+
"value": "string"
3078+
},
30133079
"username_field": {
30143080
"default": "string",
30153081
"enterprise": true,
@@ -3032,11 +3098,31 @@ CreateParameterRequest is a structure used to create a new parameter value for a
30323098
| `client_id` | [codersdk.DeploymentConfigField-string](#codersdkdeploymentconfigfield-string) | false | | |
30333099
| `client_secret` | [codersdk.DeploymentConfigField-string](#codersdkdeploymentconfigfield-string) | false | | |
30343100
| `email_domain` | [codersdk.DeploymentConfigField-array_string](#codersdkdeploymentconfigfield-array_string) | false | | |
3101+
| `icon_url` | [codersdk.DeploymentConfigField-string](#codersdkdeploymentconfigfield-string) | false | | |
30353102
| `ignore_email_verified` | [codersdk.DeploymentConfigField-bool](#codersdkdeploymentconfigfield-bool) | false | | |
30363103
| `issuer_url` | [codersdk.DeploymentConfigField-string](#codersdkdeploymentconfigfield-string) | false | | |
30373104
| `scopes` | [codersdk.DeploymentConfigField-array_string](#codersdkdeploymentconfigfield-array_string) | false | | |
3105+
| `sign_in_text` | [codersdk.DeploymentConfigField-string](#codersdkdeploymentconfigfield-string) | false | | |
30383106
| `username_field` | [codersdk.DeploymentConfigField-string](#codersdkdeploymentconfigfield-string) | false | | |
30393107

3108+
## codersdk.OIDCMethod
3109+
3110+
```json
3111+
{
3112+
"enabled": true,
3113+
"iconUrl": "string",
3114+
"signInText": "string"
3115+
}
3116+
```
3117+
3118+
### Properties
3119+
3120+
| Name | Type | Required | Restrictions | Description |
3121+
| ------------ | ------- | -------- | ------------ | ----------- |
3122+
| `enabled` | boolean | false | | |
3123+
| `iconUrl` | string | false | | |
3124+
| `signInText` | string | false | | |
3125+
30403126
## codersdk.Organization
30413127

30423128
```json

‎docs/api/users.md

+11-3
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,17 @@ curl -X GET http://coder-server:8080/api/v2/users/authmethods \
141141
142142
```json
143143
{
144-
"github": true,
145-
"oidc": true,
146-
"password": true
144+
"github": {
145+
"enabled": true
146+
},
147+
"oidc": {
148+
"enabled": true,
149+
"iconUrl": "string",
150+
"signInText": "string"
151+
},
152+
"password": {
153+
"enabled": true
154+
}
147155
}
148156
```
149157

0 commit comments

Comments
 (0)