From 52761b48659b92084c2df8b247183d1fefe464e1 Mon Sep 17 00:00:00 2001 From: Alis Akers Date: Mon, 23 Oct 2023 12:09:35 -0700 Subject: [PATCH] feat: updated keys and Dev* deployment workflow --- .github/workflows/deployDev.yml | 11 +++- .github/workflows/terraformPlan.yml | 61 ++++--------------- .github/workflows/testingWorkflow.yml | 13 ++++ .github/workflows/updateKeysAndDeployDev.yml | 46 ++++++++++++++ ops/demo/main.tf | 14 ----- ops/demo/persistent/main.tf | 15 ----- ops/dev/alerts.tf | 1 - ops/dev/api.tf | 2 - ops/dev/main.tf | 15 ----- ops/dev/metabase.tf | 1 - ops/dev/persistent/main.tf | 15 ----- ops/dev2/main.tf | 14 ----- ops/dev2/metabase.tf | 1 - ops/dev2/persistent/main.tf | 15 ----- ops/dev3/main.tf | 14 ----- ops/dev3/metabase.tf | 1 - ops/dev3/persistent/main.tf | 15 ----- ops/dev4/main.tf | 14 ----- ops/dev4/metabase.tf | 1 - ops/dev4/persistent/main.tf | 15 ----- ops/dev5/main.tf | 14 ----- ops/dev5/persistent/main.tf | 15 ----- ops/dev6/main.tf | 14 ----- ops/dev6/persistent/main.tf | 15 ----- ops/dev7/main.tf | 14 ----- ops/dev7/persistent/main.tf | 15 ----- ops/pentest/main.tf | 14 ----- ops/pentest/persistent/main.tf | 15 ----- ops/prod/main.tf | 14 ----- ops/prod/metabase.tf | 1 - ops/prod/persistent/main.tf | 15 ----- .../alerts/app_service_metrics/_var.tf | 6 -- .../alerts/app_service_metrics/database.tf | 2 - .../alerts/app_service_metrics/exceptions.tf | 6 -- .../app_service_metrics/function_triggers.tf | 2 - .../alerts/app_service_metrics/main.tf | 13 ---- .../alerts/app_service_metrics/uptime.tf | 1 - ops/services/alerts/db_metrics/_var.tf | 5 -- ops/services/alerts/db_metrics/main.tf | 1 - .../infra/_var.tf | 6 -- .../infra/main.tf | 1 - ops/services/app_gateway/_var.tf | 6 -- ops/services/app_gateway/main.tf | 2 +- ops/services/app_service/_var.tf | 5 -- ops/services/app_service/main.tf | 2 - ops/services/metabase/service/_var.tf | 5 -- ops/services/metabase/service/main.tf | 1 - ops/stg/main.tf | 14 ----- ops/stg/metabase.tf | 1 - ops/stg/persistent/main.tf | 15 ----- ops/test/main.tf | 14 ----- ops/test/metabase.tf | 1 - ops/test/persistent/main.tf | 15 ----- ops/training/main.tf | 14 ----- ops/training/persistent/main.tf | 15 ----- 55 files changed, 83 insertions(+), 500 deletions(-) create mode 100644 .github/workflows/updateKeysAndDeployDev.yml diff --git a/.github/workflows/deployDev.yml b/.github/workflows/deployDev.yml index d9d49b2447..fe8be05c5d 100644 --- a/.github/workflows/deployDev.yml +++ b/.github/workflows/deployDev.yml @@ -26,7 +26,16 @@ on: options: - "false" - "true" - + workflow_call: + inputs: + deploy_env: + description: 'The environment to deploy to' + required: true + type: string + replace_keys: + description: 'Replace keys' + default: "false" + type: string env: NODE_VERSION: 18 diff --git a/.github/workflows/terraformPlan.yml b/.github/workflows/terraformPlan.yml index 239a2ad1b8..15cdef6be1 100644 --- a/.github/workflows/terraformPlan.yml +++ b/.github/workflows/terraformPlan.yml @@ -1,77 +1,42 @@ name: Ad-hoc Terraform Plan -run-name: Terraform plan ${{ inputs.env }} by @${{ github.actor }} on: workflow_dispatch: inputs: env: - description: 'The environment to deploy to' + description: "Environment target" required: true - type: choice - options: - - dev - - dev2 - - dev3 - - dev4 - - dev5 - - dev6 - - dev7 - - pentest - - test - - demo - - training - - stg - - prod - - all - -env: - ARM_CLIENT_ID: ${{ secrets.TERRAFORM_ARM_CLIENT_ID }} - ARM_CLIENT_SECRET: ${{ secrets.TERRAFORM_ARM_CLIENT_SECRET }} - ARM_SUBSCRIPTION_ID: ${{ secrets.TERRAFORM_ARM_SUBSCRIPTION_ID }} - ARM_TENANT_ID: ${{ secrets.TERRAFORM_ARM_TENANT_ID }} - OKTA_API_TOKEN: ${{ secrets.OKTA_API_TOKEN_NONPROD }} + default: "prod" jobs: - matrix_prep: - runs-on: ubuntu-latest - outputs: - matrix: ${{ steps.set_matrix.outputs.matrix }} - steps: - - uses: actions/checkout@v4 - - id: set_matrix - run: | - if [[ "${{ inputs.env }}" == "all" ]]; then - matrix=[{\"env\":\"dev\"},{\"env\":\"dev2\"},{\"env\":\"dev3\"},{\"env\":\"dev4\"},{\"env\":\"dev5\"},{\"env\":\"dev6\"},{\"env\":\"dev7\"},{\"env\":\"pentest\"},{\"env\":\"test\"},{\"env\":\"demo\"},{\"env\":\"training\"},{\"env\":\"stg\"},{\"env\":\"prod\"}] - else - matrix=[{\"env\":\"${{ inputs.env }}\"}] - fi - echo "matrix={\"include\":$(echo $matrix)}" >> $GITHUB_OUTPUT - terraform_plan: - needs: matrix_prep + terraform-plan: runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: ${{fromJson(needs.matrix_prep.outputs.matrix)}} defaults: run: working-directory: ./ops + env: # all Azure interaction is through Terraform + ARM_CLIENT_ID: ${{ secrets.TERRAFORM_ARM_CLIENT_ID }} + ARM_CLIENT_SECRET: ${{ secrets.TERRAFORM_ARM_CLIENT_SECRET }} + ARM_SUBSCRIPTION_ID: ${{ secrets.TERRAFORM_ARM_SUBSCRIPTION_ID }} + ARM_TENANT_ID: ${{ secrets.TERRAFORM_ARM_TENANT_ID }} + OKTA_API_TOKEN: ${{ secrets.OKTA_API_TOKEN_NONPROD }} steps: - uses: actions/checkout@v4 - uses: azure/login@v1 with: creds: ${{ secrets.AZURE_CREDENTIALS }} - name: Use prod Okta token if required - if: ${{ matrix.env == 'prod' || matrix.env == 'stg' || matrix.env == 'training' }} + if: ${{ github.event.inputs.env == 'prod' || github.event.inputs.env == 'stg' }} run: | echo "OKTA_API_TOKEN=${{ secrets.OKTA_API_TOKEN }}" >> "$GITHUB_ENV" - uses: hashicorp/setup-terraform@v2.0.3 with: terraform_version: 1.3.3 - name: Terraform Init - run: make init-${{ matrix.env }} + run: make init-${{ github.event.inputs.env }} - name: Build ReportStream function app uses: ./.github/actions/build-reportstream-functions with: - deploy-env: ${{ matrix.env }} + deploy-env: ${{env.DEPLOY_ENV}} - name: Terraform plan - run: make plan-${{ matrix.env }} + run: make plan-${{ github.event.inputs.env }} \ No newline at end of file diff --git a/.github/workflows/testingWorkflow.yml b/.github/workflows/testingWorkflow.yml index 4ac88d0558..5b73983fae 100644 --- a/.github/workflows/testingWorkflow.yml +++ b/.github/workflows/testingWorkflow.yml @@ -25,6 +25,19 @@ permissions: packages: write jobs: + key_rotation: + strategy: + fail-fast: false + matrix: + include: + - deploy_env: dev + - deploy_env: dev0 + with: + deploy_env: ${{ matrix.deploy_env }} + replace_keys: "true" + uses: ./.github/workflows/deployDev.yml + secrets: inherit + # Check for changes in the backend, cypress, database, frontend, and nginx directories workflow_changes: with: diff --git a/.github/workflows/updateKeysAndDeployDev.yml b/.github/workflows/updateKeysAndDeployDev.yml new file mode 100644 index 0000000000..c1fc6a568e --- /dev/null +++ b/.github/workflows/updateKeysAndDeployDev.yml @@ -0,0 +1,46 @@ +name: Update keys and deploy Dev* + +on: + workflow_dispatch: + schedule: + - cron: "0 * * * *" + +permissions: + packages: write + +jobs: + key_rotation: + strategy: + fail-fast: false + matrix: + include: + - deploy_env: dev + # - deploy_env: dev2 + # - deploy_env: dev3 + # - deploy_env: dev4 + # - deploy_env: dev5 + # - deploy_env: dev6 + # - deploy_env: dev7 + # - deploy_env: pentest + with: + deploy_env: ${{ matrix.deploy_env }} + replace_keys: "true" + uses: ./.github/workflows/deployDev.yml + secrets: inherit + + # update_keys_and_deploy_prod: + # if: never() + # strategy: + # fail-fast: false + # matrix: + # include: + # - deploy_env: test + # - deploy_env: demo + # - deploy_env: training + # - deploy_env: stg + # - deploy_env: prod + # with: + # deploy_env: ${{ matrix.deploy_env }} + # replace_keys: "true" + # uses: ./.github/workflows/deployDev.yml + # secrets: inherit diff --git a/ops/demo/main.tf b/ops/demo/main.tf index 353f6e9657..2ea0a69009 100644 --- a/ops/demo/main.tf +++ b/ops/demo/main.tf @@ -8,20 +8,6 @@ locals { environment = local.env resource_group = "${local.project}-${local.name}-${local.env}" } - cdc_tags = { - business_steward = "vuj4@cdc.gov" - center = "DDPHSS" - environment = local.env - escid = "3205" - funding_source = "TBD" - pii_data = "false" - security_compliance = "moderate" - security_steward = "ghv3@cdc.gov,vfd9@cdc.gov,xda7@cdc.gov,xii9@cdc.gov" - support_group = "OMHS" - system = "prim" - technical_steward = "mxc1@cdc.gov,qom6@cdc.gov,qwl5@cdc.gov,tgi8@cdc.gov" - zone = "EXTRANET" - } } # Frontend React App diff --git a/ops/demo/persistent/main.tf b/ops/demo/persistent/main.tf index 35c35c36fb..1761df9cd2 100644 --- a/ops/demo/persistent/main.tf +++ b/ops/demo/persistent/main.tf @@ -13,20 +13,6 @@ locals { environment = local.env resource_group = "${local.project}-${local.name}-${local.env}" } - cdc_tags = { - business_steward = "vuj4@cdc.gov" - center = "DDPHSS" - environment = local.env - escid = "3205" - funding_source = "TBD" - pii_data = "false" - security_compliance = "moderate" - security_steward = "ghv3@cdc.gov,vfd9@cdc.gov,xda7@cdc.gov,xii9@cdc.gov" - support_group = "OMHS" - system = "prim" - technical_steward = "mxc1@cdc.gov,qom6@cdc.gov,qwl5@cdc.gov,tgi8@cdc.gov" - zone = "EXTRANET" - } } module "monitoring" { @@ -79,7 +65,6 @@ module "db_alerting" { action_group_ids = [ data.terraform_remote_state.global.outputs.pagerduty_non_prod_action_id ] - cdc_tags = local.cdc_tags } module "vnet" { diff --git a/ops/dev/alerts.tf b/ops/dev/alerts.tf index d55146c480..2a34ab8cad 100644 --- a/ops/dev/alerts.tf +++ b/ops/dev/alerts.tf @@ -34,5 +34,4 @@ module "metric_alerts" { function_id = module.report_stream_reporting_functions.azurerm_linux_function_app_id database_id = data.terraform_remote_state.persistent_dev.outputs.postgres_server_id - cdc_tags = local.cdc_tags } diff --git a/ops/dev/api.tf b/ops/dev/api.tf index 1ca7eb7ae4..4480ee54ab 100644 --- a/ops/dev/api.tf +++ b/ops/dev/api.tf @@ -64,7 +64,6 @@ module "simple_report_api" { # this shadows (and overrides) an identical declaration in application.yaml # SPRING_JPA_PROPERTIES_HIBERNATE_DEFAULT_SCHEMA = "public" } - cdc_tags = local.cdc_tags } module "report_stream_reporting_functions" { @@ -76,5 +75,4 @@ module "report_stream_reporting_functions" { depends_on = [ azurerm_storage_account.app ] - cdc_tags = local.cdc_tags } diff --git a/ops/dev/main.tf b/ops/dev/main.tf index f02b85b126..5349e0010a 100644 --- a/ops/dev/main.tf +++ b/ops/dev/main.tf @@ -8,20 +8,6 @@ locals { environment = local.env resource_group = "${local.project}-${local.name}-${local.env}" } - cdc_tags = { - business_steward = "vuj4@cdc.gov" - center = "DDPHSS" - environment = local.env - escid = "3205" - funding_source = "TBD" - pii_data = "false" - security_compliance = "moderate" - security_steward = "ghv3@cdc.gov,vfd9@cdc.gov,xda7@cdc.gov,xii9@cdc.gov" - support_group = "OMHS" - system = "prim" - technical_steward = "mxc1@cdc.gov,qom6@cdc.gov,qwl5@cdc.gov,tgi8@cdc.gov" - zone = "EXTRANET" - } } # Frontend React App @@ -113,7 +99,6 @@ module "app_gateway" { firewall_policy_id = module.web_application_firewall.web_application_firewall_id tags = local.management_tags - cdc_tags = local.cdc_tags } module "nat_gateway" { diff --git a/ops/dev/metabase.tf b/ops/dev/metabase.tf index c885c8c3e0..ff6b388196 100644 --- a/ops/dev/metabase.tf +++ b/ops/dev/metabase.tf @@ -34,5 +34,4 @@ module "metabase_service" { depends_on = [ module.metabase_database ] - cdc_tags = local.cdc_tags } \ No newline at end of file diff --git a/ops/dev/persistent/main.tf b/ops/dev/persistent/main.tf index 6ffc3e1845..e9e79515f2 100644 --- a/ops/dev/persistent/main.tf +++ b/ops/dev/persistent/main.tf @@ -12,20 +12,6 @@ locals { environment = local.env resource_group = "${local.project}-${local.name}-${local.env_level}" } - cdc_tags = { - business_steward = "vuj4@cdc.gov" - center = "DDPHSS" - environment = local.env - escid = "3205" - funding_source = "TBD" - pii_data = "false" - security_compliance = "moderate" - security_steward = "ghv3@cdc.gov,vfd9@cdc.gov,xda7@cdc.gov,xii9@cdc.gov" - support_group = "OMHS" - system = "prim" - technical_steward = "mxc1@cdc.gov,qom6@cdc.gov,qwl5@cdc.gov,tgi8@cdc.gov" - zone = "EXTRANET" - } } module "monitoring" { @@ -77,7 +63,6 @@ module "db_alerting" { action_group_ids = [ data.terraform_remote_state.global.outputs.pagerduty_non_prod_action_id ] - cdc_tags = local.cdc_tags } module "vnet" { diff --git a/ops/dev2/main.tf b/ops/dev2/main.tf index d3909fab3b..8fe5e06bd9 100644 --- a/ops/dev2/main.tf +++ b/ops/dev2/main.tf @@ -10,20 +10,6 @@ locals { # environments should use the "local.env_level" convention where possible. resource_group = "${local.project}-${local.name}-${local.env_level}" } - cdc_tags = { - business_steward = "vuj4@cdc.gov" - center = "DDPHSS" - environment = local.env - escid = "3205" - funding_source = "TBD" - pii_data = "false" - security_compliance = "moderate" - security_steward = "ghv3@cdc.gov,vfd9@cdc.gov,xda7@cdc.gov,xii9@cdc.gov" - support_group = "OMHS" - system = "prim" - technical_steward = "mxc1@cdc.gov,qom6@cdc.gov,qwl5@cdc.gov,tgi8@cdc.gov" - zone = "EXTRANET" - } } # Frontend React App diff --git a/ops/dev2/metabase.tf b/ops/dev2/metabase.tf index 33becfa89a..30ca720009 100644 --- a/ops/dev2/metabase.tf +++ b/ops/dev2/metabase.tf @@ -34,5 +34,4 @@ module "metabase_service" { depends_on = [ module.metabase_database ] - cdc_tags = local.cdc_tags } diff --git a/ops/dev2/persistent/main.tf b/ops/dev2/persistent/main.tf index 264120f7fd..f987b6010b 100644 --- a/ops/dev2/persistent/main.tf +++ b/ops/dev2/persistent/main.tf @@ -14,20 +14,6 @@ locals { # environments should use the "local.env_level" convention where possible. resource_group = "${local.project}-${local.name}-${local.env_level}" } - cdc_tags = { - business_steward = "vuj4@cdc.gov" - center = "DDPHSS" - environment = local.env - escid = "3205" - funding_source = "TBD" - pii_data = "false" - security_compliance = "moderate" - security_steward = "ghv3@cdc.gov,vfd9@cdc.gov,xda7@cdc.gov,xii9@cdc.gov" - support_group = "OMHS" - system = "prim" - technical_steward = "mxc1@cdc.gov,qom6@cdc.gov,qwl5@cdc.gov,tgi8@cdc.gov" - zone = "EXTRANET" - } } module "monitoring" { @@ -79,7 +65,6 @@ module "db_alerting" { action_group_ids = [ data.terraform_remote_state.global.outputs.pagerduty_non_prod_action_id ] - cdc_tags = local.cdc_tags } module "vnet" { diff --git a/ops/dev3/main.tf b/ops/dev3/main.tf index 312fb3e1b8..96f599e274 100644 --- a/ops/dev3/main.tf +++ b/ops/dev3/main.tf @@ -10,20 +10,6 @@ locals { # environments should use the "local.env_level" convention where possible. resource_group = "${local.project}-${local.name}-${local.env_level}" } - cdc_tags = { - business_steward = "vuj4@cdc.gov" - center = "DDPHSS" - environment = local.env - escid = "3205" - funding_source = "TBD" - pii_data = "false" - security_compliance = "moderate" - security_steward = "ghv3@cdc.gov,vfd9@cdc.gov,xda7@cdc.gov,xii9@cdc.gov" - support_group = "OMHS" - system = "prim" - technical_steward = "mxc1@cdc.gov,qom6@cdc.gov,qwl5@cdc.gov,tgi8@cdc.gov" - zone = "EXTRANET" - } } # Frontend React App diff --git a/ops/dev3/metabase.tf b/ops/dev3/metabase.tf index 22a24d6bf3..0e229c0e30 100644 --- a/ops/dev3/metabase.tf +++ b/ops/dev3/metabase.tf @@ -34,5 +34,4 @@ module "metabase_service" { depends_on = [ module.metabase_database ] - cdc_tags = local.cdc_tags } \ No newline at end of file diff --git a/ops/dev3/persistent/main.tf b/ops/dev3/persistent/main.tf index c60ab5ee86..053e40645a 100644 --- a/ops/dev3/persistent/main.tf +++ b/ops/dev3/persistent/main.tf @@ -12,20 +12,6 @@ locals { environment = local.env resource_group = "${local.project}-${local.name}-${local.env}" } - cdc_tags = { - business_steward = "vuj4@cdc.gov" - center = "DDPHSS" - environment = local.env - escid = "3205" - funding_source = "TBD" - pii_data = "false" - security_compliance = "moderate" - security_steward = "ghv3@cdc.gov,vfd9@cdc.gov,xda7@cdc.gov,xii9@cdc.gov" - support_group = "OMHS" - system = "prim" - technical_steward = "mxc1@cdc.gov,qom6@cdc.gov,qwl5@cdc.gov,tgi8@cdc.gov" - zone = "EXTRANET" - } } module "monitoring" { @@ -78,7 +64,6 @@ module "db_alerting" { action_group_ids = [ data.terraform_remote_state.global.outputs.pagerduty_non_prod_action_id ] - cdc_tags = local.cdc_tags } module "vnet" { diff --git a/ops/dev4/main.tf b/ops/dev4/main.tf index fcecd956a8..b3a59844ce 100644 --- a/ops/dev4/main.tf +++ b/ops/dev4/main.tf @@ -10,20 +10,6 @@ locals { # environments should use the "local.env_level" convention where possible. resource_group = "${local.project}-${local.name}-${local.env_level}" } - cdc_tags = { - business_steward = "vuj4@cdc.gov" - center = "DDPHSS" - environment = local.env - escid = "3205" - funding_source = "TBD" - pii_data = "false" - security_compliance = "moderate" - security_steward = "ghv3@cdc.gov,vfd9@cdc.gov,xda7@cdc.gov,xii9@cdc.gov" - support_group = "OMHS" - system = "prim" - technical_steward = "mxc1@cdc.gov,qom6@cdc.gov,qwl5@cdc.gov,tgi8@cdc.gov" - zone = "EXTRANET" - } } # Frontend React App diff --git a/ops/dev4/metabase.tf b/ops/dev4/metabase.tf index 48374aa96f..ae5fda8edf 100644 --- a/ops/dev4/metabase.tf +++ b/ops/dev4/metabase.tf @@ -34,5 +34,4 @@ module "metabase_service" { depends_on = [ module.metabase_database ] - cdc_tags = local.cdc_tags } \ No newline at end of file diff --git a/ops/dev4/persistent/main.tf b/ops/dev4/persistent/main.tf index 5a88143ac0..01333573c6 100644 --- a/ops/dev4/persistent/main.tf +++ b/ops/dev4/persistent/main.tf @@ -14,20 +14,6 @@ locals { # environments should use the "local.env_level" convention where possible. resource_group = "${local.project}-${local.name}-${local.env_level}" } - cdc_tags = { - business_steward = "vuj4@cdc.gov" - center = "DDPHSS" - environment = local.env - escid = "3205" - funding_source = "TBD" - pii_data = "false" - security_compliance = "moderate" - security_steward = "ghv3@cdc.gov,vfd9@cdc.gov,xda7@cdc.gov,xii9@cdc.gov" - support_group = "OMHS" - system = "prim" - technical_steward = "mxc1@cdc.gov,qom6@cdc.gov,qwl5@cdc.gov,tgi8@cdc.gov" - zone = "EXTRANET" - } } module "monitoring" { @@ -79,7 +65,6 @@ module "db_alerting" { action_group_ids = [ data.terraform_remote_state.global.outputs.pagerduty_non_prod_action_id ] - cdc_tags = local.cdc_tags } module "vnet" { diff --git a/ops/dev5/main.tf b/ops/dev5/main.tf index ae4f1b68bb..008ad5c9f7 100644 --- a/ops/dev5/main.tf +++ b/ops/dev5/main.tf @@ -10,20 +10,6 @@ locals { # environments should use the "local.env_level" convention where possible. resource_group = "${local.project}-${local.name}-${local.env_level}" } - cdc_tags = { - business_steward = "vuj4@cdc.gov" - center = "DDPHSS" - environment = local.env - escid = "3205" - funding_source = "TBD" - pii_data = "false" - security_compliance = "moderate" - security_steward = "ghv3@cdc.gov,vfd9@cdc.gov,xda7@cdc.gov,xii9@cdc.gov" - support_group = "OMHS" - system = "prim" - technical_steward = "mxc1@cdc.gov,qom6@cdc.gov,qwl5@cdc.gov,tgi8@cdc.gov" - zone = "EXTRANET" - } } # Frontend React App diff --git a/ops/dev5/persistent/main.tf b/ops/dev5/persistent/main.tf index bf0d3615bf..78d853c6da 100644 --- a/ops/dev5/persistent/main.tf +++ b/ops/dev5/persistent/main.tf @@ -14,20 +14,6 @@ locals { # environments should use the "local.env_level" convention where possible. resource_group = "${local.project}-${local.name}-${local.env_level}" } - cdc_tags = { - business_steward = "vuj4@cdc.gov" - center = "DDPHSS" - environment = local.env - escid = "3205" - funding_source = "TBD" - pii_data = "false" - security_compliance = "moderate" - security_steward = "ghv3@cdc.gov,vfd9@cdc.gov,xda7@cdc.gov,xii9@cdc.gov" - support_group = "OMHS" - system = "prim" - technical_steward = "mxc1@cdc.gov,qom6@cdc.gov,qwl5@cdc.gov,tgi8@cdc.gov" - zone = "EXTRANET" - } } module "monitoring" { @@ -79,7 +65,6 @@ module "db_alerting" { action_group_ids = [ data.terraform_remote_state.global.outputs.pagerduty_non_prod_action_id ] - cdc_tags = local.cdc_tags } module "vnet" { diff --git a/ops/dev6/main.tf b/ops/dev6/main.tf index fbae6d7a1d..3e7493f324 100644 --- a/ops/dev6/main.tf +++ b/ops/dev6/main.tf @@ -10,20 +10,6 @@ locals { # environments should use the "local.env_level" convention where possible. resource_group = "${local.project}-${local.name}-${local.env_level}" } - cdc_tags = { - business_steward = "vuj4@cdc.gov" - center = "DDPHSS" - environment = local.env - escid = "3205" - funding_source = "TBD" - pii_data = "false" - security_compliance = "moderate" - security_steward = "ghv3@cdc.gov,vfd9@cdc.gov,xda7@cdc.gov,xii9@cdc.gov" - support_group = "OMHS" - system = "prim" - technical_steward = "mxc1@cdc.gov,qom6@cdc.gov,qwl5@cdc.gov,tgi8@cdc.gov" - zone = "EXTRANET" - } } # Frontend React App diff --git a/ops/dev6/persistent/main.tf b/ops/dev6/persistent/main.tf index 1f048dea06..5c8580401c 100644 --- a/ops/dev6/persistent/main.tf +++ b/ops/dev6/persistent/main.tf @@ -14,20 +14,6 @@ locals { # environments should use the "local.env_level" convention where possible. resource_group = "${local.project}-${local.name}-${local.env_level}" } - cdc_tags = { - business_steward = "vuj4@cdc.gov" - center = "DDPHSS" - environment = local.env - escid = "3205" - funding_source = "TBD" - pii_data = "false" - security_compliance = "moderate" - security_steward = "ghv3@cdc.gov,vfd9@cdc.gov,xda7@cdc.gov,xii9@cdc.gov" - support_group = "OMHS" - system = "prim" - technical_steward = "mxc1@cdc.gov,qom6@cdc.gov,qwl5@cdc.gov,tgi8@cdc.gov" - zone = "EXTRANET" - } } module "monitoring" { @@ -79,7 +65,6 @@ module "db_alerting" { action_group_ids = [ data.terraform_remote_state.global.outputs.pagerduty_non_prod_action_id ] - cdc_tags = local.cdc_tags } module "vnet" { diff --git a/ops/dev7/main.tf b/ops/dev7/main.tf index 079df248ec..4d43ea0420 100644 --- a/ops/dev7/main.tf +++ b/ops/dev7/main.tf @@ -10,20 +10,6 @@ locals { # environments should use the "local.env_level" convention where possible. resource_group = "${local.project}-${local.name}-${local.env_level}" } - cdc_tags = { - business_steward = "vuj4@cdc.gov" - center = "DDPHSS" - environment = local.env - escid = "3205" - funding_source = "TBD" - pii_data = "false" - security_compliance = "moderate" - security_steward = "ghv3@cdc.gov,vfd9@cdc.gov,xda7@cdc.gov,xii9@cdc.gov" - support_group = "OMHS" - system = "prim" - technical_steward = "mxc1@cdc.gov,qom6@cdc.gov,qwl5@cdc.gov,tgi8@cdc.gov" - zone = "EXTRANET" - } } # Frontend React App diff --git a/ops/dev7/persistent/main.tf b/ops/dev7/persistent/main.tf index 1f39590ca5..f6d085042c 100644 --- a/ops/dev7/persistent/main.tf +++ b/ops/dev7/persistent/main.tf @@ -14,20 +14,6 @@ locals { # environments should use the "local.env_level" convention where possible. resource_group = "${local.project}-${local.name}-${local.env_level}" } - cdc_tags = { - business_steward = "vuj4@cdc.gov" - center = "DDPHSS" - environment = local.env - escid = "3205" - funding_source = "TBD" - pii_data = "false" - security_compliance = "moderate" - security_steward = "ghv3@cdc.gov,vfd9@cdc.gov,xda7@cdc.gov,xii9@cdc.gov" - support_group = "OMHS" - system = "prim" - technical_steward = "mxc1@cdc.gov,qom6@cdc.gov,qwl5@cdc.gov,tgi8@cdc.gov" - zone = "EXTRANET" - } } module "monitoring" { @@ -79,7 +65,6 @@ module "db_alerting" { action_group_ids = [ data.terraform_remote_state.global.outputs.pagerduty_non_prod_action_id ] - cdc_tags = local.cdc_tags } module "vnet" { diff --git a/ops/pentest/main.tf b/ops/pentest/main.tf index d73e9a8ea7..b8dbb30784 100644 --- a/ops/pentest/main.tf +++ b/ops/pentest/main.tf @@ -8,20 +8,6 @@ locals { environment = local.env resource_group = "${local.project}-${local.name}-${local.env}" } - cdc_tags = { - business_steward = "vuj4@cdc.gov" - center = "DDPHSS" - environment = local.env - escid = "3205" - funding_source = "TBD" - pii_data = "false" - security_compliance = "moderate" - security_steward = "ghv3@cdc.gov,vfd9@cdc.gov,xda7@cdc.gov,xii9@cdc.gov" - support_group = "OMHS" - system = "prim" - technical_steward = "mxc1@cdc.gov,qom6@cdc.gov,qwl5@cdc.gov,tgi8@cdc.gov" - zone = "EXTRANET" - } } # Frontend React App diff --git a/ops/pentest/persistent/main.tf b/ops/pentest/persistent/main.tf index 5372f78146..48e3a86231 100644 --- a/ops/pentest/persistent/main.tf +++ b/ops/pentest/persistent/main.tf @@ -13,20 +13,6 @@ locals { environment = local.env resource_group = "${local.project}-${local.name}-${local.env}" } - cdc_tags = { - business_steward = "vuj4@cdc.gov" - center = "DDPHSS" - environment = local.env - escid = "3205" - funding_source = "TBD" - pii_data = "false" - security_compliance = "moderate" - security_steward = "ghv3@cdc.gov,vfd9@cdc.gov,xda7@cdc.gov,xii9@cdc.gov" - support_group = "OMHS" - system = "prim" - technical_steward = "mxc1@cdc.gov,qom6@cdc.gov,qwl5@cdc.gov,tgi8@cdc.gov" - zone = "EXTRANET" - } } module "monitoring" { @@ -78,7 +64,6 @@ module "db_alerting" { action_group_ids = [ data.terraform_remote_state.global.outputs.pagerduty_non_prod_action_id ] - cdc_tags = local.cdc_tags } module "vnet" { diff --git a/ops/prod/main.tf b/ops/prod/main.tf index 6011faeb72..79244e8114 100644 --- a/ops/prod/main.tf +++ b/ops/prod/main.tf @@ -9,20 +9,6 @@ locals { resource_group = "${local.project}-${local.name}-${local.env}" } # a list of tags that the cdc requires - cdc_tags = { - business_steward = "vuj4@cdc.gov" - center = "DDPHSS" - environment = local.env - escid = "3205" - funding_source = "TBD" - pii_data = "false" - security_compliance = "moderate" - security_steward = "ghv3@cdc.gov,vfd9@cdc.gov,xda7@cdc.gov,xii9@cdc.gov" - support_group = "OMHS" - system = "prim" - technical_steward = "mxc1@cdc.gov,qom6@cdc.gov,qwl5@cdc.gov,tgi8@cdc.gov" - zone = "EXTRANET" - } } # Frontend React App diff --git a/ops/prod/metabase.tf b/ops/prod/metabase.tf index 201e9c56ef..3c9dcf98ec 100644 --- a/ops/prod/metabase.tf +++ b/ops/prod/metabase.tf @@ -34,5 +34,4 @@ module "metabase_service" { depends_on = [ module.metabase_database ] - cdc_tags = local.cdc_tags } diff --git a/ops/prod/persistent/main.tf b/ops/prod/persistent/main.tf index be273f9f67..901a226225 100644 --- a/ops/prod/persistent/main.tf +++ b/ops/prod/persistent/main.tf @@ -14,20 +14,6 @@ locals { environment = local.env resource_group = "${local.project}-${local.name}-${local.env}" } - cdc_tags = { - business_steward = "vuj4@cdc.gov" - center = "DDPHSS" - environment = local.env - escid = "3205" - funding_source = "TBD" - pii_data = "false" - security_compliance = "moderate" - security_steward = "ghv3@cdc.gov,vfd9@cdc.gov,xda7@cdc.gov,xii9@cdc.gov" - support_group = "OMHS" - system = "prim" - technical_steward = "mxc1@cdc.gov,qom6@cdc.gov,qwl5@cdc.gov,tgi8@cdc.gov" - zone = "EXTRANET" - } } module "monitoring" { @@ -81,7 +67,6 @@ module "db_alerting" { action_group_ids = [ data.terraform_remote_state.global.outputs.pagerduty_prod_action_id ] - cdc_tags = local.cdc_tags } module "vnet" { diff --git a/ops/services/alerts/app_service_metrics/_var.tf b/ops/services/alerts/app_service_metrics/_var.tf index 970ea7c6d0..92864e8c52 100644 --- a/ops/services/alerts/app_service_metrics/_var.tf +++ b/ops/services/alerts/app_service_metrics/_var.tf @@ -115,9 +115,3 @@ variable "wiki_docs_json" { type = map(string) default = { "Alert Response Docs" : "https://github.com/CDCgov/prime-simplereport/wiki/Alert-Response" } } - -variable "cdc_tags" { - description = "cdc tags for resources" - type = map(string) - default = {} -} diff --git a/ops/services/alerts/app_service_metrics/database.tf b/ops/services/alerts/app_service_metrics/database.tf index 47ba04379a..368c3e8252 100644 --- a/ops/services/alerts/app_service_metrics/database.tf +++ b/ops/services/alerts/app_service_metrics/database.tf @@ -25,7 +25,6 @@ ${local.skip_on_weekends} action_group = var.action_group_ids custom_webhook_payload = var.wiki_docs_text } - tags = var.cdc_tags } resource "azurerm_monitor_scheduled_query_rules_alert" "db_connection_exhaustion" { @@ -55,5 +54,4 @@ resource "azurerm_monitor_scheduled_query_rules_alert" "db_connection_exhaustion operator = "GreaterThan" threshold = 5 } - tags = var.cdc_tags } diff --git a/ops/services/alerts/app_service_metrics/exceptions.tf b/ops/services/alerts/app_service_metrics/exceptions.tf index 857c7ff979..8acfb4ac89 100644 --- a/ops/services/alerts/app_service_metrics/exceptions.tf +++ b/ops/services/alerts/app_service_metrics/exceptions.tf @@ -48,7 +48,6 @@ AppServiceConsoleLogs operator = "GreaterThan" threshold = 2 } - tags = var.cdc_tags } resource "azurerm_monitor_scheduled_query_rules_alert" "first_error_in_a_week" { @@ -99,7 +98,6 @@ requests operator = "GreaterThan" threshold = 0 } - tags = var.cdc_tags } resource "azurerm_monitor_scheduled_query_rules_alert" "account_request_failures" { @@ -136,7 +134,6 @@ ${local.skip_on_weekends} operator = "GreaterThan" threshold = 4 } - tags = var.cdc_tags } resource "azurerm_monitor_scheduled_query_rules_alert" "experian_auth_failures" { @@ -173,7 +170,6 @@ ${local.skip_on_weekends} operator = "GreaterThan" threshold = 0 } - tags = var.cdc_tags } resource "azurerm_monitor_scheduled_query_rules_alert" "all_experian_auth_failures" { @@ -210,7 +206,6 @@ ${local.skip_on_weekends} operator = "GreaterThan" threshold = 2 } - tags = var.cdc_tags } resource "azurerm_monitor_scheduled_query_rules_alert" "frontend_error_boundary" { @@ -240,5 +235,4 @@ resource "azurerm_monitor_scheduled_query_rules_alert" "frontend_error_boundary" operator = "GreaterThan" threshold = 0 } - tags = var.cdc_tags } diff --git a/ops/services/alerts/app_service_metrics/function_triggers.tf b/ops/services/alerts/app_service_metrics/function_triggers.tf index ce62279cc6..9dead26449 100644 --- a/ops/services/alerts/app_service_metrics/function_triggers.tf +++ b/ops/services/alerts/app_service_metrics/function_triggers.tf @@ -59,7 +59,6 @@ requests action_group = var.action_group_ids custom_webhook_payload = var.wiki_docs_text } - tags = var.cdc_tags } resource "azurerm_monitor_scheduled_query_rules_alert" "fhir_batched_uploader_function_not_triggering" { @@ -91,6 +90,5 @@ requests action_group = var.action_group_ids custom_webhook_payload = var.wiki_docs_text } - tags = var.cdc_tags } diff --git a/ops/services/alerts/app_service_metrics/main.tf b/ops/services/alerts/app_service_metrics/main.tf index 6e4eb86c32..cac70cdf73 100644 --- a/ops/services/alerts/app_service_metrics/main.tf +++ b/ops/services/alerts/app_service_metrics/main.tf @@ -29,7 +29,6 @@ resource "azurerm_monitor_metric_alert" "cpu_util" { webhook_properties = var.wiki_docs_json } } - tags = var.cdc_tags } resource "azurerm_monitor_metric_alert" "mem_util" { @@ -57,7 +56,6 @@ resource "azurerm_monitor_metric_alert" "mem_util" { webhook_properties = var.wiki_docs_json } } - tags = var.cdc_tags } resource "azurerm_monitor_smart_detector_alert_rule" "failure_anomalies" { @@ -73,7 +71,6 @@ resource "azurerm_monitor_smart_detector_alert_rule" "failure_anomalies" { ids = var.action_group_ids webhook_payload = var.wiki_docs_text } - tags = var.cdc_tags } resource "azurerm_monitor_scheduled_query_rules_alert" "http_2xx_failed_requests" { @@ -113,7 +110,6 @@ ${local.skip_on_weekends} action_group = var.action_group_ids custom_webhook_payload = var.wiki_docs_text } - tags = var.cdc_tags } resource "azurerm_monitor_scheduled_query_rules_alert" "http_4xx_errors" { @@ -153,7 +149,6 @@ ${local.skip_on_weekends} action_group = var.action_group_ids custom_webhook_payload = var.wiki_docs_text } - tags = var.cdc_tags } resource "azurerm_monitor_scheduled_query_rules_alert" "http_401_410" { @@ -183,7 +178,6 @@ ${local.skip_on_weekends} action_group = var.action_group_ids custom_webhook_payload = var.wiki_docs_text } - tags = var.cdc_tags } resource "azurerm_monitor_scheduled_query_rules_alert" "http_5xx_errors" { @@ -213,7 +207,6 @@ ${local.skip_on_weekends} action_group = var.action_group_ids custom_webhook_payload = var.wiki_docs_text } - tags = var.cdc_tags } resource "azurerm_monitor_scheduled_query_rules_alert" "batched_uploader_single_failure_detected" { @@ -245,7 +238,6 @@ ${local.skip_on_weekends} action_group = var.action_group_ids custom_webhook_payload = var.wiki_docs_text } - tags = var.cdc_tags } resource "azurerm_monitor_scheduled_query_rules_alert" "bulk_results_upload" { @@ -277,7 +269,6 @@ requests operator = "GreaterThan" threshold = 0 } - tags = var.cdc_tags } resource "azurerm_monitor_scheduled_query_rules_alert" "report_stream_batched_uploader_400" { @@ -308,7 +299,6 @@ customEvents operator = "GreaterThan" threshold = 0 } - tags = var.cdc_tags } resource "azurerm_monitor_scheduled_query_rules_alert" "report_stream_fhir_batched_uploader_400" { @@ -339,7 +329,6 @@ customEvents operator = "GreaterThan" threshold = 0 } - tags = var.cdc_tags } resource "azurerm_monitor_scheduled_query_rules_alert" "fhir_batched_uploader_single_failure_detected" { @@ -371,7 +360,6 @@ ${local.skip_on_weekends} action_group = var.action_group_ids custom_webhook_payload = var.wiki_docs_text } - tags = var.cdc_tags } resource "azurerm_monitor_metric_alert" "function_app_memory_alert" { @@ -426,5 +414,4 @@ and duration >= 180000 action_group = var.action_group_ids custom_webhook_payload = var.wiki_docs_text } - tags = var.cdc_tags } diff --git a/ops/services/alerts/app_service_metrics/uptime.tf b/ops/services/alerts/app_service_metrics/uptime.tf index b6148889cd..84397f266a 100644 --- a/ops/services/alerts/app_service_metrics/uptime.tf +++ b/ops/services/alerts/app_service_metrics/uptime.tf @@ -75,5 +75,4 @@ resource "azurerm_monitor_metric_alert" "uptime" { webhook_properties = var.wiki_docs_json } } - tags = var.cdc_tags } diff --git a/ops/services/alerts/db_metrics/_var.tf b/ops/services/alerts/db_metrics/_var.tf index 7c31c2147a..20ecf8f1d6 100644 --- a/ops/services/alerts/db_metrics/_var.tf +++ b/ops/services/alerts/db_metrics/_var.tf @@ -22,8 +22,3 @@ variable "wiki_docs_json" { type = map(string) default = { "Alert Response Docs" : "https://github.com/CDCgov/prime-simplereport/wiki/Alert-Response" } } - -variable "cdc_tags" { - description = "tags for resources created" - type = map(string) -} \ No newline at end of file diff --git a/ops/services/alerts/db_metrics/main.tf b/ops/services/alerts/db_metrics/main.tf index 18b269bf08..78dc923c06 100644 --- a/ops/services/alerts/db_metrics/main.tf +++ b/ops/services/alerts/db_metrics/main.tf @@ -23,5 +23,4 @@ resource "azurerm_monitor_metric_alert" "db_storage" { webhook_properties = var.wiki_docs_json } } - tags = var.cdc_tags } diff --git a/ops/services/app_functions/report_stream_batched_publisher/infra/_var.tf b/ops/services/app_functions/report_stream_batched_publisher/infra/_var.tf index a4fbf3ca96..4ff283d9d5 100644 --- a/ops/services/app_functions/report_stream_batched_publisher/infra/_var.tf +++ b/ops/services/app_functions/report_stream_batched_publisher/infra/_var.tf @@ -66,9 +66,3 @@ variable "report_stream_batch_maximum" { } variable "lb_subnet_id" {} - -variable "cdc_tags" { - type = map(string) - description = "Tags for CDC" - default = {} -} \ No newline at end of file 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 index 4387a7e0d3..4091a7d208 100644 --- a/ops/services/app_functions/report_stream_batched_publisher/infra/main.tf +++ b/ops/services/app_functions/report_stream_batched_publisher/infra/main.tf @@ -104,5 +104,4 @@ resource "azurerm_linux_function_app" "functions" { azurerm_service_plan.asp ] } - tags = var.cdc_tags } diff --git a/ops/services/app_gateway/_var.tf b/ops/services/app_gateway/_var.tf index fdac039f70..b2b4fa11f3 100644 --- a/ops/services/app_gateway/_var.tf +++ b/ops/services/app_gateway/_var.tf @@ -69,9 +69,3 @@ variable "zones" { type = list(string) default = ["1", "2", "3"] } - -variable "cdc_tags" { - description = "cdc tags for resources" - type = map(string) - default = {} -} \ No newline at end of file diff --git a/ops/services/app_gateway/main.tf b/ops/services/app_gateway/main.tf index b073ab23b4..a1303867f3 100644 --- a/ops/services/app_gateway/main.tf +++ b/ops/services/app_gateway/main.tf @@ -429,7 +429,7 @@ resource "azurerm_application_gateway" "load_balancer" { firewall_policy_id = var.firewall_policy_id - tags = merge(var.tags, var.cdc_tags) + tags = var.tags } diff --git a/ops/services/app_service/_var.tf b/ops/services/app_service/_var.tf index 28bc3ee021..2d8d51c18c 100644 --- a/ops/services/app_service/_var.tf +++ b/ops/services/app_service/_var.tf @@ -39,8 +39,3 @@ variable "deploy_info" { variable "sku_name" { default = "P1v3" } - -variable "cdc_tags" { - type = map(string) - default = {} -} diff --git a/ops/services/app_service/main.tf b/ops/services/app_service/main.tf index c23e6f2f9e..685a96bf90 100644 --- a/ops/services/app_service/main.tf +++ b/ops/services/app_service/main.tf @@ -63,7 +63,6 @@ resource "azurerm_linux_web_app" "service" { action = "Allow" } } - tags = var.cdc_tags } # Creates a staging slot for the Linux Web App @@ -111,7 +110,6 @@ resource "azurerm_linux_web_app_slot" "staging" { action = "Allow" } } - tags = var.cdc_tags } resource "azurerm_key_vault_access_policy" "app_secret_access" { diff --git a/ops/services/metabase/service/_var.tf b/ops/services/metabase/service/_var.tf index b706d92c3d..9c0bbb6d0e 100644 --- a/ops/services/metabase/service/_var.tf +++ b/ops/services/metabase/service/_var.tf @@ -81,8 +81,3 @@ variable "metabase_url" { # Secret Access variable "key_vault_id" {} variable "tenant_id" {} - -variable "cdc_tags" { - type = map(string) - description = "Tags for CDC" -} diff --git a/ops/services/metabase/service/main.tf b/ops/services/metabase/service/main.tf index b88405deb7..ce54a69df9 100644 --- a/ops/services/metabase/service/main.tf +++ b/ops/services/metabase/service/main.tf @@ -71,7 +71,6 @@ resource "azurerm_linux_web_app" "metabase" { null_resource.service_plan_id ] } - tags = var.cdc_tags } resource "azurerm_key_vault_access_policy" "app_secret_access" { diff --git a/ops/stg/main.tf b/ops/stg/main.tf index e91deae3f1..7b6e1e35bb 100644 --- a/ops/stg/main.tf +++ b/ops/stg/main.tf @@ -8,20 +8,6 @@ locals { environment = local.env resource_group = "${local.project}-${local.name}-${local.env}" } - cdc_tags = { - business_steward = "vuj4@cdc.gov" - center = "DDPHSS" - environment = local.env - escid = "3205" - funding_source = "TBD" - pii_data = "false" - security_compliance = "moderate" - security_steward = "ghv3@cdc.gov,vfd9@cdc.gov,xda7@cdc.gov,xii9@cdc.gov" - support_group = "OMHS" - system = "prim" - technical_steward = "mxc1@cdc.gov,qom6@cdc.gov,qwl5@cdc.gov,tgi8@cdc.gov" - zone = "EXTRANET" - } } # Frontend React App diff --git a/ops/stg/metabase.tf b/ops/stg/metabase.tf index 83b2ed7013..ac4baec8be 100644 --- a/ops/stg/metabase.tf +++ b/ops/stg/metabase.tf @@ -34,5 +34,4 @@ module "metabase_service" { depends_on = [ module.metabase_database ] - cdc_tags = local.cdc_tags } diff --git a/ops/stg/persistent/main.tf b/ops/stg/persistent/main.tf index 4baea8fa38..2c476ea890 100644 --- a/ops/stg/persistent/main.tf +++ b/ops/stg/persistent/main.tf @@ -13,20 +13,6 @@ locals { environment = local.env resource_group = "${local.project}-${local.name}-${local.env}" } - cdc_tags = { - business_steward = "vuj4@cdc.gov" - center = "DDPHSS" - environment = local.env - escid = "3205" - funding_source = "TBD" - pii_data = "false" - security_compliance = "moderate" - security_steward = "ghv3@cdc.gov,vfd9@cdc.gov,xda7@cdc.gov,xii9@cdc.gov" - support_group = "OMHS" - system = "prim" - technical_steward = "mxc1@cdc.gov,qom6@cdc.gov,qwl5@cdc.gov,tgi8@cdc.gov" - zone = "EXTRANET" - } } module "monitoring" { @@ -78,7 +64,6 @@ module "db_alerting" { action_group_ids = [ data.terraform_remote_state.global.outputs.pagerduty_stg_action_id ] - cdc_tags = local.cdc_tags } module "vnet" { diff --git a/ops/test/main.tf b/ops/test/main.tf index 5c92acc017..41c3a18e78 100644 --- a/ops/test/main.tf +++ b/ops/test/main.tf @@ -8,20 +8,6 @@ locals { environment = local.env resource_group = "${local.project}-${local.name}-${local.env}" } - cdc_tags = { - business_steward = "vuj4@cdc.gov" - center = "DDPHSS" - environment = local.env - escid = "3205" - funding_source = "TBD" - pii_data = "false" - security_compliance = "moderate" - security_steward = "ghv3@cdc.gov,vfd9@cdc.gov,xda7@cdc.gov,xii9@cdc.gov" - support_group = "OMHS" - system = "prim" - technical_steward = "mxc1@cdc.gov,qom6@cdc.gov,qwl5@cdc.gov,tgi8@cdc.gov" - zone = "EXTRANET" - } } # Frontend React App diff --git a/ops/test/metabase.tf b/ops/test/metabase.tf index ea37bfcf16..dbba6f636b 100644 --- a/ops/test/metabase.tf +++ b/ops/test/metabase.tf @@ -34,5 +34,4 @@ module "metabase_service" { depends_on = [ module.metabase_database ] - cdc_tags = local.cdc_tags } diff --git a/ops/test/persistent/main.tf b/ops/test/persistent/main.tf index 96c8fcc36d..5592d69692 100644 --- a/ops/test/persistent/main.tf +++ b/ops/test/persistent/main.tf @@ -12,20 +12,6 @@ locals { environment = local.env resource_group = "${local.project}-${local.name}-${local.env}" } - cdc_tags = { - business_steward = "vuj4@cdc.gov" - center = "DDPHSS" - environment = local.env - escid = "3205" - funding_source = "TBD" - pii_data = "false" - security_compliance = "moderate" - security_steward = "ghv3@cdc.gov,vfd9@cdc.gov,xda7@cdc.gov,xii9@cdc.gov" - support_group = "OMHS" - system = "prim" - technical_steward = "mxc1@cdc.gov,qom6@cdc.gov,qwl5@cdc.gov,tgi8@cdc.gov" - zone = "EXTRANET" - } } module "monitoring" { @@ -77,7 +63,6 @@ module "db_alerting" { action_group_ids = [ data.terraform_remote_state.global.outputs.pagerduty_non_prod_action_id ] - cdc_tags = local.cdc_tags } module "vnet" { diff --git a/ops/training/main.tf b/ops/training/main.tf index a771910db5..1624fc2a95 100644 --- a/ops/training/main.tf +++ b/ops/training/main.tf @@ -8,20 +8,6 @@ locals { environment = local.env resource_group = "${local.project}-${local.name}-${local.env}" } - cdc_tags = { - business_steward = "vuj4@cdc.gov" - center = "DDPHSS" - environment = local.env - escid = "3205" - funding_source = "TBD" - pii_data = "false" - security_compliance = "moderate" - security_steward = "ghv3@cdc.gov,vfd9@cdc.gov,xda7@cdc.gov,xii9@cdc.gov" - support_group = "OMHS" - system = "prim" - technical_steward = "mxc1@cdc.gov,qom6@cdc.gov,qwl5@cdc.gov,tgi8@cdc.gov" - zone = "EXTRANET" - } } # Frontend React App diff --git a/ops/training/persistent/main.tf b/ops/training/persistent/main.tf index 61053d5719..2f9f489503 100644 --- a/ops/training/persistent/main.tf +++ b/ops/training/persistent/main.tf @@ -13,20 +13,6 @@ locals { environment = local.env resource_group = "${local.project}-${local.name}-${local.env}" } - cdc_tags = { - business_steward = "vuj4@cdc.gov" - center = "DDPHSS" - environment = local.env - escid = "3205" - funding_source = "TBD" - pii_data = "false" - security_compliance = "moderate" - security_steward = "ghv3@cdc.gov,vfd9@cdc.gov,xda7@cdc.gov,xii9@cdc.gov" - support_group = "OMHS" - system = "prim" - technical_steward = "mxc1@cdc.gov,qom6@cdc.gov,qwl5@cdc.gov,tgi8@cdc.gov" - zone = "EXTRANET" - } } module "monitoring" { @@ -78,7 +64,6 @@ module "db_alerting" { action_group_ids = [ data.terraform_remote_state.global.outputs.pagerduty_non_prod_action_id ] - cdc_tags = local.cdc_tags } module "vnet" {