10000 docs: API templateversions, templates, members, organizations by mtojek · Pull Request #5546 · coder/coder · GitHub
[go: up one dir, main page]
Skip to content

docs: API templateversions, templates, members, organizations #5546

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

Merged
merged 26 commits into from
Jan 11, 2023
Merged

docs: API templateversions, templates, members, organizations #5546

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
a3fbe72
docs: audit, deploymentconfig, files, parameters
mtojek Dec 22, 2022
fbe1d70
Swagger comments in workspacebuilds.go
mtojek Jan 2, 2023
96daf47
structs in workspacebuilds.go
mtojek Jan 2, 2023
663ec87
workspaceagents: instance identity
mtojek Jan 2, 2023
fc00d7e
workspaceagents.go in progress
mtojek Jan 2, 2023
67a85b9
workspaceagents.go in progress
mtojek Jan 2, 2023
ce8c7ea
Agents
mtojek Jan 2, 2023
d2a9af5
workspacebuilds.go
mtojek Jan 2, 2023
f37c6b3
/workspaces
mtojek Jan 3, 2023
250982a
templates.go, templateversions.go
mtojek Jan 3, 2023
ff622a7
templateversion.go in progress
mtojek Jan 3, 2023
9dd385c
cancel
mtojek Jan 3, 2023
f96351a
templateversions
mtojek Jan 3, 2023
15de3b6
wip
mtojek Jan 3, 2023
596cdbd
Merge branch 'main' into 3522-workspacebuilds-1
mtojek Jan 3, 2023
eb4ba48
Merge
mtojek Jan 3, 2023
e314c24
x-apidocgen
mtojek Jan 4, 2023
97cd7ac
NullTime hack not needed anymore
mtojek Jan 4, 2023
ae06598
Fix: x-apidocgen
mtojek Jan 4, 2023
c82eb01
Merge branch '3522-workspacebuilds-1' into 3522-templates-1
mtojek Jan 4, 2023
77815d3
Merge branch '3522-templates-1' into 3522-organizations-1
mtojek Jan 4, 2023
7aa0f65
Members
mtojek Jan 4, 2023
b93398e
Fixes
mtojek Jan 4, 2023
5c96bd5
Fix
mtojek Jan 4, 2023
0cd9c4a
Merge branch 'main' into 3522-templates-1
mtojek Jan 5, 2023
afcd7c2
Merge branch 'main' into 3522-templates-1
mtojek Jan 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' into 3522-workspacebuilds-1
  • Loading branch information
@mtojek
mtojek committed Jan 3, 2023
commit 596cdbdc599c01d4efc1ed824b1e536c97d84851
47 changes: 47 additions & 0 deletions coderd/apidoc/docs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,11 @@ const docTemplate = `{
"CoderSessionToken": []
}
],
<<<<<<< HEAD
"description": "Notice: Swagger 2.0 doesn't support file upload with a ` + "`" + `content-type` + "`" + ` different than ` + "`" + `application/x-www-form-urlencoded` + "`" + `.",
=======
"description": "Swagger notice: Swagger 2.0 doesn't support file upload with a ` + "`" + `content-type` + "`" + ` different than ` + "`" + `application/x-www-form-urlencoded` + "`" + `.",
>>>>>>> main
"consumes": [
"application/x-tar"
],
Expand Down Expand Up @@ -1848,6 +1852,7 @@ const docTemplate = `{
}
}
},
<<<<<<< HEAD
"codersdk.AWSInstanceIdentityToken": {
"type": "object",
"required": [
Expand Down Expand Up @@ -1915,6 +1920,8 @@ const docTemplate = `{
}
}
},
=======
>>>>>>> main
"codersdk.AuditDiff": {
"type": "object",
"additionalProperties": {
Expand Down Expand Up @@ -2210,6 +2217,7 @@ const docTemplate = `{
}
}
},
<<<<<<< HEAD
"codersdk.CreateWorkspaceBuildRequest": {
"type": "object",
"required": [
Expand Down Expand Up @@ -2250,6 +2258,8 @@ const docTemplate = `{
}
}
},
=======
>>>>>>> main
"codersdk.DERP": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -2656,6 +2666,7 @@ const docTemplate = `{
}
}
},
<<<<<<< HEAD
"codersdk.GoogleInstanceIdentityToken": {
"type": "object",
"required": [
Expand All @@ -2667,6 +2678,8 @@ const docTemplate = `{
}
}
},
=======
>>>>>>> main
"codersdk.Healthcheck": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -2749,6 +2762,7 @@ const docTemplate = `{
"type": "object",
"properties": {
"created_at": {
<<<<<<< HEAD
"type": "string"
},
"destination_scheme": {
Expand All @@ -2766,6 +2780,26 @@ const docTemplate = `{
"name": {
"type": "string"
},
=======
"type": "string",
"format": "date-time"
},
"destination_scheme": {
"type": "string",
"enum": [
"none",
"environment_variable",
"provisioner_variable"
]
},
"id": {
"type": "string",
"format": "uuid"
},
"name": {
"type": "string"
},
>>>>>>> main
"scope": {
"type": "string",
"enum": [
Expand All @@ -2786,6 +2820,7 @@ const docTemplate = `{
]
},
"updated_at": {
<<<<<<< HEAD
"type": "string"
}
}
Expand All @@ -2807,6 +2842,10 @@ const docTemplate = `{
"additionalProperties": {
"type": "string"
}
=======
"type": "string",
"format": "date-time"
>>>>>>> main
}
}
},
Expand Down Expand Up @@ -3172,7 +3211,12 @@ const docTemplate = `{
"type": "object",
"properties": {
"hash": {
<<<<<<< HEAD
"type": "string"
=======
"type": "string",
"format": "uuid"
>>>>>>> main
}
}
},
Expand Down Expand Up @@ -3668,6 +3712,7 @@ const docTemplate = `{
},
"netip.Addr": {
"type": "object"
<<<<<<< HEAD
},
"tailcfg.DERPMap": {
"type": "object",
Expand Down Expand Up @@ -3769,6 +3814,8 @@ const docTemplate = `{
"type": "string"
}
}
=======
>>>>>>> main
}
},
"securityDefinitions": {
Expand Down
43 changes: 43 additions & 0 deletions coderd/apidoc/swagger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,11 @@
"CoderSessionToken": []
}
],
<<<<<<< HEAD
"description": "Notice: Swagger 2.0 doesn't support file upload with a `content-type` different than `application/x-www-form-urlencoded`.",
=======
"description": "Swagger notice: Swagger 2.0 doesn't support file upload with a `content-type` different than `application/x-www-form-urlencoded`.",
>>>>>>> main
"consumes": ["application/x-tar"],
"produces": ["application/json"],
"tags": ["Files"],
Expand Down Expand Up @@ -1615,6 +1619,7 @@
}
}
},
<<<<<<< HEAD
"codersdk.AWSInstanceIdentityToken": {
"type": "object",
"required": ["document", "signature"],
Expand Down Expand Up @@ -1679,6 +1684,8 @@
}
}
},
=======
>>>>>>> main
"codersdk.AuditDiff": {
"type": "object",
"additionalProperties": {
Expand Down Expand Up @@ -1950,6 +1957,7 @@
}
}
},
<<<<<<< HEAD
"codersdk.CreateWorkspaceBuildRequest": {
"type": "object",
"required": ["transition"],
Expand Down Expand Up @@ -1983,6 +1991,8 @@
}
}
},
=======
>>>>>>> main
"codersdk.DERP": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -2389,6 +2399,7 @@
}
}
},
<<<<<<< HEAD
"codersdk.GoogleInstanceIdentityToken": {
"type": "object",
"required": ["json_web_token"],
Expand All @@ -2398,6 +2409,8 @@
}
}
},
=======
>>>>>>> main
"codersdk.Healthcheck": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -2480,6 +2493,7 @@
"type": "object",
"properties": {
"created_at": {
<<<<<<< HEAD
"type": "string"
},
"destination_scheme": {
Expand All @@ -2493,6 +2507,22 @@
"name": {
"type": "string"
},
=======
"type": "string",
"format": "date-time"
},
"destination_scheme": {
"type": "string",
"enum": ["none", "environment_variable", "provisioner_variable"]
},
"id": {
"type": "string",
"format": "uuid"
},
"name": {
"type": "string"
},
>>>>>>> main
"scope": {
"type": "string",
"enum": ["template", "workspace", "import_job"]
Expand All @@ -2506,6 +2536,7 @@
"enum": ["none", "data"]
},
"updated_at": {
<<<<<<< HEAD
"type": "string"
}
}
Expand All @@ -2527,6 +2558,10 @@
"additionalProperties": {
"type": "string"
}
=======
"type": "string",
"format": "date-time"
>>>>>>> main
}
}
},
Expand Down Expand Up @@ -2884,7 +2919,12 @@
"type": "object",
"properties": {
"hash": {
<<<<<<< HEAD
"type": "string"
=======
"type": "string",
"format": "uuid"
>>>>>>> main
}
}
},
Expand Down Expand Up @@ -3351,6 +3391,7 @@
},
"netip.Addr": {
"type": "object"
<<<<<<< HEAD
},
"tailcfg.DERPMap": {
"type": "object",
Expand Down Expand Up @@ -3452,6 +3493,8 @@
"type": "string"
}
}
=======
>>>>>>> main
}
},
"securityDefinitions": {
Expand Down
2 changes: 1 addition & 1 deletion coderd/files.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const (
)

// @Summary Upload file
// @Description Notice: Swagger 2.0 doesn't support file upload with a `content-type` different than `application/x-www-form-urlencoded`.
// @Description Swagger notice: Swagger 2.0 doesn't support file upload with a `content-type` different than `application/x-www-form-urlencoded`.
// @ID update-file
// @Security CoderSessionToken
// @Produce json
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.
0