updating modules

modules/container_app/container_app.tf

@@ -22,6 +22,24 @@ resource "azurerm_container_app" "container_app_app" {
         image = container.value["image"]
         memory = init_container.value["memory"]
         name = init_container.value["name"]
+
+      dynamic "env" {
+        for_each = container.value["envs"] != null ? container.value["envs"] : []
+        content {
+          name = env.value["name"]
+          secret_name = env.value["secret_name"]
+          value = env.value["value"]
+        }
+      }
+
+      dynamic "volume_mounts" {
+        for_each = container.value["volume_mounts"] != null ? container.value["volume_mounts"] : []
+        content {
+          name = volume_mount.value["name"]
+          path = volumn_mount.value["path"]
+          sub_path = volume_mount.value["sub_path"] != null ? volume_mount.value["sub_path"] : null
+        }
+      }
       }
     }
 
@@ -47,11 +65,21 @@ resource "azurerm_container_app" "container_app_app" {
           for_each = container.value["volume_mounts"] != null ? container.value["volume_mounts"] : []
           content {
             name = volume_mount.value["name"]
-            path = volumn_mount.value["path"]
+            path = volume_mount.value["path"]
+            sub_path = volume_mount.value["sub_path"] != null ? volume_mount.value["sub_path"] : null
           }
         }
       }
     }
+
+    dynamic "volume" {
+      for_each = var.volume
+      content {
+        name = volume.value["name"]
+        storage_type = volume.value["storage_type"]
+        storage_name = volume.value["storage_name"]
+      }
+    }
   }
 
   ingress {

modules/container_app/variables.tf

@@ -19,6 +19,7 @@ variable "containers" {
     volume_mounts = optional(list(object({
       name = string
       path = string
+      sub_path = optional(string)
     })))
   }))
 }
@@ -82,6 +83,7 @@ variable "init_containers" {
     volume_mounts = optional(list(object({
       name = string
       path = string
+      sub_path = optional(string)
     })))
   }))
 }
@@ -136,3 +138,13 @@ variable "template_max_replicas" {
   default = 1
   type = number
 }
+
+variable "volume" {
+  default = []
+  type = list(object({
+    name = string
+    storage_type = string
+    storage_name = string
+    share_name = string
+  }))
+}

modules/container_app_environment_storage/client_config.tf

@@ -0,0 +1,2 @@
+data "azurerm_client_config" "current" {
+}

modules/container_app_environment_storage/container_app_environment_storage.tf

@@ -0,0 +1,8 @@
+resource "azurerm_container_app_environment_storage" "container_app_environment_storage" {
+  name = var.name
+  container_app_environment_id = var.container_app_environment_id
+  account_name = var.storage_account_name
+  share_name = var.share_name
+  access_key = var.storage_account_access_key
+  access_mode = var.access_mode
+}

modules/container_app_environment_storage/variables.tf

@@ -0,0 +1,23 @@
+variable "access_mode" {
+  type = string
+}
+
+variable "container_app_environment_id" {
+  type = string
+}
+
+variable "name" {
+  type = string
+}
+
+variable "share_name" {
+  type = string
+}
+
+variable "storage_account_access_key" {
+  type = string
+}
+
+variable "storage_account_name" {
+  type = string
+}

modules/storage/outputs.tf

@@ -1,3 +1,7 @@
 output "storage_account_primary_connection_string" {
   value = azurerm_storage_account.storage_account.primary_connection_string
 }
+
+output "storage_account_name" {
+  value = azurerm_storage_account.storage_account.name
+}

modules/storage/static_website.tf

@@ -1,6 +0,0 @@
-resource "azurerm_storage_account_static_website" "static_website" {
-  count = length(var.static_websites)
-  storage_account_id = azurerm_storage_account.storage_account.id
-  error_404_document = var.static_websites[count.index].error_404_document
-  index_document     = var.static_websites[count.index].index_document
-}

modules/storage/storage_share.tf

@@ -0,0 +1,5 @@
+resource "azure_storage_share" "storage_share" {
+  count = length(var.storage_shares)
+  name = var.storage_shares[count.index]
+  storage_account_name = azurerm_storage_account.storage_account.name
+}

modules/storage/variables.tf

@@ -12,14 +12,6 @@ variable "resource_group_name" {
   type = string
 }
 
-variable "static_websites" {
-  default = []
-  type = list(object({
-    error_404_document = string
-    index_document = string
-  }))
-}
-
 variable "storage_account_name" {
   type = string
 }
@@ -45,6 +37,11 @@ variable "storage_queues" {
   type = list(string)
 }
 
+variable "storage_shares" {
+  default = []
+  type = list(string)
+}
+
 variable "storage_tables" {
   default = []
   type = list(string)