Merge pull request #15 from rackspace-infrastructure-automation/aws_p…

…rovider_update Update AWS provider version
rackspace-infrastructure-automation · Apr 14, 2020 · c946d42 · c946d42
2 parents dfa2e37 + 9ac5795
commit c946d42
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 63 deletions.
diff --git a/README.md b/README.md
@@ -7,28 +7,28 @@ It will not do s3 origin, which is in another module.
 
 ```HCL
 module "s3" {
- source = "[email protected]:rackspace-infrastructure-automation/aws-terraform-s3//?ref=v0.12.0"
-
- bucket_acl                                 = "bucket-owner-full-control"
- bucket_logging                             = false
- environment                                = "Development"
- lifecycle_enabled                          = true
- name                                       = "${random_string.s3_rstring.result}-example-s3-bucket"
- noncurrent_version_expiration_days         = "425"
- noncurrent_version_transition_glacier_days = "60"
- noncurrent_version_transition_ia_days      = "30"
- object_expiration_days                     = "425"
- transition_to_glacier_days                 = "60"
- transition_to_ia_days                      = "30"
- versioning                                 = true
- website                                    = true
- website_error                              = "error.html"
- website_index                              = "index.html"
-
- tags = {
-   RightSaid = "Fred"
-   LeftSaid  = "George"
- }
+  source = "[email protected]:rackspace-infrastructure-automation/aws-terraform-s3//?ref=v0.12.0"
+
+  bucket_acl                                 = "bucket-owner-full-control"
+  bucket_logging                             = false
+  environment                                = "Development"
+  lifecycle_enabled                          = true
+  name                                       = "${random_string.s3_rstring.result}-example-s3-bucket"
+  noncurrent_version_expiration_days         = "425"
+  noncurrent_version_transition_glacier_days = "60"
+  noncurrent_version_transition_ia_days      = "30"
+  object_expiration_days                     = "425"
+  transition_to_glacier_days                 = "60"
+  transition_to_ia_days                      = "30"
+  versioning                                 = true
+  website                                    = true
+  website_error                              = "error.html"
+  website_index                              = "index.html"
+
+  tags = {
+    RightSaid = "Fred"
+    LeftSaid  = "George"
+  }
 }
 ```
 
@@ -43,15 +43,15 @@ made when upgrading from a previous release to version 0.12.0 or higher.
 
 The following module variables were updated to better meet current Rackspace style guides:
 
-- `bucket_name` -> `name`  
-- `kms_master_key_id` -> `kms_key_id`  
+- `bucket_name` -> `name`
+- `kms_master_key_id` -> `kms_key_id`
 - `bucket_tags` -> `tags`
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| aws | >= 2.0.0 |
+| aws | >= 2.7.0 |
 
 ## Inputs
 

diff --git a/examples/s3.tf b/examples/s3.tf
@@ -3,7 +3,7 @@ terraform {
 }
 
 provider "aws" {
-  version = "~> 2.0"
+  version = "~> 2.7"
   region  = "us-west-2"
 }
 

diff --git a/main.tf b/main.tf
@@ -1,60 +1,60 @@
 /**
  * # aws-terraform-s3
  *
- *This module builds a s3 bucket with varying options.
- *It will not do s3 origin, which is in another module.
+ * This module builds a s3 bucket with varying options.
+ * It will not do s3 origin, which is in another module.
  *
- *## Basic Usage
+ * ## Basic Usage
  *
- *```HCL
- *module "s3" {
- *  source = "[email protected]:rackspace-infrastructure-automation/aws-terraform-s3//?ref=v0.12.0"
+ * ```HCL
+ * module "s3" {
+ *   source = "[email protected]:rackspace-infrastructure-automation/aws-terraform-s3//?ref=v0.12.0"
  *
- *  bucket_acl                                 = "bucket-owner-full-control"
- *  bucket_logging                             = false
- *  environment                                = "Development"
- *  lifecycle_enabled                          = true
- *  name                                       = "${random_string.s3_rstring.result}-example-s3-bucket"
- *  noncurrent_version_expiration_days         = "425"
- *  noncurrent_version_transition_glacier_days = "60"
- *  noncurrent_version_transition_ia_days      = "30"
- *  object_expiration_days                     = "425"
- *  transition_to_glacier_days                 = "60"
- *  transition_to_ia_days                      = "30"
- *  versioning                                 = true
- *  website                                    = true
- *  website_error                              = "error.html"
- *  website_index                              = "index.html"
+ *   bucket_acl                                 = "bucket-owner-full-control"
+ *   bucket_logging                             = false
+ *   environment                                = "Development"
+ *   lifecycle_enabled                          = true
+ *   name                                       = "${random_string.s3_rstring.result}-example-s3-bucket"
+ *   noncurrent_version_expiration_days         = "425"
+ *   noncurrent_version_transition_glacier_days = "60"
+ *   noncurrent_version_transition_ia_days      = "30"
+ *   object_expiration_days                     = "425"
+ *   transition_to_glacier_days                 = "60"
+ *   transition_to_ia_days                      = "30"
+ *   versioning                                 = true
+ *   website                                    = true
+ *   website_error                              = "error.html"
+ *   website_index                              = "index.html"
  *
- *  tags = {
- *    RightSaid = "Fred"
- *    LeftSaid  = "George"
- *  }
- *}
- *```
+ *   tags = {
+ *     RightSaid = "Fred"
+ *     LeftSaid  = "George"
+ *   }
+ * }
+ * ```
  *
  * Full working references are available at [examples](examples)
  *
- *## Terraform 0.12 upgrade
+ * ## Terraform 0.12 upgrade
  *
- *Several changes were required while adding terraform 0.12 compatibility.  The following changes should be
- *made when upgrading from a previous release to version 0.12.0 or higher.
+ * Several changes were required while adding terraform 0.12 compatibility.  The following changes should be
+ * made when upgrading from a previous release to version 0.12.0 or higher.
  *
- *### Module variables
+ * ### Module variables
  *
- *The following module variables were updated to better meet current Rackspace style guides:
+ * The following module variables were updated to better meet current Rackspace style guides:
  *
- *- `bucket_name` -> `name`
- *- `kms_master_key_id` -> `kms_key_id`
- *- `bucket_tags` -> `tags`
+ * - `bucket_name` -> `name`
+ * - `kms_master_key_id` -> `kms_key_id`
+ * - `bucket_tags` -> `tags`
  *
  */
 
 terraform {
   required_version = ">= 0.12"
 
   required_providers {
-    aws = ">= 2.0.0"
+    aws = ">= 2.7.0"
   }
 }
 

diff --git a/tests/test1/main.tf b/tests/test1/main.tf
@@ -3,7 +3,7 @@ terraform {
 }
 
 provider "aws" {
-  version = "~> 2.0"
+  version = "~> 2.7"
   region  = "us-west-2"
 }