Apply namingconvention

agentinstall.ps1

@@ -67,7 +67,7 @@ wget "https://vstsagentpackage.azureedge.net/agent/$agentVersion/$zip" -OutFile
 for ($i = 1; $i -le $count; $i++) {
     Set-Location C:\a
     $agentDir = "A$i"
-    $agentName = "$ComputerName-ws2019-A$i"
+    $agentName = "$ComputerName-A$i"
 
     Expand-Archive -Path ./$zip -DestinationPath ./$agentDir
 
@@ -81,7 +81,7 @@ for ($i = 1; $i -le $count; $i++) {
 for ($i = 1; $i -le $count; $i++) {
     Set-Location C:\a
     $agentDir = "B$i"
-    $agentName = "$ComputerName-ws2019-B$i"
+    $agentName = "$ComputerName-B$i"
 
     Expand-Archive -Path ./$zip -DestinationPath ./$agentDir
 

agentinstall.sh

@@ -23,7 +23,7 @@ do
 "Setup for Agent $i on $4"
 cd /usr/lib/agt
 
-dir=$4-u1804-A$i
+dir=$4-A$i
 mkdir $dir
 
 cd $dir
@@ -56,7 +56,7 @@ do
 "Setup for Agent $i on $4"
 cd /usr/lib/agt
 
-dir=$4-u1804-B$i
+dir=$4-B$i
 mkdir $dir
 
 cd $dir

main.tf

@@ -5,9 +5,9 @@ terraform {
 }
 
 resource "azurerm_resource_group" "main" {
-  name     = "${var.PREFIX}"
+  name     = "${var.PREFIX}-${var.ENVIRONMENT}-${var.RUN_DATE}-rg"
   location = "${var.AZURE_REGION}"
-  tags     = "${var.TAGS}"
+  tags     = "${merge(var.TAGS, { "ACCOUNT" = "${var.VSTS_ACCOUNT}", "RUN_DATE" = "${var.RUN_DATE}" })}"
 }
 
 data "azurerm_virtual_network" "main" {
@@ -22,10 +22,10 @@ data "azurerm_subnet" "main" {
 }
 
 resource "azurerm_network_security_group" "main" {
-  name                = "${var.PREFIX}-networksecurity"
+  name                = "${var.PREFIX}-${var.ENVIRONMENT}-networksecurity"
   location            = "${azurerm_resource_group.main.location}"
   resource_group_name = "${azurerm_resource_group.main.name}"
-  tags                = "${var.TAGS}"
+  tags                = "${merge(var.TAGS, { "ACCOUNT" = "${var.VSTS_ACCOUNT}", "RUN_DATE" = "${var.RUN_DATE}" })}"
 }
 
 module "pool_agent1-ubuntu" {
@@ -47,6 +47,8 @@ module "pool_agent1-ubuntu" {
   VM                                     = "${element(var.SERVERNAMES, 0)}"
   BRANCH                                 = "${var.BRANCH}"
   TAGS                                   = "${var.TAGS}"
+  vm_name                                = "MSAGT${upper(var.ENVIRONMENT)}${element(var.SERVERNAMES, 0)}"
+  run_date                               = "${var.RUN_DATE}"
 }
 
 module "pool_agent2-ubuntu" {
@@ -68,7 +70,11 @@ module "pool_agent2-ubuntu" {
   VM                                     = "${element(var.SERVERNAMES, 1)}"
   BRANCH                                 = "${var.BRANCH}"
   TAGS                                   = "${var.TAGS}"
+  vm_name                                = "MSAGT${upper(var.ENVIRONMENT)}${element(var.SERVERNAMES, 2)}"
+  run_date                               = "${var.RUN_DATE}"
+  environment                            = "${var.ENVIRONMENT}"
 }
+
 module "pool_agent3-ws2019-vs2019" {
   source                                 = "./modules/azdo_ws2019agent"
   PREFIX                                 = "${var.PREFIX}"
@@ -88,6 +94,9 @@ module "pool_agent3-ws2019-vs2019" {
   VM                                     = "${element(var.SERVERNAMES, 2)}"
   BRANCH                                 = "${var.BRANCH}"
   TAGS                                   = "${var.TAGS}"
+  vm_name                                = "MSAGT${upper(var.ENVIRONMENT)}${element(var.SERVERNAMES, 2)}"
+  run_date                               = "${var.RUN_DATE}"
+  environment                            = "${var.ENVIRONMENT}"
 }
 
 module "pool_agent4-ws2019-vs2019" {
@@ -109,5 +118,9 @@ module "pool_agent4-ws2019-vs2019" {
   VM                                     = "${element(var.SERVERNAMES, 3)}"
   BRANCH                                 = "${var.BRANCH}"
   TAGS                                   = "${var.TAGS}"
+  vm_name                                = "MSAGT${upper(var.ENVIRONMENT)}${element(var.SERVERNAMES, 2)}"
+  run_date                               = "${var.RUN_DATE}"
+  environment                            = "${var.ENVIRONMENT}"
 }
 
+

modules/azdo_ubuntuagent/main.tf

@@ -1,6 +1,6 @@
 
 resource "azurerm_network_interface" "VM" {
-  name                      = "${var.PREFIX}-${var.VM}-nic"
+  name                      = "${var.vm_name}-nic"
   location                  = "${var.AZURERM_RESOURCE_GROUP_MAIN_LOCATION}"
   resource_group_name       = "${var.AZURERM_RESOURCE_GROUP_MAIN_NAME}"
   network_security_group_id = "${var.AZURERM_NETWORK_SECURITY_GROUP_MAIN_ID}"
@@ -10,17 +10,16 @@ resource "azurerm_network_interface" "VM" {
     subnet_id                     = "${var.AZURERM_SUBNET_ID}"
     private_ip_address_allocation = "Dynamic"
   }
-
-  tags = "${var.TAGS}"
+  tags = "${merge(var.TAGS, { "ACCOUNT" = "${var.VSTS_ACCOUNT}", "RUN_DATE" = "${var.run_date}" })}"
 }
 
 resource "azurerm_virtual_machine" "VM" {
-  name                  = "${var.PREFIX}-${var.VM}-u1804"
-  location              = "${var.AZURERM_RESOURCE_GROUP_MAIN_LOCATION}"
-  resource_group_name   = "${var.AZURERM_RESOURCE_GROUP_MAIN_NAME}"
-  network_interface_ids = ["${azurerm_network_interface.VM.id}"]
-  vm_size               = "Standard_F8s"
-  delete_os_disk_on_termination = true
+  name                             = "${var.vm_name}"
+  location                         = "${var.AZURERM_RESOURCE_GROUP_MAIN_LOCATION}"
+  resource_group_name              = "${var.AZURERM_RESOURCE_GROUP_MAIN_NAME}"
+  network_interface_ids            = ["${azurerm_network_interface.VM.id}"]
+  vm_size                          = "Standard_F8s"
+  delete_os_disk_on_termination    = true
   delete_data_disks_on_termination = true
 
   storage_image_reference {
@@ -30,14 +29,14 @@ resource "azurerm_virtual_machine" "VM" {
     version   = "latest"
   }
   storage_os_disk {
-    name              = "${var.PREFIX}-${var.VM}-osdisk"
+    name              = "${var.vm_name}-osdisk"
     caching           = "ReadWrite"
     create_option     = "FromImage"
     managed_disk_type = "Premium_LRS"
     disk_size_gb      = "128"
   }
   os_profile {
-    computer_name  = "${var.VM}"
+    computer_name  = "${var.vm_name}"
     admin_username = "${var.ADMIN_USERNAME}"
     admin_password = "${var.ADMIN_PASSWORD}"
   }
@@ -48,12 +47,11 @@ resource "azurerm_virtual_machine" "VM" {
       key_data = "${var.ADMIN_SSHKEYDATA}"
     }
   }
-
-  tags = "${var.TAGS}"
+  tags = "${merge(var.TAGS, { "ACCOUNT" = "${var.VSTS_ACCOUNT}", "OS" = "Ubuntu 1804", "RUN_DATE" = "${var.run_date}" })}"
 }
 
 resource "azurerm_virtual_machine_extension" "VMTeamServicesAgentLinux" {
-  name                 = "${var.PREFIX}-${var.VM}-TeamServicesAgentLinux"
+  name                 = "${var.vm_name}-TeamServicesAgentLinux"
   location             = "${var.AZURERM_RESOURCE_GROUP_MAIN_LOCATION}"
   resource_group_name  = "${var.AZURERM_RESOURCE_GROUP_MAIN_NAME}"
   virtual_machine_name = "${azurerm_virtual_machine.VM.name}"
@@ -63,7 +61,7 @@ resource "azurerm_virtual_machine_extension" "VMTeamServicesAgentLinux" {
   protected_settings   = <<SETTINGS
     {
         "fileUris": ["https://raw.githubusercontent.com/UKHO/AzurePipelinesAgents/${var.BRANCH}/agentinstall.sh"],
-        "commandToExecute": "sh agentinstall.sh ${var.VSTS_ACCOUNT} ${var.VSTS_TOKEN} \"${var.VSTS_POOL_PREFIX}\" ${var.PREFIX}-${var.VM} ${var.VSTS_AGENT_COUNT}"
+        "commandToExecute": "sh agentinstall.sh ${var.VSTS_ACCOUNT} ${var.VSTS_TOKEN} \"${var.VSTS_POOL_PREFIX}\" ${var.vm_name}-${var.run_date} ${var.VSTS_AGENT_COUNT}"
     }
 SETTINGS
 }

modules/azdo_ubuntuagent/variables.tf

@@ -62,3 +62,10 @@ variable "VSTS_AGENT_COUNT" {
 variable "TAGS" {
   type = "map"
 }
+
+variable "vm_name" {
+}
+
+variable "run_date" {  
+}
+

modules/azdo_ws2019agent/main.tf

@@ -6,7 +6,7 @@ data "azurerm_shared_image_version" "existing" {
 }
 
 resource "azurerm_network_interface" "WSVM" {
-  name                      = "${var.PREFIX}-${var.VM}-nic"
+  name                      = "${var.vm_name}-nic"
   location                  = "${var.AZURERM_RESOURCE_GROUP_MAIN_LOCATION}"
   resource_group_name       = "${var.AZURERM_RESOURCE_GROUP_MAIN_NAME}"
   network_security_group_id = "${var.AZURERM_NETWORK_SECURITY_GROUP_MAIN_ID}"
@@ -16,61 +16,60 @@ resource "azurerm_network_interface" "WSVM" {
     subnet_id                     = "${var.AZURERM_SUBNET_ID}"
     private_ip_address_allocation = "Dynamic"
   }
-
-  tags = "${var.TAGS}"
+  tags = "${merge(var.TAGS, { "ACCOUNT" = "${var.VSTS_ACCOUNT}", "RUN_DATE" = "${var.run_date}" })}"
 }
 
 resource "azurerm_virtual_machine" "WSVM" {
-  name                  = "${var.PREFIX}-${var.VM}-ws2019"
-  location              = "${var.AZURERM_RESOURCE_GROUP_MAIN_LOCATION}"
-  resource_group_name   = "${var.AZURERM_RESOURCE_GROUP_MAIN_NAME}"
-  network_interface_ids = ["${azurerm_network_interface.WSVM.id}"]
-  vm_size               = "Standard_D2s_v3"
-  delete_os_disk_on_termination = true
+  name                             = "${var.vm_name}"
+  location                         = "${var.AZURERM_RESOURCE_GROUP_MAIN_LOCATION}"
+  resource_group_name              = "${var.AZURERM_RESOURCE_GROUP_MAIN_NAME}"
+  network_interface_ids            = ["${azurerm_network_interface.WSVM.id}"]
+  vm_size                          = "Standard_D2s_v3"
+  delete_os_disk_on_termination    = true
   delete_data_disks_on_termination = true
 
   storage_image_reference {
     id = "${data.azurerm_shared_image_version.existing.id}"
   }
   storage_os_disk {
-    name              = "${var.PREFIX}-${var.VM}-osdisk"
+    name              = "${var.vm_name}-osdisk"
     caching           = "ReadWrite"
     create_option     = "FromImage"
     managed_disk_type = "Standard_LRS"
+
   }
   os_profile {
-    computer_name  = "${var.VM}"
+    computer_name  = "${var.vm_name}"
     admin_username = "${var.ADMIN_USERNAME}"
     admin_password = "${var.ADMIN_PASSWORD}"
   }
 
   os_profile_windows_config {
     provision_vm_agent        = true
     enable_automatic_upgrades = true
-    
+
     additional_unattend_config {
       pass         = "oobeSystem"
       component    = "Microsoft-Windows-Shell-Setup"
       setting_name = "AutoLogon"
       content      = "<AutoLogon><Password><Value>${var.ADMIN_PASSWORD}</Value></Password><Enabled>true</Enabled><LogonCount>1</LogonCount><Username>${var.ADMIN_USERNAME}</Username></AutoLogon>"
     }
   }
-
-  tags = "${var.TAGS}"
+  tags = "${merge(var.TAGS, { "ACCOUNT" = "${var.VSTS_ACCOUNT}", "OS" = "ws2019", "RUN_DATE" = "${var.run_date}" })}"
 }
 
 resource "azurerm_virtual_machine_extension" "VMTeamServicesAgentWindows" {
-  name                 = "${var.PREFIX}-${var.VM}-TeamServicesAgentWindows"
+  name                 = "${var.vm_name}-TeamServicesAgentWindows"
   location             = "${var.AZURERM_RESOURCE_GROUP_MAIN_LOCATION}"
   resource_group_name  = "${var.AZURERM_RESOURCE_GROUP_MAIN_NAME}"
   virtual_machine_name = "${azurerm_virtual_machine.WSVM.name}"
   publisher            = "Microsoft.Compute"
   type                 = "CustomScriptExtension"
   type_handler_version = "1.9"
-  settings   = <<SETTINGS
+  protected_settings   = <<SETTINGS
     {
         "fileUris": ["https://raw.githubusercontent.com/UKHO/AzurePipelinesAgents/${var.BRANCH}/agentinstall.ps1"],
-        "commandToExecute": "powershell.exe -ExecutionPolicy Unrestricted -File agentinstall.ps1 -account \"${var.VSTS_ACCOUNT}\" -PAT \"${var.VSTS_TOKEN}\" -PoolNamePrefix \"${var.VSTS_POOL_PREFIX}\" -ComputerName \"${var.PREFIX}-${var.VM}\" -count \"${var.VSTS_AGENT_COUNT}\""
+        "commandToExecute": "powershell.exe -ExecutionPolicy Unrestricted -File agentinstall.ps1 -account \"${var.VSTS_ACCOUNT}\" -PAT \"${var.VSTS_TOKEN}\" -PoolNamePrefix \"${var.VSTS_POOL_PREFIX}\" -ComputerName \"${var.vm_name}-${var.run_date}\" -count \"${var.VSTS_AGENT_COUNT}\""
     }
 SETTINGS
 }

modules/azdo_ws2019agent/variables.tf

@@ -62,3 +62,12 @@ variable "VSTS_AGENT_COUNT" {
 variable "TAGS" {
   type = "map"
 }
+
+variable "vm_name" {
+}
+
+variable "run_date" {
+
+}
+
+

secrets.auto.tfvars.enc

@@ -1,18 +1,18 @@
-U2FsdGVkX19+YgSa9+rKQJbKtDptckwOWxQrc9BIjIhhbV9nwNR6z9yGGIAnK0+rHQBnce3ZP+Y1
-QhogkCIlY5nUNrUSW7PeZP8/wEFXp5y2MULSVr8OAGbcohLmvZdiN7H39tNYFr2Xe6/0iglQVwTy
-QTnztCuEXWvOZ+Ah4QA6+xbyqTWfKbs6gYHzBq5noXxSxxlxIVst5M1L5gBb9BAQraMzd9e62/Rc
-x3yw2bkf3E5hot9ePE+o6N033RhCWphJ2cMgjWaJvBnDzaMGVncTfvNmtreMa4Qqcjwew6sPDglV
-OoJ9gJWYiRxlMXeHD8nOq9kO2K+uve0tRP2V8vWJrGKUCyoUEF5LeSnxvPwiKZv9hVDkMvNfgwbc
-AWY0WsGxpbJcTCwLQOLXEarzBuXMVnc1gC7Ze2/7fbFS990WM+tinr5MVxNq+R+BwzCHB8zqNX/k
-uo5rCLU8vtAIOW4ze2I+R4QjuDTUVfVrdLB0QLuQjSOLh7q8YsV3sfXToh3EiQ5kxClSKSDV4SlT
-nXxkz8PDxwWApPWzIQRwRFVn4BWHQ5ILMZ4GFclisozkmWgvijkjxtepFQixRm8MPoZeKZF6x/FI
-pE60CyqlXCqb4YDABrxzseTJOYqkcF6wTWY5HbIxf9HJFBNWYeM69dgz07G/OEB624vOhPNHgKo1
-89jjCOENsds6XZNt6/NTLrcDP5DY269YmiDvOcwiMJJGTLwbjt+x9fUUcbYF21iWoFzoYLZs1+rw
-HOzUqYiEiTxkWadBupOdhvyLbuv2jzE7yY79VDWxz8Jt+SRzli3e6s2py8vBg1EhkpyfnE4hDJNY
-ohf3NxuA8Z2WO5F1LGiRWUYhtNZevfvUQh1gat8Dte+WxVXkswvr+tqSykFF5ZDCLnmSmfcXMBw3
-qPtHuG8ub4WRgE7seLsLF7r613MkEGAOnQnb6pKnYduN5ojC7EVyhpqnjOhrV0f7vm15IpXphPmK
-j+djOFeJ7UCqXRQchWXsMqcey54Hb04DTai8xiFjxstqKxyhb0SyQ4wVK7noalusNHVN85o1GNUT
-irPFzHvmdzfV/mEI1cm+w5uQ9s0KsLJSHVPWUptpobwbPSnaSWDSDGZy4Gjq2gpk7Oy+BlgeRu5X
-tTyuFz+zw3zvhjQgdqZfrrG1jBnCz5BBZY362aa6TIEMV76ullYMQcKfhL8mTxv0Vza7y9Ff+eBA
-U2yuNkKr9v26g2EbCHm7BpohSZA4U0r6pjagLb3PaISjdtJD9SZkvtewMqioRblSVK65S3MCHLmb
-xLIUY6GXCg==
+U2FsdGVkX1+7rjYHedQOccyrtwKR/FxgZ2aROn7/euaP9b/RUUebAyqRREjIRl9VjGOQcZH6ui0N
+ohzOUXowL6jnekCwqcWN+6UU3EIEFWZu0OqDZhohB/7i19VYO3MTVMj66bdS/YI4gkSBmc653JFh
+SsOVAjCCSaqOm3TmXRao0Eob55g6QnJ1AaIsEIaXd2hJZVltJDv88FS3lGRchkNKN/duvP1oVFCN
+nIUzTglxPEj/QVe17F/DEOZ5t+lChulhLRbPzxP+9dbzMHAGkpGh0DKgYfZdqsoRr4UwiWwjT9Ky
+YwLL/9ej5LhS8RtcAeQLNovMRjtAw8JOlH5QOVrTjRHj9eu2I775/PMQ7197n0GnBYnsU95gnck+
+V+6rujot2RHzeUCq8hB32fd/O3jHLPKPMecOkrOYTqPFbFF7/B4yycafwGGLCOEfrkqkmma3TWpJ
+hJBRT11h/lxJ5u0z0yg2BaUgEiTpglh2/gX3OuwYjGd/JoycxLqr3SEqk5t+GsCV4Vyd+6/XhwT0
+ZYDc3VWF3fA0baeP1N7rpGpxb9Qv0tr5p51KboqRKYBS7DoY4S9cj6ZlgVUyP8et9iCD7yZIxJ5h
+tfZSKtaUhd9Jtwi6Ub2TJH2y3nRA45Q3n3gpVp3MKTlH32+RZTNhN4n1ouWHaFXWuGv5wZ6xV3uS
+wwAJBnh5qEOWIaWy8dfFGZu+UvAjHDHvVmNhTYmWWHmBnHlI7EMJIsIL5i2yoJylVYBIg0/L/J5O
+H9zVDdadlBCi4UZTXtBhjaZYy9sauErTn6AzAzlNzxURTTdgHfHw8zuFky1hMPsSNrWtOzDYLHlw
+ImhcatC4BMhKkMaXbabEeWw9UVRAYFe7cYMitalCJXeYM6O8NBbUJaEK6pRZ9SdRFiswsE+ti+iN
+piQVnyVBK0buOzR9sTgNdyuapCaqmbPzneU+3zLQ78xm9nPLmRD+rVMwoDnPhx1fDoNDBAvZJPBR
+vOkduB4toDA7JtDr/qqCfaD+ZgTasETNc2Oi4fDGL7Ukd+pJmByv1ZyH9AIYGfhJ+Os2Gpp2W7a1
+L6hWcjXOJv/3BfkuZL/djGfrt6uXqsb68fbBdCwHNH3/xIPIwJPezaYCV+Eg9YaFQRVusvvkeh6m
+YE0k8V4YZskxqUJpxRP7qWjQMBLy2aQgGYDU978+pYIt+Grgqyh/8ObqaFrLORK0VxajzQq0fm8l
+TlFOR0jAg5acdmfAf4nIx6WwTl88G2+0hYelzn7PpRD9wVD08R+LHxOvpPoYTP1+FFMMqeGXd3oL
+MaMpeJOtEw==

tfplan.sh

@@ -2,7 +2,8 @@
 
 export vaultName="AzDOLive-keyvault"
 export keyPrefix="terraform-azdolive"
-export TF_VAR_PREFIX=$TF_VAR_PREFIX-$(date +%F)
+export TF_VAR_RUN_DATE=$(date +%F)
+export TF_VAR_PREFIX=$TF_VAR_PREFIX-$TF_VAR_RUN_DATE
 
 export ARM_CLIENT_ID=$(az keyvault secret show --vault-name "$vaultName" --name "$keyPrefix-clientid"  --query value -o tsv)
 export ARM_CLIENT_SECRET=$(az keyvault secret show --vault-name "$vaultName" --name "$keyPrefix-clientsecret"  --query value -o tsv)

variables.tf

@@ -50,3 +50,11 @@ variable "BRANCH" {
 variable "TAGS" {
   type="map"
 }
+
+variable "RUN_DATE" {
+  type="string"
+}
+
+variable "ENVIRONMENT" {
+  default = "prd"
+}