diff --git a/project.clj b/project.clj index 5dd0e380..9d1c3ede 100644 --- a/project.clj +++ b/project.clj @@ -38,7 +38,7 @@ [org.cyverse/cyverse-groups-client "0.1.9"] [org.cyverse/common-cfg "2.8.3"] [org.cyverse/common-cli "2.8.2"] - [org.cyverse/common-swagger-api "3.4.7"] + [org.cyverse/common-swagger-api "3.4.8"] [org.cyverse/kameleon "3.0.10" :exclusion [com.impossibl.pgjdbc-ng/pgjdbc-ng]] [com.impossibl.pgjdbc-ng/pgjdbc-ng "0.8.9"] diff --git a/src/terrain/clients/apps/raw.clj b/src/terrain/clients/apps/raw.clj index dfb0e8dc..5c7319c7 100644 --- a/src/terrain/clients/apps/raw.clj +++ b/src/terrain/clients/apps/raw.clj @@ -1453,11 +1453,10 @@ {:query-params (secured-params) :as :json})))) -(defn update-agave-job-status - [job-id body params] - (:body (client/post (apps-url "callbacks" "agave-job" job-id) +(defn update-tapis-job-status + [job-id body] + (:body (client/post (apps-url "callbacks" "tapis-job" job-id) (disable-redirects - {:query-params params - :form-params body + {:form-params body :content-type :json :as :json})))) diff --git a/src/terrain/routes/callbacks.clj b/src/terrain/routes/callbacks.clj index 0303010f..b8e61b50 100644 --- a/src/terrain/routes/callbacks.clj +++ b/src/terrain/routes/callbacks.clj @@ -1,7 +1,7 @@ (ns terrain.routes.callbacks (:require [common-swagger-api.schema :refer [context describe POST]] [common-swagger-api.schema.analyses :refer [AnalysisIdPathParam]] - [common-swagger-api.schema.callbacks :refer [AgaveJobStatusUpdateParams AgaveJobStatusUpdate]] + [common-swagger-api.schema.callbacks :refer [TapisJobStatusUpdate]] [ring.util.http-response :refer [ok]] [terrain.clients.apps.raw :as apps] [terrain.util :refer [optional-routes]] @@ -14,15 +14,14 @@ "Routes for making calls back into the DE web services." [] (optional-routes - [config/app-routes-enabled] + [config/app-routes-enabled] - (context "/callbacks" [] - :tags ["callbacks"] + (context "/callbacks" [] + :tags ["callbacks"] - (POST "/agave-job/:job-id" [] - :path-params [job-id :- AnalysisIdPathParam] - :body [body (describe AgaveJobStatusUpdate "The updated job status information.")] - :query [params AgaveJobStatusUpdateParams] - :summary "Update the status of an Agave analysis." - :description "The DE registers this endpoint as a callback when it submts jobs to Agave." - (ok (apps/update-agave-job-status job-id body params)))))) + (POST "/tapis-job/:job-id" [] + :path-params [job-id :- AnalysisIdPathParam] + :body [body (describe TapisJobStatusUpdate "The updated job status information.")] + :summary "Update the status of a Tapis analysis." + :description "The DE registers this endpoint as a callback when it submits jobs to Tapis." + (ok (apps/update-tapis-job-status job-id body))))))