Skip to content
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

Jump to bottom

Fix tests #86

Merged
merged 3 commits into from
Mar 19, 2024
Merged

Fix tests #86

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
880e1b4
update vpc version in examples
joe-niland Mar 18, 2024
a4af821
formatting
joe-niland Mar 18, 2024
939bbb0
fix linting issues
joe-niland Mar 18, 2024
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
4 changes: 2 additions & 2 deletions examples/complete/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ provider "awsutils" {

module "vpc" {
source = "cloudposse/vpc/aws"
version = "0.18.1"
version = "2.1.1"

cidr_block = "172.16.0.0/16"
ipv4_primary_cidr_block = "172.16.0.0/16"

context = module.this.context
}
Expand Down
2 changes: 1 addition & 1 deletion examples/complete/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 0.13.0"
required_version = ">= 1.0.0"

required_providers {
aws = {
Expand Down
12 changes: 6 additions & 6 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ resource "aws_route53_record" "amazonses_verification_record" {
name = "_amazonses.${var.domain}"
type = "TXT"
ttl = "600"
records = [join("", aws_ses_domain_identity.ses_domain.*.verification_token)]
records = [join("", aws_ses_domain_identity.ses_domain[*].verification_token)]
}

resource "aws_ses_domain_dkim" "ses_domain_dkim" {
count = module.this.enabled ? 1 : 0

domain = join("", aws_ses_domain_identity.ses_domain.*.domain)
domain = join("", aws_ses_domain_identity.ses_domain[*].domain)
}

resource "aws_route53_record" "amazonses_dkim_record" {
Expand Down Expand Up @@ -50,7 +50,7 @@ data "aws_iam_policy_document" "ses_policy" {

statement {
actions = var.iam_permissions
resources = concat(aws_ses_domain_identity.ses_domain.*.arn, var.iam_allowed_resources)
resources = concat(aws_ses_domain_identity.ses_domain[*].arn, var.iam_allowed_resources)
}
}

Expand All @@ -67,7 +67,7 @@ resource "aws_iam_group_policy" "ses_group_policy" {
name = module.this.id
group = aws_iam_group.ses_users[0].name

policy = join("", data.aws_iam_policy_document.ses_policy.*.json)
policy = join("", data.aws_iam_policy_document.ses_policy[*].json)
}

resource "aws_iam_user_group_membership" "ses_user" {
Expand All @@ -93,9 +93,9 @@ module "ses_user" {

resource "aws_iam_user_policy" "sending_emails" {
#bridgecrew:skip=BC_AWS_IAM_16:Skipping `Ensure IAM policies are attached only to groups or roles` check because this module intentionally attaches IAM policy directly to a user.
count = local.create_user_enabled && ! local.create_group_enabled ? 1 : 0
count = local.create_user_enabled && !local.create_group_enabled ? 1 : 0

name = module.this.id
policy = join("", data.aws_iam_policy_document.ses_policy.*.json)
policy = join("", data.aws_iam_policy_document.ses_policy[*].json)
user = module.ses_user.user_name
}