retooled for existing log group II

Author: JamesW1-NHS

terraform/modules/api_gateway/logs.tf

@@ -54,7 +54,7 @@ resource "aws_iam_role_policy" "cloudwatch" {
 EOF
 }
 
-resource "aws_iam_role_policy_attachment" "cwlogs_apigateway_policy" {
+resource "aws_iam_role_policy_attachment" "api_logs_apigateway_policy" {
   role       = aws_iam_role.api_cloudwatch.name
   policy_arn = "arn:aws:iam::aws:policy/service-role/AmazonAPIGatewayPushToCloudWatchLogs"
 }
@@ -63,8 +63,8 @@ resource "aws_iam_role_policy_attachment" "cwlogs_apigateway_policy" {
 # e.g.
 #   "logs.${data.aws_region.current.region}.amazonaws.com"
 
-resource "aws_iam_role" "cwlogs_subscription_role" {
-  name = "${local.short_prefix}-cwlogs-subscription-role"
+resource "aws_iam_role" "api_logs_subscription_role" {
+  name = "${var.short_prefix}-api-logs-subscription-role"
   assume_role_policy = jsonencode({
     Version = "2012-10-17",
     Statement = [{
@@ -78,10 +78,10 @@ resource "aws_iam_role" "cwlogs_subscription_role" {
   })
 }
 
-resource "aws_cloudwatch_log_subscription_filter" "cwlogs_subscription_logfilter" {
-  name            = "${local.short_prefix}-cwlogs-subscription-logfilter"
+resource "aws_cloudwatch_log_subscription_filter" "api_logs_subscription_logfilter" {
+  name            = "${local.short_prefix}-api-logs-subscription-logfilter"
   log_group_name  = aws_cloudwatch_log_group.api_access_log.name
   filter_pattern  = ""
   destination_arn = "arn:aws:logs:eu-west-2:693466633220:destination:api_gateway_log_destination"
-  role_arn        = aws_iam_role.cwlogs_subscription_role.arn
+  role_arn        = aws_iam_role.api_logs_subscription_role.arn
 }