add python-ecsclient dependency, url resource default, ecs.py env var defaults

Author: claire-peters

coldfront/config/plugins/ecs.py

@@ -3,8 +3,10 @@
 from coldfront.config.base import INSTALLED_APPS
 
 INSTALLED_APPS += [ 'coldfront.plugins.ecs' ]
-ECS_USER = ENV.str('ECS_USER', '')
-ECS_PASS = ENV.str('ECS_PASS', '')
+
+ECS_USER = ENV.str('ECS_USER', default='')
+ECS_PASS = ENV.str('ECS_PASS', default='')
+ECS_CLIENT_VERSION = ENV.str('ECS_CLIENT_VERSION', default='3')
 
 LOGGING['handlers']['ecs'] = {
     'class': 'logging.handlers.TimedRotatingFileHandler',

coldfront/core/resource/management/commands/add_resource_defaults.py

@@ -33,6 +33,7 @@ def handle(self, *args, **options):
             ('GPU Count', 'Int'),
             ('Features', 'Text'),
             ('slurm_integration', 'Text'),
+            ('url', 'Text'),
             # UBCCR
             ('Core Count', 'Int'),
             # ('expiry_time', 'Int'),

requirements.txt

@@ -29,6 +29,7 @@ idna==3.7
 protobuf==6.30.0
 pyparsing==3.1.2
 python-dateutil==2.9.0.post0
+python-ecsclient==1.1.12
 python-memcached==1.62
 pytz==2024.1
 redis==5.0.0

setup.py

@@ -75,6 +75,7 @@
         'logging_tree==1.9',
         'mysqlclient==2.2.0',
         'pandas==2.2.1',
+        'python-ecsclient==1.1.12',
         'reportlab==4.0.5',
         'xhtml2pdf==0.2.15',
         'XlsxWriter',