Skip to content

Commit

Permalink
Merge branch 'staging' into prod
Browse files Browse the repository at this point in the history
  • Loading branch information
kevinpricethesecond committed Dec 3, 2024
2 parents 194624d + 58cd78d commit 52a1001
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 8 deletions.
9 changes: 2 additions & 7 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
1.7.0
1.8.0

Live-docs: https://tapis-project.github.io/live-docs/?service=GlobusProxy

Expand All @@ -9,9 +9,4 @@ New features:
- none

Bug fixes:
- fixed incorrect error code when globus errors happen while making a transfer
- fixed formatting of error logs
- fixed 400 error on GET when a content-type header is included
- added additional tenant
- better error messages for uncaught exceptions
- change schema to allow for larger file sizes
- none
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -154,3 +154,8 @@ $ curl -x GET "http://localhost:5000/v3/globus-proxy/transfers/<client id>/<task
}
```

## Links

docker: https://hub.docker.com/r/tapis/globus-proxy
github: https://github.com/tapis-project/globus-proxy

7 changes: 6 additions & 1 deletion service/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,8 @@ def handle_transfer_error(exception, endpoint_id=None, msg=None):
error = GlobusInvalidRequestError(msg=message)
if exception.code == 404:
error = EndpointNotFoundError(msg=exception.message)
if exception.code == 'EndpointDeleted':
error = EndpointNotFoundError(msg=exception.message)
logger.error(error)
return error

Expand Down Expand Up @@ -335,7 +337,10 @@ def precheck(client_id, endpoints, access_token, refresh_token):
endpoints = list(endpoints.split())
logger.debug(f'have ep list:: {endpoints}')
for endpoint_id in endpoints:
endpoint_info = transfer_client.get_endpoint(endpoint_id)
try:
endpoint_info = transfer_client.get_endpoint(endpoint_id)
except TransferAPIError as e:
raise handle_transfer_error(e)
endpoint_type = endpoint_info["entity_type"]
if endpoint_type == "GCP_mapped_collection": # if it's a globus connect personal ep
connected = is_endpoint_connected(transfer_client, endpoint_id)
Expand Down

0 comments on commit 52a1001

Please sign in to comment.