Merge pull request #7 from aws-samples/commit_hash

Added commit hash to S3 object

Author: jakebark

buildspec.yml

@@ -8,6 +8,8 @@ phases:
        - env
        - git clone -b $REFERENCE_NAME codecommit::$REPO_REGION://$REPOSITORY_NAME
        - dt=$(date '+%d-%m-%Y-%H:%M:%S');
-       - echo "$dt" 
-       - zip -yr $dt-$REPOSITORY_NAME-backup.zip ./
-       - aws s3 cp $dt-$REPOSITORY_NAME-backup.zip s3://$BUCKET/$REPOSITORY_NAME/
+       - echo "$dt"
+       - SHORT_COMMIT_ID=$(echo "$COMMIT_ID" | cut -c1-8)
+       - object=$dt-$REPOSITORY_NAME-$SHORT_COMMIT_ID
+       - zip -yr $object.zip ./
+       - aws s3 cp $object.zip s3://$BUCKET/$REPOSITORY_NAME/

cloudwatch.tf

@@ -41,6 +41,7 @@ resource "aws_cloudwatch_event_target" "this" {
       repositoryName = "$.detail.repositoryName",
       account        = "$.account",
       referenceName  = "$.detail.referenceName",
+      commitId       = "$.detail.commitId",
     }
     input_template = <<EOF
 {
@@ -64,6 +65,10 @@ resource "aws_cloudwatch_event_target" "this" {
         {
             "name": "ACCOUNT_ID",
             "value": <account>
+        },
+        {
+            "name": "COMMIT_ID",
+            "value": <commitId>
         }
     ]
 }

codebuild.tf

@@ -81,7 +81,7 @@ data "aws_iam_policy_document" "codebuild" {
     ]
 
     resources = [
-      "${aws_s3_bucket.this.arn}",
+      aws_s3_bucket.this.arn,
       "${aws_s3_bucket.this.arn}/*"
     ]
   }

s3.tf

@@ -42,8 +42,8 @@ data "aws_iam_policy_document" "this" {
     ]
 
     resources = [
-      "${aws_s3_bucket.this.arn}/*",
-      "${aws_s3_bucket.this.arn}"
+      aws_s3_bucket.this.arn,
+      "${aws_s3_bucket.this.arn}/*"
     ]
 
     condition {