diff --git a/_example/.terraform.lock.hcl b/_example/.terraform.lock.hcl deleted file mode 100644 index d613953..0000000 --- a/_example/.terraform.lock.hcl +++ /dev/null @@ -1,74 +0,0 @@ -# This file is maintained automatically by "terraform init". -# Manual edits may be lost in future updates. - -provider "registry.terraform.io/hashicorp/archive" { - version = "2.2.0" - hashes = [ - "h1:CIWi5G6ob7p2wWoThRQbOB8AbmFlCzp7Ka81hR3cVp0=", - "zh:06bd875932288f235c16e2237142b493c2c2b6aba0e82e8c85068332a8d2a29e", - "zh:0c681b481372afcaefddacc7ccdf1d3bb3a0c0d4678a526bc8b02d0c331479bc", - "zh:100fc5b3fc01ea463533d7bbfb01cb7113947a969a4ec12e27f5b2be49884d6c", - "zh:55c0d7ddddbd0a46d57c51fcfa9b91f14eed081a45101dbfc7fd9d2278aa1403", - "zh:73a5dd68379119167934c48afa1101b09abad2deb436cd5c446733e705869d6b", - "zh:841fc4ac6dc3479981330974d44ad2341deada8a5ff9e3b1b4510702dfbdbed9", - "zh:91be62c9b41edb137f7f835491183628d484e9d6efa82fcb75cfa538c92791c5", - "zh:acd5f442bd88d67eb948b18dc2ed421c6c3faee62d3a12200e442bfff0aa7d8b", - "zh:ad5720da5524641ad718a565694821be5f61f68f1c3c5d2cfa24426b8e774bef", - "zh:e63f12ea938520b3f83634fc29da28d92eed5cfbc5cc8ca08281a6a9c36cca65", - "zh:f6542918faa115df46474a36aabb4c3899650bea036b5f8a5e296be6f8f25767", - ] -} - -provider "registry.terraform.io/hashicorp/aws" { - version = "3.74.0" - constraints = ">= 3.1.15, >= 3.28.0" - hashes = [ - "h1:YNOblHBUf+XTjGTfIIsAMGp4weXB+tmQrMPCrpmM1/U=", - "zh:00767509c13c0d1c7ad6af702c6942e6572aa6d529b40a00baacc0e73faafea2", - "zh:03aafdc903ad49c2eda03889f927f44212674c50e475a9c6298850381319eec2", - "zh:2de8a6a97b180f909d652f215125aa4683e99db15fcf3b28d62e3d542f875ed6", - "zh:3ac29ebc3af99028f4230a79f56606a0c2954b68767bd749b921a76eb4f3bd30", - "zh:50add2e2d118a15a644360eabc5a34cec59f2560b491f8fabf9c52ab83ca7b09", - "zh:85dd8e81910ab79f841a4a595fdd8ac358fbfe460956144afb0be3d81f91fe10", - "zh:895de83d0f0941fde31bfc53fa6b1ea276901f006bec221bbdee4771a04f3693", - "zh:a15c9724aac52d1ba5001d2d83e42843099b52b1638ea29d84e20be0f45fa4f1", - "zh:c982a64463bd73e9bff2589de214b1de0a571438d9015001f9eae45cfc3a2559", - "zh:e9ef973c18078324e43213ea1252c12b9441e566bf054ddfdbff5dd62f3035d9", - "zh:f297e705b0f339c8baa27ae70db5df9aa6578adfe1ea3d2ba8edc186512464eb", - ] -} - -provider "registry.terraform.io/hashicorp/null" { - version = "3.1.0" - hashes = [ - "h1:vpC6bgUQoJ0znqIKVFevOdq+YQw42bRq0u+H3nto8nA=", - "zh:02a1675fd8de126a00460942aaae242e65ca3380b5bb192e8773ef3da9073fd2", - "zh:53e30545ff8926a8e30ad30648991ca8b93b6fa496272cd23b26763c8ee84515", - "zh:5f9200bf708913621d0f6514179d89700e9aa3097c77dac730e8ba6e5901d521", - "zh:9ebf4d9704faba06b3ec7242c773c0fbfe12d62db7d00356d4f55385fc69bfb2", - "zh:a6576c81adc70326e4e1c999c04ad9ca37113a6e925aefab4765e5a5198efa7e", - "zh:a8a42d13346347aff6c63a37cda9b2c6aa5cc384a55b2fe6d6adfa390e609c53", - "zh:c797744d08a5307d50210e0454f91ca4d1c7621c68740441cf4579390452321d", - "zh:cecb6a304046df34c11229f20a80b24b1603960b794d68361a67c5efe58e62b8", - "zh:e1371aa1e502000d9974cfaff5be4cfa02f47b17400005a16f14d2ef30dc2a70", - "zh:fc39cc1fe71234a0b0369d5c5c7f876c71b956d23d7d6f518289737a001ba69b", - "zh:fea4227271ebf7d9e2b61b89ce2328c7262acd9fd190e1fd6d15a591abfa848e", - ] -} - -provider "registry.terraform.io/hashicorp/template" { - version = "2.2.0" - hashes = [ - "h1:94qn780bi1qjrbC3uQtjJh3Wkfwd5+tTtJHOb7KTg9w=", - "zh:01702196f0a0492ec07917db7aaa595843d8f171dc195f4c988d2ffca2a06386", - "zh:09aae3da826ba3d7df69efeb25d146a1de0d03e951d35019a0f80e4f58c89b53", - "zh:09ba83c0625b6fe0a954da6fbd0c355ac0b7f07f86c91a2a97849140fea49603", - "zh:0e3a6c8e16f17f19010accd0844187d524580d9fdb0731f675ffcf4afba03d16", - "zh:45f2c594b6f2f34ea663704cc72048b212fe7d16fb4cfd959365fa997228a776", - "zh:77ea3e5a0446784d77114b5e851c970a3dde1e08fa6de38210b8385d7605d451", - "zh:8a154388f3708e3df5a69122a23bdfaf760a523788a5081976b3d5616f7d30ae", - "zh:992843002f2db5a11e626b3fc23dc0c87ad3729b3b3cff08e32ffb3df97edbde", - "zh:ad906f4cebd3ec5e43d5cd6dc8f4c5c9cc3b33d2243c89c5fc18f97f7277b51d", - "zh:c979425ddb256511137ecd093e23283234da0154b7fa8b21c2687182d9aea8b2", - ] -} diff --git a/_example/example.tf b/_example/example.tf index 76d1198..ff9b7c6 100644 --- a/_example/example.tf +++ b/_example/example.tf @@ -9,9 +9,7 @@ module "secure_baseline" { source = "./../" environment = "test" - label_order = [ - "environment", "name" - ] + label_order = ["environment", "name"] enabled = true slack_webhook = "" diff --git a/main.tf b/main.tf index 77bb156..e9faed4 100644 --- a/main.tf +++ b/main.tf @@ -8,7 +8,7 @@ module "cloudtrail" { environment = var.environment managedby = var.managedby label_order = var.label_order - enabled = var.enabled && var.cloudtrail_enabled + enabled = var.enabled && var.cloudtrail_enabled iam_role_name = "CloudTrail-CloudWatch-Delivery-Role" iam_role_policy_name = "CloudTrail-CloudWatch-Delivery-Policy" account_type = "individual" diff --git a/modules/cloudtrail/main.tf b/modules/cloudtrail/main.tf index 4c46c87..e195c2a 100644 --- a/modules/cloudtrail/main.tf +++ b/modules/cloudtrail/main.tf @@ -25,7 +25,7 @@ module "labels" { # type specific features. module "s3_bucket" { source = "clouddrove/s3/aws" - version = "0.15.0" + version = "0.15.1" name = var.s3_bucket_name environment = var.environment @@ -44,7 +44,7 @@ module "s3_bucket" { module "s3_bucket_logging" { source = "clouddrove/s3/aws" - version = "0.15.0" + version = "0.15.1" name = format("%s-logging-bucket", var.s3_bucket_name) environment = var.environment @@ -54,7 +54,6 @@ module "s3_bucket_logging" { create_bucket = var.enabled acl = "private" sse_algorithm = "AES256" - logging = { target_bucket : module.s3_bucket.id, target_prefix = "logs" } depends_on = [module.s3_bucket] } diff --git a/modules/cloudtrail/variables.tf b/modules/cloudtrail/variables.tf index 0d8665a..e1aba19 100644 --- a/modules/cloudtrail/variables.tf +++ b/modules/cloudtrail/variables.tf @@ -105,7 +105,7 @@ variable "cloudwatch_logs_retention_in_days" { variable "iam_role_name" { type = string - default = "CloudTrail-CloudWatch-Delivery-Role" + default = "CloudTrail-CloudWatch-Delivery-Role-prakash" description = "The name of the IAM Role to be used by CloudTrail to delivery logs to CloudWatch Logs group." } diff --git a/modules/config/main.tf b/modules/config/main.tf index e786876..42a2135 100644 --- a/modules/config/main.tf +++ b/modules/config/main.tf @@ -101,7 +101,7 @@ module "sns" { # type specific features. module "s3_bucket" { source = "clouddrove/s3/aws" - version = "0.15.0" + version = "0.15.1" name = var.config_s3_bucket_name environment = var.environment diff --git a/modules/guardduty/main.tf b/modules/guardduty/main.tf index 92fa0ff..ca7380d 100644 --- a/modules/guardduty/main.tf +++ b/modules/guardduty/main.tf @@ -18,7 +18,6 @@ module "labels" { resource "aws_s3_bucket" "bucket" { count = var.enabled ? 1 : 0 bucket = var.bucket_name - acl = "private" force_destroy = true } resource "aws_guardduty_detector" "detector" { @@ -108,7 +107,7 @@ resource "aws_cloudwatch_event_rule" "default" { #Module : CLOUD WATCH EVENT TARGET #Description : Attaching event rule and lambda function to targets. resource "aws_cloudwatch_event_target" "default" { - count = var.enabled ? 1 : 0 + count = var.enabled && var.slack_enabled ? 1 : 0 rule = join("", aws_cloudwatch_event_rule.default.*.name) target_id = "Guardduty" arn = module.slack-lambda.arn # ARN of the Lambda Function, write after including lambda function