Merge pull request #2 from hyprnz/rdunn/0.12

Supports Terraform version 0.12

Author: rdunn-Hypr

README.md

@@ -27,44 +27,50 @@ This repo supports version 0.11 and 0.12 of Terraform. The implementation patter
 ## Contributions
 All contributions are accepted, details on how to contribute can be found in [contrib.md](contrib.md).
 
+## Providers
+
+| Name | Version |
+|------|---------|
+| aws | ~> 2.19 |
+
 ## Inputs
 
 | Name | Description | Type | Default | Required |
-|------|-------------|:----:|:-----:|:-----:|
-| certificate\_arn | The arn of the certificate to be used for TLS connections. The certificate must be in the same account as the cloudfront resource. | string | n/a | yes |
-| cors\_allowed\_headers | Specifies which headers are allowed. | list | n/a | yes |
-| cors\_allowed\_origins | A list of allowed CORS origins. | list | n/a | yes |
-| namespace | A namespace that is appended to the `site_name` variable. This minimises S3 bucket naming collisions. | string | n/a | yes |
-| site\_name | The name of the static website or js bundle to be hosted by the S3 bucket. This will be the bucket name prefix. | string | n/a | yes |
-| url | The url alias to access the bucket. Must match the certificate name to provide a TLS connection | string | n/a | yes |
-| cloudfront\_allowed\_methods | Controls which HTTP methods CloudFront processes and forwards to your Amazon S3 bucket or your custom origin. | list | `<list>` | no |
-| cloudfront\_cached\_methods | Controls whether CloudFront caches the response to requests using the specified HTTP methods. | list | `<list>` | no |
-| cloudfront\_tags | Additional tags to be added to all cloudfront resources | map | `<map>` | no |
-| comment | A comment for the Cloudfront distribution resource | string | `""` | no |
-| cors\_allowed\_methods | Specifies which methods are allowed. Can be GET, PUT, POST, DELETE or HEAD. Defaults to `GET`, `PUT`, `POST`. | list | `<list>` | no |
-| cors\_expose\_headers | Specifies expose header in the response. Defaults to `ETag` | list | `<list>` | no |
-| cors\_max\_age\_seconds | Specifies time in seconds that browser can cache the response for a preflight request. Defaults to 1 hour. | string | `"3600"` | no |
-| create\_custom\_route53\_record | Determines if a route53 alias record should be created that matches the `url` variable. Default is false. | string | `"false"` | no |
-| default\_ttl | The default amount of time (in seconds) that an object is in a CloudFront cache before CloudFront forwards another request in the absence of an Cache-Control max-age or Expires header. Defaults to 1 hour. | string | `"3600"` | no |
-| enable\_cdn\_compression | Select whether you want CloudFront to automatically compress content for web requests that include Accept-Encoding: gzip in the request header. CloudFront compresses files of certain types for both Amazon S3 and custom origins. Default is `true`. | string | `"true"` | no |
-| error\_document\_default | The default error html file. Defaults to `error.html`. | string | `"error.html"` | no |
-| index\_document\_default | The default html file. Defaults to `index.html`. | string | `"index.html"` | no |
-| max\_ttl | The maximum amount of time (in seconds) that an object is in a CloudFront cache before CloudFront forwards another request to your origin to determine whether the object has been updated. Only effective in the presence of Cache-Control max-age, Cache-Control s-maxage, and Expires headers. Defaults to 7 days. | string | `"604800"` | no |
-| min\_ttl | The minimum amount of time that you want objects to stay in CloudFront caches before CloudFront queries your origin to see whether the object has been updated. Defaults to 0 seconds. | string | `"0"` | no |
-| module\_tags | Additional tags that are added to all resources in this module. | map | `<map>` | no |
-| price\_class | The price class for this distribution. One of `PriceClass_All`, `PriceClass_200`, `PriceClass_100` | string | `"PriceClass_All"` | no |
-| s3\_tags | Additional tags to be added to all s3 resources | map | `<map>` | no |
-| site\_config\_values | A map of js bundle configuration values required for a specific environment. | map | `<map>` | no |
-| wait\_for\_deployment | If enabled, the resource will wait for the distribution status to change from `InProgress` to `Deployed`. Setting this to `false` will skip the process. Default: `true`. | string | `"true"` | no |
-| zone\_id | The zone id of the hosted zone to create the alias record in. Used only when `create_custom_route53_record` is set to `true`. | string | `""` | no |
+|------|-------------|------|---------|:-----:|
+| certificate\_arn | The arn of the certificate to be used for TLS connections. The certificate must be in the same account as the cloudfront resource. | `any` | n/a | yes |
+| cors\_allowed\_headers | Specifies which headers are allowed. | `list(string)` | n/a | yes |
+| cors\_allowed\_origins | A list of allowed CORS origins. | `list(string)` | n/a | yes |
+| namespace | A namespace that is appended to the `site_name` variable. This minimises S3 bucket naming collisions. | `any` | n/a | yes |
+| site\_name | The name of the static website or js bundle to be hosted by the S3 bucket. This will be the bucket name prefix. | `any` | n/a | yes |
+| url | The custom URL to access the site. Must match the certificate name to provide a valid TLS connection. | `any` | n/a | yes |
+| cloudfront\_allowed\_methods | Controls which HTTP methods CloudFront processes and forwards to your Amazon S3 bucket or your custom origin. | `list(string)` | <pre>[<br>  "GET",<br>  "HEAD",<br>  "OPTIONS"<br>]<br></pre> | no |
+| cloudfront\_cached\_methods | Controls whether CloudFront caches the response to requests using the specified HTTP methods. | `list(string)` | <pre>[<br>  "GET",<br>  "HEAD"<br>]<br></pre> | no |
+| cloudfront\_tags | Additional tags to be added to all cloudfront resources. | `map(any)` | `{}` | no |
+| comment | A comment for the Cloudfront distribution resource | `string` | `""` | no |
+| cors\_allowed\_methods | Specifies which methods are allowed. Can be GET, PUT, POST, DELETE or HEAD. Defaults to `GET`, `PUT`, `POST`. | `list(string)` | <pre>[<br>  "GET",<br>  "PUT",<br>  "POST"<br>]<br></pre> | no |
+| cors\_expose\_headers | Specifies expose header in the response. Defaults to `ETag`. | `list(string)` | <pre>[<br>  "ETag"<br>]<br></pre> | no |
+| cors\_max\_age\_seconds | Specifies time in seconds that browser can cache the response for a preflight request. Defaults to 1 hour. | `number` | `3600` | no |
+| create\_custom\_route53\_record | Determines if a route53 alias record should be created that matches the `url` variable. Default is false. | `bool` | `false` | no |
+| default\_ttl | The default amount of time (in seconds) that an object is in a CloudFront cache before CloudFront forwards another request in the absence of an Cache-Control max-age or Expires header. Defaults to 1 hour. | `number` | `3600` | no |
+| enable\_cdn\_compression | Select whether you want CloudFront to automatically compress content for web requests that include Accept-Encoding: gzip in the request header. CloudFront compresses files of certain types for both Amazon S3 and custom origins. Default is `true`. | `bool` | `true` | no |
+| error\_document\_default | The default error html file. Defaults to `error.html`. | `string` | `"error.html"` | no |
+| index\_document\_default | The default html file. Defaults to `index.html`. | `string` | `"index.html"` | no |
+| max\_ttl | The maximum amount of time (in seconds) that an object is in a CloudFront cache before CloudFront forwards another request to your origin to determine whether the object has been updated. Only effective in the presence of Cache-Control max-age, Cache-Control s-maxage, and Expires headers. Defaults to 7 days. | `number` | `604800` | no |
+| min\_ttl | The minimum amount of time that you want objects to stay in CloudFront caches before CloudFront queries your origin to see whether the object has been updated. Defaults to 0 seconds. | `number` | `0` | no |
+| module\_tags | Additional tags that are added to all resources in this module. | `map(any)` | `{}` | no |
+| price\_class | The price class for this distribution. One of `PriceClass_All`, `PriceClass_200`, `PriceClass_100`. | `string` | `"PriceClass_All"` | no |
+| s3\_tags | Additional tags to be added to all s3 resources. | `map(any)` | `{}` | no |
+| site\_config\_values | A map of js bundle configuration values required for a specific environment. | `map(any)` | `{}` | no |
+| wait\_for\_deployment | If enabled, the resource will wait for the distribution status to change from `InProgress` to `Deployed`. Setting this to `false` will skip the process. Default: `true`. | `bool` | `true` | no |
+| zone\_id | The zone id of the hosted zone to create the alias record in. Used only when `create_custom_route53_record` is set to `true`. | `string` | `""` | no |
 
 ## Outputs
 
 | Name | Description |
 |------|-------------|
 | cloudfront\_hosted\_zone | The hosted zone id of the Cloudfront Distribution |
 | cloudfront\_url | The URL for the Cloudfront Distribution - used to set the alias for the custom domain. |
