adding source role arns to trust policies

chanzuckerberg · Sep 19, 2022 · 71047a9 · 71047a9
1 parent a96bc38
commit 71047a9
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 0 deletions.
diff --git a/aws-assume-role-policy/module_test.go b/aws-assume-role-policy/module_test.go
@@ -1,6 +1,7 @@
 package test
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/chanzuckerberg/go-misc/tftest"
@@ -24,6 +25,7 @@ func TestAWSAssumeRolePolicy(t *testing.T) {
 				tftest.IAMRegion,
 				map[string]interface{}{
 					"source_account_ids": []string{curAcct},
+					"source_role_arns":   []string{fmt.Sprintf("arn:aws:iam::%s:role/okta-czi-admin", curAcct)},
 					"saml_idp_arns":      []string{"samlARN1", "samlARN2"},
 					"oidc":               oidcCfg,
 				},

diff --git a/aws-iam-role-crossacct/main.tf b/aws-iam-role-crossacct/main.tf
@@ -11,6 +11,7 @@ module "assume_role_policy" {
   source             = "../aws-assume-role-policy"
   source_account_ids = var.source_account_ids
   saml_idp_arns      = var.saml_idp_arns
+  source_role_arns   = var.source_role_arns
   oidc               = var.oidc
   env                = var.env
   owner              = var.owner

diff --git a/aws-iam-role-crossacct/module_test.go b/aws-iam-role-crossacct/module_test.go
@@ -1,6 +1,7 @@
 package test
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/chanzuckerberg/go-misc/tftest"
@@ -20,6 +21,7 @@ func TestAWSIAMRoleCrossAcct(t *testing.T) {
 				map[string]interface{}{
 					"role_name":          random.UniqueId(),
 					"source_account_ids": []string{curAcct},
+					"source_role_arns":   []string{fmt.Sprintf("arn:aws:iam::%s:role/okta-czi-admin", curAcct)},
 				},
 			)
 		},

diff --git a/aws-iam-role-crossacct/variables.tf b/aws-iam-role-crossacct/variables.tf
@@ -20,6 +20,12 @@ variable "saml_idp_arns" {
   description = "The AWS SAML IDP arns to establish a trust relationship. Ignored if empty or not provided."
 }
 
+variable "source_role_arns" {
+  type        = list(string)
+  description = "The source AWS roles to establish a trust relationship. Ignored if empty or not provided."
+  default = []
+}
+
 variable "oidc" {
   type = list(object(
     {