From 53880ca1c8a303f2bc7ad8a876c749bb4de27fd6 Mon Sep 17 00:00:00 2001 From: Derek A Dombek <50093944+derekadombek@users.noreply.github.com> Date: Tue, 5 Nov 2024 13:01:42 -0700 Subject: [PATCH] Remove unneeded Resource Groups and creds (#363) * Remove unneeded resource groups and Creds * rm outputs base file --------- Co-authored-by: Administrator --- .github/workflows/build-deploy-frontend.yml | 5 --- .github/workflows/deploy-dev.yml | 5 --- ops/terraform/config/dev2.config | 4 -- ops/terraform/config/dev3.config | 4 -- ops/terraform/config/dev4.config | 4 -- ops/terraform/config/dev5.config | 4 -- ops/terraform/config/dev6.config | 4 -- ops/terraform/locals.tf | 48 ++------------------- ops/terraform/main.tf | 2 +- ops/terraform/outputs.tf | 0 10 files changed, 5 insertions(+), 75 deletions(-) delete mode 100644 ops/terraform/config/dev2.config delete mode 100644 ops/terraform/config/dev3.config delete mode 100644 ops/terraform/config/dev4.config delete mode 100644 ops/terraform/config/dev5.config delete mode 100644 ops/terraform/config/dev6.config delete mode 100644 ops/terraform/outputs.tf diff --git a/.github/workflows/build-deploy-frontend.yml b/.github/workflows/build-deploy-frontend.yml index b698a1bf..c7cf0de0 100644 --- 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 index abedd6c1..4eef2fe9 100644 --- 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 deleted file mode 100644 index d88c2583..00000000 --- a/ops/terraform/config/dev2.config +++ /dev/null @@ -1,4 +0,0 @@ -storage_account_name = "tfstaterv2024" -container_name = "rv-tfstate" -key = "dev2.terraform.tfstate" -use_oidc = true \ No newline at end of file diff --git a/ops/terraform/config/dev3.config b/ops/terraform/config/dev3.config deleted file mode 100644 index 4bbdbabc..00000000 --- a/ops/terraform/config/dev3.config +++ /dev/null @@ -1,4 +0,0 @@ -storage_account_name = "tfstaterv2024" -container_name = "rv-tfstate" -key = "dev3/terraform.tfstate" -use_oidc = true diff --git a/ops/terraform/config/dev4.config b/ops/terraform/config/dev4.config deleted file mode 100644 index bbad19f8..00000000 --- a/ops/terraform/config/dev4.config +++ /dev/null @@ -1,4 +0,0 @@ -storage_account_name = "tfstaterv2024" -container_name = "rv-tfstate" -key = "dev4.terraform.tfstate" -use_oidc = true diff --git a/ops/terraform/config/dev5.config b/ops/terraform/config/dev5.config deleted file mode 100644 index ff1eb38a..00000000 --- a/ops/terraform/config/dev5.config +++ /dev/null @@ -1,4 +0,0 @@ -storage_account_name = "tfstaterv2024" -container_name = "rv-tfstate" -key = "dev5.terraform.tfstate" -use_oidc = true diff --git a/ops/terraform/config/dev6.config b/ops/terraform/config/dev6.config deleted file mode 100644 index dee86db8..00000000 --- a/ops/terraform/config/dev6.config +++ /dev/null @@ -1,4 +0,0 @@ -storage_account_name = "tfstaterv2024" -container_name = "rv-tfstate" -key = "dev6.terraform.tfstate" -use_oidc = true diff --git a/ops/terraform/locals.tf b/ops/terraform/locals.tf index 20331db3..3ac01c81 100644 --- 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" } } } \ No newline at end of file diff --git a/ops/terraform/main.tf b/ops/terraform/main.tf index 0753ee42..8b192d17 100644 --- 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 deleted file mode 100644 index e69de29b..00000000