Handle 'None' string in fence config #1161

AlbertSnows · 2024-07-18T19:02:35Z

Link to JIRA ticket if there is one: https://ctds-planx.atlassian.net/browse/PXP-11305

New Features

Breaking Changes

Bug Fixes

fixed initial setup error due to empty property in config-default.yaml file

Improvements

Dependency updates

Deployment changes

…mplicated

fence/config.py

Fix so local csvs file are processed in consistent order, regardless of os Updates user_info overwrite logic to preserve data when processing CSVs without some attributes

coveralls · 2024-07-23T15:09:11Z

Pull Request Test Coverage Report for Build 11444102217

Details

0 of 0 changed or added relevant lines in 0 files are covered.
315 unchanged lines in 4 files lost coverage.
Overall coverage increased (+0.2%) to 75.493%

Files with Coverage Reduction	New Missed Lines	%
config.py	12	85.39%
utils.py	55	64.81%
scripting/google_monitor.py	103	40.0%
scripting/fence_create.py	145	61.66%

Totals
Change from base Build 11407509502:	0.2%
Covered Lines:	7843
Relevant Lines:	10389

💛 - Coveralls

tests/test_app_config.py

fence/config.py

tests/test_app_config.py

fence/config.py

tests/test_app_config.py

minor refactors implementing alex's suggestions

fence/config.py

changes to visibility

…fix/handle_none_string_v2

moving create_client to fence create to help resolve circular dependencies defining generic functions in config moving send email to google monitor to help with circular dependencies adding utils test

tests/test_utils.py

fence/utils.py

github-actions · 2024-10-18T15:54:20Z

