Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
  • Loading branch information
mtojek committed Jan 3, 2023
commit eb4ba489511026f1502a023299dc0ea1563bffa2
48 changes: 2 additions & 46 deletions coderd/apidoc/docs.go
Original file line number Diff line number Diff line change
Expand Up @@ -310,11 +310,7 @@ 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 @@ -1852,7 +1848,6 @@ const docTemplate = `{
}
}
},
<<<<<<< HEAD
"codersdk.AWSInstanceIdentityToken": {
"type": "object",
"required": [
Expand Down Expand Up @@ -1920,8 +1915,6 @@ const docTemplate = `{
}
}
},
=======
>>>>>>> main
"codersdk.AuditDiff": {
"type": "object",
"additionalProperties": {
Expand Down Expand Up @@ -2217,7 +2210,6 @@ const docTemplate = `{
}
}
},
<<<<<<< HEAD
"codersdk.CreateWorkspaceBuildRequest": {
"type": "object",
"required": [
Expand Down Expand Up @@ -2258,8 +2250,6 @@ const docTemplate = `{
}
}
},
=======
>>>>>>> main
"codersdk.DERP": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -2666,7 +2656,6 @@ const docTemplate = `{
}
}
},
<<<<<<< HEAD
"codersdk.GoogleInstanceIdentityToken": {
"type": "object",
"required": [
Expand All @@ -2678,8 +2667,6 @@ const docTemplate = `{
}
}
},
=======
>>>>>>> main
"codersdk.Healthcheck": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -2762,25 +2749,6 @@ const docTemplate = `{
"type": "object",
"properties": {
"created_at": {
<<<<<<< HEAD
"type": "string"
},
"destination_scheme": {
"type": "string",
"enum": [
"none",
"environment_variable",
"provisioner_variable"
]
},
"id": {
"type": "string",
"format": "uuid"
},
"name": {
"type": "string"
},
=======
"type": "string",
"format": "date-time"
},
Expand All @@ -2799,7 +2767,6 @@ const docTemplate = `{
"name": {
"type": "string"
},
>>>>>>> main
"scope": {
"type": "string",
"enum": [
Expand All @@ -2820,8 +2787,8 @@ const docTemplate = `{
]
},
"updated_at": {
<<<<<<< HEAD
"type": "string"
"type": "string",
"format": "date-time"
}
}
},
Expand All @@ -2842,10 +2809,6 @@ const docTemplate = `{
"additionalProperties": {
"type": "string"
}
=======
"type": "string",
"format": "date-time"
>>>>>>> main
}
}
},
Expand Down Expand Up @@ -3211,12 +3174,8 @@ const docTemplate = `{
"type": "object",
"properties": {
"hash": {
<<<<<<< HEAD
"type": "string"
=======
"type": "string",
"format": "uuid"
>>>>>>> main
}
}
},
Expand Down Expand Up @@ -3712,7 +3671,6 @@ const docTemplate = `{
},
"netip.Addr": {
"type": "object"
<<<<<<< HEAD
},
"tailcfg.DERPMap": {
"type": "object",
Expand Down Expand Up @@ -3814,8 +3772,6 @@ const docTemplate = `{
"type": "string"
}
}
=======
>>>>>>> main
}
},
"securityDefinitions": {
Expand Down
44 changes: 2 additions & 42 deletions coderd/apidoc/swagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -264,11 +264,7 @@
"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 @@ -1619,7 +1615,6 @@
}
}
},
<<<<<<< HEAD
"codersdk.AWSInstanceIdentityToken": {
"type": "object",
"required": ["document", "signature"],
Expand Down Expand Up @@ -1684,8 +1679,6 @@
}
}
},
=======
>>>>>>> main
"codersdk.AuditDiff": {
"type": "object",
"additionalProperties": {
Expand Down Expand Up @@ -1957,7 +1950,6 @@
}
}
},
<<<<<<< HEAD
"codersdk.CreateWorkspaceBuildRequest": {
"type": "object",
"required": ["transition"],
Expand Down Expand Up @@ -1991,8 +1983,6 @@
}
}
},
=======
>>>>>>> main
"codersdk.DERP": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -2399,7 +2389,6 @@
}
}
},
<<<<<<< HEAD
"codersdk.GoogleInstanceIdentityToken": {
"type": "object",
"required": ["json_web_token"],
Expand All @@ -2409,8 +2398,6 @@
}
}
},
=======
>>>>>>> main
"codersdk.Healthcheck": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -2493,21 +2480,6 @@
"type": "object",
"properties": {
"created_at": {
<<<<<<< HEAD
"type": "string"
},
"destination_scheme": {
"type": "string",
"enum": ["none", "environment_variable", "provisioner_variable"]
},
"id": {
"type": "string",
"format": "uuid"
},
"name": {
"type": "string"
},
=======
"type": "string",
"format": "date-time"
},
Expand All @@ -2522,7 +2494,6 @@
"name": {
"type": "string"
},
>>>>>>> main
"scope": {
"type": "string",
"enum": ["template", "workspace", "import_job"]
Expand All @@ -2536,8 +2507,8 @@
"enum": ["none", "data"]
},
"updated_at": {
<<<<<<< HEAD
"type": "string"
"type": "string",
"format": "date-time"
}
}
},
Expand All @@ -2558,10 +2529,6 @@
"additionalProperties": {
"type": "string"
}
=======
"type": "string",
"format": "date-time"
>>>>>>> main
}
}
},
Expand Down Expand Up @@ -2919,12 +2886,8 @@
"type": "object",
"properties": {
"hash": {
<<<<<<< HEAD
"type": "string"
=======
"type": "string",
"format": "uuid"
>>>>>>> main
}
}
},
Expand Down Expand Up @@ -3391,7 +3354,6 @@
},
"netip.Addr": {
"type": "object"
<<<<<<< HEAD
},
"tailcfg.DERPMap": {
"type": "object",
Expand Down Expand Up @@ -3493,8 +3455,6 @@
"type": "string"
}
}
=======
>>>>>>> main
}
},
"securityDefinitions": {
Expand Down
Loading