-| s3\_bucket\_hosted\_id | The hosted_id s3 web site bucket. |
+| s3\_bucket\_hosted\_id | The hosted\_id s3 web site bucket. |
 | s3\_bucket\_website\_domain | The domain of the s3 web site bucket. |
 | s3\_bucket\_website\_endpoint | The endpoint of the s3 web site bucket. |
 

artifactory/README.md

@@ -4,14 +4,20 @@ This Terraform module is provided as an additional component for those wanting t
 
 This has been provided as an additional module to meet the architectural needs of a global module i.e. there will only ever be one module implementation of an artifactory, as opposed to n number of s3-static-website module implementations, where n is the number of environments. This module design also caters for cross AWS Account patterns.
 
+## Providers
+
+| Name | Version |
+|------|---------|
+| aws | ~> 2.19 |
+
 ## Inputs
 
 | Name | Description | Type | Default | Required |
-|------|-------------|:----:|:-----:|:-----:|
-| namespace | A namespace that is appended to the `site_name-artifactory.` variable. This minimises S3 bucket naming collisions. | string | n/a | yes |
-| site\_name | The name of the static website or js bundle to be hosted by the S3 bucket. This will be the bucket name prefix. | string | n/a | yes |
-| force\_destroy | Controls if all objects in a bucket should be deleted when destroying the bucket resource. If set to `false`, the bucket resource cannot be destroyed until all objects are deleted. Defaults to `true`. | string | `"true"` | no |
-| tags | A map of additional tags to add to the artifactory resource. A name tag with the value `<site_name>-artifactory.<namespace>` is added by default. | map | `<map>` | no |
+|------|-------------|------|---------|:-----:|
+| namespace | A namespace that is appended to the `site_name-artifactory.` variable. This minimises S3 bucket naming collisions. | `any` | n/a | yes |
+| site\_name | The name of the static website or js bundle to be hosted by the S3 bucket. This will be the bucket name prefix. | `any` | n/a | yes |
+| force\_destroy | Controls if all objects in a bucket should be deleted when destroying the bucket resource. If set to `false`, the bucket resource cannot be destroyed until all objects are deleted. Defaults to `true`. | `bool` | `true` | no |
+| tags | A map of additional tags to add to the artifactory resource. A name tag with the value `<site_name>-artifactory.<namespace>` is added by default. | `map(any)` | `{}` | no |
 
 ## Outputs
 

