Merge pull request #26 from EGA-archive/fix-config

Change faulty config variable
EGA-archive · Jan 25, 2019 · 9eae1de · 9eae1de
2 parents 329dce0 + 7ca0927
commit 9eae1de
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/deploy/bootstrap/run.sh b/deploy/bootstrap/run.sh
@@ -328,6 +328,7 @@ cat >> ${PRIVATE}/lega.yml <<EOF
         lega_label: "finalize"
     volumes:
        - ./conf.ini:/etc/ega/conf.ini:ro
+       - ./../../lega:/home/lega/.local/lib/python3.6/site-packages/lega
     restart: on-failure:3
     networks:
       - lega
@@ -343,13 +344,14 @@ cat >> ${PRIVATE}/lega.yml <<EOF
     labels:
         lega_label: "ingest"
     environment:
-      - S3_ACCESS_KEY=${S3_ACCESS_KEY}
-      - S3_SECRET_KEY=${S3_SECRET_KEY}
+      - VAULT_ACCESS_KEY=${S3_ACCESS_KEY}
+      - VAULT_SECRET_KEY=${S3_SECRET_KEY}
       - AWS_ACCESS_KEY_ID=${S3_ACCESS_KEY}
       - AWS_SECRET_ACCESS_KEY=${S3_SECRET_KEY}
     volumes:
        - inbox:/ega/inbox
        - ./conf.ini:/etc/ega/conf.ini:ro
+       - ./../../lega:/home/lega/.local/lib/python3.6/site-packages/lega
     restart: on-failure:3
     networks:
       - lega
@@ -403,6 +405,7 @@ cat >> ${PRIVATE}/lega.yml <<EOF
        - ./certs/ssl.key:/etc/ega/ssl.key:ro
        - ./pgp/ega.sec:/etc/ega/pgp/ega.sec:ro
        - ./pgp/ega2.sec:/etc/ega/pgp/ega2.sec:ro
+       - ./../../lega:/home/lega/.local/lib/python3.6/site-packages/lega
     restart: on-failure:3
     networks:
       - lega
@@ -424,8 +427,8 @@ cat >> ${PRIVATE}/lega.yml <<EOF
     image: nbisweden/ega-base:latest
     environment:
       - LEGA_PASSWORD=${LEGA_PASSWORD}
-      - S3_ACCESS_KEY=${S3_ACCESS_KEY}
-      - S3_SECRET_KEY=${S3_SECRET_KEY}
+      - VAULT_ACCESS_KEY=${S3_ACCESS_KEY}
+      - VAULT_SECRET_KEY=${S3_SECRET_KEY}
       - AWS_ACCESS_KEY_ID=${S3_ACCESS_KEY}
       - AWS_SECRET_ACCESS_KEY=${S3_SECRET_KEY}
     volumes:
@@ -597,8 +600,8 @@ DB_LEGA_OUT_USER          = lega_out
 CEGA_CONNECTION           = ${CEGA_CONNECTION}
 CEGA_ENDPOINT_CREDS       = ${CEGA_USERS_CREDS}
 #
-S3_ACCESS_KEY             = ${S3_ACCESS_KEY}
-S3_SECRET_KEY             = ${S3_SECRET_KEY}
+VAULT_ACCESS_KEY             = ${S3_ACCESS_KEY}
+VAULT_SECRET_KEY             = ${S3_SECRET_KEY}
 #
 DOCKER_PORT_inbox         = ${DOCKER_PORT_inbox}
 DOCKER_PORT_mq            = ${DOCKER_PORT_mq}

diff --git a/lega/utils/storage.py b/lega/utils/storage.py
@@ -213,10 +213,8 @@ def __init__(self):
         endpoint = CONF.get_value('vault', 'url')
         region = CONF.get_value('vault', 'region')
         bucket = CONF.get_value('vault', 'bucket', default='lega')
-        # access_key = CONF.get_value('vault', 'access_key')
-        # secret_key = CONF.get_value('vault', 'secret_key')
-        access_key = os.environ['S3_ACCESS_KEY']
-        secret_key = os.environ['S3_SECRET_KEY']
+        access_key = CONF.get_value('vault', 'access_key')
+        secret_key = CONF.get_value('vault', 'secret_key')
         self.s3 = boto3.client('s3',
                                endpoint_url=endpoint,
                                region_name=region,

diff --git a/tests/unit/test_storage.py b/tests/unit/test_storage.py
@@ -58,15 +58,15 @@ def setUp(self):
         self.env = EnvironmentVarGuard()
         self.env.set('VAULT_URL', 'http://localhost:5000')
         self.env.set('VAULT_REGION', 'lega')
-        self.env.set('S3_ACCESS_KEY', 'test')
-        self.env.set('S3_SECRET_KEY', 'test')
+        self.env.set('VAULT_ACCESS_KEY', 'test')
+        self.env.set('VAULT_SECRET_KEY', 'test')
 
     def tearDown(self):
         """Remove setup variables."""
         self.env.unset('VAULT_URL')
         self.env.unset('VAULT_REGION')
-        self.env.unset('S3_ACCESS_KEY')
-        self.env.unset('S3_SECRET_KEY')
+        self.env.unset('VAULT_ACCESS_KEY')
+        self.env.unset('VAULT_SECRET_KEY')
         self._dir.cleanup_all()
 
     @mock.patch.object(boto3, 'client')