deploy to middleware with CORS change

CDCgov · Dec 13, 2024 · 0a54838 · 0a54838
1 parent 2f2e622
commit 0a54838
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 29 deletions.
diff --git a/.github/workflows/build-deploy-ocr.yml b/.github/workflows/build-deploy-ocr.yml
@@ -1,20 +1,20 @@
 name: Create, publish, deploy a OCR API image
 
 on:
-  # push:
-  #   branches: test-deploy-middleware
-  workflow_dispatch:
-    inputs:
-      deploy-env:
-        description: 'The environment to deploy to'
-        required: true
-        type: choice
-        options:
-          - dev
-          - demo
-      ocr-docker-tag:
-        description: 'This is optional if you would like to deploy an already published OCR-API image'
-        required: false
+  push:
+    branches: test-deploy-middleware
+  # workflow_dispatch:
+  #   inputs:
+  #     deploy-env:
+  #       description: 'The environment to deploy to'
+  #       required: true
+  #       type: choice
+  #       options:
+  #         - dev
+  #         - demo
+  #     ocr-docker-tag:
+  #       description: 'This is optional if you would like to deploy an already published OCR-API image'
+  #       required: false
 
 permissions:
   contents: read
@@ -37,7 +37,7 @@ jobs:
         shell: bash
         id: set_tag
         run: |
-          USER_INPUT="fa1b599d864865dda07d564a113928f48eaaf163"
+          USER_INPUT=""
           echo "docker_tag=$(
             #this gives a new sha as default if dispatch input is empty
             echo ${USER_INPUT:-"${{ github.sha }}"}
@@ -63,7 +63,7 @@ jobs:
   deploy-ocr:
     name: Deploy OCR
     runs-on: ubuntu-latest
-    environment: dev
+    environment: demo
     needs: [build-publish-ocr]
     steps:
       - uses: actions/checkout@v4
@@ -76,7 +76,7 @@ jobs:
       - name: Deploy OCR-API
         uses: ./.github/actions/deploy-api
         with:
-          deploy-env: dev
+          deploy-env: demo
           docker-tag: ${{ needs.build-publish-ocr.outputs.docker_tag }}
           docker-registry: ghcr.io
           api-name: middleware
diff --git a/ops/terraform/main.tf b/ops/terraform/main.tf
@@ -77,7 +77,7 @@ module "middleware_api" {
     PORT = "8080"
     SSL_MODE = "require"
     POSTGRES_HOST     = module.database.postgres_fqdn
-    POSTGRES_DB       = module.database.postgres_db_name
+    POSTGRES_DB       = "${module.database.postgres_db_name}-db"
     POSTGRES_USER     = module.database.postgres_user
     POSTGRES_PASSWORD = module.vault.postgres_password
     WEBSITES_CONTAINER_START_TIME_LIMIT = 400
@@ -110,7 +110,7 @@ module "ocr_api" {
   vnet         = module.networking.network_name
   sku_name     = var.sku_name
   https_only   = true
-  depends_on   = [module.networking.ocrsubnet_id, module.networking.middlewaresubnet_id]
+  depends_on   = [module.networking.ocrsubnet_id, module.networking.lbsubnet_id]
 }
 
 module "ocr_autoscale" {
@@ -142,7 +142,6 @@ module "vault" {
   name                = var.name
   location            = data.azurerm_resource_group.rg.location
   resource_group_name = data.azurerm_resource_group.rg.name
-  env                 = local.environment
   tenant_id           = var.tenant_id
   client_id           = var.client_id
   object_id           = module.middleware_api.webapp_id

diff --git a/ops/terraform/modules/security/main.tf b/ops/terraform/modules/security/main.tf
@@ -28,12 +28,6 @@ resource "azurerm_network_security_group" "web-nsg" {
   # }
 }
 
-resource "azurerm_subnet_network_security_group_association" "web-nsg-subnet" {
-  depends_on                = [azurerm_network_security_rule.ag_nsg_rule_inbound]
-  subnet_id                 = var.lb_subnet_id
-  network_security_group_id = azurerm_network_security_group.web-nsg.id
-}
-
 locals {
   ag_inbound_ports_map = {
     "100" : "80", # If the key starts with a number, you must use the colon syntax ":" instead of "="

diff --git a/ops/terraform/modules/vault/variables.tf b/ops/terraform/modules/vault/variables.tf
@@ -10,6 +10,4 @@ variable "postgres_server_id" {
 variable "resource_group_name" {}
 variable "subscription_id" {}
 variable "service_plan_id" {}
-variable "tenant_id" {}
-variable "env" {  
-}
+variable "tenant_id" {}