Remove unneeded Resource Groups and creds (#363)

* Remove unneeded resource groups and Creds * rm outputs base file --------- Co-authored-by: Administrator <[email protected]>
CDCgov · Nov 5, 2024 · 53880ca · 53880ca
1 parent 4ba556e
commit 53880ca
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 75 deletions.
diff --git a/.github/workflows/build-deploy-frontend.yml b/.github/workflows/build-deploy-frontend.yml
@@ -9,11 +9,6 @@ on:
         type: choice
         options:
           - dev
-          - dev2
-          - dev3
-          - dev4
-          - dev5
-          - dev6
           - demo
       demo-blob-name:
         description: 'After the demo env gets created, copy its blob storage name here'

diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml
@@ -9,11 +9,6 @@ on:
         type: choice
         options:
           - dev
-          - dev2
-          - dev3
-          - dev4
-          - dev5
-          - dev6
           - demo
       ocr-version:
         description: 'Create a version for this OCR API image'

diff --git a/ops/terraform/config/dev2.config b/ops/terraform/config/dev2.config
diff --git a/ops/terraform/config/dev3.config b/ops/terraform/config/dev3.config
diff --git a/ops/terraform/config/dev4.config b/ops/terraform/config/dev4.config
diff --git a/ops/terraform/config/dev5.config b/ops/terraform/config/dev5.config
diff --git a/ops/terraform/config/dev6.config b/ops/terraform/config/dev6.config
diff --git a/ops/terraform/locals.tf b/ops/terraform/locals.tf
@@ -12,52 +12,12 @@ locals {
       lbsubnetcidr  = "10.0.3.0/24"
     }
   }
-  dev2 = {
-    dev2 = {
-      vnetcidr      = "10.2.0.0/16"
-      appsubnetcidr = "10.2.1.0/24"
-      websubnetcidr = "10.2.2.0/24"
-      lbsubnetcidr  = "10.2.3.0/24"
-    }
-  }
-  dev3 = {
-    dev3 = {
-      vnetcidr      = "10.3.0.0/16"
-      appsubnetcidr = "10.3.1.0/24"
-      websubnetcidr = "10.3.2.0/24"
-      lbsubnetcidr  = "10.3.3.0/24"
-    }
-  }
-  dev4 = {
-    dev4 = {
-      vnetcidr      = "10.4.0.0/16"
-      appsubnetcidr = "10.4.1.0/24"
-      websubnetcidr = "10.4.2.0/24"
-      lbsubnetcidr  = "10.4.3.0/24"
-    }
-  }
-  dev5 = {
-    dev5 = {
-      vnetcidr      = "10.5.0.0/16"
-      appsubnetcidr = "10.5.1.0/24"
-      websubnetcidr = "10.5.2.0/24"
-      lbsubnetcidr  = "10.5.3.0/24"
-    }
-  }
-  dev6 = {
-    dev6 = {
-      vnetcidr      = "10.6.0.0/16"
-      appsubnetcidr = "10.6.1.0/24"
-      websubnetcidr = "10.6.2.0/24"
-      lbsubnetcidr  = "10.6.3.0/24"
-    }
-  }
   demo = {
     demo = {
-      vnetcidr      = "10.7.0.0/16"
-      appsubnetcidr = "10.7.1.0/24"
-      websubnetcidr = "10.7.2.0/24"
-      lbsubnetcidr  = "10.7.3.0/24"
+      vnetcidr      = "10.1.0.0/16"
+      appsubnetcidr = "10.1.1.0/24"
+      websubnetcidr = "10.1.2.0/24"
+      lbsubnetcidr  = "10.1.3.0/24"
     }
   }
 }
diff --git a/ops/terraform/main.tf b/ops/terraform/main.tf
@@ -1,5 +1,5 @@
 locals {
-  workspaces = merge(local.dev, local.dev2, local.dev3, local.dev4, local.dev5, local.dev6, local.demo)
+  workspaces = merge(local.dev, local.demo)
   workspace  = local.workspaces[terraform.workspace]
 
   management_tags = {

diff --git a/ops/terraform/outputs.tf b/ops/terraform/outputs.tf