filepath	$$\textcolor{#23d18b}{\tt{passed}}$$	$$\textcolor{#f14c4c}{\tt{failed}}$$	$$\textcolor{#ffa500}{\tt{skipped}}$$	SUBTOTAL
$$\textcolor{#23d18b}{\tt{tests/test\_oauth2.py}}$$	$$\textcolor{#23d18b}{\tt{15}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#23d18b}{\tt{15}}$$
$$\textcolor{#23d18b}{\tt{tests/test\_centralized\_auth.py}}$$	$$\textcolor{#23d18b}{\tt{16}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#23d18b}{\tt{16}}$$
$$\textcolor{#f14c4c}{\tt{tests/test\_data\_upload.py}}$$	$$\textcolor{#23d18b}{\tt{3}}$$	$$\textcolor{#f14c4c}{\tt{5}}$$	$$\textcolor{#ffa500}{\tt{1}}$$	$$\textcolor{#f14c4c}{\tt{9}}$$
$$\textcolor{#23d18b}{\tt{tests/test\_presigned\_url.py}}$$	$$\textcolor{#23d18b}{\tt{7}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#23d18b}{\tt{7}}$$
$$\textcolor{#23d18b}{\tt{tests/test\_user\_token.py}}$$	$$\textcolor{#23d18b}{\tt{5}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#23d18b}{\tt{5}}$$
$$\textcolor{#23d18b}{\tt{tests/test\_drs\_endpoint.py}}$$	$$\textcolor{#23d18b}{\tt{4}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#23d18b}{\tt{4}}$$
$$\textcolor{#23d18b}{\tt{tests/test\_ras\_authn.py}}$$	$$\textcolor{#23d18b}{\tt{3}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#23d18b}{\tt{3}}$$
$$\textcolor{#ffa500}{\tt{tests/test\_dbgap.py}}$$	$$\textcolor{#23d18b}{\tt{3}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#ffa500}{\tt{1}}$$	$$\textcolor{#ffa500}{\tt{4}}$$
$$\textcolor{#23d18b}{\tt{tests/test\_client\_credentials.py}}$$	$$\textcolor{#23d18b}{\tt{1}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#23d18b}{\tt{1}}$$
$$\textcolor{#23d18b}{\tt{tests/test\_google\_data\_access.py}}$$	$$\textcolor{#23d18b}{\tt{1}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#23d18b}{\tt{1}}$$
$$\textcolor{#23d18b}{\tt{tests/test\_oidc\_client.py}}$$	$$\textcolor{#23d18b}{\tt{2}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#23d18b}{\tt{2}}$$
$$\textcolor{#23d18b}{\tt{tests/test\_audit\_service.py}}$$	$$\textcolor{#23d18b}{\tt{1}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#23d18b}{\tt{1}}$$
$$\textcolor{#ffa500}{\tt{tests/test\_register\_user.py}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#ffa500}{\tt{2}}$$	$$\textcolor{#ffa500}{\tt{2}}$$
$$\textcolor{#f14c4c}{\tt{TOTAL}}$$	$$\textcolor{#23d18b}{\tt{61}}$$	$$\textcolor{#f14c4c}{\tt{5}}$$	$$\textcolor{#ffa500}{\tt{4}}$$	$$\textcolor{#f14c4c}{\tt{70}}$$

Please find the detailed integration test report here

Please find the ci env pod logs here

github-actions · 2024-10-21T17:20:15Z

filepath	$$\textcolor{#23d18b}{\tt{passed}}$$	$$\textcolor{#f14c4c}{\tt{failed}}$$	$$\textcolor{#ffa500}{\tt{skipped}}$$	SUBTOTAL
$$\textcolor{#23d18b}{\tt{tests/test\_oauth2.py}}$$	$$\textcolor{#23d18b}{\tt{15}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#23d18b}{\tt{15}}$$
$$\textcolor{#23d18b}{\tt{tests/test\_centralized\_auth.py}}$$	$$\textcolor{#23d18b}{\tt{16}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#23d18b}{\tt{16}}$$
$$\textcolor{#ffa500}{\tt{tests/test\_data\_upload.py}}$$	$$\textcolor{#23d18b}{\tt{8}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#ffa500}{\tt{1}}$$	$$\textcolor{#ffa500}{\tt{9}}$$
$$\textcolor{#23d18b}{\tt{tests/test\_user\_token.py}}$$	$$\textcolor{#23d18b}{\tt{5}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#23d18b}{\tt{5}}$$
$$\textcolor{#23d18b}{\tt{tests/test\_presigned\_url.py}}$$	$$\textcolor{#23d18b}{\tt{7}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#23d18b}{\tt{7}}$$
$$\textcolor{#23d18b}{\tt{tests/test\_drs\_endpoint.py}}$$	$$\textcolor{#23d18b}{\tt{4}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#23d18b}{\tt{4}}$$
$$\textcolor{#ffa500}{\tt{tests/test\_dbgap.py}}$$	$$\textcolor{#23d18b}{\tt{3}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#ffa500}{\tt{1}}$$	$$\textcolor{#ffa500}{\tt{4}}$$
$$\textcolor{#23d18b}{\tt{tests/test\_ras\_authn.py}}$$	$$\textcolor{#23d18b}{\tt{3}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#23d18b}{\tt{3}}$$
$$\textcolor{#23d18b}{\tt{tests/test\_client\_credentials.py}}$$	$$\textcolor{#23d18b}{\tt{1}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#23d18b}{\tt{1}}$$
$$\textcolor{#23d18b}{\tt{tests/test\_oidc\_client.py}}$$	$$\textcolor{#23d18b}{\tt{2}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#23d18b}{\tt{2}}$$
$$\textcolor{#23d18b}{\tt{tests/test\_audit\_service.py}}$$	$$\textcolor{#23d18b}{\tt{1}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#23d18b}{\tt{1}}$$
$$\textcolor{#ffa500}{\tt{tests/test\_register\_user.py}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#ffa500}{\tt{2}}$$	$$\textcolor{#ffa500}{\tt{2}}$$
$$\textcolor{#f14c4c}{\tt{tests/test\_google\_data\_access.py}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#f14c4c}{\tt{1}}$$	$$\textcolor{#666666}{\tt{0}}$$	$$\textcolor{#f14c4c}{\tt{1}}$$
$$\textcolor{#f14c4c}{\tt{TOTAL}}$$	$$\textcolor{#23d18b}{\tt{65}}$$	$$\textcolor{#f14c4c}{\tt{1}}$$	$$\textcolor{#ffa500}{\tt{4}}$$	$$\textcolor{#f14c4c}{\tt{70}}$$

Please find the detailed integration test report here

Please find the ci env pod logs here

AlbertSnows added 3 commits July 18, 2024 14:02

adding default empty dict

5dc1da9

adding sanity happy path test

67dc533

redesigning code to handle none case without getting too much more co…

19384ad

…mplicated

github-actions bot added the @requires-fence label Jul 18, 2024

gave a better name

9032344

AlbertSnows changed the title ~~[WIP] Fix/handle none string v2~~ Handle 'None' string in fence config Jul 18, 2024

AlbertSnows marked this pull request as ready for review July 18, 2024 19:13

adding typing

fdc937c

mfshao reviewed Jul 18, 2024

View reviewed changes

fence/config.py Outdated Show resolved Hide resolved

AlbertSnows and others added 5 commits July 18, 2024 15:06

adding more state handling

ed05a13

Trigger GitHub Actions workflow

7c1ffe4

Testing

9ee8a78

fix(PXP-11364): Fix failing dbgap sync unit test

174424f

Fix so local csvs file are processed in consistent order, regardless of os Updates user_info overwrite logic to preserve data when processing CSVs without some attributes

Trigger GitHub Actions workflow

532dcc5

Merge branch 'master' into fix/handle_none_string_v2

48ee3e0

Avantol13 requested changes Jul 23, 2024

View reviewed changes

tests/test_app_config.py Show resolved Hide resolved

AlbertSnows added 2 commits July 23, 2024 11:31

moving to separate unit test

8c4a9b7

Merge branch 'master' into fix/handle_none_string_v2

5e51743

AlbertSnows changed the title ~~Handle 'None' string in fence config~~ Handle 'None' string in fence config Jul 31, 2024

Merge branch 'master' into fix/handle_none_string_v2

491140f

PlanXCyborg added test-apis-centralizedAuth and removed @requires-fence labels Aug 1, 2024

Merge branch 'master' into fix/handle_none_string_v2

d9bc79f

BinamB previously approved these changes Aug 7, 2024

View reviewed changes

Avantol13 requested changes Aug 7, 2024

View reviewed changes

Avantol13 requested changes Aug 9, 2024

View reviewed changes

fence/config.py Outdated Show resolved Hide resolved

fence/config.py Outdated Show resolved Hide resolved

tests/test_app_config.py Show resolved Hide resolved

more documentation

a06ecaf

minor refactors implementing alex's suggestions

AlbertSnows dismissed BinamB’s stale review via a06ecaf August 9, 2024 18:13

Avantol13 removed the test-apis-centralizedAuth label Aug 9, 2024

Merge branch 'master' into fix/handle_none_string_v2

65edbd9

Avantol13 requested changes Aug 9, 2024

View reviewed changes

fence/config.py Outdated Show resolved Hide resolved

fence/config.py Outdated Show resolved Hide resolved

fence/config.py Outdated Show resolved Hide resolved

fence/config.py Outdated Show resolved Hide resolved

fence/config.py Outdated Show resolved Hide resolved

AlbertSnows added 5 commits August 9, 2024 18:16

more documentation

2b63f57

changes to visibility

Merge remote-tracking branch 'origin/fix/handle_none_string_v2' into …

95db2db

…fix/handle_none_string_v2

cleaning up references in test fence create

8e60f67

moving create_client to fence create to help resolve circular dependencies defining generic functions in config moving send email to google monitor to help with circular dependencies adding utils test

Merge branch 'master' into fix/handle_none_string_v2

528feac

documentation + minor rename

06cebff

Avantol13 requested changes Aug 26, 2024

View reviewed changes

tests/test_utils.py Show resolved Hide resolved

tests/test_utils.py Outdated Show resolved Hide resolved

fence/utils.py Show resolved Hide resolved

fence/utils.py Show resolved Hide resolved

fence/utils.py Show resolved Hide resolved

fix name, add description

af9c5b1

AlbertSnows mentioned this pull request Sep 3, 2024

[HOLD] move backoff settings, send email, and create client to config #1181

Open

AlbertSnows and others added 2 commits September 3, 2024 14:18

Merge branch 'master' into fix/handle_none_string_v2

e2d5fd7

Merge branch 'master' into fix/handle_none_string_v2

a7ec57a

Merge branch 'master' into fix/handle_none_string_v2

d44dd5a

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Handle 'None' string in fence config #1161

Handle 'None' string in fence config #1161

AlbertSnows commented Jul 18, 2024 •

edited

Loading

coveralls commented Jul 23, 2024 •

edited

Loading

github-actions bot commented Oct 18, 2024

github-actions bot commented Oct 21, 2024

Handle 'None' string in fence config #1161

Are you sure you want to change the base?

Handle 'None' string in fence config #1161

Conversation

AlbertSnows commented Jul 18, 2024 • edited Loading

New Features

Breaking Changes

Bug Fixes

Improvements

Dependency updates

Deployment changes

coveralls commented Jul 23, 2024 • edited Loading

Pull Request Test Coverage Report for Build 11444102217

Details

💛 - Coveralls

github-actions bot commented Oct 18, 2024

github-actions bot commented Oct 21, 2024

AlbertSnows commented Jul 18, 2024 •

edited

Loading

coveralls commented Jul 23, 2024 •

edited

Loading