small changes

fence/sync/sync_users.py

@@ -376,8 +376,7 @@ def _match_pattern(filepath, id_patterns, encrypted=True):
             if encrypted:
                 pattern += ".enc"
             pattern += "$"
-            basename = os.path.basename(filepath)
-            if re.match(pattern, basename):
+            if re.match(pattern, os.path.basename(filepath)):
                 return True
         return False
 

tests/dbgap_sync/test_user_sync.py

@@ -74,9 +74,9 @@ def test_sync_incorrect_user_yaml_file(syncer, monkeypatch, db_session):
     assert syncer.arborist_client.create_policy.not_called()
 
 
-@pytest.mark.parametrize("allow_non_dbgap_whitelist", [True, False])
+@pytest.mark.parametrize("allow_non_dbgap_whitelist", [False, True])
 @pytest.mark.parametrize("syncer", ["google", "cleversafe"], indirect=True)
-@pytest.mark.parametrize("parse_consent_code_config", [True, False])
+@pytest.mark.parametrize("parse_consent_code_config", [False, True])
 def test_sync(
     syncer,
     db_session,

tests/test-fence-config.yaml

@@ -676,9 +676,6 @@ EXPIRED_AUTHZ_REMOVAL_JOB_FREQ_IN_SECONDS: 1
 GLOBAL_PARSE_VISAS_ON_LOGIN:
 # Settings for usersync with visas
 USERSYNC:
-  sync_from_visas: false
-  # fallback to dbgap sftp when there are no valid visas for a user i.e. if they're expired or if they're malformed
-  fallback_to_dbgap_sftp: false
   visa_types:
     ras: ["https://ras.nih.gov/visas/v1", "https://ras.nih.gov/visas/v1.1"]
 RAS_USERINFO_ENDPOINT: '/openid/connect/v1.1/userinfo'