Removed custom event bus

Author: seanturner026

README.md

@@ -105,8 +105,6 @@ $ saw watch /aws/lambda/events_debug_logger_ec2 --expand
 |------|-------------|
 | cloudwatch\_log\_group\_arn | ARN of cloudwatch log group which holds service-specific log events. |
 | cloudwatch\_log\_group\_name | Name of cloudwatch log group which holds service-specific log events. |
-| event\_bus\_arn | ARN of the event bridge eventbus. |
-| event\_bus\_name | Name of the event bridge eventbus. |
 | event\_rule\_arn | ARN of the event bridge rule. |
 | event\_rule\_id | ID of the event bridge rule. |
 | event\_rule\_name | Name of the event bridge rule. |

go.mod

@@ -5,6 +5,7 @@ go 1.16
 require (
 	github.com/aws/aws-lambda-go v1.23.0
 	github.com/aws/aws-sdk-go v1.27.1
+	github.com/aws/aws-sdk-go-v2 v1.3.2
 	github.com/aws/aws-sdk-go-v2/config v1.1.6
 	github.com/aws/aws-sdk-go-v2/service/eventbridge v1.3.1
 	github.com/gruntwork-io/terratest v0.33.0

go.sum

@@ -251,7 +251,6 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt
 github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a h1:zPPuIq2jAWWPTrGt70eK/BSch+gFAGrNzecsoENgu2o=
 github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a/go.mod h1:yL958EeXv8Ylng6IfnvG4oflryUi3vgA3xPs9hmII1s=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
 github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
 github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
 github.com/joefitzgerald/rainbow-reporter v0.1.0/go.mod h1:481CNgqmVHQZzdIbN52CupLJyoVwB10FQ/IQlF1pdL8=

lambdas/cmd/events_debug_logger/main.go renamed to lambdas/cmd/events_logger/main.go

@@ -2,7 +2,7 @@ locals {
   service_name = replace(var.service_name, "-", "_")
 
   lambdas = {
-    events_debug_logger = {
+    events_logger = {
       description = "Logs eventbridge events for ${var.service_name}."
       timeout     = 10
     }

locals.tf

@@ -1,21 +1,11 @@
 output "cloudwatch_log_group_arn" {
   description = "ARN of cloudwatch log group which holds service-specific log events."
-  value       = aws_cloudwatch_log_group.this["events_debug_logger"].arn
+  value       = aws_cloudwatch_log_group.this["events_logger"].arn
 }
 
 output "cloudwatch_log_group_name" {
   description = "Name of cloudwatch log group which holds service-specific log events."
-  value       = aws_cloudwatch_log_group.this["events_debug_logger"].name
-}
-
-output "event_bus_arn" {
-  description = "ARN of the event bridge eventbus."
-  value       = aws_cloudwatch_event_bus.this.arn
-}
-
-output "event_bus_name" {
-  description = "Name of the event bridge eventbus."
-  value       = aws_cloudwatch_event_bus.this.name
+  value       = aws_cloudwatch_log_group.this["events_logger"].name
 }
 
 output "event_rule_arn" {

outputs.tf

@@ -6,27 +6,16 @@ resource "aws_cloudwatch_log_group" "this" {
   tags              = var.tags
 }
 
-resource "aws_cloudwatch_event_bus" "this" {
-  name = "${var.name}_${local.service_name}"
-  tags = var.tags
-}
-
 resource "aws_cloudwatch_event_rule" "this" {
-  name           = "${var.name}_${local.service_name}_star_rule"
-  description    = "Capture all ${var.service_name} events"
-  event_bus_name = aws_cloudwatch_event_bus.this.name
-
-  event_pattern = jsonencode({
-    "source" : ["aws.${var.service_name}"],
-  })
-
-  tags = var.tags
+  name          = "${var.name}_${local.service_name}_star_rule"
+  description   = "Capture all ${var.service_name} events"
+  event_pattern = jsonencode({ "source" : ["aws.${var.service_name}"] })
+  tags          = var.tags
 }
 
 resource "aws_cloudwatch_event_target" "this" {
-  event_bus_name = aws_cloudwatch_event_bus.this.id
-  arn            = aws_lambda_function.this["events_debug_logger"].arn
-  rule           = aws_cloudwatch_event_rule.this.name
+  arn  = aws_lambda_function.this["events_logger"].arn
+  rule = aws_cloudwatch_event_rule.this.id
 
   retry_policy {
     maximum_event_age_in_seconds = 300

r_cloudwatch.tf

@@ -36,7 +36,7 @@ resource "aws_lambda_function" "this" {
 resource "aws_lambda_permission" "this" {
   action        = "lambda:InvokeFunction"
   statement_id  = "AllowExecutionFromEvents-${join("", [for word in split("_", local.service_name) : title(word)])}"
-  function_name = aws_lambda_function.this["events_debug_logger"].function_name
+  function_name = aws_lambda_function.this["events_logger"].function_name
   principal     = "events.amazonaws.com"
   source_arn    = aws_cloudwatch_event_rule.this.arn
 }

r_lambda.tf

@@ -7,10 +7,10 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/config"
 	"github.com/aws/aws-sdk-go-v2/service/eventbridge"
 	"github.com/aws/aws-sdk-go-v2/service/eventbridge/types"
-	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/gruntwork-io/terratest/modules/random"
 	"github.com/gruntwork-io/terratest/modules/terraform"
@@ -19,6 +19,7 @@ import (
 
 func TestCompleteInvocation(t *testing.T) {
 	t.Parallel()
+	name := "events_logger"
 	uniqueID := strings.ToLower(random.UniqueId())
 	serviceName := "ecs"
 
@@ -40,8 +41,7 @@ func TestCompleteInvocation(t *testing.T) {
 
 	client := eventbridge.NewFromConfig(cfg)
 	input := &eventbridge.DescribeRuleInput{
-		Name:         aws.String(fmt.Sprintf("_%s_%s_star_rule", uniqueID, serviceName)),
-		EventBusName: aws.String(fmt.Sprintf("_%s_%s", uniqueID, serviceName)),
+		Name: aws.String(fmt.Sprintf("_%s_%s_star_rule", uniqueID, serviceName)),
 	}
 
 	response, err := client.DescribeRule(context.TODO(), input)
@@ -53,7 +53,7 @@ func TestCompleteInvocation(t *testing.T) {
 		}
 	}
 
-	expectedSawCommand := fmt.Sprintf("saw watch /aws/lambda/events_debug_logger_%s --expand", serviceName)
+	expectedSawCommand := fmt.Sprintf("saw watch /aws/lambda/%s_%s --expand", name, serviceName)
 	sawCommand := terraform.Output(t, options, "saw_command")
 
 	assert.Equal(t, expectedSawCommand, sawCommand)