add logs group

clouddrove · Oct 14, 2021 · d970727 · d970727
1 parent 0181dd3
commit d970727
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/.github/workflows/readme.yml b/.github/workflows/readme.yml
@@ -10,15 +10,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout'
-        uses: actions/checkout@master
+        uses: actions/checkout@v2.3.4
 
       - name: Set up Python 3.7.
         uses: actions/setup-python@v2
         with:
           python-version: '3.x'
 
       - name: 'create readme'
-        uses: 'clouddrove/github-actions@v7.0'
+        uses: 'clouddrove/github-actions@v8.0'
         with:
           actions_subcommand: 'readme'
           github_token: '${{ secrets.GITHUB}}'
@@ -35,7 +35,7 @@ jobs:
         continue-on-error: true
 
       - name: 'push readme'
-        uses: 'clouddrove/github-actions@v7.0'
+        uses: 'clouddrove/github-actions@v8.0'
         continue-on-error: true
         with:
           actions_subcommand: 'push'
@@ -51,4 +51,4 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # required
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_TERRAFORM }} # required
-        if: always()
+        if: always()
diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
@@ -1,4 +1,3 @@
-
 name: 'Terraform GitHub Actions'
 on:
   pull_request:
@@ -14,7 +13,7 @@ jobs:
         uses: actions/checkout@v2.3.4
 
       - name: 'Terraform Format'
-        uses: 'clouddrove/github-actions@v7.0'
+        uses: 'clouddrove/github-actions@v8.0'
         with:
           actions_subcommand: 'fmt'
 
@@ -33,13 +32,13 @@ jobs:
           aws-region: us-east-2
 
       - name: 'Terraform init'
-        uses: 'clouddrove/github-actions@v7.0'
+        uses: 'clouddrove/github-actions@v8.0'
         with:
           actions_subcommand: 'init'
           tf_actions_working_dir: ./_example
 
       - name: 'Terraform validate'
-        uses: 'clouddrove/github-actions@v7.0'
+        uses: 'clouddrove/github-actions@v8.0'
         with:
           actions_subcommand: 'validate'
           tf_actions_working_dir: ./_example
@@ -52,7 +51,7 @@ jobs:
         uses: actions/checkout@v2.3.4
 
       - name: 'Terraform init'
-        uses: 'clouddrove/github-actions@v7.0'
+        uses: 'clouddrove/github-actions@v8.0'
         with:
           actions_subcommand: 'init'
           tf_actions_working_dir: ./_example
@@ -65,7 +64,7 @@ jobs:
           aws-region: us-east-2
 
       - name: 'Terraform plan'
-        uses: 'clouddrove/github-actions@v7.0'
+        uses: 'clouddrove/github-actions@v8.0'
         with:
           actions_subcommand: 'plan'
           tf_actions_working_dir: ./_example
@@ -84,7 +83,6 @@ jobs:
       - name: 'Install Tflint'
         run: |
           curl https://raw.githubusercontent.com/terraform-linters/tflint/master/install_linux.sh | bash
-
       - name: 'Pre-Commit 🔎'
         uses: pre-commit/action@v2.0.3
         continue-on-error: true
@@ -98,4 +96,4 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # required
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_TERRAFORM }} # required
-        if: always()
+        if: always()
diff --git a/main.tf b/main.tf
@@ -30,8 +30,8 @@ resource "aws_cloudtrail" "default" {
   enable_log_file_validation    = var.enable_log_file_validation
   is_multi_region_trail         = true
   include_global_service_events = var.include_global_service_events
-  cloud_watch_logs_role_arn     = aws_iam_role.cloudtrail_cloudwatch_role.arn
-  cloud_watch_logs_group_arn    = "${aws_cloudwatch_log_group.cloudtrail.arn}:*"
+  cloud_watch_logs_role_arn     = var.cloud_watch_logs_role_arn
+  cloud_watch_logs_group_arn    = var.cloud_watch_logs_group_arn
   kms_key_id                    = aws_kms_key.cloudtrail.arn
   is_organization_trail         = var.is_organization_trail
   tags                          = module.labels.tags