artifactory/example/main.tf

@@ -2,21 +2,21 @@ module "static_website_artifactory_example" {
   source = "../"
 
   providers = {
-    aws = "aws"
+    aws = aws
   }
 
   site_name = "bundle"
   namespace = "dev.example.com"
 }
 
 provider "aws" {
-  region = "${var.aws_region}"
+  region = var.aws_region
 }
 
 variable "aws_region" {
   default = "ap-southeast-2"
 }
 
 output "bucket_name" {
-  value = "${module.static_website_artifactory_example.bucket_name}"
+  value = module.static_website_artifactory_example.bucket_name
 }

artifactory/main.tf

@@ -1,12 +1,12 @@
 locals {
-  bucket_name = "${format("%s-%s.%s", var.site_name, "artifactory", var.namespace)}"
+  bucket_name = format("%s-%s.%s", var.site_name, "artifactory", var.namespace)
 }
 
 resource "aws_s3_bucket" "artifactory" {
-  bucket = "${local.bucket_name}"
+  bucket = local.bucket_name
   acl    = "private"
 
-  force_destroy = "${var.force_destroy}"
+  force_destroy = var.force_destroy
 
-  tags = "${merge(map("Name", local.bucket_name), var.tags)}"
+  tags = merge(map("Name", local.bucket_name), map("Site Name", var.site_name), var.tags)
 }

artifactory/outputs.tf

@@ -1,4 +1,4 @@
 output "bucket_name" {
   description = "The name of the artifactory bucket"
-  value       = "${aws_s3_bucket.artifactory.id}"
+  value       = aws_s3_bucket.artifactory.id
 }

artifactory/providers.tf

