updating naming conventions and all that

Author: damienjburks

terraform/main.tf

@@ -48,7 +48,6 @@ resource "azuredevops_build_definition" "this" {
 
   variable_groups = [
     azuredevops_variable_group.infra_variable_group.id,
-    azuredevops_variable_group.image_repo_variable.id,
   ]
 
   variable {

terraform/outputs.tf

@@ -0,0 +1,7 @@
+output "acr_name" {
+  value = azurerm_container_registry.this_container_registry.name
+}
+
+output "acr_url" {
+  value = azurerm_container_registry.this_container_registry.login_server
+}

terraform/variable-group.tf

@@ -5,37 +5,13 @@ resource "azuredevops_variable_group" "infra_variable_group" {
   allow_access = true
 
   variable {
-    name         = "ACR_NAME"
-    secret_value = azurerm_container_registry.this_container_registry.name
-    is_secret    = false
+    name  = "ACR_URL"
+    value = azurerm_container_registry.this_container_registry.login_server
 
   }
 
   variable {
-    name         = "ACR_SERVICE_CONNECTION"
-    secret_value = azuredevops_serviceendpoint_azurecr.acr_registry_endpoint.id
-    is_secret    = false
-  }
-}
-
-
-resource "azuredevops_variable_group" "image_repo_variable" {
-  project_id   = azuredevops_project.this.id
-  name         = "Image Repository Variables"
-  description  = "Managed by Terraform"
-  allow_access = true
-
-  variable {
-    name  = "imageRepository"
-    value = ""
-  }
-  variable {
-    name  = "containerRegistry"
-    value = ""
-  }
-
-  variable {
-    name  = "AZ_CONTAINER_NAME"
-    value = ""
+    name  = "ACR_SERVICE_CONNECTION"
+    value = azuredevops_serviceendpoint_azurecr.acr_registry_endpoint.id
   }
 }

terraform/variables.tf

@@ -8,7 +8,6 @@ variable "TFC_AZ_DEVOPS_PAT" {}
 variable "TFC_AZ_DEVOPS_GITHUB_PAT" {}
 
 ### Resource Group Variables ###
-
 variable "resource_group_name" {
   type        = string
   description = "name of the resource group"
@@ -19,27 +18,23 @@ variable "location" {
   type        = string
   description = "location of the resource group"
   default     = "eastus"
-
 }
 
 #### Azure Container Registry and Kubernetes Variables  ###
 variable "acr_name" {
   type        = string
   description = "name of the Azure Container Registry"
-  default     = "fastapidevsecopsacr"
-
+  default     = "DSBContainerRegistry"
 }
 
 variable "aks_name" {
   type        = string
   description = "name of the Azure Kubernetes Service"
-  default     = "fastapidevsecopsaks"
-
+  default     = "DSB-AKS-Cluster"
 }
 
 variable "uaid_name" {
   type        = string
   description = "name of the Azure Kubernetes Service"
-  default     = "DevSecOps-User-Assigned-Identity"
-
+  default     = "DSB-UA-Identity"
 }