Merge pull request #9 from tomarv2/develop

Pulling refs/heads/develop into main

Author: tomarv2

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/antonbabenko/pre-commit-terraform
-    rev: v1.64.0
+    rev: v1.76.0
     hooks:
       - id: terraform_fmt
       - id: terraform_tflint
@@ -31,7 +31,7 @@ repos:
       - id: requirements-txt-fixer
 
   - repo: https://github.com/bridgecrewio/checkov.git
-    rev: '2.1.226'
+    rev: '2.1.280'
     hooks:
     - id: checkov
       verbose: true

README.md

@@ -115,10 +115,8 @@ No modules.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| <a name="input_cloudwatch_event_config"></a> [cloudwatch\_event\_config](#input\_cloudwatch\_event\_config) | Cloudwatch event configuration | `map(any)` | `{}` | no |
+| <a name="input_config"></a> [config](#input\_config) | Cloudwatch event configuration | `map(any)` | `{}` | no |
 | <a name="input_extra_tags"></a> [extra\_tags](#input\_extra\_tags) | Additional tags to associate | `map(string)` | `{}` | no |
-| <a name="input_prjid"></a> [prjid](#input\_prjid) | Name of the project/stack e.g: mystack, nifieks, demoaci. Should not be changed after running 'tf apply' | `string` | n/a | yes |
-| <a name="input_teamid"></a> [teamid](#input\_teamid) | Name of the team/group e.g. devops, dataengineering. Should not be changed after running 'tf apply' | `string` | n/a | yes |
 
 ## Outputs
 

examples/main.tf

@@ -13,7 +13,7 @@ provider "aws" {
 
 module "cloudwatch_event" {
   source = "../"
-  cloudwatch_event_config = {
+  config = {
     demo_rule = {
       service_role = "arn:aws:iam::123456789012:role/demo-role"
       target_arn   = "<lambda_role>"

examples/variables.tf

@@ -16,7 +16,7 @@ variable "region" {
   type        = string
 }
 
-variable "cloudwatch_event_config" {
+variable "config" {
   description = "Cloudwatch event configuration"
   type        = map(any)
   default     = {}

main.tf

@@ -1,16 +1,16 @@
 resource "aws_cloudwatch_event_rule" "event_rule" {
-  for_each = var.cloudwatch_event_config != null ? var.cloudwatch_event_config : {}
+  for_each = var.config != null ? var.config : {}
 
   name                = each.key
-  description         = try(each.value.description, "Terraform managed: ${var.teamid}-${var.prjid}")
+  description         = try(each.value.description, "Terraform managed")
   schedule_expression = try(each.value.schedule, "rate(1 day)")
   role_arn            = each.value.service_role
 
   tags = merge(local.shared_tags, var.extra_tags)
 }
 
 resource "aws_cloudwatch_event_target" "event_target_input_type" {
-  for_each = var.cloudwatch_event_config != null ? var.cloudwatch_event_config : {}
+  for_each = var.config != null ? var.config : {}
 
   target_id = each.key
   rule      = join("", [for rule in aws_cloudwatch_event_rule.event_rule : rule.id])

tags.tf

@@ -1,9 +1,5 @@
 locals {
   shared_tags = tomap(
-    {
-      "Name"    = "${var.teamid}-${var.prjid}",
-      "Team"    = var.teamid,
-      "Project" = var.prjid
-    }
+    {}
   )
 }

variables.tf

@@ -1,14 +1,4 @@
-variable "teamid" {
-  description = "Name of the team/group e.g. devops, dataengineering. Should not be changed after running 'tf apply'"
-  type        = string
-}
-
-variable "prjid" {
-  description = "Name of the project/stack e.g: mystack, nifieks, demoaci. Should not be changed after running 'tf apply'"
-  type        = string
-}
-
-variable "cloudwatch_event_config" {
+variable "config" {
   description = "Cloudwatch event configuration"
   type        = map(any)
   default     = {}