Merge pull request #13 from kumarvna/develop

adding terraform v0.15 support
kumarvna · May 30, 2021 · eaf1955 · eaf1955
2 parents 9733018 + 541ecc9
commit eaf1955
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 20 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@
 # .tfstate files
 *.tfstate
 *.tfstate.*
+*.terraform.lock.hcl
 
 # Crash log files
 crash.log

diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ These types of resources are supported
 ```hcl
 module "static-website-cdn" {
   source  = "kumarvna/static-website-cdn/azurerm"
-  version = "2.1.0"
+  version = "2.2.0"
 
   # Resource Group, location, and Storage account details
   create_resource_group = true
@@ -39,6 +39,7 @@ module "static-website-cdn" {
 
   # Custom domain for CDN endpoint
   custom_domain_name = "web.example.com"
+  friendly_name      = "mywebapp"
   
   # Adding TAG's to your Azure resources (Required)
   tags = {
@@ -101,7 +102,7 @@ End Date of the Project|Date when this application, workload, or service is plan
 ```hcl
 module "static-website-cdn" {
   source  = "kumarvna/static-website-cdn/azurerm"
-  version = "2.1.0"
+  version = "2.2.0"
 
   # ... omitted
 
@@ -121,13 +122,13 @@ module "static-website-cdn" {
 | Name | Version |
 |------|---------|
 | terraform | >= 0.13 |
-| azurerm | ~> 2.27.0 |
+| azurerm | >= 2.59.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| azurerm | ~> 2.27.0 |
+| azurerm | >= 2.59.0 |
 | null | n/a |
 | random | n/a |
 
@@ -137,7 +138,7 @@ module "static-website-cdn" {
 |------|-------------|------|---------|:--------:|
 | access\_tier | The access tier of the storage account. | `string` | `"Hot"` | no |
 | account\_kind | The kind of storage account. | `string` | `"StorageV2"` | no |
-| allowed\_headers | A list of headers that are allowed to be a part of the cross-origin request. | `list(string)` | `[]` | no |
+| allowed\_headers | A list of headers that are allowed to be a part of the cross-origin request. | `list(string)` | `["*"]` | no |
 | allowed\_methods | A list of http headers that are allowed to be executed by the origin. Valid options are `DELETE`, `GET`, `HEAD`, `MERGE`, `POST`, `OPTIONS`, `PUT` or `PATCH`. | `list(string)` | <pre>[<br>  "GET",<br>  "HEAD"<br>]</pre> | no |
 | allowed\_origins | A list of origin domains that will be allowed by CORS. | `list(string)` | <pre>[<br>  "*"<br>]</pre> | no |
 | assign\_identity | Specifies the identity type of the Storage Account. At this time the only allowed value is SystemAssigned. | `bool` | `true` | no |
@@ -150,7 +151,7 @@ module "static-website-cdn" {
 | enable\_cdn\_profile | Controls the creation of CDN profile and endpoint for static website. Possible values are `true` or `false` | `bool` | `false` | no |
 | enable\_https\_traffic | Configure the storage account to accept requests from secure connections only. Possible values are `true` or `false` | `bool` | `true` | no |
 | enable\_static\_website | Controls if static website to be enabled on the storage account. Possible values are `true` or `false` | `bool` | `true` | no |
-| exposed\_headers | A list of response headers that are exposed to CORS clients. | `list(string)` | `[]` | no |
+| exposed\_headers | A list of response headers that are exposed to CORS clients. | `list(string)` | `["*"]` | no |
 | friendly\_name | The friendly name of your custom domain in the Azure Portal | `string` | n/a | yes |
 | index\_path | path from your repo root to index.html | `string` | `"index.html"` | no |
 | location | The location of the resource group in which resources are created | `string` | `""` | no |
@@ -181,7 +182,7 @@ module "static-website-cdn" {
 
 ## Authors
 
-Module is maintained by [Kumaraswamy Vithanala](mailto:[email protected]) with the help from other awesome contributors.
+Originally created by [Kumaraswamy Vithanala](mailto:[email protected]) and maintained with the help from [icornett](https://github.com/icornett)
 
 ## Other resources
 

diff --git a/examples/README.md b/examples/README.md
@@ -11,7 +11,7 @@ Following example to create a storage account with static website.
 ```hcl
 module "static-website-cdn" {
   source  = "kumarvna/static-website-cdn/azurerm"
-  version = "2.1.0"
+  version = "2.2.0"
 
   # Resource Group, location, and Storage account details
   resource_group_name  = "rg-demo-westeurope-01"
@@ -40,7 +40,7 @@ Following example to create a storage account, static website with CDN endpoint.
 ```hcl
 module "static-website-cdn" {
   source  = "kumarvna/static-website-cdn/azurerm"
-  version = "2.1.0"
+  version = "2.2.0"
 
   # Resource Group, location, and Storage account details
   create_resource_group = true
@@ -61,6 +61,7 @@ module "static-website-cdn" {
 
   # Custom domain for CDN endpoint
   custom_domain_name = "web.example.com"
+  friendly_name      = "mywebapp"
 
   # Adding TAG's to your Azure resources (Required)
   tags = {

diff --git a/examples/complete/README.md b/examples/complete/README.md
@@ -7,7 +7,7 @@ Configuration in this directory creates Azure storage account and enable the sta
 ```hcl
 module "static-website-cdn" {
   source  = "kumarvna/static-website-cdn/azurerm"
-  version = "2.1.0"
+  version = "2.2.0"
 
   # Resource Group, location, and Storage account details
   create_resource_group = true
@@ -28,6 +28,7 @@ module "static-website-cdn" {
 
   # Custom domain for CDN endpoint
   custom_domain_name = "web.example.com"
+  friendly_name      = "mywebapp"
 
   # Adding TAG's to your Azure resources (Required)
   tags = {

diff --git a/examples/complete/main.tf b/examples/complete/main.tf
@@ -1,12 +1,13 @@
 module "static-website-cdn" {
   source  = "kumarvna/static-website-cdn/azurerm"
-  version = "2.1.0"
+  version = "2.2.0"
+
 
   # Resource Group, location, and Storage account details
   create_resource_group = true
   resource_group_name   = "rg-demo-westeurope-01"
   location              = "westeurope"
-  storage_account_name  = "storageaccwesteupore01"
+  storage_account_name  = "demostoraccwesteupore01"
 
   # Static Website createion set to true by default
   # account_kind should set to StorageV2 or BlockBlobStorage
@@ -21,6 +22,7 @@ module "static-website-cdn" {
 
   # Custom domain for CDN endpoint
   custom_domain_name = "web.example.com"
+  friendly_name      = "mywebapp"
 
   # Adding TAG's to your Azure resources (Required)
   tags = {

diff --git a/examples/simple/README.md b/examples/simple/README.md
@@ -7,7 +7,7 @@ Configuration in this directory creates Azure storage account and enable the sta
 ```hcl
 module "static-website-cdn" {
   source  = "kumarvna/static-website-cdn/azurerm"
-  version = "2.1.0"
+  version = "2.2.0"
 
   # Resource Group, location, and Storage account details
   resource_group_name  = "rg-demo-westeurope-01"

diff --git a/examples/simple/main.tf b/examples/simple/main.tf
@@ -1,6 +1,6 @@
 module "static-website-cdn" {
   source  = "kumarvna/static-website-cdn/azurerm"
-  version = "2.1.0"
+  version = "2.2.0"
 
   # Resource Group, location, and Storage account details
   resource_group_name  = "rg-demo-westeurope-01"

diff --git a/graph.png b/graph.png
diff --git a/main.tf b/main.tf
@@ -29,6 +29,7 @@ resource "azurerm_storage_account" "storeacc" {
   account_tier              = local.account_tier
   account_replication_type  = local.account_replication_type
   enable_https_traffic_only = var.enable_https_traffic
+  min_tls_version           = var.min_tls_version
   tags                      = merge({ "Name" = format("%s", var.storage_account_name) }, var.tags, )
 
   dynamic "static_website" {

diff --git a/variables.tf b/variables.tf
@@ -38,6 +38,11 @@ variable "enable_https_traffic" {
   default     = true
 }
 
+variable "min_tls_version" {
+  description = "The minimum supported TLS version for the storage account"
+  default     = "TLS1_2"
+}
+
 variable "enable_static_website" {
   description = "Controls if static website to be enabled on the storage account. Possible values are `true` or `false`"
   default     = true
@@ -107,13 +112,13 @@ variable "allowed_origins" {
 variable "allowed_headers" {
   type        = list(string)
   description = "A list of headers that are allowed to be a part of the cross-origin request."
-  default     = []
+  default     = ["*"]
 }
 
 variable "exposed_headers" {
   type        = list(string)
   description = "A list of response headers that are exposed to CORS clients."
-  default     = []
+  default     = ["*"]
 }
 
 variable "max_age_in_seconds" {

diff --git a/versions.tf b/versions.tf
@@ -2,14 +2,14 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 2.27.0"
-    }
-    null = {
-      source = "hashicorp/null"
+      version = ">= 2.59.0"
     }
     random = {
       source = "hashicorp/random"
     }
+    null = {
+      source = "hashicorp/null"
+    }
   }
   required_version = ">= 0.13"
 }