CORE-1889 Tapis v3 Migration #270
Conversation
| @@ -73,8 +66,7 @@ | |||
|
|
|||
| (defn store-access-token | |||
| "Stores information about an OAuth access token in the database." | |||
| [api-name username {:keys [token-type expires-at refresh-token access-token]}] | |||
| (validate-token-type token-type) | |||
There was a problem hiding this comment.
Tapis no longer returns a token-type field.
| @@ -365,4 +365,5 @@ | |||
| (.hasAppPermission (util/get-apps-client clients system-id) username system-id app-id required-level)) | |||
|
|
|||
| (supportsJobSharing [_ job-step] | |||
| (.supportsJobSharing (util/apps-client-for-job-step clients job-step) job-step))) | |||
| (and (not= (:job_type job-step) jp/agave-job-type) | |||
| (.supportsJobSharing (util/apps-client-for-job-step clients job-step) job-step)))) | |||
There was a problem hiding this comment.
The changes in this namespace are only for allowing users to still list their old Agave jobs, even if they can't relaunch them anymore.
Maybe it would be better to re-add an Agave type that handles the logic in these methods, and throws an error for the rest? 🤷
There was a problem hiding this comment.
That seems pretty clean to me, but this is also understandable, so I'm open to leaving it as is.
| @@ -51,8 +52,7 @@ | |||
| "FolderInput" "collection" | |||
| "MultiFileSelector" "many"}) | |||
|
|
|||
| (def input-types | |||
| (set (keys input-multiplicities))) | |||
| (def input-types am/param-ds-input-types) | |||
There was a problem hiding this comment.
The HPC FileFolderInput type was missing from this before, so inputs were not repopulating in the UI relaunch forms correctly.
| (log/info (str "received a status update for Agave job " external-id ": status = " status)) | ||
| (apps/update-job-status job-id external-id status (first (remove string/blank? [end-time last-updated])))) | ||
| (service/assert-valid type "no status provided") | ||
| (let [{:keys [jobUuid]} (service/parse-json data) |
There was a problem hiding this comment.
Not sure why once again, but this data field is JSON encoded as a string, so we have to parse it here in order to get the Tapis job ID.
| @@ -365,4 +365,5 @@ | |||
| (.hasAppPermission (util/get-apps-client clients system-id) username system-id app-id required-level)) | |||
|
|
|||
| (supportsJobSharing [_ job-step] | |||
| (.supportsJobSharing (util/apps-client-for-job-step clients job-step) job-step))) | |||
| (and (not= (:job_type job-step) jp/agave-job-type) | |||
| (.supportsJobSharing (util/apps-client-for-job-step clients job-step) job-step)))) | |||
There was a problem hiding this comment.
That seems pretty clean to me, but this is also understandable, so I'm open to leaving it as is.
psarando
force-pushed
the
tapis-v3
branch
2 times, most recently
from
f028411 to
8a44e78
Compare
Bump authy to version 3.0.1 Rename token-uri oauth endpoint to "tokens"
Since the Tapis API no longer returns the `token-type` field, there is no need to check for it.
This PR will rename everything from
agavetotapisand add updates for cyverse-de/mescal#25 and cyverse-de/common-swagger-api#85, which must be merged first before this PR can be merged.