Merge pull request #2 from kumarvna/develop

kumarvna · web-flow · commit 0046be796460 · 2021-05-14T22:06:57.000+05:30
Module updated to support latest azure provider
diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ These types of resources are supported:
 ```hcl
 module "storage" {
   source  = "kumarvna/storage/azurerm"
-  version = "2.1.0"
+  version = "2.2.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,
@@ -114,7 +114,7 @@ The default action set to `Allow` when no network rules matched. A `subnet_ids`
 ```hcl
 module "storage" {
   source  = "kumarvna/storage/azurerm"
-  version = "2.1.0"
+  version = "2.2.0"
 
   # .... omitted
 
@@ -147,7 +147,7 @@ This module supports the implementation of storage lifecycle management. If spec
 ```hcl
 module "storage" {
   source  = "kumarvna/storage/azurerm"
-  version = "2.1.0"
+  version = "2.2.0"
 
   # .... omitted
 
@@ -208,7 +208,7 @@ End Date of the Project|Date when this application, workload, or service is plan
 ```hcl
 module "key-vault" {
   source  = "kumarvna/storage/azurerm"
-  version = "2.1.0"
+  version = "2.2.0"
 
   # ... omitted
 
@@ -227,13 +227,13 @@ module "key-vault" {
 | Name | Version |
 |------|---------|
 | terraform | >= 0.13 |
-| azurerm | ~> 2.27 |
+| azurerm | >= 2.59.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| azurerm | ~> 2.27 |
+| azurerm | >= 2.59 |
 | random | n/a |
 
 ## Inputs
@@ -246,6 +246,7 @@ Name | Description | Type | Default
 `account_kind`|General-purpose v2 accounts: Basic storage account type for blobs, files, queues, and tables.|string|`"StorageV2"`
 `skuname`|The SKUs supported by Microsoft Azure Storage. Valid options are Premium_LRS, Premium_ZRS, Standard_GRS, Standard_GZRS, Standard_LRS, Standard_RAGRS, Standard_RAGZRS, Standard_ZRS|string|`Standard_RAGRS`
 `access_tier`|Defines the access tier for BlobStorage and StorageV2 accounts. Valid options are Hot and Cool.|string|`"Hot"`
+`min_tls_version`|The minimum supported TLS version for the storage account. Possible values are `TLS1_0`, `TLS1_1`, and `TLS1_2` |string|`"TLS1_2"`
 `assign_identity`|Set to `true` to enable system-assigned managed identity, or `false` to disable it.|string|`true`
 `soft_delete_retention`|Number of retention days for soft delete. If set to null it will disable soft delete all together.|number|`30`
 `enable_advanced_threat_protection`|Controls Advance threat protection plan for Storage account!string|`false`
diff --git a/examples/complete/README.md b/examples/complete/README.md
@@ -5,7 +5,7 @@ This example is to create a storage account with containers, SMB file shares, ta
 ```hcl
 module "storage" {
   source  = "kumarvna/storage/azurerm"
-  version = "2.1.0"
+  version = "2.2.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,
diff --git a/examples/complete/main.tf b/examples/complete/main.tf
@@ -1,6 +1,6 @@
 module "storage" {
   source  = "kumarvna/storage/azurerm"
-  version = "2.1.0"
+  version = "2.2.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, 
diff --git a/examples/complete/output.tf b/examples/complete/output.tf
@@ -41,16 +41,19 @@ output "storage_account_primary_web_host" {
 output "storage_primary_connection_string" {
   description = "The primary connection string for the storage account."
   value       = module.storage.storage_primary_connection_string
+  sensitive   = true
 }
 
 output "storage_primary_access_key" {
   description = "The primary access key for the storage account."
   value       = module.storage.storage_primary_access_key
+  sensitive   = true
 }
 
 output "storage_secondary_access_key" {
   description = "The secondary access key for the storage account."
   value       = module.storage.storage_secondary_access_key
+  sensitive   = true
 }
 
 output "containers" {
diff --git a/examples/storage_account_with_containers/README.md b/examples/storage_account_with_containers/README.md
@@ -7,7 +7,7 @@ Simple configuration to create a Azure storage account with Containers.
 ```hcl
 module "storage" {
   source  = "kumarvna/storage/azurerm"
-  version = "2.1.0"
+  version = "2.2.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,
diff --git a/examples/storage_account_with_containers/main.tf b/examples/storage_account_with_containers/main.tf
@@ -1,6 +1,6 @@
 module "storage" {
   source  = "kumarvna/storage/azurerm"
-  version = "2.1.0"
+  version = "2.2.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, 
diff --git a/examples/storage_account_with_containers/output.tf b/examples/storage_account_with_containers/output.tf
@@ -41,16 +41,19 @@ output "storage_account_primary_web_host" {
 output "storage_primary_connection_string" {
   description = "The primary connection string for the storage account."
   value       = module.storage.storage_primary_connection_string
+  sensitive   = true
 }
 
 output "storage_primary_access_key" {
   description = "The primary access key for the storage account."
   value       = module.storage.storage_primary_access_key
+  sensitive   = true
 }
 
 output "storage_secondary_access_key" {
   description = "The secondary access key for the storage account."
   value       = module.storage.storage_secondary_access_key
+  sensitive   = true
 }
 
 output "containers" {
diff --git a/examples/storage_account_with_fileshares/main.tf b/examples/storage_account_with_fileshares/main.tf
@@ -1,6 +1,6 @@
 module "storage" {
   source  = "kumarvna/storage/azurerm"
-  version = "2.1.0"
+  version = "2.2.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, 
diff --git a/examples/storage_account_with_fileshares/output.tf b/examples/storage_account_with_fileshares/output.tf
@@ -41,16 +41,19 @@ output "storage_account_primary_web_host" {
 output "storage_primary_connection_string" {
   description = "The primary connection string for the storage account."
   value       = module.storage.storage_primary_connection_string
+  sensitive   = true
 }
 
 output "storage_primary_access_key" {
   description = "The primary access key for the storage account."
   value       = module.storage.storage_primary_access_key
+  sensitive   = true
 }
 
 output "storage_secondary_access_key" {
   description = "The secondary access key for the storage account."
   value       = module.storage.storage_secondary_access_key
+  sensitive   = true
 }
 
 output "file_shares" {
diff --git a/graph.png b/graph.png
diff --git a/main.tf b/main.tf
@@ -4,9 +4,8 @@
 locals {
   account_tier             = (var.account_kind == "FileStorage" ? "Premium" : split("_", var.skuname)[0])
   account_replication_type = (local.account_tier == "Premium" ? "LRS" : split("_", var.skuname)[1])
-
-  resource_group_name = element(coalescelist(data.azurerm_resource_group.rgrp.*.name, azurerm_resource_group.rg.*.name, [""]), 0)
-  location            = element(coalescelist(data.azurerm_resource_group.rgrp.*.location, azurerm_resource_group.rg.*.location, [""]), 0)
+  resource_group_name      = element(coalescelist(data.azurerm_resource_group.rgrp.*.name, azurerm_resource_group.rg.*.name, [""]), 0)
+  location                 = element(coalescelist(data.azurerm_resource_group.rgrp.*.location, azurerm_resource_group.rg.*.location, [""]), 0)
 }
 
 #---------------------------------------------------------
@@ -34,15 +33,16 @@ resource "random_string" "unique" {
 }
 
 resource "azurerm_storage_account" "storeacc" {
-  name                      = substr("format("sta%s%s", lower(replace(var.storage_account_name, "/[[:^alnum:]]/", "")), random_string.unique.result)", 0, 24)
+  name                      = substr(format("sta%s%s", lower(replace(var.storage_account_name, "/[[:^alnum:]]/", "")), random_string.unique.result), 0, 24)
   resource_group_name       = local.resource_group_name
   location                  = local.location
   account_kind              = var.account_kind
   account_tier              = local.account_tier
   account_replication_type  = local.account_replication_type
   enable_https_traffic_only = true
+  min_tls_version           = var.min_tls_version
   allow_blob_public_access  = var.enable_advanced_threat_protection == true ? true : false
-  tags                      = merge({ "ResourceName" = format("sta%s%s", lower(replace(var.storage_account_name, "/[[:^alnum:]]/", "")), random_string.unique.result) }, var.tags, )
+  tags                      = merge({ "ResourceName" = substr(format("sta%s%s", lower(replace(var.storage_account_name, "/[[:^alnum:]]/", "")), random_string.unique.result), 0, 24) }, var.tags, )
 
   identity {
     type = var.assign_identity ? "SystemAssigned" : null
diff --git a/output.tf b/output.tf
@@ -39,13 +39,13 @@ output "storage_account_primary_web_host" {
 }
 
 output "storage_primary_connection_string" {
-  description = "The primary connection string for the storage account."
+  description = "The primary connection string for the storage account"
   value       = azurerm_storage_account.storeacc.primary_connection_string
   sensitive   = true
 }
 
 output "storage_primary_access_key" {
-  description = "The primary access key for the storage account."
+  description = "The primary access key for the storage account"
   value       = azurerm_storage_account.storeacc.primary_access_key
   sensitive   = true
 }
diff --git a/variables.tf b/variables.tf
@@ -33,6 +33,11 @@ variable "access_tier" {
   default     = "Hot"
 }
 
+variable "min_tls_version" {
+  description = "The minimum supported TLS version for the storage account"
+  default     = "TLS1_2"
+}
+
 variable "assign_identity" {
   description = "Set to `true` to enable system-assigned managed identity, or `false` to disable it."
   default     = true
diff --git a/versions.tf b/versions.tf
@@ -2,10 +2,11 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = ">= 2.27.0"
+      version = ">= 2.59.0"
     }
     random = {
-      source = "hashicorp/random"
+      source  = "hashicorp/random"
+      version = ">= 3.1.0"
     }
   }
   required_version = ">= 0.13"

Original file line number	Diff line number	Diff line change
`@@ -41,16 +41,19 @@ output "storage_account_primary_web_host" {`
`41`	`41`	`output "storage_primary_connection_string" {`
`42`	`42`	`description = "The primary connection string for the storage account."`
`43`	`43`	`value = module.storage.storage_primary_connection_string`
	`44`	`+ sensitive = true`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`output "storage_primary_access_key" {`
`47`	`48`	`description = "The primary access key for the storage account."`
`48`	`49`	`value = module.storage.storage_primary_access_key`
	`50`	`+ sensitive = true`
`49`	`51`	`}`
`50`	`52`
`51`	`53`	`output "storage_secondary_access_key" {`
`52`	`54`	`description = "The secondary access key for the storage account."`
`53`	`55`	`value = module.storage.storage_secondary_access_key`
	`56`	`+ sensitive = true`
`54`	`57`	`}`
`55`	`58`
`56`	`59`	`output "containers" {`