Tidy up terraform + workflows

benchiverton · Jul 1, 2024 · 28f4b13 · 28f4b13
1 parent afd518f
commit 28f4b13
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 46 deletions.
diff --git a/.github/workflows/instance-deploy-test.yml b/.github/workflows/instance-deploy-test.yml
@@ -47,10 +47,6 @@ jobs:
         uses: azure/login@v1
         with:
           creds: ${{ secrets.AZURE_CREDENTIALS }}
-      # - name: Setup azure CLI
-      #   run: 
-      # - name: Setup dnsutils (dig) CLI
-      #   run: sudo apt-get install -y dnsutils
       - name: Terraform Format
         id: fmt
         run: terraform -chdir=instance fmt

diff --git a/.github/workflows/instance-destroy-test.yaml → .github/workflows/instance-destroy-test.yml b/.github/workflows/instance-destroy-test.yaml → .github/workflows/instance-destroy-test.yml
@@ -31,3 +31,5 @@ jobs:
           TF_VAR_acr_username: "not-used"
           TF_VAR_acr_password: "not-used"
           TF_VAR_website_dns_subdomain: "not-used"
+          TF_VAR_api_dns_subdomain: "not-used"
+          TF_VAR_monitoring_dns_subdomain: "not-used"
diff --git a/terraform/instance/dns.tf b/terraform/instance/dns.tf
@@ -21,20 +21,6 @@ resource "azurerm_dns_txt_record" "api" {
   }
 }
 
-# resource "azurerm_container_app_custom_domain" "api" {
-#   name             = trimsuffix(azurerm_dns_cname_record.api.fqdn, ".")
-#   container_app_id = azurerm_container_app.api.id
-
-#   depends_on = [
-#     azurerm_dns_txt_record.api,
-#   ]
-
-#   lifecycle {
-#     // When using an Azure created Managed Certificate these values must be added to ignore_changes to prevent resource recreation.
-#     ignore_changes = [certificate_binding_type, container_app_environment_certificate_id]
-#   }
-# }
-
 resource "azurerm_dns_cname_record" "website" {
   name                = var.website_dns_subdomain
   zone_name           = data.azurerm_dns_zone.rockpal-co-uk.name
@@ -53,20 +39,6 @@ resource "azurerm_dns_txt_record" "website" {
   }
 }
 
-# resource "azurerm_container_app_custom_domain" "website" {
-#   name             = trimsuffix(azurerm_dns_cname_record.website.fqdn, ".")
-#   container_app_id = azurerm_container_app.website.id
-
-#   depends_on = [
-#     azurerm_dns_txt_record.website,
-#   ]
-
-#   lifecycle {
-#     // When using an Azure created Managed Certificate these values must be added to ignore_changes to prevent resource recreation.
-#     ignore_changes = [certificate_binding_type, container_app_environment_certificate_id]
-#   }
-# }
-
 resource "azurerm_dns_cname_record" "monitoring" {
   name                = var.monitoring_dns_subdomain
   zone_name           = data.azurerm_dns_zone.rockpal-co-uk.name
@@ -85,20 +57,6 @@ resource "azurerm_dns_txt_record" "monitoring" {
   }
 }
 
-# resource "azurerm_container_app_custom_domain" "monitoring" {
-#   name             = trimsuffix(azurerm_dns_cname_record.monitoring.fqdn, ".")
-#   container_app_id = azurerm_container_app.monitoring.id
-
-#   depends_on = [
-#     azurerm_dns_txt_record.monitoring,
-#   ]
-
-#   lifecycle {
-#     // When using an Azure created Managed Certificate these values must be added to ignore_changes to prevent resource recreation.
-#     ignore_changes = [certificate_binding_type, container_app_environment_certificate_id]
-#   }
-# }
-
 module "container_apps_bind_dns" {
   source                                = "./container_apps_bind_dns"
   container_app_resource_group_name     = azurerm_resource_group.instance.name