Skip to content

improvement: Use expose cf_signed_downloads to filter which buckets C… #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GrooveStomp merged 3 commits into from
Sep 30, 2020
Merged

improvement: Use expose cf_signed_downloads to filter which buckets C… #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4701d0a
improvement: Use expose cf_signed_downloads to filter which buckets C…
GrooveStomp Sep 29, 2020
5207e91
Use renamed var name
GrooveStomp Sep 29, 2020
25ad74e
Bump version of s3_hosting module to support new output var
GrooveStomp Sep 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion templates/terraform/modules/environment/iam.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
#
# Kubernetes admin role

locals {
non_upload_buckets = [for bucket in module.s3_hosting : bucket if !bucket.cf_signing_enabled]
}

# Create KubernetesAdmin role for aws-iam-authenticator
resource "aws_iam_role" "kubernetes_admin_role" {
name = "${var.project}-kubernetes-admin-${var.environment}"
Expand Down Expand Up @@ -81,7 +85,7 @@ data "aws_iam_policy_document" "deploy_assets_policy" {
"s3:GetBucketLocation",
]

resources = formatlist("%s/*", module.s3_hosting[*].bucket_arn)
resources = formatlist("%s/*", local.non_upload_buckets[*].bucket_arn)
}

statement {
Expand Down
2 changes: 1 addition & 1 deletion templates/terraform/modules/environment/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ module "assets_domains" {

module "s3_hosting" {
source = "commitdev/zero/aws//modules/s3_hosting"
version = "0.1.0"
version = "0.1.4"
count = length(var.hosted_domains)

cf_signed_downloads = var.hosted_domains[count.index].signed_urls
Expand Down