Merge pull request #10 from jannekeskitalo/fix_conditional_type_error

unfunco · web-flow · commit 74de1ddb5f69 · 2022-04-28T12:58:43.000+01:00
Changed local.oidc_provider to local.oidc_provider_arn
diff --git a/data.tf b/data.tf
@@ -28,7 +28,7 @@ data "aws_iam_policy_document" "assume_role" {
     }
 
     principals {
-      identifiers = [local.oidc_provider.arn]
+      identifiers = [local.oidc_provider_arn]
       type        = "Federated"
     }
   }
diff --git a/main.tf b/main.tf
@@ -14,7 +14,7 @@
 
 locals {
   github_organizations = [for repo in var.github_repositories : split("/", repo)[0]]
-  oidc_provider        = var.create_oidc_provider ? aws_iam_openid_connect_provider.github[0] : data.aws_iam_openid_connect_provider.github[0]
+  oidc_provider_arn    = var.create_oidc_provider ? aws_iam_openid_connect_provider.github[0].arn : data.aws_iam_openid_connect_provider.github[0].arn
   partition            = data.aws_partition.current.partition
 }
 

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ data "aws_iam_policy_document" "assume_role" {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`principals {`
`31`		`- identifiers = [local.oidc_provider.arn]`
	`31`	`+ identifiers = [local.oidc_provider_arn]`
`32`	`32`	`type = "Federated"`
`33`	`33`	`}`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`
`15`	`15`	`locals {`
`16`	`16`	`github_organizations = [for repo in var.github_repositories : split("/", repo)[0]]`
`17`		`- oidc_provider = var.create_oidc_provider ? aws_iam_openid_connect_provider.github[0] : data.aws_iam_openid_connect_provider.github[0]`
	`17`	`+ oidc_provider_arn = var.create_oidc_provider ? aws_iam_openid_connect_provider.github[0].arn : data.aws_iam_openid_connect_provider.github[0].arn`
`18`	`18`	`partition = data.aws_partition.current.partition`
`19`	`19`	`}`
`20`	`20`