remove all references to export_max_num_list

unioslo · May 29, 2024 · a046ef5 · a046ef5
1 parent b6d4c2e
commit a046ef5
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 22 deletions.
diff --git a/tsdfileapi/config/config-test-container-postgres.yaml b/tsdfileapi/config/config-test-container-postgres.yaml
@@ -53,7 +53,6 @@ backends:
       allow_info: true
       allow_list: true
       allow_rpc: true
-      export_max_num_list: null
       export_path: /tmp/pXX/apps
       export_policy:
         default:
@@ -75,7 +74,6 @@ backends:
       allow_export: true
       allow_info: true
       allow_list: true
-      export_max_num_list: null
       export_path: /file-api/tsdfileapi/data/tsd/pXX/export
       export_policy:
         default:
@@ -94,7 +92,6 @@ backends:
       allow_export: true
       allow_info: true
       allow_list: true
-      export_max_num_list: null
       export_path: /tmp/pXX/import
       export_policy:
         default:
@@ -124,7 +121,6 @@ backends:
       allow_export: true
       allow_info: true
       allow_list: true
-      export_max_num_list: null
       export_path: /tmp/pXX
       export_policy:
         default:
@@ -151,7 +147,6 @@ backends:
       allow_info: true
       allow_list: true
       allow_rpc: true
-      export_max_num_list: null
       export_path: /tmp/pXX/survey
       export_policy:
         default:
@@ -177,7 +172,6 @@ debug: true
 default_file_owner: pXX-nobody
 disallowed_start_chars: '~'
 export_chunk_size: 512000
-export_max_num_list: 100
 jwt_secret: null
 jwt_test_secret: jS25aQbePizfTsetg8LbFsNKl1W6wi4nQaBj705ofWA=
 log_level: info

diff --git a/tsdfileapi/config/config-test.yaml b/tsdfileapi/config/config-test.yaml
@@ -10,7 +10,6 @@ valid_tenant_regex: ^[0-9a-z]+$
 tenant_string_pattern: pXX
 allowed_symlinks:
   - "/tsd"
-export_max_num_list: 100
 export_chunk_size: 512000
 max_body_size: 5368709120
 default_file_owner: pXX-nobody
@@ -44,7 +43,6 @@ backends:
         ensure_tenant_in_group_name: false
       has_posix_ownership: false
       import_path: /tmp/pXX
-      export_max_num_list: None
       export_path: /tmp/pXX/export
     apps_files:
       allow_list: true
@@ -63,7 +61,6 @@ backends:
         enabled: false
       has_posix_ownership: false
       import_path: /tmp/pXX
-      export_max_num_list: None
       export_path: /tmp/pXX/export
     files_export:
       allow_list: true
@@ -82,7 +79,6 @@ backends:
         enabled: false
       has_posix_ownership: false
       import_path: /tmp/pXX
-      export_max_num_list: None
       export_path: /tmp/pXX/export
     cluster:
       allow_list: true
@@ -106,7 +102,6 @@ backends:
         ensure_tenant_in_group_name: false
       has_posix_ownership: false
       import_path: /tmp/pXX/cluster/
-      export_max_num_list: None
       export_path: /tmp/pXX/export
     survey:
       allow_list: true
@@ -128,7 +123,6 @@ backends:
         ensure_tenant_in_group_name: false
       has_posix_ownership: false
       import_path: /tmp/pXX/survey
-      export_max_num_list: None
       export_path: /tmp/pXX/export
       backup_deletes:
         backup_days: 90
@@ -162,7 +156,6 @@ backends:
         enabled: false
       has_posix_ownership: false
       import_path: /tmp/pXX/store
-      export_max_num_list: None
       export_path: /tmp/pXX/store
   dbs:
     survey:

diff --git a/tsdfileapi/config/config.yaml b/tsdfileapi/config/config.yaml
@@ -8,7 +8,6 @@ requestor_claim_name: user
 tenant_claim_name: proj
 valid_tenant_regex: ^[0-9a-z]+$
 tenant_string_pattern: pXX
-export_max_num_list: 100
 export_chunk_size: 512000
 max_body_size: 5368709120
 default_file_owner: pXX-nobody
@@ -17,4 +16,4 @@ jwt_test_secret: jS25aQbePizfTsetg8LbFsNKl1W6wi4nQaBj705ofWA=
 jwt_secret: None
 nacl_public: {'public': 'mZQEzkyi7bCvmDVfHGsU/7HX1+gT/R3PkSnyDU4OaiY=', 'private': 'fTEB1MZz8MskkZHSIM9ypxJc4e45Z8fmLGGXkUrp1hQ='}
 log_level: info
