Generate independet objects for terraform-state resources

qhub/stages/input_vars.py

@@ -28,6 +28,7 @@ def stage_01_terraform_state(stage_outputs, config):
             "namespace": config["namespace"],
             "region": config["azure"]["region"],
             "storage_account_postfix": config["azure"]["storage_account_postfix"],
+            "state_resource_group_name": f'{config["project_name"]}-{config["namespace"]}-state',
         }
     else:
         return {}

qhub/stages/state_imports.py

@@ -18,9 +18,10 @@ def stage_01_terraform_state(stage_outputs, config):
         ]
     elif config["provider"] == "azure":
         subscription_id = os.environ["ARM_SUBSCRIPTION_ID"]
-        resource_group_name = f"{config['project_name']}-{config['namespace']}"
-        resource_group_name_safe = resource_group_name.replace("-", "")
-        resource_group_url = f"/subscriptions/{subscription_id}/resourceGroups/{config['project_name']}-{config['namespace']}"
+        resource_name_prefix = f"{config['project_name']}-{config['namespace']}"
+        state_resource_group_name = f"{resource_name_prefix}-state"
+        state_resource_name_prefix_safe = resource_name_prefix.replace("-", "")
+        resource_group_url = f"/subscriptions/{subscription_id}/resourceGroups/{state_resource_group_name}"
 
         return [
             (
@@ -29,11 +30,11 @@ def stage_01_terraform_state(stage_outputs, config):
             ),
             (
                 "module.terraform-state.azurerm_storage_account.terraform-storage-account",
-                f"{resource_group_url}/providers/Microsoft.Storage/storageAccounts/{resource_group_name_safe}{config['azure']['storage_account_postfix']}",
+                f"{resource_group_url}/providers/Microsoft.Storage/storageAccounts/{state_resource_name_prefix_safe}{config['azure']['storage_account_postfix']}",
             ),
             (
                 "module.terraform-state.azurerm_storage_container.storage_container",
-                f"https://{resource_group_name_safe}{config['azure']['storage_account_postfix']}.blob.core.windows.net/{resource_group_name}state",
+                f"https://{state_resource_name_prefix_safe}{config['azure']['storage_account_postfix']}.blob.core.windows.net/{resource_name_prefix}-state",
             ),
         ]
     elif config["provider"] == "aws":

qhub/stages/tf_objects.py

@@ -78,10 +78,10 @@ def QHubTerraformState(directory: str, qhub_config: Dict):
     elif qhub_config["provider"] == "azure":
         return TerraformBackend(
             "azurerm",
-            resource_group_name=f"{qhub_config['project_name']}-{qhub_config['namespace']}",
+            resource_group_name=f"{qhub_config['project_name']}-{qhub_config['namespace']}-state",
             # storage account must be globally unique
             storage_account_name=f"{qhub_config['project_name']}{qhub_config['namespace']}{qhub_config['azure']['storage_account_postfix']}",
-            container_name=f"{qhub_config['project_name']}-{qhub_config['namespace']}state",
+            container_name=f"{qhub_config['project_name']}-{qhub_config['namespace']}-state",
             key=f"terraform/{qhub_config['project_name']}-{qhub_config['namespace']}/{directory}",
         )
     elif qhub_config["provider"] == "local":

qhub/template/stages/01-terraform-state/azure/main.tf

@@ -18,16 +18,22 @@ variable "storage_account_postfix" {
   type        = string
 }
 
+variable "state_resource_group_name" {
+  description = "Name for terraform state resource group"
+  type        = string
+}
+
 provider "azurerm" {
   features {}
 }
 
 module "terraform-state" {
   source = "./modules/terraform-state"
 
-  resource_group_name     = "${var.name }-${var.namespace}"
-  location                = var.region
-  storage_account_postfix = var.storage_account_postfix
+  name                          = "${var.name}-${var.namespace}"
+  resource_group_name           = var.state_resource_group_name
+  location                      = var.region
+  storage_account_postfix       = var.storage_account_postfix
 }
 
 terraform {

qhub/template/stages/01-terraform-state/azure/modules/terraform-state/main.tf

@@ -1,12 +1,13 @@
-resource "azurerm_resource_group" "terraform-resource-group" {
+resource "azurerm_resource_group" "terraform-state-resource-group" {
   name     = var.resource_group_name
   location = var.location
 }
 
-resource "azurerm_storage_account" "terraform-storage-account" {
-  name                     = replace("${var.resource_group_name}${var.storage_account_postfix}", "-", "") # must be unique across the entire Azure service
-  resource_group_name      = azurerm_resource_group.terraform-resource-group.name
-  location                 = azurerm_resource_group.terraform-resource-group.location
+resource "azurerm_storage_account" "terraform-state-storage-account" {
+  # name, can only consist of lowercase letters and numbers, and must be between 3 and 24 characters long
+  name                     = replace("${var.name}${var.storage_account_postfix}", "-", "") # must be unique across the entire Azure service
+  resource_group_name      = azurerm_resource_group.terraform-state-resource-group.name
+  location                 = azurerm_resource_group.terraform-state-resource-group.location
   account_tier             = "Standard"
   account_replication_type = "GRS"
 
@@ -16,7 +17,7 @@ resource "azurerm_storage_account" "terraform-storage-account" {
 }
 
 resource "azurerm_storage_container" "storage_container" {
-  name                  = "${var.resource_group_name}state"
-  storage_account_name  = azurerm_storage_account.terraform-storage-account.name
+  name                  = "${var.name}-state"
+  storage_account_name  = azurerm_storage_account.terraform-state-storage-account.name
   container_access_type = "private"
 }

qhub/template/stages/01-terraform-state/azure/modules/terraform-state/variables.tf

@@ -1,5 +1,10 @@
 variable "resource_group_name" {
-  description = "Prefix name for terraform state"
+  description = "Prefix of name to append resource"
+  type        = string
+}
+
+variable "name" {
+  description = "Prefix of name to append resource"
   type        = string
 }