Merge pull request #120 from pluralsh/improve-azure-setup

Smarter azure setup

Author: JohnBlackwell

terraform/clouds/azure/locals.tf

@@ -1,5 +1,5 @@
-
 locals {
+  network_name = var.network_name == "" ? "${var.cluster_name}-network" : var.network_name
   resource_group = {
     name     = var.create_resource_group ? azurerm_resource_group.main[0].name : var.resource_group_name
     location = var.location

terraform/clouds/azure/network.tf

@@ -1,20 +1,20 @@
 resource "azurerm_virtual_network" "network" {
   address_space       = var.network_cidrs
   location            = local.resource_group.location
-  name                = var.network_name
+  name                = local.network_name
   resource_group_name = local.resource_group.name
 }
 
 resource "azurerm_subnet" "network" {
   address_prefixes                               = var.subnet_cidrs
-  name                                           = "${var.network_name}-sn"
+  name                                           = "${local.network_name}-sn"
   resource_group_name                            = local.resource_group.name
   virtual_network_name                           = azurerm_virtual_network.network.name
   enforce_private_link_endpoint_network_policies = true
 }
 
 resource "azurerm_subnet" "postgres" {
-  name                 = "${var.network_name}-pg"
+  name                 = "${local.network_name}-pg"
   resource_group_name  = local.resource_group.name
   virtual_network_name = azurerm_virtual_network.network.name
   address_prefixes     = var.postgres_cidrs

terraform/clouds/azure/postgres.tf

@@ -31,7 +31,7 @@ resource "azurerm_private_dns_zone_virtual_network_link" "mysql" {
 resource "azurerm_private_dns_zone" "postgres" {
   count = var.create_db ? 1 : 0
 
-  name                = var.postgres_dns_zone
+  name                = local.db_name
   resource_group_name = local.resource_group.name
 }
 

terraform/clouds/azure/variables.tf

@@ -40,7 +40,7 @@ variable "location" {
 
 variable "network_name" {
   type = string
-  default = "plural"
+  default = ""
 }
 
 variable "network_cidrs" {