update node_version and azurerm to support node 20

CDCgov · Apr 25, 2024 · 1551170 · 1551170
1 parent fda548a
commit 1551170
Show file tree

Hide file tree

Showing 32 changed files with 81 additions and 74 deletions.
diff --git a/.github/workflows/terraformChecks.yml b/.github/workflows/terraformChecks.yml
@@ -27,12 +27,7 @@ jobs:
   check-terraform-validity:
     runs-on: ubuntu-latest
     env:
-      TERRAFORM_DIRS: |
-          dev dev/persistent dev2 dev2/persistent dev3 dev3/persistent dev4 dev4/persistent
-          dev5 dev5/persistent dev6 dev6/persistent 
-          test test/persistent demo demo/persistent training training/persistent
-          stg stg/persistent pentest pentest/persistent prod prod/persistent
-          global
+      TERRAFORM_DIRS: pentest pentest/persistent
     steps:
       - uses: actions/checkout@v4
       - uses: hashicorp/setup-terraform@v3.0.0

diff --git a/ops/demo/_config.tf b/ops/demo/_config.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.55"
+      version = "~> 3.100.0"
     }
   }
   required_version = "~> 1.3.3"

diff --git a/ops/demo/persistent/_config.tf b/ops/demo/persistent/_config.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.55"
+      version = "~> 3.100.0"
     }
     okta = {
       source  = "okta/okta"

diff --git a/ops/dev/_config.tf b/ops/dev/_config.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.55"
+      version = "~> 3.100.0"
     }
   }
   required_version = "~> 1.3.3"

diff --git a/ops/dev/persistent/_config.tf b/ops/dev/persistent/_config.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.55"
+      version = "~> 3.100.0"
     }
     okta = {
       source  = "okta/okta"

diff --git a/ops/dev2/_config.tf b/ops/dev2/_config.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.55"
+      version = "~> 3.100.0"
     }
   }
   required_version = "~> 1.3.3"

diff --git a/ops/dev2/persistent/_config.tf b/ops/dev2/persistent/_config.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.55"
+      version = "~> 3.100.0"
     }
     okta = {
       source  = "okta/okta"

diff --git a/ops/dev3/_config.tf b/ops/dev3/_config.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.55"
+      version = "~> 3.100.0"
     }
   }
   required_version = "~> 1.3.3"

diff --git a/ops/dev3/persistent/_config.tf b/ops/dev3/persistent/_config.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.55"
+      version = "~> 3.100.0"
     }
     okta = {
       source  = "okta/okta"

diff --git a/ops/dev4/_config.tf b/ops/dev4/_config.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.55"
+      version = "~> 3.100.0"
     }
   }
   required_version = "~> 1.3.3"

diff --git a/ops/dev4/persistent/_config.tf b/ops/dev4/persistent/_config.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.55"
+      version = "~> 3.100.0"
     }
     okta = {
       source  = "okta/okta"

diff --git a/ops/dev5/_config.tf b/ops/dev5/_config.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.55"
+      version = "~> 3.100.0"
     }
   }
   required_version = "~> 1.3.3"

diff --git a/ops/dev5/persistent/_config.tf b/ops/dev5/persistent/_config.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.55"
+      version = "~> 3.100.0"
     }
     okta = {
       source  = "okta/okta"

diff --git a/ops/dev6/_config.tf b/ops/dev6/_config.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.55"
+      version = "~> 3.100.0"
     }
   }
   required_version = "~> 1.3.3"

diff --git a/ops/dev6/persistent/_config.tf b/ops/dev6/persistent/_config.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.55"
+      version = "~> 3.100.0"
     }
     okta = {
       source  = "okta/okta"

diff --git a/ops/global/_config.tf b/ops/global/_config.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.55"
+      version = "~> 3.100.0"
     }
     okta = {
       source  = "okta/okta"

diff --git a/ops/pentest/.terraform.lock.hcl b/ops/pentest/.terraform.lock.hcl
diff --git a/ops/pentest/_config.tf b/ops/pentest/_config.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.55"
+      version = "~> 3.100.0"
     }
   }
   required_version = "~> 1.3.3"

diff --git a/ops/pentest/persistent/.terraform.lock.hcl b/ops/pentest/persistent/.terraform.lock.hcl
diff --git a/ops/pentest/persistent/_config.tf b/ops/pentest/persistent/_config.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.55"
+      version = "~> 3.100.0"
     }
     okta = {
       source  = "okta/okta"

diff --git a/ops/prod/_config.tf b/ops/prod/_config.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.55"
+      version = "~> 3.100.0"
     }
   }
   required_version = "~> 1.3.3"

