tfctl 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a629291d80ced92fb46ec555c3eb0023b5b28defd031e457719f76a30bf9127
-  data.tar.gz: 2be23cc36e785f7fdae92c3717a7808b070549737682ecc26b02779b9cdc6489
+  metadata.gz: 7862426153b20908c7f418711505fc0192a1ea61f5edcc5ac1aa71d69190a8a6
+  data.tar.gz: c2d6272043b02a506316143a4ad9f9f61c811609092a2642e64fb3dcfaf09472
 SHA512:
-  metadata.gz: 1a032960fc4809364bbe28cb85210713bc777b22d18c0041748c300c1e0a25fd01b4eb06bc242bfb880af10f3215c0776916ff32d80a40244d850eedaf514708
-  data.tar.gz: fb9337a42296df0fc17afe77f75cdb5a94c0d1569f94094d8b39d54e1e1b3beab1ba50976cafdebe90cacec5daac8e492ff610be2dd2f206ecbe0bb39f396e3c
+  metadata.gz: b35eb69b4a65c422e025dc02761c52947824b656d7bdd12eafe88ca214b1e11ca68b27b27edf7b0fb73002a4cdfe80e6c714b46c2957b9548ac26feb910040a5
+  data.tar.gz: 57ea113b1384c4b6ea77af357eb647fbf1362d06bb438b111dca1037479a66d3c9b5d294f1e375fae8e4fe9d53c6df3d093d6d2df40683b86bc21a795ed13a3d

data/CHANGELOG.adoc

@@ -1,5 +1,23 @@
 = Changelog
 
+== 1.6.0
+
+ * fix: pass the default AWS provider explicitly from tfctl generated configuration.
+   This fixes provider inheritance issues when using multiple providers which
+   was introduced in 1.3.0.  You may need to add a terraform block with
+   `required_provides` to your profiles if you don't have it defined already.
+   Terraform will warn about this during `init`.  Here's an example block:
+
+----
+terraform {
+  required_providers {
+    aws = {
+      source = "hashicorp/aws"
+    }
+  }
+}
+----
+
 == 1.5.0
 
  * feat: support for setting default tags at AWS provider level.  (Thanks @patrickli)

data/examples/control_tower/modules/s3-bucket/main.tf

@@ -2,3 +2,7 @@ resource aws_s3_bucket bucket {
   bucket = var.name
   acl    = "private"
 }
+
+output "arn" {
+  value = aws_s3_bucket.bucket.arn
+}

data/examples/control_tower/profiles/example-profile/main.tf

@@ -1,4 +1,11 @@
+resource "random_pet" "bucket_prefix" {
+}
+
 module "bucket" {
   source = "../../modules/s3-bucket"
-  name   = "${local.account_id}-${local.account["data"]["example_bucket_name"]}"
+  name   = "${random_pet.bucket_prefix.id}-${local.account["data"]["example_bucket_name"]}"
+}
+
+output "bucket_arn" {
+  value = module.bucket.arn
 }

data/examples/control_tower/profiles/example-profile/terraform.tf

@@ -0,0 +1,7 @@
+terraform {
+  required_providers {
+    aws = {
+      source = "hashicorp/aws"
+    }
+  }
+}

data/examples/control_tower/profiles/example-profile/variables.tf

@@ -6,7 +6,7 @@ variable "config" {
 
 locals {
   config     = jsondecode(var.config)
-  account_id = "${data.aws_caller_identity.current.account_id}"
+  account_id = data.aws_caller_identity.current.account_id
   # get account configuration from tfctl config
-  account    = [ for account in local.config["accounts"]: account if account["id"] == local.account_id ][0]
+  account = [for account in local.config["accounts"] : account if account["id"] == local.account_id][0]
 }

data/lib/tfctl/generator.rb

@@ -80,8 +80,11 @@ module Tfctl
                 profile_block = {
                     'module' => {
                         profile => {
-                            'source' => "../../../profiles/#{profile}",
-                            'config' => '${var.config}',
+                            'source'    => "../../../profiles/#{profile}",
+                            'config'    => '${var.config}',
+                            'providers' => {
+                                'aws' => 'aws',
+                            },
                         },
                     },
                 }

data/lib/tfctl/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tfctl
-    VERSION = '1.5.0'
+    VERSION = '1.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tfctl
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Andrew Wasilczuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-30 00:00:00.000000000 Z
+date: 2021-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-organizations
@@ -164,6 +164,7 @@ files:
 - examples/control_tower/modules/s3-bucket/variables.tf
 - examples/control_tower/profiles/example-profile/data.tf
 - examples/control_tower/profiles/example-profile/main.tf
+- examples/control_tower/profiles/example-profile/terraform.tf
 - examples/control_tower/profiles/example-profile/variables.tf
 - examples/control_tower/tfctl.yaml
 - lib/hash.rb