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

PXP-4582 user sync merges multiple dbgap sftp servers #755

Merged
merged 15 commits into from
Feb 21, 2020
Merged

Conversation

itsJiaqi
Copy link
Contributor

@itsJiaqi itsJiaqi commented Jan 30, 2020

DCF will be checking 2 sftp servers for telemetry files and merge user credentials from both. This PR allows for the configuration of any number of additional dbGaP servers in fence's config file by including a list of dbGaP objects.

In order to have this work on DCF, we will have to modify DCF's fence config file to include a list of dbGaP configurations

@github-actions
Copy link

github-actions bot commented Jan 30, 2020

The style in this PR agrees with black. ✔️

This formatting comment was generated automatically by a script in uc-cdis/wool.

@coveralls
Copy link

coveralls commented Jan 30, 2020

Pull Request Test Coverage Report for Build 8449

  • 40 of 64 (62.5%) changed or added relevant lines in 1 file are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage decreased (-0.02%) to 69.462%

Changes Missing Coverage Covered Lines Changed/Added Lines %
fence/sync/sync_users.py 40 64 62.5%
Totals Coverage Status
Change from base Build 8426: -0.02%
Covered Lines: 5127
Relevant Lines: 7381

💛 - Coveralls

fence/config-default.yaml Outdated Show resolved Hide resolved
docs/usersync.md Outdated Show resolved Hide resolved
docs/usersync.md Outdated Show resolved Hide resolved
fence/sync/sync_users.py Outdated Show resolved Hide resolved
fence/sync/sync_users.py Outdated Show resolved Hide resolved
fence/sync/sync_users.py Outdated Show resolved Hide resolved
fence/sync/sync_users.py Show resolved Hide resolved
@paulineribeyre
Copy link
Contributor

rn fence-create is not creating UserSyncer with the additional_dbGaP parameter... i'm a bit concerned about why the integration tests are not failing

@itsJiaqi
Copy link
Contributor Author

itsJiaqi commented Feb 3, 2020

rn fence-create is not creating UserSyncer with the additional_dbGaP parameter... i'm a bit concerned about why the integration tests are not failing

Yep completely missed that. I think it makes sense that integration tests are not failing since we don't have any integration tests for multiple sftp support and the rest of the code should work as is without additional_dbGaP

tests/test-fence-config.yaml Show resolved Hide resolved
# Follows the same format as dbGaP entries
# accepts a list of objects
# example:
# additional_dbGaP:
Copy link
Contributor

Choose a reason for hiding this comment

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

you can make dbGaP a list of 1 element in the default config

fence/sync/sync_users.py Show resolved Hide resolved
fence/sync/sync_users.py Show resolved Hide resolved
fence/sync/sync_users.py Show resolved Hide resolved
user_projects_csv = {
key.lower(): value for key, value in user_projects_csv.items()
}
user_projects = {key.lower(): value for key, value in user_projects.items()}
Copy link
Contributor

Choose a reason for hiding this comment

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

i think we need this line

@itsJiaqi itsJiaqi merged commit 95093a0 into master Feb 21, 2020
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

3 participants