Merge pull request #3422 from AlexsLemonade/ark/fix-deploy-issues

Fix deploy issues
AlexsLemonade · Oct 17, 2023 · 517b276 · 517b276
2 parents f5d4b39 + 1b22efb
commit 517b276
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 1 deletion.
diff --git a/api/environment.tpl b/api/environment.tpl
@@ -1,4 +1,5 @@
 SYSTEM_VERSION=${{SYSTEM_VERSION}}
+STAGE=${{STAGE}}
 DJANGO_SECRET_KEY=${{DJANGO_SECRET_KEY}}
 DJANGO_DEBUG=${{DJANGO_DEBUG}}
 DATABASE_PORT=${{DATABASE_PORT}}

diff --git a/infrastructure/networking.tf b/infrastructure/networking.tf
@@ -101,7 +101,7 @@ resource "aws_db_subnet_group" "data_refinery" {
 
 # Get the API a static IP address.
 resource "aws_eip" "data_refinery_api_ip" {
-  domain = "vpc"
+  vpc = true
 
   tags = merge(
     var.default_tags,

diff --git a/workers/batch-job-templates/affy_to_pcl.tpl.json b/workers/batch-job-templates/affy_to_pcl.tpl.json
@@ -29,6 +29,7 @@
         "jobRoleArn": "${{WORKER_ROLE_ARN}}",
         "environment": [
             {"name": "SYSTEM_VERSION", "value": "${{SYSTEM_VERSION}}"},
+            {"name": "STAGE", "value": "${{STAGE}}"},
             {"name": "DJANGO_DEBUG", "value": "${{DJANGO_DEBUG}}"},
             {"name": "DATABASE_NAME", "value": "${{DATABASE_NAME}}"},
             {"name": "DATABASE_USER", "value": "${{DATABASE_USER}}"},

diff --git a/workers/batch-job-templates/create_compendia.tpl.json b/workers/batch-job-templates/create_compendia.tpl.json
@@ -29,6 +29,7 @@
         "jobRoleArn": "${{WORKER_ROLE_ARN}}",
         "environment": [
             {"name": "SYSTEM_VERSION", "value": "${{SYSTEM_VERSION}}"},
+            {"name": "STAGE", "value": "${{STAGE}}"},
             {"name": "DJANGO_DEBUG", "value": "${{DJANGO_DEBUG}}"},
             {"name": "DATABASE_NAME", "value": "${{DATABASE_NAME}}"},
             {"name": "DATABASE_USER", "value": "${{DATABASE_USER}}"},

diff --git a/workers/batch-job-templates/create_qn_target.tpl.json b/workers/batch-job-templates/create_qn_target.tpl.json
@@ -29,6 +29,7 @@
         "jobRoleArn": "${{WORKER_ROLE_ARN}}",
         "environment": [
             {"name": "SYSTEM_VERSION", "value": "${{SYSTEM_VERSION}}"},
+            {"name": "STAGE", "value": "${{STAGE}}"},
             {"name": "DJANGO_DEBUG", "value": "${{DJANGO_DEBUG}}"},
             {"name": "DATABASE_NAME", "value": "${{DATABASE_NAME}}"},
             {"name": "DATABASE_USER", "value": "${{DATABASE_USER}}"},

diff --git a/workers/batch-job-templates/create_quantpendia.tpl.json b/workers/batch-job-templates/create_quantpendia.tpl.json
@@ -29,6 +29,7 @@
         "jobRoleArn": "${{WORKER_ROLE_ARN}}",
         "environment": [
             {"name": "SYSTEM_VERSION", "value": "${{SYSTEM_VERSION}}"},
+            {"name": "STAGE", "value": "${{STAGE}}"},
             {"name": "DJANGO_DEBUG", "value": "${{DJANGO_DEBUG}}"},
             {"name": "DATABASE_NAME", "value": "${{DATABASE_NAME}}"},
             {"name": "DATABASE_USER", "value": "${{DATABASE_USER}}"},

diff --git a/workers/batch-job-templates/downloader.tpl.json b/workers/batch-job-templates/downloader.tpl.json
@@ -29,6 +29,7 @@
         "jobRoleArn": "${{WORKER_ROLE_ARN}}",
         "environment": [
             {"name": "SYSTEM_VERSION", "value": "${{SYSTEM_VERSION}}"},
+            {"name": "STAGE", "value": "${{STAGE}}"},
             {"name": "DJANGO_DEBUG", "value": "${{DJANGO_DEBUG}}"},
             {"name": "DATABASE_NAME", "value": "${{DATABASE_NAME}}"},
             {"name": "DATABASE_USER", "value": "${{DATABASE_USER}}"},

diff --git a/workers/batch-job-templates/illumina_to_pcl.tpl.json b/workers/batch-job-templates/illumina_to_pcl.tpl.json
@@ -29,6 +29,7 @@
         "jobRoleArn": "${{WORKER_ROLE_ARN}}",
         "environment": [
             {"name": "SYSTEM_VERSION", "value": "${{SYSTEM_VERSION}}"},
+            {"name": "STAGE", "value": "${{STAGE}}"},
             {"name": "DJANGO_DEBUG", "value": "${{DJANGO_DEBUG}}"},
             {"name": "DATABASE_NAME", "value": "${{DATABASE_NAME}}"},
             {"name": "DATABASE_USER", "value": "${{DATABASE_USER}}"},

diff --git a/workers/batch-job-templates/janitor.tpl.json b/workers/batch-job-templates/janitor.tpl.json
@@ -29,6 +29,7 @@
         "jobRoleArn": "${{WORKER_ROLE_ARN}}",
         "environment": [
             {"name": "SYSTEM_VERSION", "value": "${{SYSTEM_VERSION}}"},
+            {"name": "STAGE", "value": "${{STAGE}}"},
             {"name": "DJANGO_DEBUG", "value": "${{DJANGO_DEBUG}}"},
             {"name": "DATABASE_NAME", "value": "${{DATABASE_NAME}}"},
             {"name": "DATABASE_USER", "value": "${{DATABASE_USER}}"},

diff --git a/workers/batch-job-templates/no_op.tpl.json b/workers/batch-job-templates/no_op.tpl.json
@@ -29,6 +29,7 @@
         "jobRoleArn": "${{WORKER_ROLE_ARN}}",
         "environment": [
             {"name": "SYSTEM_VERSION", "value": "${{SYSTEM_VERSION}}"},
+            {"name": "STAGE", "value": "${{STAGE}}"},
             {"name": "DJANGO_DEBUG", "value": "${{DJANGO_DEBUG}}"},
             {"name": "DATABASE_NAME", "value": "${{DATABASE_NAME}}"},
             {"name": "DATABASE_USER", "value": "${{DATABASE_USER}}"},

diff --git a/workers/batch-job-templates/qn_dispatcher.tpl.json b/workers/batch-job-templates/qn_dispatcher.tpl.json
@@ -29,6 +29,7 @@
         "jobRoleArn": "${{WORKER_ROLE_ARN}}",
         "environment": [
             {"name": "SYSTEM_VERSION", "value": "${{SYSTEM_VERSION}}"},
+            {"name": "STAGE", "value": "${{STAGE}}"},
             {"name": "DJANGO_DEBUG", "value": "${{DJANGO_DEBUG}}"},
             {"name": "DATABASE_NAME", "value": "${{DATABASE_NAME}}"},
             {"name": "DATABASE_USER", "value": "${{DATABASE_USER}}"},

diff --git a/workers/batch-job-templates/qn_reference.tpl.json b/workers/batch-job-templates/qn_reference.tpl.json
@@ -29,6 +29,7 @@
         "jobRoleArn": "${{WORKER_ROLE_ARN}}",
         "environment": [
             {"name": "SYSTEM_VERSION", "value": "${{SYSTEM_VERSION}}"},
+            {"name": "STAGE", "value": "${{STAGE}}"},
             {"name": "DJANGO_DEBUG", "value": "${{DJANGO_DEBUG}}"},
             {"name": "DATABASE_NAME", "value": "${{DATABASE_NAME}}"},
             {"name": "DATABASE_USER", "value": "${{DATABASE_USER}}"},

diff --git a/workers/batch-job-templates/salmon.tpl.json b/workers/batch-job-templates/salmon.tpl.json
@@ -29,6 +29,7 @@
         "jobRoleArn": "${{WORKER_ROLE_ARN}}",
         "environment": [
             {"name": "SYSTEM_VERSION", "value": "${{SYSTEM_VERSION}}"},
+            {"name": "STAGE", "value": "${{STAGE}}"},
             {"name": "DJANGO_DEBUG", "value": "${{DJANGO_DEBUG}}"},
             {"name": "DATABASE_NAME", "value": "${{DATABASE_NAME}}"},
             {"name": "DATABASE_USER", "value": "${{DATABASE_USER}}"},

diff --git a/workers/batch-job-templates/smasher.tpl.json b/workers/batch-job-templates/smasher.tpl.json
@@ -29,6 +29,7 @@
         "jobRoleArn": "${{WORKER_ROLE_ARN}}",
         "environment": [
             {"name": "SYSTEM_VERSION", "value": "${{SYSTEM_VERSION}}"},
+            {"name": "STAGE", "value": "${{STAGE}}"},
             {"name": "DJANGO_DEBUG", "value": "${{DJANGO_DEBUG}}"},
             {"name": "DATABASE_NAME", "value": "${{DATABASE_NAME}}"},
             {"name": "DATABASE_USER", "value": "${{DATABASE_USER}}"},

diff --git a/workers/batch-job-templates/transcriptome_index.tpl.json b/workers/batch-job-templates/transcriptome_index.tpl.json
@@ -29,6 +29,7 @@
         "jobRoleArn": "${{WORKER_ROLE_ARN}}",
         "environment": [
             {"name": "SYSTEM_VERSION", "value": "${{SYSTEM_VERSION}}"},
+            {"name": "STAGE", "value": "${{STAGE}}"},
             {"name": "DJANGO_DEBUG", "value": "${{DJANGO_DEBUG}}"},
             {"name": "DATABASE_NAME", "value": "${{DATABASE_NAME}}"},
             {"name": "DATABASE_USER", "value": "${{DATABASE_USER}}"},

diff --git a/workers/batch-job-templates/tximport.tpl.json b/workers/batch-job-templates/tximport.tpl.json
@@ -29,6 +29,7 @@
         "jobRoleArn": "${{WORKER_ROLE_ARN}}",
         "environment": [
             {"name": "SYSTEM_VERSION", "value": "${{SYSTEM_VERSION}}"},
+            {"name": "STAGE", "value": "${{STAGE}}"},
             {"name": "DJANGO_DEBUG", "value": "${{DJANGO_DEBUG}}"},
             {"name": "DATABASE_NAME", "value": "${{DATABASE_NAME}}"},
             {"name": "DATABASE_USER", "value": "${{DATABASE_USER}}"},