Merge pull request #4761 from hashicorp/WAYP-1522

api: fix duplicate gateway.yml paths
hashicorp · Jun 2, 2023 · 6d5a84c · 6d5a84c
2 parents 596cf48 + e09c41e
commit 6d5a84c
Show file tree

Hide file tree

Showing 3 changed files with 253 additions and 2 deletions.
diff --git a/pkg/server/gen/server.pb.gw.go b/pkg/server/gen/server.pb.gw.go
diff --git a/pkg/server/gen/server.swagger.json b/pkg/server/gen/server.swagger.json
@@ -314,6 +314,39 @@
         ]
       }
     },
+    "/config-source/delete": {
+      "put": {
+        "summary": "Delete the configuration for a dynamic configuration source",
+        "operationId": "Waypoint_DeleteConfigSource",
+        "responses": {
+          "200": {
+            "description": "A successful response.",
+            "schema": {
+              "properties": {}
+            }
+          },
+          "default": {
+            "description": "An unexpected error response.",
+            "schema": {
+              "$ref": "#/definitions/grpc.gateway.runtime.Error"
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/hashicorp.waypoint.DeleteConfigSourceRequest"
+            }
+          }
+        ],
+        "tags": [
+          "Waypoint"
+        ]
+      }
+    },
     "/deployment/{deployment.id}/status-report": {
       "put": {
         "summary": "ExpediteStatusReport returns the queued status report job id",
@@ -2224,6 +2257,39 @@
         ]
       }
     },
+    "/project/config/delete": {
+      "put": {
+        "summary": "Delete one or more configuration variables for applications or runners.",
+        "operationId": "Waypoint_DeleteConfig",
+        "responses": {
+          "200": {
+            "description": "A successful response.",
+            "schema": {
+              "$ref": "#/definitions/hashicorp.waypoint.ConfigDeleteResponse"
+            }
+          },
+          "default": {
+            "description": "An unexpected error response.",
+            "schema": {
+              "$ref": "#/definitions/grpc.gateway.runtime.Error"
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/hashicorp.waypoint.ConfigDeleteRequest"
+            }
+          }
+        ],
+        "tags": [
+          "Waypoint"
+        ]
+      }
+    },
     "/project/from-template": {
       "post": {
         "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 @@
       "default": "UNKNOWN",
       "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."
     },
+    "hashicorp.waypoint.ConfigDeleteRequest": {
+      "type": "object",
+      "properties": {
+        "variables": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/hashicorp.waypoint.ConfigVar"
+          }
+        }
+      }
+    },
     "hashicorp.waypoint.ConfigDeleteResponse": {
       "type": "object"
     },
@@ -7998,6 +8075,14 @@
         }
       }
     },
+    "hashicorp.waypoint.DeleteConfigSourceRequest": {
+      "type": "object",
+      "properties": {
+        "config_source": {
+          "$ref": "#/definitions/hashicorp.waypoint.ConfigSource"
+        }
+      }
+    },
     "hashicorp.waypoint.DeleteOnDemandRunnerConfigResponse": {
       "type": "object",
       "properties": {

diff --git a/pkg/server/proto/gateway.yml b/pkg/server/proto/gateway.yml
@@ -259,15 +259,15 @@ http:
     body: "*"
 
   - selector: hashicorp.waypoint.Waypoint.DeleteConfig
-    put: /project/config
+    put: /project/config/delete
     body: "*"
 
   - selector: hashicorp.waypoint.Waypoint.SetConfigSource
     put: /config-source
     body: "*"
 
   - selector: hashicorp.waypoint.Waypoint.DeleteConfigSource
-    put: /config-source
+    put: /config-source/delete
     body: "*"
 
   - selector: hashicorp.waypoint.Waypoint.GetConfigSource