Skip to content

Rename storage setup #484

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
paulineribeyre merged 7 commits into from
Mar 3, 2026
Merged

Rename storage setup #484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1922b31
Update test_gen3_workflow.py
paulineribeyre Feb 27, 2026
ba6b0fb
Update gen3workflow.py
paulineribeyre Feb 27, 2026
ef416ed
Merge branch 'master' of github.com:uc-cdis/gen3-code-vigil into rena…
paulineribeyre Mar 2, 2026
4b5d218
unskip gen3-wf tests
paulineribeyre Mar 2, 2026
b4cfb97
Fix cleanup_user_bucket 403
paulineribeyre Mar 2, 2026
219742d
Fix storage_setup -> setup_storage
paulineribeyre Mar 2, 2026
da79237
Merge branch 'master' into rename-storage-setup
haraprasadj Mar 3, 2026
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
6 changes: 3 additions & 3 deletions gen3-integration-tests/services/gen3workflow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,9 @@ def _perform_s3_action(
##### /storage endpoint #####
#############################

def get_storage_info(self, user: str = "main_account", expected_status=200) -> Dict:
"""Makes a GET request to the `/storage/info` endpoint."""
storage_url = f"{self.BASE_URL}{self.SERVICE_URL}/storage/info"
def setup_storage(self, user: str = "main_account", expected_status=200) -> Dict:
"""Makes a GET request to the `/storage/setup` endpoint."""
storage_url = f"{self.BASE_URL}{self.SERVICE_URL}/storage/setup"
headers = (
{
"Authorization": f"bearer {self._get_access_token(user)}",
Expand Down
17 changes: 9 additions & 8 deletions gen3-integration-tests/tests/test_gen3_workflow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ def _nextflow_parse_completed_line(log_line):
return task_info


@pytest.mark.skip(reason="Until https://github.com/uc-cdis/gen3-code-vigil/pull/484 is merged")
@pytest.mark.skipif(
"funnel" not in pytest.deployed_services,
reason="funnel service is not running on this environment",
Expand All @@ -80,18 +79,20 @@ def setup_class(cls):
cls.invalid_user = "dummy_one"
cls.s3_folder_name = "integration-tests"
cls.s3_file_name = "test-input.txt"
# Ensure the bucket is emptied before running the tests
cls.gen3_workflow.cleanup_user_bucket()

cls.s3_storage_config = WorkflowStorageConfig.from_dict(
cls.gen3_workflow.get_storage_info(user=cls.valid_user, expected_status=200)
cls.gen3_workflow.setup_storage(user=cls.valid_user, expected_status=200)
)

######################## Test /storage/info endpoint ########################
# Ensure the bucket is emptied before running the tests (must run after
# `storage_setup` so the user has access to empty the bucket)
Copy link
Copy Markdown
Contributor Author

@paulineribeyre paulineribeyre Mar 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i will rename this before merging

Suggested change
# `storage_setup` so the user has access to empty the bucket)
# `setup_storage` so the user has access to empty the bucket)

cls.gen3_workflow.cleanup_user_bucket()

######################## Test /storage/setup endpoint ########################

def test_get_storage_info_without_token(self):
"""Test GET /storage/info without an access token."""
self.gen3_workflow.get_storage_info(user=None, expected_status=401)
def test_setup_storage_without_token(self):
"""Test GET /storage/setup without an access token."""
self.gen3_workflow.setup_storage(user=None, expected_status=401)

######################## Test /s3/ endpoint ########################

Expand Down
Loading