Merge pull request #54 from pbs/CAT-24419-v3

CAT-24419

Author: ehirsch-3pg

README.md

@@ -5,7 +5,7 @@
 ### Using the Repo Source
 
 ```hcl
-github.com/pbs/terraform-aws-ecs-task-definition-module?ref=2.0.2
+github.com/pbs/terraform-aws-ecs-task-definition-module?ref=x.y.z
 ```
 
 ### Alternative Installation Methods
@@ -22,7 +22,7 @@ Integrate this module like so:
 
 ```hcl
 module "task" {
-  source = "github.com/pbs/terraform-aws-ecs-task-definition-module?ref=2.0.2"
+  source = "github.com/pbs/terraform-aws-ecs-task-definition-module?ref=x.y.z"
 
   # Tagging Parameters
   organization = var.organization
@@ -40,7 +40,7 @@ module "task" {
 
 If this repo is added as a subtree, then the version of the module should be close to the version shown here:
 
-`2.0.2`
+`x.y.z`
 
 Note, however that subtrees can be altered as desired within repositories.
 
@@ -80,6 +80,7 @@ No modules.
 | [aws_iam_role.task_role](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role) | resource |
 | [aws_iam_role_policy.task_execution_role_policy](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy) | resource |
 | [aws_iam_role_policy.task_role_policy](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy) | resource |
+| [aws_iam_role_policy_attachment.cw_agent](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
 | [aws_caller_identity.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/caller_identity) | data source |
 | [aws_default_tags.common_tags](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/default_tags) | data source |
 | [aws_iam_policy_document.assume_role_policy](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |

scripts/validate.sh

@@ -7,6 +7,6 @@ IFS=$'\n\t'
 GIT_ROOT=$(git rev-parse --show-toplevel)
 pushd "$GIT_ROOT" >/dev/null
 export AWS_DEFAULT_REGION='us-east-1'
-terraform init -backend=false
+terraform init -backend=false -upgrade
 terraform validate
 git add .terraform.lock.hcl

security.tf

@@ -163,3 +163,10 @@ resource "aws_iam_role_policy" "task_execution_role_policy" {
 
   policy = local.task_execution_role_policy_json
 }
+
+resource "aws_iam_role_policy_attachment" "cw_agent" {
+  count = var.use_cwagent_sidecar ? 1 : 0
+
+  policy_arn = "arn:aws:iam::aws:policy/CloudWatchAgentServerPolicy"
+  role       = aws_iam_role.task_role.name
+}

template.tf

@@ -204,9 +204,10 @@ locals {
     "logConfiguration" : {
       "logDriver" : "awslogs",
       "options" : {
-        "awslogs-group" : local.log_group_name,
+        "awslogs-create-group" : "true",
+        "awslogs-group" : "/ecs/ecs-cwagent",
         "awslogs-region" : data.aws_region.current.name,
-        "awslogs-stream-prefix" : "cwagent"
+        "awslogs-stream-prefix" : "ecs"
       }
     }
   }