Merge pull request #412 from alliance-genome/KANBAN-621_KANBAN-622_ce…

…ntral-logging KANBAN-621 KANBAN-622 central logging - fixing log server access
alliance-genome · Oct 16, 2024 · 2491457 · 2491457
2 parents 09c37dc + 2b69fb0
commit 2491457
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 8 deletions.
diff --git a/api/aws_infra/requirements.txt b/api/aws_infra/requirements.txt
@@ -75,7 +75,7 @@ jsii==1.104.0 \
     #   aws-cdk-lib
     #   constructs
 pavi-shared-aws @ file:///tmp/pavi_shared_aws-0.0.0-py3-none-any.whl \
-    --hash=sha256:28cf4ff4c411d12a554f57dfd2d958beb86914aa143868c83a8efb30686eb350
+    --hash=sha256:3d18e74f5ff5fbcb52833356d29f566d2487afeccbb5d73de0eb93cdaadaccb9
     # via api-aws_infra (pyproject.toml)
 publication==0.0.3 \
     --hash=sha256:0248885351febc11d8a1098d5c8e3ab2dabcf3e8c0c96db1e17ecd12b53afbe6 \

diff --git a/api/aws_infra/tests/requirements.txt b/api/aws_infra/tests/requirements.txt
@@ -124,7 +124,7 @@ packaging==24.1 \
     --hash=sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124
     # via pytest
 pavi-shared-aws @ file:///tmp/pavi_shared_aws-0.0.0-py3-none-any.whl \
-    --hash=sha256:28cf4ff4c411d12a554f57dfd2d958beb86914aa143868c83a8efb30686eb350
+    --hash=sha256:3d18e74f5ff5fbcb52833356d29f566d2487afeccbb5d73de0eb93cdaadaccb9
     # via api-aws_infra (pyproject.toml)
 pluggy==1.5.0 \
     --hash=sha256:2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1 \

diff --git a/pipeline/aws_infra/requirements.txt b/pipeline/aws_infra/requirements.txt
@@ -75,7 +75,7 @@ jsii==1.104.0 \
     #   aws-cdk-lib
     #   constructs
 pavi-shared-aws @ file:///tmp/pavi_shared_aws-0.0.0-py3-none-any.whl \
-    --hash=sha256:28cf4ff4c411d12a554f57dfd2d958beb86914aa143868c83a8efb30686eb350
+    --hash=sha256:3d18e74f5ff5fbcb52833356d29f566d2487afeccbb5d73de0eb93cdaadaccb9
     # via pipeline-aws_infra (pyproject.toml)
 publication==0.0.3 \
     --hash=sha256:0248885351febc11d8a1098d5c8e3ab2dabcf3e8c0c96db1e17ecd12b53afbe6 \

diff --git a/pipeline/aws_infra/tests/requirements.txt b/pipeline/aws_infra/tests/requirements.txt
@@ -124,7 +124,7 @@ packaging==24.1 \
     --hash=sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124
     # via pytest
 pavi-shared-aws @ file:///tmp/pavi_shared_aws-0.0.0-py3-none-any.whl \
-    --hash=sha256:28cf4ff4c411d12a554f57dfd2d958beb86914aa143868c83a8efb30686eb350
+    --hash=sha256:3d18e74f5ff5fbcb52833356d29f566d2487afeccbb5d73de0eb93cdaadaccb9
     # via pipeline-aws_infra (pyproject.toml)
 pluggy==1.5.0 \
     --hash=sha256:2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1 \

diff --git a/shared_aws/aws_infra/requirements.txt b/shared_aws/aws_infra/requirements.txt
@@ -75,7 +75,7 @@ jsii==1.104.0 \
     #   aws-cdk-lib
     #   constructs
 pavi-shared-aws @ file:///tmp/pavi_shared_aws-0.0.0-py3-none-any.whl \
-    --hash=sha256:28cf4ff4c411d12a554f57dfd2d958beb86914aa143868c83a8efb30686eb350
+    --hash=sha256:3d18e74f5ff5fbcb52833356d29f566d2487afeccbb5d73de0eb93cdaadaccb9
     # via pavi-shared-aws-infra (pyproject.toml)
 publication==0.0.3 \
     --hash=sha256:0248885351febc11d8a1098d5c8e3ab2dabcf3e8c0c96db1e17ecd12b53afbe6 \

diff --git a/shared_aws/aws_infra/tests/requirements.txt b/shared_aws/aws_infra/tests/requirements.txt
@@ -124,7 +124,7 @@ packaging==24.1 \
     --hash=sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124
     # via pytest
 pavi-shared-aws @ file:///tmp/pavi_shared_aws-0.0.0-py3-none-any.whl \
-    --hash=sha256:28cf4ff4c411d12a554f57dfd2d958beb86914aa143868c83a8efb30686eb350
+    --hash=sha256:3d18e74f5ff5fbcb52833356d29f566d2487afeccbb5d73de0eb93cdaadaccb9
     # via pavi-shared-aws-infra (pyproject.toml)
 pluggy==1.5.0 \
     --hash=sha256:2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1 \

diff --git a/shared_aws/py_package/pavi_shared_aws/shared_cdk_classes/application_stack.py b/shared_aws/py_package/pavi_shared_aws/shared_cdk_classes/application_stack.py
@@ -119,6 +119,11 @@ def defineEbEnvironmentCdkConstructs(
             option_name='EC2KeyName',
             value='AGR-ssl2'
         ),
+        eb.CfnEnvironment.OptionSettingProperty(
+            namespace='aws:autoscaling:launchconfiguration',
+            option_name='SecurityGroups',  # Security groups added in addition to the EB-created security group
+            value='sg-0451f962e9b18aefa'  # Security group allowing write-to-log-server access
+        ),
         eb.CfnEnvironment.OptionSettingProperty(
             namespace='aws:elasticbeanstalk:application:environment',
             option_name='NET',

diff --git a/webui/aws_infra/requirements.txt b/webui/aws_infra/requirements.txt
@@ -75,7 +75,7 @@ jsii==1.104.0 \
     #   aws-cdk-lib
     #   constructs
 pavi-shared-aws @ file:///tmp/pavi_shared_aws-0.0.0-py3-none-any.whl \
-    --hash=sha256:28cf4ff4c411d12a554f57dfd2d958beb86914aa143868c83a8efb30686eb350
+    --hash=sha256:3d18e74f5ff5fbcb52833356d29f566d2487afeccbb5d73de0eb93cdaadaccb9
     # via webui-aws_infra (pyproject.toml)
 publication==0.0.3 \
     --hash=sha256:0248885351febc11d8a1098d5c8e3ab2dabcf3e8c0c96db1e17ecd12b53afbe6 \

diff --git a/webui/aws_infra/tests/requirements.txt b/webui/aws_infra/tests/requirements.txt
@@ -124,7 +124,7 @@ packaging==24.1 \
     --hash=sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124
     # via pytest
 pavi-shared-aws @ file:///tmp/pavi_shared_aws-0.0.0-py3-none-any.whl \
-    --hash=sha256:28cf4ff4c411d12a554f57dfd2d958beb86914aa143868c83a8efb30686eb350
+    --hash=sha256:3d18e74f5ff5fbcb52833356d29f566d2487afeccbb5d73de0eb93cdaadaccb9
     # via webui-aws_infra (pyproject.toml)
 pluggy==1.5.0 \
     --hash=sha256:2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1 \