-backends: {'disk': {'store': {'has_posix_ownership': False, 'export_max_num_list': None, 'import_path': '/tmp/pXX', 'export_path': '/tmp/pXX', 'allow_export': True, 'allow_list': True, 'allow_info': True, 'allow_delete': True, 'export_policy': {'default': {'enabled': False}}, 'group_logic': {'default_url_group': None, 'default_memberships': ['pXX-member-group'], 'enabled': False}, 'request_hook': {'enabled': False}}, 'apps_files': {'has_posix_ownership': False, 'export_max_num_list': None, 'import_path': '/tmp/pXX', 'export_path': '/tmp/pXX', 'allow_export': True, 'allow_list': True, 'allow_info': True, 'allow_delete': True, 'export_policy': {'default': {'enabled': False}}, 'group_logic': {'default_url_group': None, 'default_memberships': ['pXX-member-group'], 'enabled': False}, 'request_hook': {'enabled': False}}}, 'dbs': {'apps_tables': {'db': {'engine': 'sqlite', 'path': '/tmp/pXX', 'table_structure': None, 'mq': None}}}}
+backends: {'disk': {'store': {'has_posix_ownership': False, 'import_path': '/tmp/pXX', 'export_path': '/tmp/pXX', 'allow_export': True, 'allow_list': True, 'allow_info': True, 'allow_delete': True, 'export_policy': {'default': {'enabled': False}}, 'group_logic': {'default_url_group': None, 'default_memberships': ['pXX-member-group'], 'enabled': False}, 'request_hook': {'enabled': False}}, 'apps_files': {'has_posix_ownership': False, 'import_path': '/tmp/pXX', 'export_path': '/tmp/pXX', 'allow_export': True, 'allow_list': True, 'allow_info': True, 'allow_delete': True, 'export_policy': {'default': {'enabled': False}}, 'group_logic': {'default_url_group': None, 'default_memberships': ['pXX-member-group'], 'enabled': False}, 'request_hook': {'enabled': False}}}, 'dbs': {'apps_tables': {'db': {'engine': 'sqlite', 'path': '/tmp/pXX', 'table_structure': None, 'mq': None}}}}
diff --git a/tsdfileapi/config/example-file-api-config.yaml b/tsdfileapi/config/example-file-api-config.yaml
@@ -10,7 +10,6 @@ requestor_claim_name: 'user'
 tenant_claim_name: 'proj'
 valid_tenant_regex: '^[0-9a-z]+$'
 tenant_string_pattern: 'pXX'
-export_max_num_list: 100
 export_chunk_size: 512000
 backup_days: 90
 # endpoint backends

diff --git a/tsdfileapi/defaults.py b/tsdfileapi/defaults.py
@@ -24,7 +24,6 @@
     "tenant_claim_name": "proj",
     "valid_tenant_regex": "^[0-9a-z]+$",
     "tenant_string_pattern": "pXX",
-    "export_max_num_list": 100,
     "export_chunk_size": 512000,
     "max_body_size": 5368709120,
     "default_file_owner": "pXX-nobody",
@@ -59,7 +58,6 @@
         "disk": {
             "publication": {
                 "has_posix_ownership": False,
-                "export_max_num_list": None,
                 "import_path": f"{TMP}/pXX",
                 "export_path": f"{TMP}/pXX",
                 "allow_export": True,
@@ -80,7 +78,6 @@
             },
             "apps_files": {
                 "has_posix_ownership": False,
-                "export_max_num_list": None,
                 "import_path": f"{TMP}/pXX/apps",
                 "export_path": f"{TMP}/pXX/apps",
                 "allow_export": True,
@@ -106,7 +103,6 @@
             },
             "survey": {
                 "has_posix_ownership": False,
-                "export_max_num_list": None,
                 "import_path": f"{TMP}/pXX/survey",
                 "export_path": f"{TMP}/pXX/survey",
                 "allow_export": True,
@@ -144,7 +140,6 @@
             },
             "files_import": {
                 "has_posix_ownership": True,
-                "export_max_num_list": None,
                 "import_path": f"{TMP}/pXX/import",
                 "export_path": f"{TMP}/pXX/import",
                 "allow_export": True,
@@ -170,7 +165,6 @@
             },
             "files_export": {
                 "has_posix_ownership": False,
-                "export_max_num_list": None,
                 "import_path": f"{TMP}/pXX",
                 "export_path": f"{os.getcwd()}/tsdfileapi/data/tsd/pXX/export",
                 "allow_export": True,