Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion examples/vpc_config/vpc.tf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ resource "aws_internet_gateway" "gw" {
}

resource "aws_eip" "nat" {
vpc = true
domain = "vpc"
depends_on = [aws_internet_gateway.gw]
}

Expand Down
12 changes: 6 additions & 6 deletions main.tf
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
locals {
default_lambda_bucket = format("observeinc-%s", data.aws_region.current.name)
default_lambda_bucket = format("observeinc-%s", data.aws_region.current.id)
lambda_iam_role_arn = var.lambda_iam_role_arn != "" ? var.lambda_iam_role_arn : aws_iam_role.lambda[0].arn
lambda_iam_role_name = regex(".*role/(?P<role_name>.*)$", local.lambda_iam_role_arn)["role_name"]
s3_bucket = var.s3_bucket != "" ? var.s3_bucket : lookup(var.s3_regional_buckets, data.aws_region.current.name, local.default_lambda_bucket)
s3_bucket = var.s3_bucket != "" ? var.s3_bucket : lookup(var.s3_regional_buckets, data.aws_region.current.id, local.default_lambda_bucket)
s3_key = var.s3_key != "" ? var.s3_key : join("/", [var.s3_key_prefix, format("%s.zip", var.lambda_version)])
observe_token = var.kms_key != null ? aws_kms_ciphertext.token[0].ciphertext_blob : var.observe_token
goarch = lookup(
{
"amd64" : {
architectures = ["x86_64"]
handler = "bootstrap"
runtime = "provided.al2"
runtime = "provided.al2023"
}
"arm64" : {
architectures = ["arm64"]
handler = "bootstrap"
runtime = "provided.al2"
runtime = "provided.al2023"
}
},
split("/", var.lambda_version)[0],
{
architectures = null
handler = "main"
runtime = "go1.x"
handler = "bootstrap"
runtime = "provided.al2023"
},
)
}
Expand Down
1 change: 0 additions & 1 deletion modules/s3_bucket/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ module "observe_lambda_s3_subscription" {
|------|------|
| [aws_caller_identity.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/caller_identity) | data source |
| [aws_iam_policy_document.bucket](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |
| [aws_redshift_service_account.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/redshift_service_account) | data source |

## Inputs

Expand Down
10 changes: 4 additions & 6 deletions modules/s3_bucket/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ module "s3_bucket" {
tags = var.tags
}

data "aws_redshift_service_account" "this" {}

data "aws_iam_policy_document" "bucket" {
statement {
sid = "AWSCloudTrailWrite"
Expand Down Expand Up @@ -134,8 +132,8 @@ data "aws_iam_policy_document" "bucket" {
effect = "Allow"

principals {
type = "AWS"
identifiers = [data.aws_redshift_service_account.this.arn]
type = "Service"
identifiers = ["redshift.amazonaws.com"]
}

actions = [
Expand All @@ -152,8 +150,8 @@ data "aws_iam_policy_document" "bucket" {
effect = "Allow"

principals {
type = "AWS"
identifiers = [data.aws_redshift_service_account.this.arn]
type = "Service"
identifiers = ["redshift.amazonaws.com"]
}

actions = [
Expand Down
Loading