From dbabac3c92d9975db7ded64b8b1862cf7fbd714c Mon Sep 17 00:00:00 2001
From: Steven B <genseb7@gmail.com>
Date: Fri, 10 Feb 2023 15:35:00 -0500
Subject: [PATCH 1/2] add var for template name (#17)

---
 .gitignore    | 2 ++
 README.md     | 1 +
 assumerole.tf | 2 +-
 variables.tf  | 7 ++++++-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 18f9c57..b948591 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@
 
 assumerole
 assumerole/*
+
+.DS_Store
diff --git a/README.md b/README.md
index 72e3e7a..9117714 100644
--- a/README.md
+++ b/README.md
@@ -135,6 +135,7 @@ No modules.
 | <a name="input_assumerole_role_external_id"></a> [assumerole\_role\_external\_id](#input\_assumerole\_role\_external\_id) | External ID to attach to role (this is required, a random ID will be generated if not specified here) | `string` | `null` | no |
 | <a name="input_assumerole_role_name"></a> [assumerole\_role\_name](#input\_assumerole\_role\_name) | Name of role to create in assumerole template | `string` | `"Terraform"` | no |
 | <a name="input_assumerole_stack_name"></a> [assumerole\_stack\_name](#input\_assumerole\_stack\_name) | Name of CloudFormation stack | `string` | `"tf-assumerole"` | no |
+| <a name="input_assumerole_template_name"></a> [assumerole\_template\_name](#input\_assumerole\_template\_name) | File name of assumerole cloudformation template | `string` | `"assumerole/tfassumerole.cfn.yml"` | no |
 | <a name="input_bucket_name"></a> [bucket\_name](#input\_bucket\_name) | Name of bucket to hold tf state | `string` | n/a | yes |
 | <a name="input_create_assumerole_template"></a> [create\_assumerole\_template](#input\_create\_assumerole\_template) | If true, create a CloudFormation template that can be run against accounts to create an assumable role | `bool` | `false` | no |
 | <a name="input_dynamo_locktable_name"></a> [dynamo\_locktable\_name](#input\_dynamo\_locktable\_name) | Name of lock table for terraform | `string` | `"tf-locktable"` | no |
diff --git a/assumerole.tf b/assumerole.tf
index 7f24d91..5dbfb16 100644
--- a/assumerole.tf
+++ b/assumerole.tf
@@ -16,7 +16,7 @@ resource "local_file" "assumerole_addrole" {
 resource "local_sensitive_file" "assumerole_tfassumerole" {
   count = var.create_assumerole_template ? 1 : 0
 
-  filename = "assumerole/tfassumerole.cfn.yml"
+  filename = var.assumerole_template_name
 
   content = templatefile("${path.module}/template/tfassumerole.cfn.yml.tftpl", {
     external_id       = local.external_id
diff --git a/variables.tf b/variables.tf
index dbb9040..c2d8409 100644
--- a/variables.tf
+++ b/variables.tf
@@ -80,7 +80,6 @@ variable "create_assumerole_template" {
   type        = bool
 }
 
-
 variable "assumerole_role_name" {
   default     = "Terraform"
   description = "Name of role to create in assumerole template"
@@ -104,3 +103,9 @@ variable "assumerole_stack_name" {
   description = "Name of CloudFormation stack"
   type        = string
 }
+
+variable "assumerole_template_name" {
+  default     = "assumerole/tfassumerole.cfn.yml"
+  description = "File name of assumerole cloudformation template"
+  type        = string
+}

From 38df706257950e2ecc1d9d5d08007aeed9ac9035 Mon Sep 17 00:00:00 2001
From: Steven B <genseb7@gmail.com>
Date: Mon, 4 Mar 2024 14:06:40 -0500
Subject: [PATCH 2/2] fix addrole script name mismatch (#18)

* Update assumerole.tf

* Update addrole.sh.tftpl
---
 assumerole.tf             | 1 +
 template/addrole.sh.tftpl | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/assumerole.tf b/assumerole.tf
index 5dbfb16..9fcede2 100644
--- a/assumerole.tf
+++ b/assumerole.tf
@@ -9,6 +9,7 @@ resource "local_file" "assumerole_addrole" {
 
   content = templatefile("${path.module}/template/addrole.sh.tftpl", {
     stack_name = var.assumerole_stack_name
+    assumerole_template_name = var.assumerole_template_name
   })
 
 }
diff --git a/template/addrole.sh.tftpl b/template/addrole.sh.tftpl
index a83fc99..5838315 100644
--- a/template/addrole.sh.tftpl
+++ b/template/addrole.sh.tftpl
@@ -1 +1 @@
-aws cloudformation create-stack --capabilities CAPABILITY_NAMED_IAM --template-body file://tfassumerole.cfn.yml --stack-name ${stack_name}
+aws cloudformation create-stack --capabilities CAPABILITY_NAMED_IAM --template-body file://${assumerole_template_name} --stack-name ${stack_name}