Template infra deploy #10568108317

.template-version

@@ -1 +1 @@
-c7d3f5258a122a5ba8d7afad06adb0355a6698bc
+4efd2e671a06294c376979ba92b08194f0fe7c55

infra/modules/feature-flags/logs.tf

@@ -2,46 +2,20 @@ data "aws_caller_identity" "current" {}
 data "aws_region" "current" {}
 
 resource "aws_cloudwatch_log_group" "logs" {
- name = "feature-flags/${local.evidently_project_name}"
+ # Prefix log group name with /aws/vendedlogs/ to handle situations where the resource policy
+ # that AWS automatically creates to allow Evidently to send logs to CloudWatch exceeds the
+ # 5120 character limit.
+ # see https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/AWS-logs-and-resource-policy.html#AWS-vended-logs-permissions
+ # see https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_iam-quotas.html#reference_iam-quotas-entity-length
+ #
+ # Note that manually creating resource policies is also not ideal, as there is a quote of
+ # up to 10 CloudWatch Logs resource policies per Region per account, which can't be changed.
+ # see https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/cloudwatch_limits_cwl.html
+ name = "/aws/vendedlogs/feature-flags/${local.evidently_project_name}"
 
  # checkov:skip=CKV_AWS_158:Feature flag evaluation logs are not sensitive
 
  # Conservatively retain logs for 5 years.
  # Looser requirements may allow shorter retention periods
  retention_in_days = 1827
 }
-
-# Manually create policy allowing AWS services to deliver logs to this log group
-# so that the automatically created one by AWS doesn't exceed the character limit
-# see https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/AWS-logs-and-resource-policy.html#AWS-vended-logs-permissions
-# see https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_iam-quotas.html#reference_iam-quotas-entity-length
-resource "aws_cloudwatch_log_resource_policy" "logs" {
- policy_name = "/log-delivery/feature-flags/${local.evidently_project_name}-logs"
- policy_document = data.aws_iam_policy_document.logs.json
-}
-
-data "aws_iam_policy_document" "logs" {
- statement {
- sid = "AWSLogDeliveryWrite"
- effect = "Allow"
- principals {
- type = "Service"
- identifiers = ["delivery.logs.amazonaws.com"]
- }
- actions = [
- "logs:CreateLogStream",
- "logs:PutLogEvents",
- ]
- resources = ["${aws_cloudwatch_log_group.logs.arn}:log-stream:*"]
- condition {
- test = "StringEquals"
- variable = "aws:SourceAccount"
- values = [data.aws_caller_identity.current.account_id]
- }
- condition {
- test = "ArnLike"
- variable = "aws:SourceArn"
- values = ["arn:aws:logs:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:*"]
- }
- }
-}

infra/modules/feature-flags/main.tf

@@ -10,9 +10,6 @@ resource "aws_evidently_project" "feature_flags" {
  log_group = aws_cloudwatch_log_group.logs.name
  }
  }
- # Make sure the resource policy is created first so that AWS doesn't try to
- # automatically create one
- depends_on = [aws_cloudwatch_log_resource_policy.logs]
 }
 
 resource "aws_evidently_feature" "feature_flag" {