Skip to content
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.

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

MIDRC-536 MIDRC-653 Add expiration bucket lifecycle rule #112

Merged
merged 5 commits into from
Jul 18, 2024

Conversation

paulineribeyre
Copy link
Contributor

@paulineribeyre paulineribeyre commented Jun 14, 2024

Link to JIRA ticket if there is one: https://ctds-planx.atlassian.net/browse/MIDRC-536, https://ctds-planx.atlassian.net/browse/MIDRC-653

New Features

  • Add nextflow-global.s3-objects-expiration-days setting to configure when to delete objects created in S3 by Nextflow

Breaking Changes

Bug Fixes

  • Fix a bug when making requests to Arborist to check users' container authorization

Improvements

Dependency updates

Deployment changes

Copy link

filepath $$\textcolor{#f14c4c}{\tt{failed}}$$ SUBTOTAL
$$\textcolor{#f14c4c}{\tt{tests/test\_discoverypage.py}}$$ $$\textcolor{#f14c4c}{\tt{1}}$$ $$\textcolor{#f14c4c}{\tt{1}}$$
$$\textcolor{#f14c4c}{\tt{tests/test\_workspace.py}}$$ $$\textcolor{#f14c4c}{\tt{1}}$$ $$\textcolor{#f14c4c}{\tt{1}}$$
$$\textcolor{#f14c4c}{\tt{TOTAL}}$$ $$\textcolor{#f14c4c}{\tt{2}}$$ $$\textcolor{#f14c4c}{\tt{2}}$$

Please find the detailed integration test report here

Please find the ci env pod logs here

Copy link

filepath $$\textcolor{#23d18b}{\tt{passed}}$$ SUBTOTAL
$$\textcolor{#23d18b}{\tt{tests/test\_discoverypage.py}}$$ $$\textcolor{#23d18b}{\tt{1}}$$ $$\textcolor{#23d18b}{\tt{1}}$$
$$\textcolor{#23d18b}{\tt{tests/test\_workspace.py}}$$ $$\textcolor{#23d18b}{\tt{1}}$$ $$\textcolor{#23d18b}{\tt{1}}$$
$$\textcolor{#23d18b}{\tt{TOTAL}}$$ $$\textcolor{#23d18b}{\tt{2}}$$ $$\textcolor{#23d18b}{\tt{2}}$$

Please find the detailed integration test report here

Please find the ci env pod logs here

nss10
nss10 previously approved these changes Jun 17, 2024
Copy link
Contributor

@nss10 nss10 left a comment

Choose a reason for hiding this comment

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

Nothing major, just a minor question.

hatchery/nextflow.go Show resolved Hide resolved
@uc-cdis uc-cdis deleted a comment from github-actions bot Jul 15, 2024
@uc-cdis uc-cdis deleted a comment from github-actions bot Jul 15, 2024
@uc-cdis uc-cdis deleted a comment from github-actions bot Jul 15, 2024
@uc-cdis uc-cdis deleted a comment from github-actions bot Jul 15, 2024
@uc-cdis uc-cdis deleted a comment from github-actions bot Jul 15, 2024
Copy link

filepath $$\textcolor{#23d18b}{\tt{passed}}$$ SUBTOTAL
$$\textcolor{#23d18b}{\tt{tests/test\_discoverypage.py}}$$ $$\textcolor{#23d18b}{\tt{1}}$$ $$\textcolor{#23d18b}{\tt{1}}$$
$$\textcolor{#23d18b}{\tt{tests/test\_workspace.py}}$$ $$\textcolor{#23d18b}{\tt{1}}$$ $$\textcolor{#23d18b}{\tt{1}}$$
$$\textcolor{#23d18b}{\tt{TOTAL}}$$ $$\textcolor{#23d18b}{\tt{2}}$$ $$\textcolor{#23d18b}{\tt{2}}$$

Please find the detailed integration test report here

Please find the ci env pod logs here

@@ -233,14 +233,14 @@ var isUserAuthorizedForPayModels = func(userName string, allowedPayModels []stri
var isUserAuthorizedForResourcePaths = func(userName string, accessToken string, resourcePaths []string) (bool, error) {
Config.Logger.Printf("DEBUG: Checking user '%s' access to resource paths %v (service 'jupyterhub', method 'launch')", userName, resourcePaths)

body := "{ \"requests\": ["
body := fmt.Sprintf("{\"user\": {\"token\": \"%s\"}, \"requests\": [", accessToken)
Copy link
Contributor

Choose a reason for hiding this comment

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

Wondering why do we need to change this? Is sending the access token as a Bearer token not working anymore?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

it never worked, this arborist endpoint expects the token in the body

hatchery/nextflow.go Show resolved Hide resolved
@paulineribeyre paulineribeyre merged commit 6ec23fa into master Jul 18, 2024
6 of 8 checks passed
@paulineribeyre paulineribeyre deleted the feat/nf-expire-files branch July 18, 2024 18:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants