Merge pull request #18 from kumarvna/develop

update to version 2.5.0

Author: kumarvna

README.md

@@ -17,25 +17,34 @@ To defines the kind of account, set the argument to `account_kind = "StorageV2"`
 * [Storage Queue](https://www.terraform.io/docs/providers/azurerm/r/storage_queue.html)
 * [Network Policies](https://www.terraform.io/docs/providers/azurerm/r/storage_account.html#network_rules)
 * [Azure Blob storage lifecycle](https://www.terraform.io/docs/providers/azurerm/r/storage_management_policy.html)
+* [Managed Service Identity](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/storage_account#identity)
 
 ## Module Usage
 
-```hcl
+```terraform
 # Azure Provider configuration
 provider "azurerm" {
   features {}
 }
 
+resource "azurerm_user_assigned_identity" "example" {
+  for_each            = toset(["user-identity1", "user-identity2"])
+  resource_group_name = "rg-shared-westeurope-01"
+  location            = "westeurope"
+  name                = each.key
+}
+
 module "storage" {
   source  = "kumarvna/storage/azurerm"
   version = "2.5.0"
 
   # By default, this module will not create a resource group
-  # proivde a name to use an existing resource group, specify the existing resource group name,
-  # and set the argument to `create_resource_group = false`. Location will be same as existing RG.
-  resource_group_name  = "rg-demo-internal-shared-westeurope-002"
-  location             = "westeurope"
-  storage_account_name = "mydefaultstorage"
+  # proivde a name to use an existing resource group, specify the existing resource group name, 
+  # and set the argument to `create_resource_group = false`. Location will be same as existing RG. 
+  create_resource_group = true
+  resource_group_name   = "rg-demo-internal-shared-westeurope-002"
+  location              = "westeurope"
+  storage_account_name  = "mystorage"
 
   # To enable advanced threat protection set argument to `true`
   enable_advanced_threat_protection = true
@@ -59,8 +68,32 @@ module "storage" {
   # Storage queues
   queues = ["queue1", "queue2"]
 
+  # Configure managed identities to access Azure Storage (Optional)
+  # Possible types are `SystemAssigned`, `UserAssigned` and `SystemAssigned, UserAssigned`.
+  managed_identity_type = "UserAssigned"
+  managed_identity_ids  = [for k in azurerm_user_assigned_identity.example : k.id]
+
+  # Lifecycle management for storage account.
+  # Must specify the value to each argument and default is `0` 
+  lifecycles = [
+    {
+      prefix_match               = ["mystore250/folder_path"]
+      tier_to_cool_after_days    = 0
+      tier_to_archive_after_days = 50
+      delete_after_days          = 100
+      snapshot_delete_after_days = 30
+    },
+    {
+      prefix_match               = ["blobstore251/another_path"]
+      tier_to_cool_after_days    = 0
+      tier_to_archive_after_days = 30
+      delete_after_days          = 75
+      snapshot_delete_after_days = 30
+    }
+  ]
+
   # Adding TAG's to your Azure resources (Required)
-  # ProjectName and Env are already declared above, to use them here, create a varible.
+  # ProjectName and Env are already declared above, to use them here, create a varible. 
   tags = {
     ProjectName  = "demo-internal"
     Env          = "dev"
@@ -200,7 +233,7 @@ Regardless of the type of identity chosen a managed identity is a service princi
 ```terraform
 resource "azurerm_user_assigned_identity" "example" {
   for_each            = toset(["user-identity1", "user-identity2"])
-  resource_group_name = "rg-demo-internal-shared-westeurope-002"
+  resource_group_name = "rg-shared-westeurope-01"
   location            = "westeurope"
   name                = each.key
 }
@@ -235,15 +268,15 @@ An effective naming convention assembles resource names by using important resou
 
 | Name | Version |
 |------|---------|
-| terraform | >= 0.13 |
-| azurerm | >= 2.59.0 |
+| terraform | >= 1.1.0 |
+| azurerm | >= 3.1.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| azurerm | >= 2.59 |
-| random | n/a |
+| azurerm | >= 3.1.0 |
+| random | >= 3.1.0 |
 
 ## Inputs
 

examples/README.md

@@ -92,16 +92,24 @@ provider "azurerm" {
   features {}
 }
 
+resource "azurerm_user_assigned_identity" "example" {
+  for_each            = toset(["user-identity1", "user-identity2"])
+  resource_group_name = "rg-shared-westeurope-01"
+  location            = "westeurope"
+  name                = each.key
+}
+
 module "storage" {
   source  = "kumarvna/storage/azurerm"
   version = "2.5.0"
 
   # By default, this module will not create a resource group
-  # proivde a name to use an existing resource group, specify the existing resource group name,
-  # and set the argument to `create_resource_group = false`. Location will be same as existing RG.
-  resource_group_name  = "rg-demo-internal-shared-westeurope-002"
-  location             = "westeurope"
-  storage_account_name = "mydefaultstorage"
+  # proivde a name to use an existing resource group, specify the existing resource group name, 
+  # and set the argument to `create_resource_group = false`. Location will be same as existing RG. 
+  create_resource_group = true
+  resource_group_name   = "rg-demo-internal-shared-westeurope-002"
+  location              = "westeurope"
+  storage_account_name  = "mystorage"
 
   # To enable advanced threat protection set argument to `true`
   enable_advanced_threat_protection = true
@@ -125,8 +133,13 @@ module "storage" {
   # Storage queues
   queues = ["queue1", "queue2"]
 
+  # Configure managed identities to access Azure Storage (Optional)
+  # Possible types are `SystemAssigned`, `UserAssigned` and `SystemAssigned, UserAssigned`.
+  managed_identity_type = "UserAssigned"
+  managed_identity_ids  = [for k in azurerm_user_assigned_identity.example : k.id]
+
   # Lifecycle management for storage account.
-  # Must specify the value to each argument and default is `0`
+  # Must specify the value to each argument and default is `0` 
   lifecycles = [
     {
       prefix_match               = ["mystore250/folder_path"]
@@ -145,7 +158,7 @@ module "storage" {
   ]
 
   # Adding TAG's to your Azure resources (Required)
-  # ProjectName and Env are already declared above, to use them here, create a varible.
+  # ProjectName and Env are already declared above, to use them here, create a varible. 
   tags = {
     ProjectName  = "demo-internal"
     Env          = "dev"

examples/complete/README.md

@@ -8,16 +8,24 @@ provider "azurerm" {
   features {}
 }
 
+resource "azurerm_user_assigned_identity" "example" {
+  for_each            = toset(["user-identity1", "user-identity2"])
+  resource_group_name = "rg-shared-westeurope-01"
+  location            = "westeurope"
+  name                = each.key
+}
+
 module "storage" {
   source  = "kumarvna/storage/azurerm"
-  version = "2.4.0"
+  version = "2.5.0"
 
   # By default, this module will not create a resource group
-  # proivde a name to use an existing resource group, specify the existing resource group name,
-  # and set the argument to `create_resource_group = false`. Location will be same as existing RG.
-  resource_group_name  = "rg-demo-internal-shared-westeurope-002"
-  location             = "westeurope"
-  storage_account_name = "mydefaultstorage"
+  # proivde a name to use an existing resource group, specify the existing resource group name, 
+  # and set the argument to `create_resource_group = false`. Location will be same as existing RG. 
+  create_resource_group = true
+  resource_group_name   = "rg-demo-internal-shared-westeurope-002"
+  location              = "westeurope"
+  storage_account_name  = "mystorage"
 
   # To enable advanced threat protection set argument to `true`
   enable_advanced_threat_protection = true
@@ -41,8 +49,13 @@ module "storage" {
   # Storage queues
   queues = ["queue1", "queue2"]
 
+  # Configure managed identities to access Azure Storage (Optional)
+  # Possible types are `SystemAssigned`, `UserAssigned` and `SystemAssigned, UserAssigned`.
+  managed_identity_type = "UserAssigned"
+  managed_identity_ids  = [for k in azurerm_user_assigned_identity.example : k.id]
+
   # Lifecycle management for storage account.
-  # Must specify the value to each argument and default is `0`
+  # Must specify the value to each argument and default is `0` 
   lifecycles = [
     {
       prefix_match               = ["mystore250/folder_path"]
@@ -61,7 +74,7 @@ module "storage" {
   ]
 
   # Adding TAG's to your Azure resources (Required)
-  # ProjectName and Env are already declared above, to use them here, create a varible.
+  # ProjectName and Env are already declared above, to use them here, create a varible. 
   tags = {
     ProjectName  = "demo-internal"
     Env          = "dev"

examples/complete/main.tf

@@ -3,6 +3,13 @@ provider "azurerm" {
   features {}
 }
 
+resource "azurerm_user_assigned_identity" "example" {
+  for_each            = toset(["user-identity1", "user-identity2"])
+  resource_group_name = "rg-shared-westeurope-01"
+  location            = "westeurope"
+  name                = each.key
+}
+
 module "storage" {
   source  = "kumarvna/storage/azurerm"
   version = "2.5.0"
@@ -37,6 +44,11 @@ module "storage" {
   # Storage queues
   queues = ["queue1", "queue2"]
 
+  # Configure managed identities to access Azure Storage (Optional)
+  # Possible types are `SystemAssigned`, `UserAssigned` and `SystemAssigned, UserAssigned`.
+  managed_identity_type = "UserAssigned"
+  managed_identity_ids  = [for k in azurerm_user_assigned_identity.example : k.id]
+
   # Lifecycle management for storage account.
   # Must specify the value to each argument and default is `0` 
   lifecycles = [

examples/storage_account_with_containers/README.md

@@ -12,7 +12,7 @@ provider "azurerm" {
 
 module "storage" {
   source  = "kumarvna/storage/azurerm"
-  version = "2.4.0"
+  version = "2.5.0"
 
   # By default, this module will not create a resource group
   # proivde a name to use an existing resource group, specify the existing resource group name,

examples/storage_account_with_fileshares/README.md

@@ -12,7 +12,7 @@ provider "azurerm" {
 
 module "storage" {
   source  = "kumarvna/storage/azurerm"
-  version = "2.4.0"
+  version = "2.5.0"
 
   # By default, this module will not create a resource group
   # proivde a name to use an existing resource group, specify the existing resource group name,

graph.png

@@ -129,7 +129,6 @@ variable "managed_identity_ids" {
   type        = list(string)
 }
 
-
 variable "tags" {
   description = "A map of tags to add to all resources"
   type        = map(string)

variables.tf

@@ -2,12 +2,12 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = ">= 2.59.0"
+      version = ">= 3.1.0"
     }
     random = {
       source  = "hashicorp/random"
       version = ">= 3.1.0"
     }
   }
-  required_version = ">= 0.13"
+  required_version = ">= 1.1.0"
 }