Skip to content

Commit 6cdbbe1

Browse files
committed
after talking with Antonio, we decided that no additional config parameter for ENABLE_HTTPS_PLUGIN_FILETRANSFER is necessary, we simply expose these new endpoints, whatever
1 parent be38c10 commit 6cdbbe1

File tree

4 files changed

+1
-20
lines changed

4 files changed

+1
-20
lines changed

.github/workflows/qiita-ci.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,6 @@ jobs:
5858
pgport=${{ job.services.postgres.ports[5432] }}
5959
sed -i "s/PORT = 5432/PORT = $pgport/" qiita_core/support_files/config_test.cfg
6060
61-
# enable endpoints for HTTPS file transfer from/to plugin(s) and qiita main
62-
sed -i "s/ENABLE_HTTPS_PLUGIN_FILETRANSFER = False/ENABLE_HTTPS_PLUGIN_FILETRANSFER = True/" qiita_core/support_files/config_test.cfg
63-
6461
# PGPASSWORD is read by pg_restore, which is called by the build_db process.
6562
export PGPASSWORD=postgres
6663

qiita_core/configuration_manager.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,6 @@ class ConfigurationManager(object):
123123
The script used to start the plugins
124124
plugin_dir : str
125125
The path to the directory containing the plugin configuration files
126-
enable_https_plugin_filetransfer : bool
127-
Allow BASE_DATA_DIR file content transfer through https (True or False)
128-
By default, Qiita and its plugins share the filesystem of
129-
BASE_DATA_DIR. You can less tightly couple selected plugins
130-
(=no shared file system) but they need to get/push input/output files
131-
through https then
132126
help_email : str
133127
The email address a user should write to when asking for help
134128
sysadmin_email : str
@@ -221,8 +215,6 @@ def _get_main(self, config):
221215
elif not isdir(self.plugin_dir):
222216
raise ValueError("The PLUGIN_DIR (%s) folder doesn't exist"
223217
% self.plugin_dir)
224-
self.enable_https_plugin_filetransfer = config.getboolean(
225-
'main', 'ENABLE_HTTPS_PLUGIN_FILETRANSFER', fallback=False)
226218

227219
self.valid_upload_extension = [ve.strip() for ve in config.get(
228220
'main', 'VALID_UPLOAD_EXTENSION').split(',')]

qiita_core/tests/test_configuration_manager.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ def test_init(self):
5555
self.assertEqual(
5656
obs.valid_upload_extension,
5757
["fastq", "fastq.gz", "txt", "tsv", "sff", "fna", "qual"])
58-
self.assertEqual(obs.enable_https_plugin_filetransfer, False)
5958
self.assertEqual(obs.certificate_file, "/tmp/server.cert")
6059
self.assertEqual(obs.cookie_secret, "SECRET")
6160
self.assertEqual(obs.key_file, "/tmp/server.key")
@@ -332,12 +331,6 @@ def test_get_portal_latlong(self):
332331
# Plugins configuration directory
333332
PLUGIN_DIR = /tmp/
334333
335-
# Allow BASE_DATA_DIR file content transfer through https (True or False)
336-
# By default, Qiita and its plugins share the filesystem of BASE_DATA_DIR.
337-
# You can less tightly couple selected plugins (=no shared file system) but
338-
# they need to get/push input/output files through https then
339-
ENABLE_HTTPS_PLUGIN_FILETRANSFER = False
340-
341334
# Webserver certificate file paths
342335
CERTIFICATE_FILE = /tmp/server.cert
343336
KEY_FILE = /tmp/server.key

qiita_pet/webserver.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,7 @@ def __init__(self):
248248
# expose endpoints necessary for https file communication between
249249
# master and plugins IF no shared file system for base_data_dir is
250250
# intended
251-
if qiita_config.enable_https_plugin_filetransfer:
252-
handlers.extend(CLOUD_ENDPOINTS)
251+
handlers.extend(CLOUD_ENDPOINTS)
253252

254253
# rest endpoints
255254
handlers.extend(REST_ENDPOINTS)

0 commit comments

Comments
 (0)