Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix/handle error for blank guid #1276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
george42-ctds merged 4 commits into from
Jun 26, 2025
Merged

Fix/handle error for blank guid #1276

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd65bf9
(PPS-2067) add test for handling error for create blank record
george42-ctds Jun 23, 2025
759055d
(PPS-2067) add test for missing did in create blank record
george42-ctds Jun 23, 2025
6516ed1
(PPS-2067) remove debug print statements in new tests
george42-ctds Jun 23, 2025
ddace2b
Merge branch 'master' into fix/handle-error-for-blank-guid
george42-ctds Jun 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 94 additions & 0 deletions tests/data/test_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1657,6 +1657,100 @@ def json(self):
assert response.status_code == 403, response


def test_blank_index_upload_failed(
app,
client,
auth_client,
encoded_creds_jwt,
user_client,
aws_signed_url,
):
"""Test that data/upload does not return a pre-signed url if blank creation failed."""

class MockResponse(object):
def __init__(self, data, status_code=200):
self.data = data
self.status_code = status_code

def json(self):
return self.data

data_requests_mocker = mock.patch(
"fence.blueprints.data.indexd.requests", new_callable=mock.Mock
)
arborist_requests_mocker = mock.patch(
"gen3authz.client.arborist.client.httpx.Client.request", new_callable=mock.Mock
)
with data_requests_mocker as data_requests, arborist_requests_mocker as arborist_requests:
# user is authorized by arborist
arborist_requests.return_value = MockResponse({"auth": True})
arborist_requests.return_value.status_code = 200
headers = {
"Authorization": "Bearer " + encoded_creds_jwt.jwt,
"Content-Type": "application/json",
}
data = json.dumps({"file_name": "doesn't matter"})
# failure from indexd create blank record
data_requests.return_value.status_code = 500

response = client.post("/data/upload", headers=headers, data=data)

data_requests.post.assert_called()
# assert that we do not get a pre-signed url
assert response.status_code == 500, response


def test_blank_index_upload_missing_did(
app,
client,
auth_client,
encoded_creds_jwt,
user_client,
aws_signed_url,
):
"""
Test that data/upload does not return a pre-signed url
if blank creation does not have a 'did' key.
"""

class MockResponse(object):
def __init__(self, data, status_code=200):
self.data = data
self.status_code = status_code

def json(self):
return self.data

data_requests_mocker = mock.patch(
"fence.blueprints.data.indexd.requests", new_callable=mock.Mock
)
arborist_requests_mocker = mock.patch(
"gen3authz.client.arborist.client.httpx.Client.request", new_callable=mock.Mock
)
with data_requests_mocker as data_requests, arborist_requests_mocker as arborist_requests:
# user is authorized by arborist
arborist_requests.return_value = MockResponse({"auth": True})
arborist_requests.return_value.status_code = 200
headers = {
"Authorization": "Bearer " + encoded_creds_jwt.jwt,
"Content-Type": "application/json",
}
data = json.dumps({"file_name": "doesn't matter"})
data_requests.return_value.status_code = 200
# Missing 'did' in response.
data_requests.post.return_value = MockResponse(
{
"baseid": str(uuid.uuid4()),
}
)

response = client.post("/data/upload", headers=headers, data=data)

data_requests.post.assert_called()
# assert that we do not get a pre-signed url
assert response.status_code == 500, response


@pytest.mark.parametrize(
"indexd_client_with_arborist",
["gs", "s3", "gs_acl", "s3_acl", "s3_external"],
Expand Down
Loading