@@ -8,10 +8,12 @@ variable "namespace" {
 
 variable "force_destroy" {
   description = "Controls if all objects in a bucket should be deleted when destroying the bucket resource. If set to `false`, the bucket resource cannot be destroyed until all objects are deleted. Defaults to `true`."
+  type        = bool
   default     = true
 }
 
 variable "tags" {
   description = "A map of additional tags to add to the artifactory resource. A name tag with the value `<site_name>-artifactory.<namespace>` is added by default."
+  type        = map(any)
   default     = {}
 }

artifactory/vars.tf

@@ -1,3 +1,8 @@
 terraform {
-  required_version = "~> 0.11"
+  required_version = ">= 0.12"
+
+  required_providers {
+    aws = "~> 2.19"
+  }
+
 }

artifactory/versions.tf

@@ -1,21 +1,21 @@
 resource "aws_cloudfront_distribution" "cdn" {
   origin {
-    origin_id   = "${aws_s3_bucket.static_website.id}"
-    domain_name = "${aws_s3_bucket.static_website.bucket_domain_name}"
+    origin_id   = aws_s3_bucket.static_website.id
+    domain_name = aws_s3_bucket.static_website.bucket_domain_name
   }
 
-  aliases             = ["${var.url}"]
-  wait_for_deployment = "${var.wait_for_deployment}"
+  aliases             = [var.url]
+  wait_for_deployment = var.wait_for_deployment
 
   enabled             = true
-  comment             = "${var.comment}"
-  default_root_object = "${var.index_document_default}"
+  comment             = var.comment
+  default_root_object = var.index_document_default
 
   default_cache_behavior {
-    allowed_methods  = "${var.cloudfront_allowed_methods}"
-    cached_methods   = "${var.cloudfront_cached_methods}"
-    target_origin_id = "${aws_s3_bucket.static_website.id}"
-    compress         = "${var.enable_cdn_compression}"
+    allowed_methods  = var.cloudfront_allowed_methods
+    cached_methods   = var.cloudfront_cached_methods
+    target_origin_id = aws_s3_bucket.static_website.id
+    compress         = var.enable_cdn_compression
 
     forwarded_values {
       query_string = false
@@ -26,12 +26,12 @@ resource "aws_cloudfront_distribution" "cdn" {
     }
 
     viewer_protocol_policy = "redirect-to-https"
-    min_ttl                = "${var.min_ttl}"
-    default_ttl            = "${var.default_ttl}"
-    max_ttl                = "${var.max_ttl}"
+    min_ttl                = var.min_ttl
+    default_ttl            = var.default_ttl
+    max_ttl                = var.max_ttl
   }
 
-  price_class = "${var.price_class}"
+  price_class = var.price_class
 
   restrictions {
     geo_restriction {
@@ -42,15 +42,15 @@ resource "aws_cloudfront_distribution" "cdn" {
 
   viewer_certificate {
     # Certificates for cloudfront _must_ be created in us-east-1
-    acm_certificate_arn      = "${var.certificate_arn}"
+    acm_certificate_arn      = var.certificate_arn
     ssl_support_method       = "sni-only"
     minimum_protocol_version = "TLSv1"
   }
 
   logging_config {
-    bucket = "${aws_s3_bucket.static_website_log_bucket.bucket_domain_name}"
+    bucket = aws_s3_bucket.static_website_log_bucket.bucket_domain_name
     prefix = "cloudfront/"
   }
 
-  tags = "${merge(map("Name", format("%s-cdn", var.site_name)), map("Site Name", var.site_name), var.cloudfront_tags, var.module_tags)}"
+  tags = merge(map("Name", format("%s-cdn", var.site_name)), map("Site Name", var.site_name), var.cloudfront_tags, var.module_tags)
 }

cloudfront.tf

@@ -2,14 +2,14 @@ module "static_website_example" {
   source = "../../"
 
   providers = {
-    aws = "aws"
+    aws = aws
   }
 
   site_name = "bundle"
   namespace = "dev.example.com"
 
-  url             = "${var.url}"
-  certificate_arn = "${var.certificate_arn}"
+  url             = var.url
+  certificate_arn = var.certificate_arn
 
   site_config_values = {
     "auth_url"    = "www.google.com"
@@ -19,17 +19,17 @@ module "static_website_example" {
   cors_allowed_origins = ["*"]
   cors_allowed_headers = [""]
 
-  module_tags     = "${map("Environment", "dev")}"
-  s3_tags         = "${map("s3", "true")}"
-  cloudfront_tags = "${map("cloudfront", "true")}"
+  module_tags     = map("Environment", "dev")
+  s3_tags         = map("s3", "true")
+  cloudfront_tags = map("cloudfront", "true")
 
   wait_for_deployment = false
 
   comment = "Example static website cloudfront distribution"
 }
 
 provider "aws" {
-  region = "${var.aws_region}"
+  region = var.aws_region
 }
 
 variable "aws_region" {
@@ -41,21 +41,21 @@ variable "url" {}
 variable "certificate_arn" {}
 
 output "website_domain" {
-  value = "${module.static_website_example.s3_bucket_website_domain}"
+  value = module.static_website_example.s3_bucket_website_domain
 }
 
 output "website_endpoint" {
-  value = "${module.static_website_example.s3_bucket_website_endpoint}"
+  value = module.static_website_example.s3_bucket_website_endpoint
 }
 
 output "website_hosted_id" {
-  value = "${module.static_website_example.s3_bucket_hosted_id}"
+  value = module.static_website_example.s3_bucket_hosted_id
 }
 
 output "cloudfront_url" {
-  value = "${module.static_website_example.cloudfront_url}"
+  value = module.static_website_example.cloudfront_url
 }
 
 output "cloudfront_hosted_zone" {
-  value = "${module.static_website_example.cloudfront_hosted_zone}"
+  value = module.static_website_example.cloudfront_hosted_zone
 }