Skip to content
This repository was archived by the owner on Jan 8, 2024. It is now read-only.

Commit 6d5a84c

Browse files
authored
Merge pull request #4761 from hashicorp/WAYP-1522
api: fix duplicate gateway.yml paths
2 parents 596cf48 + e09c41e commit 6d5a84c

File tree

3 files changed

+253
-2
lines changed

3 files changed

+253
-2
lines changed

pkg/server/gen/server.pb.gw.go

Lines changed: 166 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/server/gen/server.swagger.json

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,39 @@
314314
]
315315
}
316316
},
317+
"/config-source/delete": {
318+
"put": {
319+
"summary": "Delete the configuration for a dynamic configuration source",
320+
"operationId": "Waypoint_DeleteConfigSource",
321+
"responses": {
322+
"200": {
323+
"description": "A successful response.",
324+
"schema": {
325+
"properties": {}
326+
}
327+
},
328+
"default": {
329+
"description": "An unexpected error response.",
330+
"schema": {
331+
"$ref": "#/definitions/grpc.gateway.runtime.Error"
332+
}
333+
}
334+
},
335+
"parameters": [
336+
{
337+
"name": "body",
338+
"in": "body",
339+
"required": true,
340+
"schema": {
341+
"$ref": "#/definitions/hashicorp.waypoint.DeleteConfigSourceRequest"
342+
}
343+
}
344+
],
345+
"tags": [
346+
"Waypoint"
347+
]
348+
}
349+
},
317350
"/deployment/{deployment.id}/status-report": {
318351
"put": {
319352
"summary": "ExpediteStatusReport returns the queued status report job id",
@@ -2224,6 +2257,39 @@
22242257
]
22252258
}
22262259
},
2260+
"/project/config/delete": {
2261+
"put": {
2262+
"summary": "Delete one or more configuration variables for applications or runners.",
2263+
"operationId": "Waypoint_DeleteConfig",
2264+
"responses": {
2265+
"200": {
2266+
"description": "A successful response.",
2267+
"schema": {
2268+
"$ref": "#/definitions/hashicorp.waypoint.ConfigDeleteResponse"
2269+
}
2270+
},
2271+
"default": {
2272+
"description": "An unexpected error response.",
2273+
"schema": {
2274+
"$ref": "#/definitions/grpc.gateway.runtime.Error"
2275+
}
2276+
}
2277+
},
2278+
"parameters": [
2279+
{
2280+
"name": "body",
2281+
"in": "body",
2282+
"required": true,
2283+
"schema": {
2284+
"$ref": "#/definitions/hashicorp.waypoint.ConfigDeleteRequest"
2285+
}
2286+
}
2287+
],
2288+
"tags": [
2289+
"Waypoint"
2290+
]
2291+
}
2292+
},
22272293
"/project/from-template": {
22282294
"post": {
22292295
"summary": "CreateProjectFromTemplate is in BETA. It creates a new Waypoint project\nfrom a Project Template, provisioning infrastructure before upserting the\nWaypoint project to the database",
@@ -7683,6 +7749,17 @@
76837749
"default": "UNKNOWN",
76847750
"description": "Supported component types, the values here MUST match the enum values\nin the Go sdk/component package exactly. A test in internal/server\nvalidates this."
76857751
},
7752+
"hashicorp.waypoint.ConfigDeleteRequest": {
7753+
"type": "object",
7754+
"properties": {
7755+
"variables": {
7756+
"type": "array",
7757+
"items": {
7758+
"$ref": "#/definitions/hashicorp.waypoint.ConfigVar"
7759+
}
7760+
}
7761+
}
7762+
},
76867763
"hashicorp.waypoint.ConfigDeleteResponse": {
76877764
"type": "object"
76887765
},
@@ -7998,6 +8075,14 @@
79988075
}
79998076
}
80008077
},
8078+
"hashicorp.waypoint.DeleteConfigSourceRequest": {
8079+
"type": "object",
8080+
"properties": {
8081+
"config_source": {
8082+
"$ref": "#/definitions/hashicorp.waypoint.ConfigSource"
8083+
}
8084+
}
8085+
},
80018086
"hashicorp.waypoint.DeleteOnDemandRunnerConfigResponse": {
80028087
"type": "object",
80038088
"properties": {

pkg/server/proto/gateway.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,15 +259,15 @@ http:
259259
body: "*"
260260

261261
- selector: hashicorp.waypoint.Waypoint.DeleteConfig
262-
put: /project/config
262+
put: /project/config/delete
263263
body: "*"
264264

265265
- selector: hashicorp.waypoint.Waypoint.SetConfigSource
266266
put: /config-source
267267
body: "*"
268268

269269
- selector: hashicorp.waypoint.Waypoint.DeleteConfigSource
270-
put: /config-source
270+
put: /config-source/delete
271271
body: "*"
272272

273273
- selector: hashicorp.waypoint.Waypoint.GetConfigSource

0 commit comments

Comments
 (0)