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 firehose policy management #80

Closed
wants to merge 6 commits into from
Closed

Fix firehose policy management #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
93e906c
Fixing management of policies to prevent constant adding and deleteting.
Sep 4, 2023
500843b
Merge pull request #1 from badcure/fix_terafrom_policies
badcure Sep 4, 2023
5579bff
Fixing tags and policies to prevent endless updates each time Terrafo…
Sep 4, 2023
f61b523
fmt
ryantanjunming Sep 5, 2023
e797c5f
revert back to $firehose_stream usage
ryantanjunming Sep 5, 2023
245a32d
changelog
ryantanjunming Sep 5, 2023
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 modules/firehose/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
## firehose

### version / full date
* [Update/17-Aug-2023] fix duplicate IAM issue
* [Update/5-Sep-2023] fix firehose policy management
15 changes: 11 additions & 4 deletions modules/firehose/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ locals {
terraform-module = "kinesis-firehose-to-coralogix"
terraform-module-version = "v0.1.0"
managed-by = "coralogix-terraform"
custom_endpoint = var.coralogix_firehose_custom_endpoint != null ? var.coralogix_firehose_custom_endpoint : ""
custom_endpoint = var.coralogix_firehose_custom_endpoint != null ? var.coralogix_firehose_custom_endpoint : "_default_"
})

# default namings
Expand Down Expand Up @@ -137,6 +137,7 @@ resource "aws_iam_role" "firehose_to_coralogix" {
}
}


################################################################################
# Firehose Logs Stream
################################################################################
Expand Down Expand Up @@ -239,10 +240,10 @@ resource "aws_iam_role_policy_attachment" "additional_policy_attachment_2" {
# Firehose Metrics Stream
################################################################################

resource "aws_iam_role_policy" "firehose_to_coralogix_metric_policy" {
resource "aws_iam_policy" "firehose_to_coralogix_metric_policy" {
count = var.metric_enable == true ? 1 : 0
name = "${var.firehose_stream}-metrics-addon"
role = aws_iam_role.firehose_to_coralogix.id
name = "${var.firehose_stream}-metrics-policy"
tags = local.tags
policy = <<EOF
{
"Version": "2012-10-17",
Expand Down Expand Up @@ -313,6 +314,12 @@ resource "aws_iam_role_policy" "firehose_to_coralogix_metric_policy" {
EOF
}

resource "aws_iam_role_policy_attachment" "firehose_to_coralogix_metric_policy" {
count = var.metric_enable == true ? 1 : 0
policy_arn = aws_iam_policy.firehose_to_coralogix_metric_policy[count.index].arn
role = aws_iam_role.firehose_to_coralogix.name
}

data "aws_iam_policy_document" "lambda_assume_role" {
count = var.metric_enable == true ? 1 : 0
statement {
Expand Down
Loading