From 19951a8564fb50429f553c971740e9073868daac Mon Sep 17 00:00:00 2001
From: Administrator <gitlab_admin_731e3f@example.com>
Date: Fri, 11 Oct 2024 12:58:34 -0600
Subject: [PATCH 1/4] Terraform variable clean-up and creation

---
 ops/terraform/locals.tf                       |  3 +-
 ops/terraform/main.tf                         | 20 ++++++---
 ops/terraform/modules/app_gateway/main.tf     | 44 +++++++++----------
 .../modules/app_gateway/variables.tf          |  5 +--
 ops/terraform/modules/app_service/main.tf     | 12 ++---
 .../modules/app_service/variables.tf          | 11 +++--
 ops/terraform/modules/compute/variables.tf    |  1 +
 .../modules/container_instances/main.tf       |  2 +-
 .../modules/container_instances/variables.tf  |  1 +
 ops/terraform/modules/network/main.tf         | 10 ++---
 ops/terraform/modules/network/variables.tf    |  1 +
 ops/terraform/modules/security/main.tf        |  2 +-
 ops/terraform/modules/security/variables.tf   |  1 +
 ops/terraform/modules/storage/main.tf         |  2 +-
 ops/terraform/modules/storage/variables.tf    |  1 +
 ops/terraform/variables.tf                    | 12 +++++
 16 files changed, 74 insertions(+), 54 deletions(-)

