From 430f8ceef8d2e1062d5e20593e0e4149b208d6a3 Mon Sep 17 00:00:00 2001 From: blewisCycle Date: Tue, 14 Jan 2025 14:16:27 -0800 Subject: [PATCH 1/6] force hub delete --- platform/paths/hubs/hub.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/paths/hubs/hub.yml b/platform/paths/hubs/hub.yml index c48dee76..629700be 100644 --- a/platform/paths/hubs/hub.yml +++ b/platform/paths/hubs/hub.yml @@ -77,7 +77,8 @@ delete: - Hubs security: - bearerAuth: [] - parameters: [] + parameters: + - $ref: ../../../components/parameters/OptionParam.yml summary: Delete Hub description: Requires the `hubs-delete` capability. This can only be aquired by being the hub owner. responses: From 57e04832110942dc1ffdff1b1290d3136377660d Mon Sep 17 00:00:00 2001 From: blewisCycle Date: Tue, 14 Jan 2025 14:28:29 -0800 Subject: [PATCH 2/6] update force function --- components/parameters/OptionParam.yml | 10 ---------- platform/paths/hubs/hub.yml | 11 ++++++++++- platform/paths/infrastructure/servers/server.yml | 11 ++++++++++- 3 files changed, 20 insertions(+), 12 deletions(-) delete mode 100644 components/parameters/OptionParam.yml diff --git a/components/parameters/OptionParam.yml b/components/parameters/OptionParam.yml deleted file mode 100644 index b359e6c3..00000000 --- a/components/parameters/OptionParam.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -name: options -in: query -required: false -description: "The option field is a key-value object, where the key is the option, and the value is a boolean. For example, `?option[force]=true`" -schema: - type: object - additionalProperties: - type: string -style: deepObject diff --git a/platform/paths/hubs/hub.yml b/platform/paths/hubs/hub.yml index 629700be..29ffe9d4 100644 --- a/platform/paths/hubs/hub.yml +++ b/platform/paths/hubs/hub.yml @@ -78,7 +78,16 @@ delete: security: - bearerAuth: [] parameters: - - $ref: ../../../components/parameters/OptionParam.yml + - name: options + in: query + required: false + schema: + type: object + required: + - force + properties: + force: + type: boolean summary: Delete Hub description: Requires the `hubs-delete` capability. This can only be aquired by being the hub owner. responses: diff --git a/platform/paths/infrastructure/servers/server.yml b/platform/paths/infrastructure/servers/server.yml index a82fda63..c125fc81 100644 --- a/platform/paths/infrastructure/servers/server.yml +++ b/platform/paths/infrastructure/servers/server.yml @@ -143,7 +143,16 @@ delete: required: true schema: type: string - - $ref: ../../../../components/parameters/OptionParam.yml + - name: options + in: query + required: false + schema: + type: object + required: + - force + properties: + force: + type: boolean responses: 200: description: Returns a Job Descriptor. From e29f90bda9288763d754c210e9ee1557d4642a67 Mon Sep 17 00:00:00 2001 From: blewisCycle Date: Tue, 14 Jan 2025 14:29:44 -0800 Subject: [PATCH 3/6] remove required force --- platform/paths/hubs/hub.yml | 2 -- platform/paths/infrastructure/servers/server.yml | 2 -- 2 files changed, 4 deletions(-) diff --git a/platform/paths/hubs/hub.yml b/platform/paths/hubs/hub.yml index 29ffe9d4..4e1a6d42 100644 --- a/platform/paths/hubs/hub.yml +++ b/platform/paths/hubs/hub.yml @@ -83,8 +83,6 @@ delete: required: false schema: type: object - required: - - force properties: force: type: boolean diff --git a/platform/paths/infrastructure/servers/server.yml b/platform/paths/infrastructure/servers/server.yml index c125fc81..7f3215e7 100644 --- a/platform/paths/infrastructure/servers/server.yml +++ b/platform/paths/infrastructure/servers/server.yml @@ -148,8 +148,6 @@ delete: required: false schema: type: object - required: - - force properties: force: type: boolean From 64634dd0a3d697667db1ba0c967a6e859301b6f1 Mon Sep 17 00:00:00 2001 From: blewisCycle Date: Tue, 14 Jan 2025 14:32:28 -0800 Subject: [PATCH 4/6] save --- platform/paths/hubs/hub.yml | 2 +- platform/paths/infrastructure/servers/server.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/paths/hubs/hub.yml b/platform/paths/hubs/hub.yml index 4e1a6d42..3fd5ae6d 100644 --- a/platform/paths/hubs/hub.yml +++ b/platform/paths/hubs/hub.yml @@ -85,7 +85,7 @@ delete: type: object properties: force: - type: boolean + type: string summary: Delete Hub description: Requires the `hubs-delete` capability. This can only be aquired by being the hub owner. responses: diff --git a/platform/paths/infrastructure/servers/server.yml b/platform/paths/infrastructure/servers/server.yml index 7f3215e7..daa24de8 100644 --- a/platform/paths/infrastructure/servers/server.yml +++ b/platform/paths/infrastructure/servers/server.yml @@ -150,7 +150,7 @@ delete: type: object properties: force: - type: boolean + type: string responses: 200: description: Returns a Job Descriptor. From 162b135f569698a6c5cb9417a6477e3a9469c96b Mon Sep 17 00:00:00 2001 From: blewisCycle Date: Tue, 14 Jan 2025 14:37:04 -0800 Subject: [PATCH 5/6] enum --- platform/paths/hubs/hub.yml | 3 +++ platform/paths/infrastructure/servers/server.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/platform/paths/hubs/hub.yml b/platform/paths/hubs/hub.yml index 3fd5ae6d..8918e425 100644 --- a/platform/paths/hubs/hub.yml +++ b/platform/paths/hubs/hub.yml @@ -86,6 +86,9 @@ delete: properties: force: type: string + enum: + - "true" + - "false" summary: Delete Hub description: Requires the `hubs-delete` capability. This can only be aquired by being the hub owner. responses: diff --git a/platform/paths/infrastructure/servers/server.yml b/platform/paths/infrastructure/servers/server.yml index daa24de8..06d57e85 100644 --- a/platform/paths/infrastructure/servers/server.yml +++ b/platform/paths/infrastructure/servers/server.yml @@ -151,6 +151,9 @@ delete: properties: force: type: string + enum: + - "true" + - "false" responses: 200: description: Returns a Job Descriptor. From 572d48d4b6d9f2b2462a3b15ae34098971ca7471 Mon Sep 17 00:00:00 2001 From: blewisCycle Date: Tue, 14 Jan 2025 14:46:18 -0800 Subject: [PATCH 6/6] add description --- platform/paths/hubs/hub.yml | 1 + platform/paths/infrastructure/servers/server.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/platform/paths/hubs/hub.yml b/platform/paths/hubs/hub.yml index 8918e425..41f8e729 100644 --- a/platform/paths/hubs/hub.yml +++ b/platform/paths/hubs/hub.yml @@ -86,6 +86,7 @@ delete: properties: force: type: string + description: If force is set to true, this will force delete the hub, even if there are servers running on it. enum: - "true" - "false" diff --git a/platform/paths/infrastructure/servers/server.yml b/platform/paths/infrastructure/servers/server.yml index 06d57e85..c695ce00 100644 --- a/platform/paths/infrastructure/servers/server.yml +++ b/platform/paths/infrastructure/servers/server.yml @@ -151,6 +151,7 @@ delete: properties: force: type: string + description: If force is set to true, this will force delete the server, even if there are environments running on it. enum: - "true" - "false"