diff --git a/client/DotNet/Armada.Client/ClientGenerated.cs b/client/DotNet/Armada.Client/ClientGenerated.cs index 9c49f5cd8bf..b323d013373 100644 --- a/client/DotNet/Armada.Client/ClientGenerated.cs +++ b/client/DotNet/Armada.Client/ClientGenerated.cs @@ -406,7 +406,7 @@ public System.Threading.Tasks.Task GetJobDetailsAsync(Api public async System.Threading.Tasks.Task GetJobDetailsAsync(ApiJobDetailsRequest body, System.Threading.CancellationToken cancellationToken) { var urlBuilder_ = new System.Text.StringBuilder(); - urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/v1/job/jobdetails"); + urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/v1/job/details"); var client_ = _httpClient; try @@ -462,18 +462,18 @@ public async System.Threading.Tasks.Task GetJobDetailsAsy /// A successful response. /// A server side error occurred. - public System.Threading.Tasks.Task GetJobRunDetailsAsync(ApiJobRunDetailsRequest body) + public System.Threading.Tasks.Task PreemptJobsAsync(ApiJobPreemptRequest body) { - return GetJobRunDetailsAsync(body, System.Threading.CancellationToken.None); + return PreemptJobsAsync(body, System.Threading.CancellationToken.None); } /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A successful response. /// A server side error occurred. - public async System.Threading.Tasks.Task GetJobRunDetailsAsync(ApiJobRunDetailsRequest body, System.Threading.CancellationToken cancellationToken) + public async System.Threading.Tasks.Task PreemptJobsAsync(ApiJobPreemptRequest body, System.Threading.CancellationToken cancellationToken) { var urlBuilder_ = new System.Text.StringBuilder(); - urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/v1/job/jobrundetails"); + urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/v1/job/preempt"); var client_ = _httpClient; try @@ -506,7 +506,7 @@ public async System.Threading.Tasks.Task GetJobRunDeta var status_ = ((int)response_.StatusCode).ToString(); if (status_ == "200") { - var objectResponse_ = await ReadObjectResponseAsync(response_, headers_).ConfigureAwait(false); + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_).ConfigureAwait(false); return objectResponse_.Object; } else @@ -529,18 +529,18 @@ public async System.Threading.Tasks.Task GetJobRunDeta /// A successful response. /// A server side error occurred. - public System.Threading.Tasks.Task GetJobStatusAsync(ApiJobStatusRequest body) + public System.Threading.Tasks.Task ReprioritizeJobsAsync(ApiJobReprioritizeRequest body) { - return GetJobStatusAsync(body, System.Threading.CancellationToken.None); + return ReprioritizeJobsAsync(body, System.Threading.CancellationToken.None); } /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A successful response. /// A server side error occurred. - public async System.Threading.Tasks.Task GetJobStatusAsync(ApiJobStatusRequest body, System.Threading.CancellationToken cancellationToken) + public async System.Threading.Tasks.Task ReprioritizeJobsAsync(ApiJobReprioritizeRequest body, System.Threading.CancellationToken cancellationToken) { var urlBuilder_ = new System.Text.StringBuilder(); - urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/v1/job/jobstatus"); + urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/v1/job/reprioritize"); var client_ = _httpClient; try @@ -573,7 +573,7 @@ public async System.Threading.Tasks.Task GetJobStatusAsync var status_ = ((int)response_.StatusCode).ToString(); if (status_ == "200") { - var objectResponse_ = await ReadObjectResponseAsync(response_, headers_).ConfigureAwait(false); + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_).ConfigureAwait(false); return objectResponse_.Object; } else @@ -596,18 +596,18 @@ public async System.Threading.Tasks.Task GetJobStatusAsync /// A successful response. /// A server side error occurred. - public System.Threading.Tasks.Task PreemptJobsAsync(ApiJobPreemptRequest body) + public System.Threading.Tasks.Task GetJobStatusAsync(ApiJobStatusRequest body) { - return PreemptJobsAsync(body, System.Threading.CancellationToken.None); + return GetJobStatusAsync(body, System.Threading.CancellationToken.None); } /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A successful response. /// A server side error occurred. - public async System.Threading.Tasks.Task PreemptJobsAsync(ApiJobPreemptRequest body, System.Threading.CancellationToken cancellationToken) + public async System.Threading.Tasks.Task GetJobStatusAsync(ApiJobStatusRequest body, System.Threading.CancellationToken cancellationToken) { var urlBuilder_ = new System.Text.StringBuilder(); - urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/v1/job/preempt"); + urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/v1/job/status"); var client_ = _httpClient; try @@ -640,7 +640,7 @@ public async System.Threading.Tasks.Task PreemptJobsAsync(ApiJobPreemptR var status_ = ((int)response_.StatusCode).ToString(); if (status_ == "200") { - var objectResponse_ = await ReadObjectResponseAsync(response_, headers_).ConfigureAwait(false); + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_).ConfigureAwait(false); return objectResponse_.Object; } else @@ -663,18 +663,18 @@ public async System.Threading.Tasks.Task PreemptJobsAsync(ApiJobPreemptR /// A successful response. /// A server side error occurred. - public System.Threading.Tasks.Task ReprioritizeJobsAsync(ApiJobReprioritizeRequest body) + public System.Threading.Tasks.Task SubmitJobsAsync(ApiJobSubmitRequest body) { - return ReprioritizeJobsAsync(body, System.Threading.CancellationToken.None); + return SubmitJobsAsync(body, System.Threading.CancellationToken.None); } /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A successful response. /// A server side error occurred. - public async System.Threading.Tasks.Task ReprioritizeJobsAsync(ApiJobReprioritizeRequest body, System.Threading.CancellationToken cancellationToken) + public async System.Threading.Tasks.Task SubmitJobsAsync(ApiJobSubmitRequest body, System.Threading.CancellationToken cancellationToken) { var urlBuilder_ = new System.Text.StringBuilder(); - urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/v1/job/reprioritize"); + urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/v1/job/submit"); var client_ = _httpClient; try @@ -707,7 +707,7 @@ public async System.Threading.Tasks.Task Reprioritiz var status_ = ((int)response_.StatusCode).ToString(); if (status_ == "200") { - var objectResponse_ = await ReadObjectResponseAsync(response_, headers_).ConfigureAwait(false); + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_).ConfigureAwait(false); return objectResponse_.Object; } else @@ -730,18 +730,18 @@ public async System.Threading.Tasks.Task Reprioritiz /// A successful response. /// A server side error occurred. - public System.Threading.Tasks.Task SubmitJobsAsync(ApiJobSubmitRequest body) + public System.Threading.Tasks.Task CancelJobSetAsync(ApiJobSetCancelRequest body) { - return SubmitJobsAsync(body, System.Threading.CancellationToken.None); + return CancelJobSetAsync(body, System.Threading.CancellationToken.None); } /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A successful response. /// A server side error occurred. - public async System.Threading.Tasks.Task SubmitJobsAsync(ApiJobSubmitRequest body, System.Threading.CancellationToken cancellationToken) + public async System.Threading.Tasks.Task CancelJobSetAsync(ApiJobSetCancelRequest body, System.Threading.CancellationToken cancellationToken) { var urlBuilder_ = new System.Text.StringBuilder(); - urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/v1/job/submit"); + urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/v1/jobset/cancel"); var client_ = _httpClient; try @@ -774,7 +774,7 @@ public async System.Threading.Tasks.Task SubmitJobsAsync(A var status_ = ((int)response_.StatusCode).ToString(); if (status_ == "200") { - var objectResponse_ = await ReadObjectResponseAsync(response_, headers_).ConfigureAwait(false); + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_).ConfigureAwait(false); return objectResponse_.Object; } else @@ -797,18 +797,18 @@ public async System.Threading.Tasks.Task SubmitJobsAsync(A /// A successful response. /// A server side error occurred. - public System.Threading.Tasks.Task CancelJobSetAsync(ApiJobSetCancelRequest body) + public System.Threading.Tasks.Task CreateQueueAsync(ApiQueue body) { - return CancelJobSetAsync(body, System.Threading.CancellationToken.None); + return CreateQueueAsync(body, System.Threading.CancellationToken.None); } /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A successful response. /// A server side error occurred. - public async System.Threading.Tasks.Task CancelJobSetAsync(ApiJobSetCancelRequest body, System.Threading.CancellationToken cancellationToken) + public async System.Threading.Tasks.Task CreateQueueAsync(ApiQueue body, System.Threading.CancellationToken cancellationToken) { var urlBuilder_ = new System.Text.StringBuilder(); - urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/v1/jobset/cancel"); + urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/v1/queue"); var client_ = _httpClient; try @@ -864,28 +864,29 @@ public async System.Threading.Tasks.Task CancelJobSetAsync(ApiJobSetCanc /// A successful response. /// A server side error occurred. - public System.Threading.Tasks.Task CreateQueueAsync(ApiQueue body) + public System.Threading.Tasks.Task GetQueueAsync(string name) { - return CreateQueueAsync(body, System.Threading.CancellationToken.None); + return GetQueueAsync(name, System.Threading.CancellationToken.None); } /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A successful response. /// A server side error occurred. - public async System.Threading.Tasks.Task CreateQueueAsync(ApiQueue body, System.Threading.CancellationToken cancellationToken) + public async System.Threading.Tasks.Task GetQueueAsync(string name, System.Threading.CancellationToken cancellationToken) { + if (name == null) + throw new System.ArgumentNullException("name"); + var urlBuilder_ = new System.Text.StringBuilder(); - urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/v1/queue"); + urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/v1/queue/{name}"); + urlBuilder_.Replace("{name}", System.Uri.EscapeDataString(ConvertToString(name, System.Globalization.CultureInfo.InvariantCulture))); var client_ = _httpClient; try { using (var request_ = new System.Net.Http.HttpRequestMessage()) { - var content_ = new System.Net.Http.StringContent(Newtonsoft.Json.JsonConvert.SerializeObject(body, _settings.Value)); - content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json"); - request_.Content = content_; - request_.Method = new System.Net.Http.HttpMethod("POST"); + request_.Method = new System.Net.Http.HttpMethod("GET"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); PrepareRequest(client_, request_, urlBuilder_); @@ -908,7 +909,7 @@ public async System.Threading.Tasks.Task CreateQueueAsync(ApiQueue body, var status_ = ((int)response_.StatusCode).ToString(); if (status_ == "200") { - var objectResponse_ = await ReadObjectResponseAsync(response_, headers_).ConfigureAwait(false); + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_).ConfigureAwait(false); return objectResponse_.Object; } else @@ -931,15 +932,15 @@ public async System.Threading.Tasks.Task CreateQueueAsync(ApiQueue body, /// A successful response. /// A server side error occurred. - public System.Threading.Tasks.Task GetQueueAsync(string name) + public System.Threading.Tasks.Task UpdateQueueAsync(string name, ApiQueue body) { - return GetQueueAsync(name, System.Threading.CancellationToken.None); + return UpdateQueueAsync(name, body, System.Threading.CancellationToken.None); } /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A successful response. /// A server side error occurred. - public async System.Threading.Tasks.Task GetQueueAsync(string name, System.Threading.CancellationToken cancellationToken) + public async System.Threading.Tasks.Task UpdateQueueAsync(string name, ApiQueue body, System.Threading.CancellationToken cancellationToken) { if (name == null) throw new System.ArgumentNullException("name"); @@ -953,7 +954,10 @@ public async System.Threading.Tasks.Task GetQueueAsync(string name, Sy { using (var request_ = new System.Net.Http.HttpRequestMessage()) { - request_.Method = new System.Net.Http.HttpMethod("GET"); + var content_ = new System.Net.Http.StringContent(Newtonsoft.Json.JsonConvert.SerializeObject(body, _settings.Value)); + content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json"); + request_.Content = content_; + request_.Method = new System.Net.Http.HttpMethod("PUT"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); PrepareRequest(client_, request_, urlBuilder_); @@ -976,7 +980,7 @@ public async System.Threading.Tasks.Task GetQueueAsync(string name, Sy var status_ = ((int)response_.StatusCode).ToString(); if (status_ == "200") { - var objectResponse_ = await ReadObjectResponseAsync(response_, headers_).ConfigureAwait(false); + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_).ConfigureAwait(false); return objectResponse_.Object; } else @@ -999,15 +1003,15 @@ public async System.Threading.Tasks.Task GetQueueAsync(string name, Sy /// A successful response. /// A server side error occurred. - public System.Threading.Tasks.Task UpdateQueueAsync(string name, ApiQueue body) + public System.Threading.Tasks.Task DeleteQueueAsync(string name) { - return UpdateQueueAsync(name, body, System.Threading.CancellationToken.None); + return DeleteQueueAsync(name, System.Threading.CancellationToken.None); } /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A successful response. /// A server side error occurred. - public async System.Threading.Tasks.Task UpdateQueueAsync(string name, ApiQueue body, System.Threading.CancellationToken cancellationToken) + public async System.Threading.Tasks.Task DeleteQueueAsync(string name, System.Threading.CancellationToken cancellationToken) { if (name == null) throw new System.ArgumentNullException("name"); @@ -1021,10 +1025,7 @@ public async System.Threading.Tasks.Task UpdateQueueAsync(string name, A { using (var request_ = new System.Net.Http.HttpRequestMessage()) { - var content_ = new System.Net.Http.StringContent(Newtonsoft.Json.JsonConvert.SerializeObject(body, _settings.Value)); - content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json"); - request_.Content = content_; - request_.Method = new System.Net.Http.HttpMethod("PUT"); + request_.Method = new System.Net.Http.HttpMethod("DELETE"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); PrepareRequest(client_, request_, urlBuilder_); @@ -1070,29 +1071,28 @@ public async System.Threading.Tasks.Task UpdateQueueAsync(string name, A /// A successful response. /// A server side error occurred. - public System.Threading.Tasks.Task DeleteQueueAsync(string name) + public System.Threading.Tasks.Task GetJobRunDetailsAsync(ApiJobRunDetailsRequest body) { - return DeleteQueueAsync(name, System.Threading.CancellationToken.None); + return GetJobRunDetailsAsync(body, System.Threading.CancellationToken.None); } /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// A successful response. /// A server side error occurred. - public async System.Threading.Tasks.Task DeleteQueueAsync(string name, System.Threading.CancellationToken cancellationToken) + public async System.Threading.Tasks.Task GetJobRunDetailsAsync(ApiJobRunDetailsRequest body, System.Threading.CancellationToken cancellationToken) { - if (name == null) - throw new System.ArgumentNullException("name"); - var urlBuilder_ = new System.Text.StringBuilder(); - urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/v1/queue/{name}"); - urlBuilder_.Replace("{name}", System.Uri.EscapeDataString(ConvertToString(name, System.Globalization.CultureInfo.InvariantCulture))); + urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/v1/run/details"); var client_ = _httpClient; try { using (var request_ = new System.Net.Http.HttpRequestMessage()) { - request_.Method = new System.Net.Http.HttpMethod("DELETE"); + var content_ = new System.Net.Http.StringContent(Newtonsoft.Json.JsonConvert.SerializeObject(body, _settings.Value)); + content_.Headers.ContentType = System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json"); + request_.Content = content_; + request_.Method = new System.Net.Http.HttpMethod("POST"); request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json")); PrepareRequest(client_, request_, urlBuilder_); @@ -1115,7 +1115,7 @@ public async System.Threading.Tasks.Task DeleteQueueAsync(string name, S var status_ = ((int)response_.StatusCode).ToString(); if (status_ == "200") { - var objectResponse_ = await ReadObjectResponseAsync(response_, headers_).ConfigureAwait(false); + var objectResponse_ = await ReadObjectResponseAsync(response_, headers_).ConfigureAwait(false); return objectResponse_.Object; } else diff --git a/pkg/api/api.swagger.go b/pkg/api/api.swagger.go index 278fc698c8a..7822f967bd6 100644 --- a/pkg/api/api.swagger.go +++ b/pkg/api/api.swagger.go @@ -213,7 +213,7 @@ func SwaggerJsonTemplate() string { " }\n" + " }\n" + " },\n" + - " \"/v1/job/jobdetails\": {\n" + + " \"/v1/job/details\": {\n" + " \"post\": {\n" + " \"tags\": [\n" + " \"Jobs\"\n" + @@ -245,28 +245,26 @@ func SwaggerJsonTemplate() string { " }\n" + " }\n" + " },\n" + - " \"/v1/job/jobrundetails\": {\n" + + " \"/v1/job/preempt\": {\n" + " \"post\": {\n" + " \"tags\": [\n" + - " \"Jobs\"\n" + + " \"Submit\"\n" + " ],\n" + - " \"operationId\": \"GetJobRunDetails\",\n" + + " \"operationId\": \"PreemptJobs\",\n" + " \"parameters\": [\n" + " {\n" + " \"name\": \"body\",\n" + " \"in\": \"body\",\n" + " \"required\": true,\n" + " \"schema\": {\n" + - " \"$ref\": \"#/definitions/apiJobRunDetailsRequest\"\n" + + " \"$ref\": \"#/definitions/apiJobPreemptRequest\"\n" + " }\n" + " }\n" + " ],\n" + " \"responses\": {\n" + " \"200\": {\n" + " \"description\": \"A successful response.\",\n" + - " \"schema\": {\n" + - " \"$ref\": \"#/definitions/apiJobRunDetailsResponse\"\n" + - " }\n" + + " \"schema\": {}\n" + " },\n" + " \"default\": {\n" + " \"description\": \"An unexpected error response.\",\n" + @@ -277,19 +275,19 @@ func SwaggerJsonTemplate() string { " }\n" + " }\n" + " },\n" + - " \"/v1/job/jobstatus\": {\n" + + " \"/v1/job/reprioritize\": {\n" + " \"post\": {\n" + " \"tags\": [\n" + - " \"Jobs\"\n" + + " \"Submit\"\n" + " ],\n" + - " \"operationId\": \"GetJobStatus\",\n" + + " \"operationId\": \"ReprioritizeJobs\",\n" + " \"parameters\": [\n" + " {\n" + " \"name\": \"body\",\n" + " \"in\": \"body\",\n" + " \"required\": true,\n" + " \"schema\": {\n" + - " \"$ref\": \"#/definitions/apiJobStatusRequest\"\n" + + " \"$ref\": \"#/definitions/apiJobReprioritizeRequest\"\n" + " }\n" + " }\n" + " ],\n" + @@ -297,38 +295,8 @@ func SwaggerJsonTemplate() string { " \"200\": {\n" + " \"description\": \"A successful response.\",\n" + " \"schema\": {\n" + - " \"$ref\": \"#/definitions/apiJobStatusResponse\"\n" + - " }\n" + - " },\n" + - " \"default\": {\n" + - " \"description\": \"An unexpected error response.\",\n" + - " \"schema\": {\n" + - " \"$ref\": \"#/definitions/runtimeError\"\n" + - " }\n" + - " }\n" + - " }\n" + - " }\n" + - " },\n" + - " \"/v1/job/preempt\": {\n" + - " \"post\": {\n" + - " \"tags\": [\n" + - " \"Submit\"\n" + - " ],\n" + - " \"operationId\": \"PreemptJobs\",\n" + - " \"parameters\": [\n" + - " {\n" + - " \"name\": \"body\",\n" + - " \"in\": \"body\",\n" + - " \"required\": true,\n" + - " \"schema\": {\n" + - " \"$ref\": \"#/definitions/apiJobPreemptRequest\"\n" + + " \"$ref\": \"#/definitions/apiJobReprioritizeResponse\"\n" + " }\n" + - " }\n" + - " ],\n" + - " \"responses\": {\n" + - " \"200\": {\n" + - " \"description\": \"A successful response.\",\n" + - " \"schema\": {}\n" + " },\n" + " \"default\": {\n" + " \"description\": \"An unexpected error response.\",\n" + @@ -339,19 +307,19 @@ func SwaggerJsonTemplate() string { " }\n" + " }\n" + " },\n" + - " \"/v1/job/reprioritize\": {\n" + + " \"/v1/job/status\": {\n" + " \"post\": {\n" + " \"tags\": [\n" + - " \"Submit\"\n" + + " \"Jobs\"\n" + " ],\n" + - " \"operationId\": \"ReprioritizeJobs\",\n" + + " \"operationId\": \"GetJobStatus\",\n" + " \"parameters\": [\n" + " {\n" + " \"name\": \"body\",\n" + " \"in\": \"body\",\n" + " \"required\": true,\n" + " \"schema\": {\n" + - " \"$ref\": \"#/definitions/apiJobReprioritizeRequest\"\n" + + " \"$ref\": \"#/definitions/apiJobStatusRequest\"\n" + " }\n" + " }\n" + " ],\n" + @@ -359,7 +327,7 @@ func SwaggerJsonTemplate() string { " \"200\": {\n" + " \"description\": \"A successful response.\",\n" + " \"schema\": {\n" + - " \"$ref\": \"#/definitions/apiJobReprioritizeResponse\"\n" + + " \"$ref\": \"#/definitions/apiJobStatusResponse\"\n" + " }\n" + " },\n" + " \"default\": {\n" + @@ -552,6 +520,38 @@ func SwaggerJsonTemplate() string { " }\n" + " }\n" + " }\n" + + " },\n" + + " \"/v1/run/details\": {\n" + + " \"post\": {\n" + + " \"tags\": [\n" + + " \"Jobs\"\n" + + " ],\n" + + " \"operationId\": \"GetJobRunDetails\",\n" + + " \"parameters\": [\n" + + " {\n" + + " \"name\": \"body\",\n" + + " \"in\": \"body\",\n" + + " \"required\": true,\n" + + " \"schema\": {\n" + + " \"$ref\": \"#/definitions/apiJobRunDetailsRequest\"\n" + + " }\n" + + " }\n" + + " ],\n" + + " \"responses\": {\n" + + " \"200\": {\n" + + " \"description\": \"A successful response.\",\n" + + " \"schema\": {\n" + + " \"$ref\": \"#/definitions/apiJobRunDetailsResponse\"\n" + + " }\n" + + " },\n" + + " \"default\": {\n" + + " \"description\": \"An unexpected error response.\",\n" + + " \"schema\": {\n" + + " \"$ref\": \"#/definitions/runtimeError\"\n" + + " }\n" + + " }\n" + + " }\n" + + " }\n" + " }\n" + " },\n" + " \"definitions\": {\n" + diff --git a/pkg/api/api.swagger.json b/pkg/api/api.swagger.json index 586e1e972de..7900e81c0c4 100644 --- a/pkg/api/api.swagger.json +++ b/pkg/api/api.swagger.json @@ -202,7 +202,7 @@ } } }, - "/v1/job/jobdetails": { + "/v1/job/details": { "post": { "tags": [ "Jobs" @@ -234,28 +234,26 @@ } } }, - "/v1/job/jobrundetails": { + "/v1/job/preempt": { "post": { "tags": [ - "Jobs" + "Submit" ], - "operationId": "GetJobRunDetails", + "operationId": "PreemptJobs", "parameters": [ { "name": "body", "in": "body", "required": true, "schema": { - "$ref": "#/definitions/apiJobRunDetailsRequest" + "$ref": "#/definitions/apiJobPreemptRequest" } } ], "responses": { "200": { "description": "A successful response.", - "schema": { - "$ref": "#/definitions/apiJobRunDetailsResponse" - } + "schema": {} }, "default": { "description": "An unexpected error response.", @@ -266,19 +264,19 @@ } } }, - "/v1/job/jobstatus": { + "/v1/job/reprioritize": { "post": { "tags": [ - "Jobs" + "Submit" ], - "operationId": "GetJobStatus", + "operationId": "ReprioritizeJobs", "parameters": [ { "name": "body", "in": "body", "required": true, "schema": { - "$ref": "#/definitions/apiJobStatusRequest" + "$ref": "#/definitions/apiJobReprioritizeRequest" } } ], @@ -286,38 +284,8 @@ "200": { "description": "A successful response.", "schema": { - "$ref": "#/definitions/apiJobStatusResponse" - } - }, - "default": { - "description": "An unexpected error response.", - "schema": { - "$ref": "#/definitions/runtimeError" - } - } - } - } - }, - "/v1/job/preempt": { - "post": { - "tags": [ - "Submit" - ], - "operationId": "PreemptJobs", - "parameters": [ - { - "name": "body", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/apiJobPreemptRequest" + "$ref": "#/definitions/apiJobReprioritizeResponse" } - } - ], - "responses": { - "200": { - "description": "A successful response.", - "schema": {} }, "default": { "description": "An unexpected error response.", @@ -328,19 +296,19 @@ } } }, - "/v1/job/reprioritize": { + "/v1/job/status": { "post": { "tags": [ - "Submit" + "Jobs" ], - "operationId": "ReprioritizeJobs", + "operationId": "GetJobStatus", "parameters": [ { "name": "body", "in": "body", "required": true, "schema": { - "$ref": "#/definitions/apiJobReprioritizeRequest" + "$ref": "#/definitions/apiJobStatusRequest" } } ], @@ -348,7 +316,7 @@ "200": { "description": "A successful response.", "schema": { - "$ref": "#/definitions/apiJobReprioritizeResponse" + "$ref": "#/definitions/apiJobStatusResponse" } }, "default": { @@ -541,6 +509,38 @@ } } } + }, + "/v1/run/details": { + "post": { + "tags": [ + "Jobs" + ], + "operationId": "GetJobRunDetails", + "parameters": [ + { + "name": "body", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/apiJobRunDetailsRequest" + } + } + ], + "responses": { + "200": { + "description": "A successful response.", + "schema": { + "$ref": "#/definitions/apiJobRunDetailsResponse" + } + }, + "default": { + "description": "An unexpected error response.", + "schema": { + "$ref": "#/definitions/runtimeError" + } + } + } + } } }, "definitions": { diff --git a/pkg/api/job.pb.go b/pkg/api/job.pb.go index c1f12a663f5..8774b995235 100644 --- a/pkg/api/job.pb.go +++ b/pkg/api/job.pb.go @@ -615,88 +615,87 @@ func init() { func init() { proto.RegisterFile("pkg/api/job.proto", fileDescriptor_e45f6b75bfad87a4) } var fileDescriptor_e45f6b75bfad87a4 = []byte{ - // 1283 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0xdd, 0x6e, 0x1b, 0x45, - 0x14, 0xce, 0x3a, 0x71, 0x62, 0x1f, 0xc7, 0xc9, 0x66, 0x9a, 0x1f, 0xd7, 0x6d, 0xed, 0x68, 0x11, - 0x34, 0x54, 0xad, 0x2d, 0x82, 0x90, 0xaa, 0xa0, 0x0a, 0x92, 0x78, 0xa9, 0x1c, 0x8a, 0x89, 0xd6, - 0x0e, 0xff, 0xc8, 0x5a, 0xdb, 0x53, 0x77, 0x1d, 0x7b, 0x77, 0xbb, 0x33, 0x5b, 0x11, 0x89, 0x0b, - 0x84, 0xc4, 0x05, 0x77, 0x95, 0x78, 0x06, 0x1e, 0x80, 0xb7, 0x80, 0xbb, 0x4a, 0xdc, 0xf4, 0x06, - 0x03, 0x29, 0x12, 0x92, 0xaf, 0x78, 0x04, 0x34, 0x33, 0xbb, 0xeb, 0x59, 0x3b, 0x95, 0x03, 0x17, - 0x91, 0xb2, 0xdf, 0xf9, 0xce, 0x37, 0x33, 0xe7, 0x7c, 0x73, 0x76, 0x0d, 0x6b, 0xee, 0x69, 0xb7, - 0x6c, 0xba, 0x56, 0xb9, 0xe7, 0xb4, 0x4a, 0xae, 0xe7, 0x50, 0x07, 0xcd, 0x9b, 0xae, 0x95, 0xbf, - 0xd3, 0xb5, 0xe8, 0x23, 0xbf, 0x55, 0x6a, 0x3b, 0x83, 0x72, 0xd7, 0xe9, 0x3a, 0x65, 0x1e, 0x6b, - 0xf9, 0x0f, 0xf9, 0x13, 0x7f, 0xe0, 0xff, 0x89, 0x9c, 0xfc, 0x7a, 0x28, 0x43, 0xfc, 0xd6, 0xc0, - 0xa2, 0x01, 0x5a, 0xec, 0x3a, 0x4e, 0xb7, 0x8f, 0xc7, 0xb9, 0xd4, 0x1a, 0x60, 0x42, 0xcd, 0x81, - 0x1b, 0x10, 0xae, 0x07, 0x04, 0x96, 0x69, 0xda, 0xb6, 0x43, 0x4d, 0x6a, 0x39, 0x36, 0x11, 0x51, - 0xed, 0xb7, 0x05, 0xc8, 0x1e, 0x39, 0x2d, 0xc3, 0xb7, 0x2b, 0x98, 0x9a, 0x56, 0x9f, 0xa0, 0x5b, - 0xb0, 0xe8, 0xf9, 0x76, 0xd3, 0xea, 0xe4, 0x94, 0x6d, 0x65, 0x27, 0x7d, 0x70, 0x65, 0x34, 0x2c, - 0xae, 0x7a, 0xbe, 0x5d, 0xed, 0xdc, 0x76, 0x06, 0x16, 0xc5, 0x03, 0x97, 0x9e, 0x19, 0x49, 0x0e, - 0x30, 0x6e, 0xcf, 0x69, 0x31, 0x6e, 0x62, 0xcc, 0xed, 0x39, 0xad, 0x38, 0x97, 0x03, 0xe8, 0x6d, - 0x48, 0x12, 0x6a, 0x52, 0x9c, 0x9b, 0xdf, 0x56, 0x76, 0x56, 0x76, 0xd5, 0x92, 0xe9, 0x5a, 0x25, - 0xb1, 0x74, 0x9d, 0xe1, 0x22, 0x99, 0x53, 0xe4, 0x64, 0x0e, 0xa0, 0x32, 0x2c, 0xb5, 0xfb, 0x3e, - 0xa1, 0xd8, 0xcb, 0x2d, 0xf0, 0x95, 0x36, 0x46, 0xc3, 0xe2, 0x5a, 0x00, 0x49, 0xf4, 0x90, 0x85, - 0x5e, 0x83, 0x05, 0xdb, 0xe9, 0xe0, 0x5c, 0x92, 0xb3, 0xd1, 0x68, 0x58, 0x5c, 0x61, 0xcf, 0x12, - 0x95, 0xc7, 0x51, 0x1d, 0xd2, 0x7d, 0x6c, 0x12, 0xdc, 0x69, 0x52, 0x92, 0x5b, 0xda, 0x56, 0x76, - 0x32, 0xbb, 0xf9, 0x92, 0xa8, 0x58, 0x29, 0x2c, 0x69, 0xa9, 0x11, 0x96, 0xf4, 0x20, 0x3f, 0x1a, - 0x16, 0x91, 0x48, 0x68, 0x90, 0xb1, 0xd8, 0xd3, 0xdf, 0x8b, 0x8a, 0x91, 0x0a, 0x71, 0xf4, 0x11, - 0x80, 0x8b, 0xed, 0x8e, 0x65, 0x77, 0x99, 0x6a, 0x6a, 0xa6, 0xea, 0xb5, 0xd1, 0xb0, 0x78, 0x25, - 0xc8, 0x98, 0x92, 0x4d, 0x47, 0x01, 0xa6, 0x4b, 0xa8, 0xe9, 0x51, 0xb1, 0xdb, 0xf4, 0xe5, 0x74, - 0x83, 0x8c, 0x69, 0xdd, 0x28, 0x80, 0x3e, 0x85, 0xcc, 0x43, 0xcb, 0xb6, 0xc8, 0x23, 0x21, 0x0c, - 0x33, 0x85, 0xaf, 0x8f, 0x86, 0xc5, 0xf5, 0x30, 0x65, 0x4a, 0x19, 0xc6, 0x11, 0xed, 0xc7, 0x45, - 0x80, 0x23, 0xa7, 0x25, 0x99, 0x2b, 0x30, 0x8c, 0x32, 0xd3, 0x30, 0xaf, 0x43, 0xf2, 0xb1, 0x8f, - 0x7d, 0x2c, 0x7b, 0x8b, 0x03, 0x32, 0x95, 0x03, 0xe8, 0x36, 0x97, 0x25, 0x98, 0x72, 0x73, 0xa5, - 0x0f, 0xd6, 0x47, 0xc3, 0xa2, 0x2a, 0x10, 0x89, 0x1c, 0x70, 0xd0, 0x5b, 0x90, 0xb6, 0xcd, 0x01, - 0x26, 0xae, 0xd9, 0xc6, 0x81, 0x9d, 0xb6, 0x58, 0xa5, 0x22, 0x50, 0xca, 0x19, 0x33, 0xd1, 0xdd, - 0xd0, 0xc0, 0x49, 0x6e, 0xe0, 0x6c, 0x68, 0xe0, 0xd9, 0xee, 0xfd, 0x02, 0x96, 0xc5, 0x9d, 0x0d, - 0x3a, 0xb7, 0x38, 0xb3, 0xc0, 0x37, 0x46, 0xc3, 0xe2, 0x46, 0x94, 0x33, 0x55, 0xe1, 0x8c, 0x14, - 0x62, 0x16, 0x6e, 0x9b, 0x76, 0x1b, 0xf7, 0xff, 0x83, 0x85, 0x45, 0xc2, 0xb4, 0x85, 0x43, 0x1c, - 0xbd, 0x03, 0xd9, 0x40, 0xd4, 0xc3, 0x26, 0x71, 0x6c, 0xee, 0xe2, 0x34, 0x4f, 0xde, 0x14, 0x01, - 0x83, 0xe3, 0xd2, 0x61, 0x97, 0x65, 0x1c, 0xf5, 0x01, 0xf5, 0x4d, 0x42, 0x9b, 0xd4, 0x33, 0x6d, - 0x62, 0xb1, 0x91, 0x73, 0x39, 0xcf, 0x6a, 0xa3, 0x61, 0x31, 0xcf, 0x32, 0x1b, 0x51, 0xe2, 0xd4, - 0x36, 0xd5, 0xc9, 0x38, 0xba, 0x07, 0xd9, 0xbe, 0x49, 0x31, 0xa1, 0xcd, 0x60, 0x76, 0x01, 0xdf, - 0xee, 0x55, 0x56, 0x46, 0x11, 0x30, 0x26, 0x26, 0x58, 0x46, 0x82, 0xd1, 0x1e, 0xa4, 0x98, 0x2d, - 0x89, 0x8b, 0xdb, 0xb9, 0x0c, 0xdf, 0x62, 0x2a, 0xec, 0xae, 0x98, 0x34, 0x3d, 0xa7, 0x55, 0x77, - 0x71, 0x5b, 0x9e, 0x34, 0x01, 0x84, 0x2a, 0x22, 0xd7, 0xf3, 0x6d, 0x92, 0x5b, 0xde, 0x9e, 0xdf, - 0xc9, 0xec, 0x22, 0x69, 0xb4, 0x05, 0xc6, 0x8f, 0x54, 0x0c, 0xdf, 0x26, 0x13, 0x2a, 0x0c, 0xd2, - 0x7e, 0x51, 0x60, 0x6d, 0x7c, 0x4f, 0x0c, 0xfc, 0xd8, 0xc7, 0x84, 0xa2, 0x3b, 0xb0, 0x24, 0xae, - 0x0b, 0xc9, 0x29, 0xdb, 0xf3, 0x92, 0xb1, 0xab, 0x1d, 0x32, 0x61, 0xec, 0x6a, 0x87, 0xa0, 0x43, - 0x58, 0xc5, 0x5f, 0xb9, 0xa6, 0xdd, 0x69, 0x46, 0xa7, 0x61, 0x77, 0x27, 0xc5, 0x07, 0xc1, 0x96, - 0x08, 0x1d, 0x4d, 0x9d, 0x24, 0x1b, 0x0b, 0xa0, 0x77, 0x61, 0x45, 0x12, 0xf1, 0x7c, 0x9b, 0xdf, - 0xa9, 0x94, 0x68, 0x7d, 0x44, 0x35, 0xfc, 0x58, 0xeb, 0x65, 0x5c, 0xfb, 0x47, 0x01, 0x24, 0x9f, - 0x85, 0xb8, 0x8e, 0x4d, 0x30, 0x6a, 0x41, 0x86, 0x29, 0x76, 0x04, 0xcc, 0x0f, 0x94, 0xd9, 0xbd, - 0x19, 0xd6, 0x6a, 0x82, 0x2d, 0x41, 0xba, 0x4d, 0xbd, 0xb3, 0x83, 0x1c, 0x1b, 0x39, 0xbd, 0x08, - 0x94, 0x16, 0x87, 0x31, 0x9a, 0x7f, 0x02, 0xab, 0x13, 0x89, 0xe8, 0x15, 0x98, 0x3f, 0xc5, 0x67, - 0xc1, 0xbc, 0x59, 0x1b, 0x0d, 0x8b, 0xd9, 0x53, 0x7c, 0x26, 0xa5, 0xb3, 0x28, 0xda, 0x83, 0xe4, - 0x13, 0xb3, 0x1f, 0xcc, 0x9a, 0xcc, 0xee, 0xea, 0xc4, 0xae, 0xc4, 0xed, 0xe6, 0x0c, 0xf9, 0x76, - 0x73, 0x60, 0x2f, 0x71, 0x57, 0xd1, 0xbe, 0x4f, 0xc0, 0x46, 0xac, 0xe1, 0xd1, 0xa9, 0x3d, 0x58, - 0x0d, 0xea, 0x38, 0x71, 0xf2, 0x3b, 0xd3, 0x2e, 0x91, 0x0f, 0x3f, 0x46, 0xc5, 0xf9, 0x79, 0x0b, - 0x7b, 0x32, 0x2e, 0xb7, 0x30, 0x16, 0xc8, 0x7f, 0xcd, 0xeb, 0x3f, 0xa1, 0x70, 0xb9, 0x42, 0xdc, - 0x8b, 0x17, 0xe2, 0x22, 0x2b, 0xcf, 0xaa, 0x85, 0x0e, 0xeb, 0x13, 0xa7, 0x8a, 0xcc, 0x2c, 0x2e, - 0x67, 0xcc, 0xcc, 0xfc, 0x43, 0x22, 0x66, 0x66, 0x81, 0x68, 0xfb, 0xa0, 0x06, 0xc3, 0xd5, 0xff, - 0x9f, 0xf7, 0x41, 0xfb, 0x5b, 0x5c, 0xaa, 0x50, 0x23, 0xe8, 0xc8, 0x97, 0x00, 0xfc, 0x7a, 0xb0, - 0xd1, 0x1c, 0x36, 0xe3, 0x55, 0x79, 0x98, 0xfb, 0xb1, 0x46, 0xf0, 0xf1, 0x1e, 0x34, 0x81, 0xbf, - 0x26, 0x7a, 0x21, 0x26, 0xbf, 0x26, 0x22, 0x30, 0x4f, 0x60, 0x25, 0x9e, 0x75, 0xb9, 0xc2, 0xdf, - 0x95, 0x0b, 0x7f, 0xf1, 0xdb, 0xe5, 0xe5, 0x35, 0xbf, 0xf5, 0x5d, 0x02, 0x32, 0xd2, 0xb7, 0x14, - 0xda, 0x80, 0x35, 0xe3, 0xa4, 0xd6, 0xac, 0x37, 0xf6, 0x1b, 0x7a, 0xf3, 0xa4, 0xf6, 0x7e, 0xed, - 0xc3, 0x8f, 0x6b, 0xea, 0x1c, 0x5a, 0x07, 0x75, 0x0c, 0x3f, 0xd0, 0xf7, 0xeb, 0x7a, 0x45, 0x55, - 0xe2, 0xe4, 0x63, 0xbd, 0x56, 0xa9, 0xd6, 0xee, 0xab, 0x89, 0x38, 0x6c, 0x9c, 0xd4, 0x6a, 0x0c, - 0x9e, 0x47, 0x5b, 0x70, 0x65, 0x0c, 0xd7, 0x4f, 0x0e, 0x0f, 0x75, 0xbd, 0xa2, 0x57, 0xd4, 0x85, - 0xb8, 0xf8, 0x7b, 0xfb, 0xd5, 0x07, 0x7a, 0x45, 0x4d, 0xc6, 0xe9, 0xc7, 0x86, 0xae, 0x7f, 0x70, - 0xdc, 0xd0, 0x2b, 0xea, 0x62, 0x3c, 0x70, 0xb8, 0x5f, 0x3b, 0xd4, 0x1f, 0xb0, 0x8c, 0x25, 0x74, - 0x0d, 0xb6, 0x26, 0x36, 0xd9, 0xd4, 0x3f, 0x39, 0xae, 0x1a, 0x7a, 0x45, 0x4d, 0xa1, 0x1b, 0x70, - 0xd5, 0x38, 0xa9, 0xd5, 0x63, 0x51, 0x43, 0x6f, 0x9c, 0x18, 0x35, 0xbd, 0xa2, 0xa6, 0x77, 0x7f, - 0x4a, 0xc0, 0xc2, 0x91, 0xd3, 0x22, 0xe8, 0x73, 0x58, 0xbe, 0x8f, 0x69, 0xd4, 0x50, 0xb4, 0x31, - 0xd9, 0x60, 0x6e, 0xa8, 0xfc, 0xe6, 0xc5, 0x7d, 0xd7, 0xae, 0x7f, 0xfb, 0xeb, 0x5f, 0x3f, 0x24, - 0x36, 0xb5, 0xb5, 0xf2, 0x93, 0x37, 0xd8, 0x67, 0x3b, 0xfb, 0x23, 0x9c, 0xb2, 0xa7, 0xdc, 0x42, - 0x4d, 0xc8, 0x0a, 0xf1, 0xf0, 0xb3, 0x66, 0x73, 0x6a, 0x8a, 0x09, 0xf9, 0xad, 0x97, 0x4c, 0x37, - 0xed, 0x06, 0xd7, 0xdf, 0xd2, 0x90, 0xa4, 0x1f, 0x8c, 0x07, 0xb6, 0xc0, 0x29, 0xa8, 0x62, 0x01, - 0xe9, 0xbb, 0xfc, 0xea, 0x45, 0xf3, 0x42, 0x2c, 0x93, 0x7f, 0xf9, 0x28, 0xd1, 0xb6, 0xf9, 0x4a, - 0x79, 0x6d, 0x43, 0x5a, 0xc9, 0xf3, 0xed, 0xf1, 0x62, 0x07, 0xd5, 0xe7, 0x7f, 0x16, 0xe6, 0xbe, - 0x39, 0x2f, 0x28, 0x3f, 0x9f, 0x17, 0x94, 0x67, 0xe7, 0x05, 0xe5, 0x8f, 0xf3, 0x82, 0xf2, 0xf4, - 0x45, 0x61, 0xee, 0xd9, 0x8b, 0xc2, 0xdc, 0xf3, 0x17, 0x85, 0xb9, 0xcf, 0x6e, 0x4a, 0x3f, 0x54, - 0x4c, 0x6f, 0x60, 0x76, 0x4c, 0xd7, 0x73, 0x7a, 0xb8, 0x4d, 0x83, 0xa7, 0x72, 0xf0, 0xcb, 0xa4, - 0xb5, 0xc8, 0x5f, 0xe8, 0x6f, 0xfe, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x32, 0xbb, 0xc6, 0x38, 0xf2, - 0x0c, 0x00, 0x00, + // 1274 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0x51, 0x6f, 0xdb, 0xd4, + 0x17, 0xaf, 0xd3, 0xa6, 0x4d, 0x4e, 0x9a, 0xd6, 0xbd, 0x6d, 0xd7, 0x34, 0xdb, 0x92, 0xca, 0x7f, + 0xfd, 0x59, 0x99, 0xb6, 0x44, 0x14, 0x21, 0x4d, 0x45, 0x13, 0xb4, 0x8d, 0x99, 0x52, 0x46, 0xa8, + 0x9c, 0x14, 0x06, 0x1a, 0x8a, 0xec, 0xe4, 0x2e, 0x73, 0x96, 0xd8, 0x9e, 0xef, 0xf5, 0x44, 0x25, + 0x1e, 0x10, 0x12, 0x0f, 0xbc, 0x4d, 0xe2, 0x33, 0xec, 0xbb, 0xc0, 0xdb, 0x24, 0x5e, 0xf6, 0x42, + 0x80, 0x0e, 0x09, 0x29, 0x4f, 0x7c, 0x04, 0xe4, 0x7b, 0x6d, 0xe7, 0xda, 0xe9, 0x94, 0xc2, 0x5b, + 0xfc, 0x3b, 0xe7, 0xfc, 0xee, 0x3d, 0xe7, 0xfc, 0xce, 0xb1, 0x03, 0x6b, 0xce, 0x93, 0x5e, 0x55, + 0x77, 0xcc, 0x6a, 0xdf, 0x36, 0x2a, 0x8e, 0x6b, 0x53, 0x1b, 0xcd, 0xeb, 0x8e, 0x59, 0xbc, 0xdd, + 0x33, 0xe9, 0x63, 0xcf, 0xa8, 0x74, 0xec, 0x61, 0xb5, 0x67, 0xf7, 0xec, 0x2a, 0xb3, 0x19, 0xde, + 0x23, 0xf6, 0xc4, 0x1e, 0xd8, 0x2f, 0x1e, 0x53, 0xdc, 0x08, 0x69, 0x88, 0x67, 0x0c, 0x4d, 0x1a, + 0xa0, 0xe5, 0x9e, 0x6d, 0xf7, 0x06, 0x78, 0x12, 0x4b, 0xcd, 0x21, 0x26, 0x54, 0x1f, 0x3a, 0x81, + 0xc3, 0xb5, 0xc0, 0xc1, 0x8f, 0xd4, 0x2d, 0xcb, 0xa6, 0x3a, 0x35, 0x6d, 0x8b, 0x70, 0xab, 0xf2, + 0xeb, 0x02, 0xe4, 0x8f, 0x6d, 0x43, 0xf3, 0xac, 0x1a, 0xa6, 0xba, 0x39, 0x20, 0xe8, 0x26, 0x2c, + 0xba, 0x9e, 0xd5, 0x36, 0xbb, 0x05, 0x69, 0x47, 0xda, 0xcd, 0x1e, 0xae, 0x8f, 0x47, 0xe5, 0x55, + 0xd7, 0xb3, 0xea, 0xdd, 0x5b, 0xf6, 0xd0, 0xa4, 0x78, 0xe8, 0xd0, 0x33, 0x2d, 0xcd, 0x00, 0xdf, + 0xb7, 0x6f, 0x1b, 0xbe, 0x6f, 0x6a, 0xe2, 0xdb, 0xb7, 0x8d, 0xb8, 0x2f, 0x03, 0xd0, 0xfb, 0x90, + 0x26, 0x54, 0xa7, 0xb8, 0x30, 0xbf, 0x23, 0xed, 0xae, 0xec, 0xc9, 0x15, 0xdd, 0x31, 0x2b, 0xfc, + 0xe8, 0xa6, 0x8f, 0xf3, 0x60, 0xe6, 0x22, 0x06, 0x33, 0x00, 0x55, 0x61, 0xa9, 0x33, 0xf0, 0x08, + 0xc5, 0x6e, 0x61, 0x81, 0x9d, 0xb4, 0x39, 0x1e, 0x95, 0xd7, 0x02, 0x48, 0x70, 0x0f, 0xbd, 0xd0, + 0x5b, 0xb0, 0x60, 0xd9, 0x5d, 0x5c, 0x48, 0x33, 0x6f, 0x34, 0x1e, 0x95, 0x57, 0xfc, 0x67, 0xc1, + 0x95, 0xd9, 0x51, 0x13, 0xb2, 0x03, 0xac, 0x13, 0xdc, 0x6d, 0x53, 0x52, 0x58, 0xda, 0x91, 0x76, + 0x73, 0x7b, 0xc5, 0x0a, 0xaf, 0x58, 0x25, 0x2c, 0x69, 0xa5, 0x15, 0x96, 0xf4, 0xb0, 0x38, 0x1e, + 0x95, 0x11, 0x0f, 0x68, 0x91, 0x09, 0xd9, 0xf3, 0xdf, 0xca, 0x92, 0x96, 0x09, 0x71, 0xf4, 0x19, + 0x80, 0x83, 0xad, 0xae, 0x69, 0xf5, 0x7c, 0xd6, 0xcc, 0x4c, 0xd6, 0xab, 0xe3, 0x51, 0x79, 0x3d, + 0x88, 0x98, 0xa2, 0xcd, 0x46, 0x06, 0x9f, 0x97, 0x50, 0xdd, 0xa5, 0xfc, 0xb6, 0xd9, 0xcb, 0xf1, + 0x06, 0x11, 0xd3, 0xbc, 0x91, 0x01, 0x7d, 0x01, 0xb9, 0x47, 0xa6, 0x65, 0x92, 0xc7, 0x9c, 0x18, + 0x66, 0x12, 0x5f, 0x1b, 0x8f, 0xca, 0x1b, 0x61, 0xc8, 0x14, 0x33, 0x4c, 0x2c, 0xca, 0x8b, 0x45, + 0x80, 0x63, 0xdb, 0x10, 0xc4, 0x15, 0x08, 0x46, 0x9a, 0x29, 0x98, 0xb7, 0x21, 0xfd, 0xd4, 0xc3, + 0x1e, 0x16, 0xb5, 0xc5, 0x00, 0xd1, 0x95, 0x01, 0xe8, 0x16, 0xa3, 0x25, 0x98, 0x32, 0x71, 0x65, + 0x0f, 0x37, 0xc6, 0xa3, 0xb2, 0xcc, 0x11, 0xc1, 0x39, 0xf0, 0x41, 0xef, 0x41, 0xd6, 0xd2, 0x87, + 0x98, 0x38, 0x7a, 0x07, 0x07, 0x72, 0xda, 0xf2, 0x2b, 0x15, 0x81, 0x42, 0xcc, 0xc4, 0x13, 0xdd, + 0x09, 0x05, 0x9c, 0x66, 0x02, 0xce, 0x87, 0x02, 0x9e, 0xad, 0xde, 0x87, 0xb0, 0xcc, 0x67, 0x36, + 0xe8, 0xdc, 0xe2, 0xcc, 0x02, 0x5f, 0x1f, 0x8f, 0xca, 0x9b, 0x51, 0xcc, 0x54, 0x85, 0x73, 0x82, + 0xc9, 0x97, 0x70, 0x47, 0xb7, 0x3a, 0x78, 0xf0, 0x2f, 0x24, 0xcc, 0x03, 0xa6, 0x25, 0x1c, 0xe2, + 0xe8, 0x03, 0xc8, 0x07, 0xa4, 0x2e, 0xd6, 0x89, 0x6d, 0x31, 0x15, 0x67, 0x59, 0xf0, 0x15, 0x6e, + 0xd0, 0x18, 0x2e, 0x24, 0xbb, 0x2c, 0xe2, 0x68, 0x00, 0x68, 0xa0, 0x13, 0xda, 0xa6, 0xae, 0x6e, + 0x11, 0xd3, 0x5f, 0x39, 0x97, 0xd3, 0xac, 0x32, 0x1e, 0x95, 0x8b, 0x7e, 0x64, 0x2b, 0x0a, 0x9c, + 0xba, 0xa6, 0x9c, 0xb4, 0xa3, 0xbb, 0x90, 0x1f, 0xe8, 0x14, 0x13, 0xda, 0x0e, 0x76, 0x17, 0xb0, + 0xeb, 0x6e, 0xfb, 0x65, 0xe4, 0x06, 0x2d, 0xb1, 0xc1, 0x72, 0x02, 0x8c, 0xf6, 0x21, 0xe3, 0xcb, + 0x92, 0x38, 0xb8, 0x53, 0xc8, 0xb1, 0x2b, 0x66, 0xc2, 0xee, 0xf2, 0x4d, 0xd3, 0xb7, 0x8d, 0xa6, + 0x83, 0x3b, 0xe2, 0xa6, 0x09, 0x20, 0x54, 0xe3, 0xb1, 0xae, 0x67, 0x91, 0xc2, 0xf2, 0xce, 0xfc, + 0x6e, 0x6e, 0x0f, 0x09, 0xab, 0x2d, 0x10, 0x7e, 0xc4, 0xa2, 0x79, 0x16, 0x49, 0xb0, 0xf8, 0x90, + 0xf2, 0xb3, 0x04, 0x6b, 0x93, 0x39, 0xd1, 0xf0, 0x53, 0x0f, 0x13, 0x8a, 0x6e, 0xc3, 0x12, 0x1f, + 0x17, 0x52, 0x90, 0x76, 0xe6, 0x05, 0x61, 0xd7, 0xbb, 0x24, 0x21, 0xec, 0x7a, 0x97, 0xa0, 0x23, + 0x58, 0xc5, 0x5f, 0x3b, 0xba, 0xd5, 0x6d, 0x47, 0xd9, 0xf8, 0xb3, 0x93, 0x61, 0x8b, 0x60, 0x8b, + 0x9b, 0x8e, 0xa7, 0x32, 0xc9, 0xc7, 0x0c, 0xe8, 0x43, 0x58, 0x11, 0x48, 0x5c, 0xcf, 0x62, 0x33, + 0x95, 0xe1, 0xad, 0x8f, 0x5c, 0x35, 0x2f, 0xd6, 0x7a, 0x11, 0x57, 0xfe, 0x96, 0x00, 0x89, 0xb9, + 0x10, 0xc7, 0xb6, 0x08, 0x46, 0x06, 0xe4, 0x7c, 0xc6, 0x2e, 0x87, 0x59, 0x42, 0xb9, 0xbd, 0x1b, + 0x61, 0xad, 0x12, 0xde, 0x02, 0xa4, 0x5a, 0xd4, 0x3d, 0x3b, 0x2c, 0xf8, 0x2b, 0xa7, 0x1f, 0x81, + 0xc2, 0xe1, 0x30, 0x41, 0x8b, 0xcf, 0x60, 0x35, 0x11, 0x88, 0xfe, 0x07, 0xf3, 0x4f, 0xf0, 0x59, + 0xb0, 0x6f, 0xd6, 0xc6, 0xa3, 0x72, 0xfe, 0x09, 0x3e, 0x13, 0xc2, 0x7d, 0x2b, 0xda, 0x87, 0xf4, + 0x33, 0x7d, 0x10, 0xec, 0x9a, 0xdc, 0xde, 0x6a, 0xe2, 0x56, 0x7c, 0xba, 0x99, 0x87, 0x38, 0xdd, + 0x0c, 0xd8, 0x4f, 0xdd, 0x91, 0x94, 0x1f, 0x52, 0xb0, 0x19, 0x6b, 0x78, 0x94, 0xb5, 0x0b, 0xab, + 0x41, 0x1d, 0x13, 0x99, 0xdf, 0x9e, 0x56, 0x89, 0x98, 0xfc, 0x04, 0xe5, 0xf9, 0xb3, 0x16, 0xf6, + 0x45, 0x5c, 0x6c, 0x61, 0xcc, 0x50, 0xfc, 0x86, 0xd5, 0x3f, 0xc1, 0x70, 0xb9, 0x42, 0xdc, 0x8d, + 0x17, 0xe2, 0x22, 0x29, 0xcf, 0xaa, 0x85, 0x0a, 0x1b, 0x89, 0xac, 0x22, 0x31, 0xf3, 0xe1, 0x8c, + 0x89, 0x99, 0x7d, 0x48, 0xc4, 0xc4, 0xcc, 0x11, 0xe5, 0x00, 0xe4, 0x60, 0xb9, 0x7a, 0xff, 0x71, + 0x1e, 0x94, 0xbf, 0xf8, 0x50, 0x85, 0x1c, 0x41, 0x47, 0xbe, 0x02, 0x60, 0xe3, 0xe1, 0xaf, 0xe6, + 0xb0, 0x19, 0xff, 0x17, 0x97, 0xb9, 0x17, 0x6b, 0x04, 0x5b, 0xef, 0x41, 0x13, 0xd8, 0x6b, 0xa2, + 0x1f, 0x62, 0xe2, 0x6b, 0x22, 0x02, 0x8b, 0x04, 0x56, 0xe2, 0x51, 0x97, 0x2b, 0xfc, 0x1d, 0xb1, + 0xf0, 0x17, 0xbf, 0x5d, 0xde, 0x5c, 0xf3, 0x9b, 0xdf, 0xa7, 0x20, 0x27, 0x7c, 0x4b, 0xa1, 0x4d, + 0x58, 0xd3, 0x4e, 0x1b, 0xed, 0x66, 0xeb, 0xa0, 0xa5, 0xb6, 0x4f, 0x1b, 0x1f, 0x37, 0x3e, 0xfd, + 0xbc, 0x21, 0xcf, 0xa1, 0x0d, 0x90, 0x27, 0xf0, 0x7d, 0xf5, 0xa0, 0xa9, 0xd6, 0x64, 0x29, 0xee, + 0x7c, 0xa2, 0x36, 0x6a, 0xf5, 0xc6, 0x3d, 0x39, 0x15, 0x87, 0xb5, 0xd3, 0x46, 0xc3, 0x87, 0xe7, + 0xd1, 0x16, 0xac, 0x4f, 0xe0, 0xe6, 0xe9, 0xd1, 0x91, 0xaa, 0xd6, 0xd4, 0x9a, 0xbc, 0x10, 0x27, + 0xff, 0xe8, 0xa0, 0x7e, 0x5f, 0xad, 0xc9, 0xe9, 0xb8, 0xfb, 0x89, 0xa6, 0xaa, 0x9f, 0x9c, 0xb4, + 0xd4, 0x9a, 0xbc, 0x18, 0x37, 0x1c, 0x1d, 0x34, 0x8e, 0xd4, 0xfb, 0x7e, 0xc4, 0x12, 0xba, 0x0a, + 0x5b, 0x89, 0x4b, 0xb6, 0xd5, 0x07, 0x27, 0x75, 0x4d, 0xad, 0xc9, 0x19, 0x74, 0x1d, 0xb6, 0xb5, + 0xd3, 0x46, 0x33, 0x66, 0xd5, 0xd4, 0xd6, 0xa9, 0xd6, 0x50, 0x6b, 0x72, 0x76, 0xef, 0x45, 0x0a, + 0x16, 0x8e, 0x6d, 0x83, 0xa0, 0x07, 0xb0, 0x7c, 0x0f, 0xd3, 0xa8, 0xa1, 0x68, 0x33, 0xd9, 0x60, + 0x26, 0xa8, 0xe2, 0x95, 0x8b, 0xfb, 0xae, 0x6c, 0x7f, 0xf7, 0xcb, 0x9f, 0x3f, 0xa6, 0xd6, 0x95, + 0x95, 0xea, 0xb3, 0x77, 0xfc, 0xcf, 0xf6, 0x2a, 0x61, 0xf6, 0x7d, 0xe9, 0x26, 0x7a, 0x08, 0x79, + 0xce, 0x1c, 0x7e, 0xd3, 0x5c, 0x99, 0x5a, 0x61, 0x9c, 0x7b, 0xeb, 0x0d, 0xab, 0x4d, 0x29, 0x32, + 0xf2, 0x0d, 0x65, 0x35, 0x24, 0x0f, 0x16, 0x83, 0xcf, 0x8e, 0x41, 0xe6, 0xec, 0xc2, 0x17, 0xf9, + 0xf6, 0x45, 0x9b, 0x82, 0x9f, 0x51, 0x7c, 0xf3, 0x12, 0x89, 0x1f, 0xe3, 0x7a, 0x96, 0x70, 0xcc, + 0x61, 0xfd, 0xd5, 0x1f, 0xa5, 0xb9, 0x6f, 0xcf, 0x4b, 0xd2, 0x4f, 0xe7, 0x25, 0xe9, 0xe5, 0x79, + 0x49, 0xfa, 0xfd, 0xbc, 0x24, 0x3d, 0x7f, 0x5d, 0x9a, 0x7b, 0xf9, 0xba, 0x34, 0xf7, 0xea, 0x75, + 0x69, 0xee, 0xcb, 0x1b, 0xc2, 0x9f, 0x13, 0xdd, 0x1d, 0xea, 0x5d, 0xdd, 0x71, 0xed, 0x3e, 0xee, + 0xd0, 0xe0, 0xa9, 0x1a, 0xfc, 0x1b, 0x31, 0x16, 0xd9, 0x4b, 0xfc, 0xdd, 0x7f, 0x02, 0x00, 0x00, + 0xff, 0xff, 0x5b, 0x9b, 0x23, 0x20, 0xe6, 0x0c, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/pkg/api/job.pb.gw.go b/pkg/api/job.pb.gw.go index 4b34593263d..250b40b5006 100644 --- a/pkg/api/job.pb.gw.go +++ b/pkg/api/job.pb.gw.go @@ -315,11 +315,11 @@ func RegisterJobsHandlerClient(ctx context.Context, mux *runtime.ServeMux, clien } var ( - pattern_Jobs_GetJobStatus_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v1", "job", "jobstatus"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Jobs_GetJobStatus_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v1", "job", "status"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_Jobs_GetJobDetails_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v1", "job", "jobdetails"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Jobs_GetJobDetails_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v1", "job", "details"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_Jobs_GetJobRunDetails_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v1", "job", "jobrundetails"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Jobs_GetJobRunDetails_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v1", "run", "details"}, "", runtime.AssumeColonVerbOpt(true))) ) var ( diff --git a/pkg/api/job.proto b/pkg/api/job.proto index 087f544000d..f48247c6086 100644 --- a/pkg/api/job.proto +++ b/pkg/api/job.proto @@ -80,19 +80,19 @@ message JobStatusResponse{ service Jobs { rpc GetJobStatus (JobStatusRequest) returns (JobStatusResponse) { option (google.api.http) = { - post: "/v1/job/jobstatus" + post: "/v1/job/status" body: "*" }; } rpc GetJobDetails (JobDetailsRequest) returns (JobDetailsResponse){ option (google.api.http) = { - post: "/v1/job/jobdetails" + post: "/v1/job/details" body: "*" }; } rpc GetJobRunDetails (JobRunDetailsRequest) returns (JobRunDetailsResponse){ option (google.api.http) = { - post: "/v1/job/jobrundetails" + post: "/v1/run/details" body: "*" }; }