diff --git a/ops/terraform/locals.tf b/ops/terraform/locals.tf
index 5a609c97..1b0a15d4 100644
--- a/ops/terraform/locals.tf
+++ b/ops/terraform/locals.tf
@@ -1,8 +1,7 @@
 locals {
-  environment = "${terraform.workspace}"
+  environment = terraform.workspace
   init = {
     environment         = local.environment
-    resource_group_name = "reportvision-rg-${terraform.workspace}"
     location            = "eastus2"
   }
   network = {
diff --git a/ops/terraform/main.tf b/ops/terraform/main.tf
index 03cf19c8..bb7e11d0 100644
--- a/ops/terraform/main.tf
+++ b/ops/terraform/main.tf
@@ -10,6 +10,7 @@ locals {
 ##########
 module "networking" {
   source         = "./modules/network"
+  name           = var.name
   location       = data.azurerm_resource_group.dev.location
   resource_group = data.azurerm_resource_group.dev.name
   vnetcidr       = local.network.config.vnetcidr
@@ -26,6 +27,7 @@ module "networking" {
 
 module "securitygroup" {
   source         = "./modules/security"
+  name           = var.name
   location       = data.azurerm_resource_group.dev.location
   resource_group = data.azurerm_resource_group.dev.name
   web_subnet_id  = module.networking.websubnet_id
@@ -37,6 +39,7 @@ module "securitygroup" {
 
 module "app_gateway" {
   source                  = "./modules/app_gateway"
+  name                    = var.name
   resource_group_location = data.azurerm_resource_group.dev.location
   resource_group_name     = data.azurerm_resource_group.dev.name
 
@@ -55,6 +58,7 @@ module "app_gateway" {
 
 module "storage" {
   source          = "./modules/storage"
+  name            = var.name
   location        = data.azurerm_resource_group.dev.location
   resource_group  = data.azurerm_resource_group.dev.name
   env             = local.environment
@@ -68,12 +72,16 @@ module "storage" {
 ##########
 
 module "ocr_api" {
-  source         = "./modules/app_service"
-  location       = local.init.location
-  resource_group = data.azurerm_resource_group.dev.name
-  app_subnet_id  = module.networking.lbsubnet_id
-  env            = local.environment
-  vnet           = module.networking.network_name
+  source               = "./modules/app_service"
+  name                 = var.name
+  location             = local.init.location
+  resource_group       = data.azurerm_resource_group.dev.name
+  docker_tag           = var.docker_tag
+  docker_registry_path = var.docker_registry_path
+  docker_registry_url  = var.docker_registry_url
+  app_subnet_id        = module.networking.lbsubnet_id
+  env                  = local.environment
+  vnet                 = module.networking.network_name
 }
 
 # module "compute" {
diff --git a/ops/terraform/modules/app_gateway/main.tf b/ops/terraform/modules/app_gateway/main.tf
index c69d9b20..d4da84f5 100644
--- a/ops/terraform/modules/app_gateway/main.tf
+++ b/ops/terraform/modules/app_gateway/main.tf
@@ -1,5 +1,5 @@
 resource "azurerm_public_ip" "lb-pip" {
-  name                = "reportvision-pip-lb-${var.env}"
+  name                = "${var.name}-pip-lb-${var.env}"
   resource_group_name = var.resource_group_name
   location            = var.resource_group_location
   allocation_method   = "Static"
@@ -10,25 +10,25 @@ resource "azurerm_public_ip" "lb-pip" {
 
 # since these variables are re-used - a locals block makes this more maintainable
 locals {
-  backend_address_pool_name_static = "${var.vnet-name}-beap-static"
-  backend_address_pool_name_api    = "${var.vnet-name}-beap-api"
-  frontend_port_name_api           = "${var.vnet-name}-feport-api"
-  frontend_port_name_static        = "${var.vnet-name}-feport-static"
-  frontend_ip_configuration_name   = "${var.vnet-name}-feip"
-  http_setting_name_static         = "${var.vnet-name}-be-htst-static"
-  http_setting_name_api            = "${var.vnet-name}-be-htst-api"
-  listener_name_static             = "${var.vnet-name}-httplstn-static"
-  listener_name_api                = "${var.vnet-name}-httplstn-api"
-  request_routing_rule_name_api    = "${var.vnet-name}-rqrt-api"
-  request_routing_rule_name_static = "${var.vnet-name}-rqrt-static"
-  redirect_configuration_name      = "${var.vnet-name}-rdrcfg"
-  static_probe_name_app            = "${var.vnet-name}-be-probe-app-static"
-  api_probe_name_app               = "${var.vnet-name}-be-probe-app-api"
-  redirect_rule                    = "${var.vnet-name}-redirect"
+  backend_address_pool_name_static = "${var.name}-${var.env}-beap-static"
+  backend_address_pool_name_api    = "${var.name}-${var.env}-beap-api"
+  frontend_port_name_api           = "${var.name}-${var.env}-feport-api"
+  frontend_port_name_static        = "${var.name}-${var.env}-feport-static"
+  frontend_ip_configuration_name   = "${var.name}-${var.env}-feip"
+  http_setting_name_static         = "${var.name}-${var.env}-be-htst-static"
+  http_setting_name_api            = "${var.name}-${var.env}-be-htst-api"
+  listener_name_static             = "${var.name}-${var.env}-httplstn-static"
+  listener_name_api                = "${var.name}-${var.env}-httplstn-api"
+  request_routing_rule_name_api    = "${var.name}-${var.env}-rqrt-api"
+  request_routing_rule_name_static = "${var.name}-${var.env}-rqrt-static"
+  redirect_configuration_name      = "${var.name}-${var.env}-rdrcfg"
+  static_probe_name_app            = "${var.name}-${var.env}-be-probe-app-static"
+  api_probe_name_app               = "${var.name}-${var.env}-be-probe-app-api"
+  redirect_rule                    = "${var.name}-${var.env}-redirect"
 }
 
 resource "azurerm_application_gateway" "load_balancer" {
-  name                = "reportvision-appgateway-${var.env}"
+  name                = "${var.name}-appgateway-${var.env}"
   resource_group_name = var.resource_group_name
   location            = var.resource_group_location
 
@@ -39,7 +39,7 @@ resource "azurerm_application_gateway" "load_balancer" {
   }
 
   gateway_ip_configuration {
-    name      = "reportvision-gateway-ip-configuration"
+    name      = "${var.name}-gateway-ip-configuration"
     subnet_id = var.web-subnet
   }
 
@@ -154,10 +154,10 @@ resource "azurerm_application_gateway" "load_balancer" {
 
 
   url_path_map {
-    name                               = "${var.vnet-name}-urlmap"
+    name                               = "${var.name}${var.env}-urlmap"
     default_backend_address_pool_name  = local.backend_address_pool_name_static
     default_backend_http_settings_name = local.http_setting_name_static
-    default_rewrite_rule_set_name      = "mde-routing"
+    default_rewrite_rule_set_name      = "${var.name}-routing"
 
     path_rule {
       name                       = "api"
@@ -166,11 +166,11 @@ resource "azurerm_application_gateway" "load_balancer" {
       backend_http_settings_name = local.http_setting_name_api
       // this is the default, why would we set it again?
       // because if we don't do this we get 404s on API calls
-      rewrite_rule_set_name = "mde-routing"
+      rewrite_rule_set_name = "${var.name}-routing"
     }
   }
   rewrite_rule_set {
-    name = "mde-routing"
+    name = "${var.name}-routing"
 
     rewrite_rule {
       name          = "api-wildcard"
diff --git a/ops/terraform/modules/app_gateway/variables.tf b/ops/terraform/modules/app_gateway/variables.tf
index 4aa71b84..a4bf2bad 100644
--- a/ops/terraform/modules/app_gateway/variables.tf
+++ b/ops/terraform/modules/app_gateway/variables.tf
@@ -1,7 +1,4 @@
-variable "vnet-name" {
-  type    = string
-  default = "reportvision-dev"
-}
+variable "name" {}
 variable "resource_group_name" {}
 variable "resource_group_location" {}
 variable "web-subnet" {}
diff --git a/ops/terraform/modules/app_service/main.tf b/ops/terraform/modules/app_service/main.tf
index 19a03ce8..24eb32e9 100644
--- a/ops/terraform/modules/app_service/main.tf
+++ b/ops/terraform/modules/app_service/main.tf
@@ -3,7 +3,7 @@ locals {
 }
 
 resource "azurerm_service_plan" "asp" {
-  name                = "${var.name_ocr}-appserviceplan-${var.env}"
+  name                = "${var.name}-ocr-appserviceplan-${var.env}"
   location            = var.location
   os_type             = "Linux"
   resource_group_name = var.resource_group
@@ -11,7 +11,7 @@ resource "azurerm_service_plan" "asp" {
 }
 
 resource "azurerm_linux_web_app" "linux_webapp" {
-  name                          = "${var.name_ocr}-${var.env}"
+  name                          = "${var.name}-ocr-${var.env}"
   https_only                    = var.https_only
   location                      = var.location
   resource_group_name           = var.resource_group
@@ -33,10 +33,10 @@ resource "azurerm_linux_web_app" "linux_webapp" {
     ftps_state                        = "Disabled"
     vnet_route_all_enabled            = false
 
-    # application_stack {
-    #   docker_image_name   = "cdcgov/reportvision-ocr-api:derek-main-dev"
-    #   docker_registry_url = "https://ghcr.io"
-    # }
+    application_stack {
+      docker_image_name   = "${var.docker_registry_path}:${var.docker_tag}"
+      docker_registry_url = var.docker_registry_url
+    }
 
     ip_restriction {
       virtual_network_subnet_id = var.app_subnet_id
diff --git a/ops/terraform/modules/app_service/variables.tf b/ops/terraform/modules/app_service/variables.tf
index b81b4571..0dc427a0 100644
--- a/ops/terraform/modules/app_service/variables.tf
+++ b/ops/terraform/modules/app_service/variables.tf
@@ -1,23 +1,22 @@
 variable "env" {}
+variable "name" {}
 variable "resource_group" {}
 variable "location" {}
-variable "name_ocr" {
-  default = "reportvision-ocr-api"
-}
+
 variable "app_subnet_id" {}
 variable "sku_name" {
   default = "P1v3"
 }
 
-variable "az_account" {
-  default = "reportvision"
-}
 
 variable "https_only" {
   type    = bool
   default = false
 }
 variable "vnet" {}
+variable "docker_tag" {}
+variable "docker_registry_path" {}
+variable "docker_registry_url" {}
 variable "app_settings" {
   type        = map(string)
   default     = {}
diff --git a/ops/terraform/modules/compute/variables.tf b/ops/terraform/modules/compute/variables.tf
index aaf0435b..3e19fd1c 100644
--- a/ops/terraform/modules/compute/variables.tf
+++ b/ops/terraform/modules/compute/variables.tf
@@ -1,4 +1,5 @@
 variable "resource_group" {}
+variable "name" {}
 variable "location" {}
 variable "web_subnet_id" {}
 variable "app_subnet_id" {}
diff --git a/ops/terraform/modules/container_instances/main.tf b/ops/terraform/modules/container_instances/main.tf
index ea537a53..55a7c742 100644
--- a/ops/terraform/modules/container_instances/main.tf
+++ b/ops/terraform/modules/container_instances/main.tf
@@ -1,5 +1,5 @@
 resource "azurerm_container_group" "example" {
-  name                = "reportvision-ocr"
+  name                = "${var.name}-cg"
   location            = var.location
   resource_group_name = var.resource_group
   ip_address_type     = "Private"
diff --git a/ops/terraform/modules/container_instances/variables.tf b/ops/terraform/modules/container_instances/variables.tf
index 3c46a99f..95ad5d89 100644
--- a/ops/terraform/modules/container_instances/variables.tf
+++ b/ops/terraform/modules/container_instances/variables.tf
@@ -1,4 +1,5 @@
 variable "environment" {}
+variable "name" {}
 variable "resource_group" {}
 variable "location" {}
 variable "app_subnet" {}
\ No newline at end of file
diff --git a/ops/terraform/modules/network/main.tf b/ops/terraform/modules/network/main.tf
index ae2e1c07..9156a2b7 100644
--- a/ops/terraform/modules/network/main.tf
+++ b/ops/terraform/modules/network/main.tf
@@ -1,12 +1,12 @@
 resource "azurerm_virtual_network" "vnet" {
-  name                = "reportvision-vnet-${var.env}"
+  name                = "${var.name}-vnet-${var.env}"
   resource_group_name = var.resource_group
   location            = var.location
   address_space       = [var.vnetcidr]
 }
 
 resource "azurerm_subnet" "web-subnet" {
-  name                 = "reportvision-web-subnet-${var.env}"
+  name                 = "${var.name}-web-subnet-${var.env}"
   virtual_network_name = azurerm_virtual_network.vnet.name
   resource_group_name  = var.resource_group
   address_prefixes     = [var.websubnetcidr]
@@ -15,7 +15,7 @@ resource "azurerm_subnet" "web-subnet" {
 }
 
 resource "azurerm_subnet" "app-subnet" {
-  name                 = "reportvision-app-subnet-${var.env}"
+  name                 = "${var.name}-app-subnet-${var.env}"
   virtual_network_name = azurerm_virtual_network.vnet.name
   resource_group_name  = var.resource_group
   address_prefixes     = [var.appsubnetcidr]
@@ -31,7 +31,7 @@ resource "azurerm_subnet" "app-subnet" {
 }
 
 resource "azurerm_subnet" "lb-subnet" {
-  name                 = "reportvision-lb-subnet-${var.env}"
+  name                 = "${var.name}-lb-subnet-${var.env}"
   virtual_network_name = azurerm_virtual_network.vnet.name
   resource_group_name  = var.resource_group
   address_prefixes     = [var.lbsubnetcidr]
@@ -39,7 +39,7 @@ resource "azurerm_subnet" "lb-subnet" {
 }
 
 resource "azurerm_subnet" "db-subnet" {
-  name                 = "reportvision-db-subnet-${var.env}"
+  name                 = "${var.name}-db-subnet-${var.env}"
   virtual_network_name = azurerm_virtual_network.vnet.name
   resource_group_name  = var.resource_group
   address_prefixes     = [var.dbsubnetcidr]
diff --git a/ops/terraform/modules/network/variables.tf b/ops/terraform/modules/network/variables.tf
index 4c14a078..a01c9363 100644
--- a/ops/terraform/modules/network/variables.tf
+++ b/ops/terraform/modules/network/variables.tf
@@ -1,4 +1,5 @@
 variable "resource_group" {}
+variable "name" {}
 variable "location" {}
 variable "vnetcidr" {}
 variable "websubnetcidr" {}
diff --git a/ops/terraform/modules/security/main.tf b/ops/terraform/modules/security/main.tf
index 37f89977..260f69c5 100644
--- a/ops/terraform/modules/security/main.tf
+++ b/ops/terraform/modules/security/main.tf
@@ -1,5 +1,5 @@
 resource "azurerm_network_security_group" "web-nsg" {
-  name                = "reportvision-web-nsg-${var.env}"
+  name                = "${var.name}-web-nsg-${var.env}"
   location            = var.location
   resource_group_name = var.resource_group
 
diff --git a/ops/terraform/modules/security/variables.tf b/ops/terraform/modules/security/variables.tf
index 8b9fc986..6004ce0d 100644
--- a/ops/terraform/modules/security/variables.tf
+++ b/ops/terraform/modules/security/variables.tf
@@ -1,4 +1,5 @@
 variable "location" {}
+variable "name" {}
 variable "env" {}
 variable "resource_group" {}
 variable "web_subnet_id" {}
diff --git a/ops/terraform/modules/storage/main.tf b/ops/terraform/modules/storage/main.tf
index 1b3c8a18..67424e72 100644
--- a/ops/terraform/modules/storage/main.tf
+++ b/ops/terraform/modules/storage/main.tf
@@ -4,7 +4,7 @@ resource "azurerm_storage_account" "frontend" {
   account_kind               = "StorageV2"
   location                   = var.location
   resource_group_name        = var.resource_group
-  name                       = "reportvisionfrontend${var.env}"
+  name                       = "${var.name}frontend${var.env}"
   https_traffic_only_enabled = false
 
   static_website {
diff --git a/ops/terraform/modules/storage/variables.tf b/ops/terraform/modules/storage/variables.tf
index fd6d6edf..4ec3d4b0 100644
--- a/ops/terraform/modules/storage/variables.tf
+++ b/ops/terraform/modules/storage/variables.tf
@@ -1,4 +1,5 @@
 variable "resource_group" {}
+variable "name" {}
 variable "env" {}
 variable "location" {}
 variable "management_tags" {}
diff --git a/ops/terraform/variables.tf b/ops/terraform/variables.tf
index bdd404ad..12fa3c86 100644
--- a/ops/terraform/variables.tf
+++ b/ops/terraform/variables.tf
@@ -8,4 +8,16 @@ variable "subscription_id" {
 
 variable "client_id" {
   description = "Client ID"
+}
+
+variable "docker_tag" {
+}
+
+variable "docker_registry_path" {
+}
+
+variable "docker_registry_url" {
+}
+
+variable "name" {
 }
\ No newline at end of file

From 9b4f06ff10c3bbf6f8f49bf31ac799c6696e42b3 Mon Sep 17 00:00:00 2001
From: Administrator <gitlab_admin_731e3f@example.com>
Date: Fri, 11 Oct 2024 13:00:59 -0600
Subject: [PATCH 2/4] wip

---
 ops/terraform/locals.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ops/terraform/locals.tf b/ops/terraform/locals.tf
index 1b0a15d4..77e0cc0b 100644
--- a/ops/terraform/locals.tf
+++ b/ops/terraform/locals.tf
@@ -1,5 +1,5 @@
 locals {
-  environment = terraform.workspace
+  environment = "${terraform.workspace}"
   init = {
     environment         = local.environment
     location            = "eastus2"

From 177b3807133587bd980f8b80ce54a7b537e8e913 Mon Sep 17 00:00:00 2001
From: Administrator <gitlab_admin_731e3f@example.com>
Date: Fri, 11 Oct 2024 13:04:09 -0600
Subject: [PATCH 3/4] -

---
 ops/terraform/modules/app_gateway/main.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ops/terraform/modules/app_gateway/main.tf b/ops/terraform/modules/app_gateway/main.tf
index d4da84f5..dd50ef9b 100644
--- a/ops/terraform/modules/app_gateway/main.tf
+++ b/ops/terraform/modules/app_gateway/main.tf
@@ -154,7 +154,7 @@ resource "azurerm_application_gateway" "load_balancer" {
 
 
   url_path_map {
-    name                               = "${var.name}${var.env}-urlmap"
+    name                               = "${var.name}-${var.env}-urlmap"
     default_backend_address_pool_name  = local.backend_address_pool_name_static
     default_backend_http_settings_name = local.http_setting_name_static
     default_rewrite_rule_set_name      = "${var.name}-routing"

From 57f567df2ccdd31d1cc0f723074707f18924a1ae Mon Sep 17 00:00:00 2001
From: Administrator <gitlab_admin_731e3f@example.com>
Date: Fri, 11 Oct 2024 15:47:43 -0600
Subject: [PATCH 4/4] add different env configs for state

---
 ops/terraform/config/dev.config           |  3 +++
 ops/terraform/config/dev2.config          |  3 +++
 ops/terraform/config/dev3.config          |  3 +++
 ops/terraform/config/dev4.config          |  3 +++
 ops/terraform/config/dev5.config          |  3 +++
 ops/terraform/config/dev6.config          |  3 +++
 ops/terraform/data.tf                     |  2 +-
 ops/terraform/main.tf                     | 24 +++++++++++------------
 ops/terraform/modules/app_gateway/main.tf |  6 +++---
 ops/terraform/providers.tf                |  3 ---
 10 files changed, 34 insertions(+), 19 deletions(-)
 create mode 100644 ops/terraform/config/dev.config
 create mode 100644 ops/terraform/config/dev2.config
 create mode 100644 ops/terraform/config/dev3.config
 create mode 100644 ops/terraform/config/dev4.config
 create mode 100644 ops/terraform/config/dev5.config
 create mode 100644 ops/terraform/config/dev6.config

diff --git a/ops/terraform/config/dev.config b/ops/terraform/config/dev.config
new file mode 100644
index 00000000..eca35f68
--- /dev/null
+++ b/ops/terraform/config/dev.config
@@ -0,0 +1,3 @@
+    storage_account_name = "tfstaterv2024"
+    container_name       = "rv-tfstate"
+    key                  = "dev.terraform.tfstate"
\ No newline at end of file
diff --git a/ops/terraform/config/dev2.config b/ops/terraform/config/dev2.config
new file mode 100644
index 00000000..651e6e72
--- /dev/null
+++ b/ops/terraform/config/dev2.config
@@ -0,0 +1,3 @@
+    storage_account_name = "tfstaterv2024"
+    container_name       = "rv-tfstate"
+    key                  = "dev2.terraform.tfstate"
\ No newline at end of file
diff --git a/ops/terraform/config/dev3.config b/ops/terraform/config/dev3.config
new file mode 100644
index 00000000..e1c3a6b8
--- /dev/null
+++ b/ops/terraform/config/dev3.config
@@ -0,0 +1,3 @@
+    storage_account_name = "tfstaterv2024"
+    container_name       = "rv-tfstate"
+    key                  = "dev3.terraform.tfstate"
\ No newline at end of file
diff --git a/ops/terraform/config/dev4.config b/ops/terraform/config/dev4.config
new file mode 100644
index 00000000..2c64a7b5
--- /dev/null
+++ b/ops/terraform/config/dev4.config
@@ -0,0 +1,3 @@
+    storage_account_name = "tfstaterv2024"
+    container_name       = "rv-tfstate"
+    key                  = "dev4.terraform.tfstate"
\ No newline at end of file
diff --git a/ops/terraform/config/dev5.config b/ops/terraform/config/dev5.config
new file mode 100644
index 00000000..e24ed17a
--- /dev/null
+++ b/ops/terraform/config/dev5.config
@@ -0,0 +1,3 @@
+    storage_account_name = "tfstaterv2024"
+    container_name       = "rv-tfstate"
+    key                  = "dev5.terraform.tfstate"
\ No newline at end of file
diff --git a/ops/terraform/config/dev6.config b/ops/terraform/config/dev6.config
new file mode 100644
index 00000000..07b3ed03
--- /dev/null
+++ b/ops/terraform/config/dev6.config
@@ -0,0 +1,3 @@
+    storage_account_name = "tfstaterv2024"
+    container_name       = "rv-tfstate"
+    key                  = "dev6.terraform.tfstate"
\ No newline at end of file
diff --git a/ops/terraform/data.tf b/ops/terraform/data.tf
index b3cd8975..641213c6 100644
--- a/ops/terraform/data.tf
+++ b/ops/terraform/data.tf
@@ -1,3 +1,3 @@
-data "azurerm_resource_group" "dev" {
+data "azurerm_resource_group" "rg" {
   name = var.resource_group_name
 }
\ No newline at end of file
diff --git a/ops/terraform/main.tf b/ops/terraform/main.tf
index bb7e11d0..5e7b9440 100644
--- a/ops/terraform/main.tf
+++ b/ops/terraform/main.tf
@@ -1,7 +1,7 @@
 locals {
   management_tags = {
     environment    = local.environment
-    resource_group = data.azurerm_resource_group.dev.name
+    resource_group = data.azurerm_resource_group.rg.name
   }
 }
 
@@ -11,8 +11,8 @@ locals {
 module "networking" {
   source         = "./modules/network"
   name           = var.name
-  location       = data.azurerm_resource_group.dev.location
-  resource_group = data.azurerm_resource_group.dev.name
+  location       = data.azurerm_resource_group.rg.location
+  resource_group = data.azurerm_resource_group.rg.name
   vnetcidr       = local.network.config.vnetcidr
   websubnetcidr  = local.network.config.websubnetcidr
   appsubnetcidr  = local.network.config.appsubnetcidr
@@ -28,8 +28,8 @@ module "networking" {
 module "securitygroup" {
   source         = "./modules/security"
   name           = var.name
-  location       = data.azurerm_resource_group.dev.location
-  resource_group = data.azurerm_resource_group.dev.name
+  location       = data.azurerm_resource_group.rg.location
+  resource_group = data.azurerm_resource_group.rg.name
   web_subnet_id  = module.networking.websubnet_id
   app_subnet_id  = module.networking.appsubnet_id
   db_subnet_id   = module.networking.dbsubnet_id
@@ -40,8 +40,8 @@ module "securitygroup" {
 module "app_gateway" {
   source                  = "./modules/app_gateway"
   name                    = var.name
-  resource_group_location = data.azurerm_resource_group.dev.location
-  resource_group_name     = data.azurerm_resource_group.dev.name
+  resource_group_location = data.azurerm_resource_group.rg.location
+  resource_group_name     = data.azurerm_resource_group.rg.name
 
   blob_endpoint = module.storage.primary_web_host
   web-subnet    = module.networking.lbsubnet_id
@@ -59,8 +59,8 @@ module "app_gateway" {
 module "storage" {
   source          = "./modules/storage"
   name            = var.name
-  location        = data.azurerm_resource_group.dev.location
-  resource_group  = data.azurerm_resource_group.dev.name
+  location        = data.azurerm_resource_group.rg.location
+  resource_group  = data.azurerm_resource_group.rg.name
   env             = local.environment
   management_tags = local.management_tags
   app_gateway_ip  = module.app_gateway.app_gateway_ip
@@ -75,7 +75,7 @@ module "ocr_api" {
   source               = "./modules/app_service"
   name                 = var.name
   location             = local.init.location
-  resource_group       = data.azurerm_resource_group.dev.name
+  resource_group       = data.azurerm_resource_group.rg.name
   docker_tag           = var.docker_tag
   docker_registry_path = var.docker_registry_path
   docker_registry_url  = var.docker_registry_url
@@ -86,8 +86,8 @@ module "ocr_api" {
 
 # module "compute" {
 #   source         = "./modules/container_instances"
-#   location       = data.azurerm_resource_group.test.location
-#   resource_group = data.azurerm_resource_group.test.name
+#   location       = data.azurerm_resource_group.rg.location
+#   resource_group = data.azurerm_resource_group.rg.name
 #   environment    = local.environment
 #   app_subnet     = module.networking.appsubnet_id
 #   # web_subnet_id   = module.networking.websubnet_id
diff --git a/ops/terraform/modules/app_gateway/main.tf b/ops/terraform/modules/app_gateway/main.tf
index dd50ef9b..c2fd5acd 100644
--- a/ops/terraform/modules/app_gateway/main.tf
+++ b/ops/terraform/modules/app_gateway/main.tf
@@ -84,7 +84,7 @@ resource "azurerm_application_gateway" "load_balancer" {
     port                                = 80
     protocol                            = "Http"
     request_timeout                     = 120
-    path                                = "/api"
+    path                                = "/"
     pick_host_name_from_backend_address = true
     probe_name                          = local.api_probe_name_app
   }
@@ -161,7 +161,7 @@ resource "azurerm_application_gateway" "load_balancer" {
 
     path_rule {
       name                       = "api"
-      paths                      = ["/api/*", "/api"]
+      paths                      = ["/*", "/"]
       backend_address_pool_name  = local.backend_address_pool_name_api
       backend_http_settings_name = local.http_setting_name_api
       // this is the default, why would we set it again?
@@ -178,7 +178,7 @@ resource "azurerm_application_gateway" "load_balancer" {
       condition {
         ignore_case = true
         negate      = false
-        pattern     = ".*api/(.*)"
+        pattern     = "./(.*)"
         variable    = "var_uri_path"
       }
 
diff --git a/ops/terraform/providers.tf b/ops/terraform/providers.tf
index 20350122..554c8664 100644
--- a/ops/terraform/providers.tf
+++ b/ops/terraform/providers.tf
@@ -1,9 +1,6 @@
 terraform {
   backend "azurerm" {
     resource_group_name  = "reportvision-rg-global"
-    storage_account_name = "tfstaterv2024"
-    container_name       = "rv-tfstate"
-    key                  = "dev/terraform.tfstate"
   }
   required_providers {
     azurerm = {