diff --git a/ops/prod/persistent/_config.tf b/ops/prod/persistent/_config.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.55"
+      version = "~> 3.100.0"
     }
     okta = {
       source  = "okta/okta"

diff --git a/ops/services/app_functions/report_stream_batched_publisher/infra/_config.tf b/ops/services/app_functions/report_stream_batched_publisher/infra/_config.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.55"
+      version = "~> 3.100.0"
     }
   }
   required_version = "~> 1.3.3"

diff --git a/ops/services/app_functions/report_stream_batched_publisher/infra/main.tf b/ops/services/app_functions/report_stream_batched_publisher/infra/main.tf
@@ -65,7 +65,7 @@ resource "azurerm_linux_function_app" "functions" {
       action                    = "Allow"
     }
     application_stack {
-      node_version = "18"
+      node_version = "20"
     }
   }
 
@@ -76,7 +76,7 @@ resource "azurerm_linux_function_app" "functions" {
   app_settings = {
     https_only                       = true
     FUNCTIONS_WORKER_RUNTIME         = "node"
-    WEBSITE_NODE_DEFAULT_VERSION     = "~18"
+    WEBSITE_NODE_DEFAULT_VERSION     = "~20"
     FUNCTION_APP_EDIT_MODE           = "readonly"
     HASH                             = azurerm_storage_blob.appcode.content_md5
     WEBSITE_RUN_FROM_PACKAGE         = "https://${data.azurerm_storage_account.app.name}.blob.core.windows.net/${azurerm_storage_container.deployments.name}/${azurerm_storage_blob.appcode.name}${data.azurerm_storage_account_sas.sas.sas}"

diff --git a/ops/services/app_service/main.tf b/ops/services/app_service/main.tf
@@ -56,6 +56,10 @@ resource "azurerm_linux_web_app" "service" {
     use_32_bit_worker                 = false
     ftps_state                        = "Disabled"
     vnet_route_all_enabled            = false
+    # Should use behavior set in the ip_restriction
+    ip_restriction_default_action     = "Deny"
+    # We don't use Kudu or the SCM site tools
+    scm_ip_restriction_default_action = "Deny"
 
     // NOTE: If this code is removed, TF will not automatically delete it with the current provider version! It must be removed manually from the App Service -> Networking blade!
     ip_restriction {
@@ -101,6 +105,10 @@ resource "azurerm_linux_web_app_slot" "staging" {
     use_32_bit_worker                 = false
     ftps_state                        = "Disabled"
     vnet_route_all_enabled            = false
+    # Should use behavior set in the ip_restriction
+    ip_restriction_default_action     = "Deny"
+    # We don't use Kudu or the SCM site tools
+    scm_ip_restriction_default_action = "Deny"
 
     # This application stack is what we use to deploy the docker image to the staging slot
     # After it becomes healthy, we swap the staging slot with the production slot to complete the deployment

diff --git a/ops/services/metabase/service/main.tf b/ops/services/metabase/service/main.tf
@@ -39,6 +39,10 @@ resource "azurerm_linux_web_app" "metabase" {
     scm_minimum_tls_version           = "1.2"
     use_32_bit_worker                 = false
     vnet_route_all_enabled            = false
+    # Should use behavior set in the ip_restriction
+    ip_restriction_default_action     = "Deny"
+    # We don't use Kudu or the SCM site tools
+    scm_ip_restriction_default_action = "Deny"
 
     ip_restriction {
       virtual_network_subnet_id = var.lb_subnet_id

diff --git a/ops/stg/_config.tf b/ops/stg/_config.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.55"
+      version = "~> 3.100.0"
     }
   }
   required_version = "~> 1.3.3"

diff --git a/ops/stg/persistent/_config.tf b/ops/stg/persistent/_config.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.55"
+      version = "~> 3.100.0"
     }
     okta = {
       source  = "okta/okta"

diff --git a/ops/test/_config.tf b/ops/test/_config.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.55"
+      version = "~> 3.100.0"
     }
   }
   required_version = "~> 1.3.3"

diff --git a/ops/test/persistent/_config.tf b/ops/test/persistent/_config.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.55"
+      version = "~> 3.100.0"
     }
     okta = {
       source  = "okta/okta"

diff --git a/ops/training/_config.tf b/ops/training/_config.tf
@@ -8,7 +8,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.55"
+      version = "~> 3.100.0"
     }
   }
   required_version = "~> 1.3.3"