feat: addindg the ability to pass into the monitor specification

Author: gambol99

.terraform.lock.hcl

@@ -0,0 +1,69 @@
+plugin "aws" {
+  enabled = true
+  version = "0.32.0"
+  source  = "github.com/terraform-linters/tflint-ruleset-aws"
+}
+
+plugin "terraform" {
+  enabled = true
+  version = "0.7.0"
+  source  = "github.com/terraform-linters/tflint-ruleset-terraform"
+}
+
+config {
+  call_module_type = "local"
+  force            = false
+}
+
+rule "terraform_required_providers" {
+  enabled = true
+}
+
+rule "terraform_required_version" {
+  enabled = true
+}
+
+rule "terraform_naming_convention" {
+  enabled = true
+  format  = "snake_case"
+}
+
+rule "terraform_typed_variables" {
+  enabled = true
+}
+
+rule "terraform_unused_declarations" {
+  enabled = true
+}
+
+rule "terraform_comment_syntax" {
+  enabled = true
+}
+
+rule "terraform_deprecated_index" {
+  enabled = true
+}
+
+rule "terraform_deprecated_interpolation" {
+  enabled = true
+}
+
+rule "terraform_documented_outputs" {
+  enabled = true
+}
+
+rule "terraform_documented_variables" {
+  enabled = true
+}
+
+rule "terraform_module_pinned_source" {
+  enabled = true
+}
+
+rule "terraform_standard_module_structure" {
+  enabled = true
+}
+
+rule "terraform_workspace_remote" {
+  enabled = true
+}

.tflint.hcl

@@ -0,0 +1,4 @@
+AVD-DS-0002 # (Dockerfile) Least Privilege User (HIGH) - https://avd.aquasec.com/misconfig/dockerfile/general/avd-ds-0002/
+AVD-DS-0013 # (Dockerfile) Use Workdir Over Cd (MEDIUM) - https://avd.aquasec.com/misconfig/dockerfile/general/avd-ds-0013/
+AVD-DS-0015 # (Dockerfile) Use COPY instead of ADD (MEDIUM) - https://avd.aquasec.com/misconfig/dockerfile/general/avd-ds-0015/
+AVD-DS-0026 # (Dockerfile) Add HEALTHCHECK instruction in your Dockerfile (LOW) - https://avd.aquasec.com/misconfig/dockerfile/general/avd-ds-0013/

.trivyignore

@@ -1,6 +1,4 @@
 #
-# Copyright (C) 2024  Appvia Ltd <[email protected]>
-#  
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
@@ -14,15 +12,23 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-AUTHOR_EMAIL[email protected]
-
-.PHONY: all security lint format documentation documentation-examples validate-all validate validate-examples init
+.PHONY: all security lint format documentation documentation-examples validate-all validate validate-examples init examples tests
 
 default: all
 
 all: 
 	$(MAKE) init
 	$(MAKE) validate
+	$(MAKE) tests
+	$(MAKE) lint
+	$(MAKE) security
+	$(MAKE) format
+	$(MAKE) documentation
+
+examples:
+	$(MAKE) validate-examples
+	$(MAKE) tests
+	$(MAKE) lint-examples
 	$(MAKE) lint
 	$(MAKE) security
 	$(MAKE) format
@@ -52,7 +58,7 @@ init:
 
 security: 
 	@echo "--> Running Security checks"
-	@tfsec .
+	@trivy config .
 	$(MAKE) security-modules
 	$(MAKE) security-examples
 
@@ -61,7 +67,7 @@ security-modules:
 	@if [ -d modules ]; then \
 		find modules -type d -mindepth 1 -maxdepth 1 | while read -r dir; do \
 			echo "--> Validating $$dir"; \
-			tfsec $$dir; \
+			trivy config  --format table --exit-code  1 --severity  CRITICAL,HIGH --ignorefile .trivyignore $$dir; \
 		done; \
 	fi
 
@@ -70,10 +76,14 @@ security-examples:
 	@if [ -d examples ]; then \
 		find examples -type d -mindepth 1 -maxdepth 1 | while read -r dir; do \
 			echo "--> Validating $$dir"; \
-			tfsec $$dir; \
+			trivy config  --format table --exit-code  1 --severity  CRITICAL,HIGH --ignorefile .trivyignore $$dir; \
 		done; \
 	fi
 
+tests: 
+	@echo "--> Running Terraform Tests" 
+	@terraform test
+
 validate:
 	@echo "--> Running terraform validate"
 	@terraform init -backend=false
@@ -138,7 +148,3 @@ clean:
 		echo "--> Removing $$dir"; \
 		rm -rf $$dir; \
 	done
-	@find . -type d -name "builds" | while read -r dir; do \
-		echo "--> Removing $$dir"; \
-		rm -rf $$dir; \
-	done

Makefile

@@ -49,13 +49,13 @@ The `terraform-docs` utility is used to generate this README. Follow the below s
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.49.0 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.52.0 |
 
 ## Modules
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_notifications"></a> [notifications](#module\_notifications) | appvia/notifications/aws | 0.1.4 |
+| <a name="module_notifications"></a> [notifications](#module\_notifications) | appvia/notifications/aws | 0.1.7 |
 
 ## Resources
 

README.md

@@ -3,7 +3,7 @@
 module "notifications" {
   count   = var.enable_notification_creation ? 1 : 0
   source  = "appvia/notifications/aws"
-  version = "0.1.4"
+  version = "0.1.7"
 
   allowed_aws_services = ["budgets.amazonaws.com", "lambda.amazonaws.com"]
   create_sns_topic     = local.enable_sns_topic_creation
@@ -17,10 +17,11 @@ module "notifications" {
 resource "aws_ce_anomaly_monitor" "this" {
   for_each = { for x in var.monitors : x.name => x }
 
-  name              = each.value.name
-  monitor_type      = each.value.monitor_type
-  monitor_dimension = each.value.monitor_dimension
-  tags              = var.tags
+  name                  = each.value.name
+  monitor_type          = each.value.monitor_type
+  monitor_dimension     = each.value.monitor_dimension
+  monitor_specification = try(each.value.monitor_specification, null)
+  tags                  = var.tags
 }
 
 ## Provision the subscriptions to the anomaly detection monitors