-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #16 from clouddrove/feature/updated_cloudtrail
[feature/updated_cloudtrail]Fix : cloudtrail IAM policy and s3 bucket policy, update the variables.
- Loading branch information
Showing
5 changed files
with
166 additions
and
95 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,83 +1,122 @@ | ||
| provider "aws" { | ||
| region = "eu-west-1" | ||
| region = "us-east-1" | ||
| } | ||
|
|
||
| data "aws_caller_identity" "current" {} | ||
| data "aws_region" "current" {} | ||
|
|
||
| module "cloudtrail" { | ||
| source = "./../../" | ||
|
|
||
| name = "trails" | ||
| environment = "test" | ||
| label_order = ["environment", "name"] | ||
|
|
||
| enabled = true | ||
| iam_role_name = "CloudTrail-CloudWatch-Delivery-Role" | ||
| iam_role_policy_name = "CloudTrail-CloudWatch-Delivery-Policy" | ||
| account_type = "master" | ||
| key_deletion_window_in_days = 10 | ||
| cloudwatch_logs_retention_in_days = 365 | ||
| cloudwatch_logs_group_name = "cloudtrail-log-group" | ||
| EVENT_IGNORE_LIST = jsonencode(["^Describe*", "^Assume*", "^List*", "^Get*", "^Decrypt*", "^Lookup*", "^BatchGet*", "^CreateLogStream$", "^RenewRole$", "^REST.GET.OBJECT_LOCK_CONFIGURATION$", "TestEventPattern", "TestScheduleExpression", "CreateNetworkInterface", "ValidateTemplate"]) | ||
| EVENT_ALERT_LIST = jsonencode(["DetachRolePolicy", "ConsoleLogin"]) | ||
| USER_IGNORE_LIST = jsonencode(["^awslambda_*", "^aws-batch$", "^bamboo*", "^i-*", "^[0-9]*$", "^ecs-service-scheduler$", "^AutoScaling$", "^AWSCloudFormation$", "^CloudTrailBot$", "^SLRManagement$"]) | ||
| SOURCE_LIST = jsonencode(["aws-sdk-go"]) | ||
|
|
||
| s3_bucket_name = "logs-bucket-cd" | ||
| secure_s3_enabled = false | ||
| s3_log_bucket_name = "logs-bucket-cd-logs" | ||
| sse_algorithm = "aws:kms" | ||
| slack_webhook = "https://hooks.slack.com/services/TEE0GHDK0F0QZ/B015frHRDBEUFHEVEG/dfdrfrefrwewqe" | ||
| slack_channel = "testing" | ||
| additional_member_root_arn = ["arn:aws:iam::xxxxxxxxxxxx:root"] | ||
| additional_member_trail = ["arn:aws:cloudtrail:*:xxxxxxxxxxxx:trail/*"] | ||
| additional_member_account_id = ["xxxxxxxxxxxx"] | ||
| additional_s3_account_path_arn = ["arn:aws:s3:::logs-bucket-clouddrove/AWSLogs/xxxxxxxxxxxx/*"] | ||
| s3_policy = data.aws_iam_policy_document.default.json | ||
| } | ||
| module "cloudtrail" { | ||
| source = "./../../" | ||
| name = "test-cloudtrail" | ||
| environment = "main" | ||
| label_order = ["environment", "name"] | ||
| enabled = true | ||
| iam_role_name = "CloudTrail-CloudWatch-Delivery-Role" | ||
| iam_role_policy_name = "CloudTrail-CloudWatch-Delivery-Policy" | ||
| account_type = "master" | ||
| key_deletion_window_in_days = 10 | ||
| cloudwatch_logs_retention_in_days = 365 | ||
| cloudwatch_logs_group_name = "cloudtrail-log-group" | ||
| EVENT_IGNORE_LIST = jsonencode(["^Describe*", "^Assume*", "^List*", "^Get*", "^Decrypt*", "^Lookup*", "^BatchGet*", "^CreateLogStream$", "^RenewRole$", "^REST.GET.OBJECT_LOCK_CONFIGURATION$", "TestEventPattern", "TestScheduleExpression", "CreateNetworkInterface", "ValidateTemplate"]) | ||
| EVENT_ALERT_LIST = jsonencode(["DetachRolePolicy", "ConsoleLogin"]) | ||
| USER_IGNORE_LIST = jsonencode(["^awslambda_*", "^aws-batch$", "^bamboo*", "^i-*", "^[0-9]*$", "^ecs-service-scheduler$", "^AutoScaling$", "^AWSCloudFormation$", "^CloudTrailBot$", "^SLRManagement$"]) | ||
| SOURCE_LIST = jsonencode(["aws-sdk-go"]) | ||
| s3_bucket_name = "test-cloudtrail-bucket" | ||
| secure_s3_enabled = false | ||
| s3_log_bucket_name = "test-clouddtrail-logs" | ||
| sse_algorithm = "aws:kms" | ||
| additional_member_root_arn = ["arn:aws:iam::xxxxxxxxxxxx:root"] | ||
| additional_member_trail = ["arn:aws:cloudtrail:*:xxxxxxxxxxxx:trail/*"] | ||
| additional_member_account_id = ["xxxxxxxxxxxx"] | ||
| additional_s3_account_path_arn = ["arn:aws:s3:::test-cloudtrail-bucket/AWSLogs/xxxxxxxxxxxx/*"] | ||
| s3_policy = data.aws_iam_policy_document.default.json | ||
| } | ||
|
|
||
| data "aws_iam_policy_document" "default" { | ||
| statement { | ||
| sid = "AWSCloudTrailAclCheck" | ||
|
|
||
| principals { | ||
| type = "Service" | ||
| identifiers = ["cloudtrail.amazonaws.com"] | ||
| } | ||
| data "aws_iam_policy_document" "default" { | ||
| statement { | ||
| sid = "AWSCloudTrailAclCheck20150319" | ||
|
|
||
| actions = [ | ||
| "s3:GetBucketAcl" | ||
| ] | ||
| principals { | ||
| type = "Service" | ||
| identifiers = ["cloudtrail.amazonaws.com"] | ||
| } | ||
|
|
||
| resources = ["arn:aws:s3:::logs-bucket-cd"] | ||
| } | ||
| actions = [ | ||
| "s3:GetBucketAcl" | ||
| ] | ||
|
|
||
| statement { | ||
| sid = "AWSCloudTrailWrite" | ||
| resources = ["arn:aws:s3:::test-cloudtrail-bucket"] | ||
| condition { | ||
| test = "StringEquals" | ||
| variable = "AWS:SourceArn" | ||
|
|
||
| principals { | ||
| type = "Service" | ||
| identifiers = ["cloudtrail.amazonaws.com"] | ||
| values = [ | ||
| "arn:aws:cloudtrail:us-east-1:xxxxxxxxxxxx:trail/xcheck-trails" | ||
| ] | ||
| } | ||
| } | ||
| statement { | ||
| sid = "AWSCloudTrailWrite20150319" | ||
|
|
||
| actions = [ | ||
| "s3:PutObject" | ||
| ] | ||
| principals { | ||
| type = "Service" | ||
| identifiers = ["cloudtrail.amazonaws.com"] | ||
| } | ||
|
|
||
| resources = compact( | ||
| concat( | ||
| [format("arn:aws:s3:::logs-bucket-cd/AWSLogs/%s/*", data.aws_caller_identity.current.account_id), "arn:aws:s3:::logs-bucket-cd/AWSLogs/xxxxxxxxxxxx/*"] | ||
| ) | ||
| ) | ||
| actions = [ | ||
| "s3:PutObject" | ||
| ] | ||
|
|
||
| condition { | ||
| test = "StringEquals" | ||
| variable = "s3:x-amz-acl" | ||
| resources = ["arn:aws:s3:::test-cloudtrail-bucket/AWSLogs/xxxxxxxxxxxx/*"] | ||
|
|
||
| values = [ | ||
| "bucket-owner-full-control" | ||
| ] | ||
| condition { | ||
| test = "StringEquals" | ||
| variable = "s3:x-amz-acl" | ||
|
|
||
| values = [ | ||
| "bucket-owner-full-control" | ||
| ] | ||
| } | ||
| condition { | ||
| test = "StringEquals" | ||
| variable = "AWS:SourceArn" | ||
|
|
||
| values = [ | ||
| "arn:aws:cloudtrail:us-east-1:xxxxxxxxxxxx:trail/xcheck-trails" | ||
| ] | ||
| } | ||
| } | ||
|
|
||
| statement { | ||
| sid = "AWSCloudTrailWrite2015031" | ||
|
|
||
| principals { | ||
| type = "Service" | ||
| identifiers = ["cloudtrail.amazonaws.com"] | ||
| } | ||
|
|
||
| actions = [ | ||
| "s3:PutObject" | ||
| ] | ||
|
|
||
| resources = ["arn:aws:s3:::logs-bucket-cd-test/AWSLogs/<AWS_ORGANIZATION_ID>/*"] | ||
|
|
||
| condition { | ||
| test = "StringEquals" | ||
| variable = "s3:x-amz-acl" | ||
|
|
||
| values = [ | ||
| "bucket-owner-full-control" | ||
| ] | ||
| } | ||
| condition { | ||
| test = "StringEquals" | ||
| variable = "AWS:SourceArn" | ||
|
|
||
| values = [ | ||
| "arn:aws:cloudtrail:us-east-1:xxxxxxxxxxxx:trail/xcheck-trails" | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,11 @@ | ||
| # Terraform version | ||
| terraform { | ||
| required_version = ">= 0.12" | ||
| } | ||
| required_version = ">= 1.3.6" | ||
|
|
||
| required_providers { | ||
| aws = { | ||
| source = "hashicorp/aws" | ||
| version = ">= 4.48.0" | ||
| } | ||
| } | ||
| } |