function with elartic search policy

clamorisse · Oct 25, 2016 · d692e18 · d692e18
1 parent 207bbc3
commit d692e18
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 11 deletions.
diff --git a/infrastructure/modules/iam/iam_lambda.tf b/infrastructure/modules/iam/iam_lambda.tf
@@ -35,7 +35,8 @@ resource "aws_iam_role_policy_attachment" "lambda_execute" {
 }
 
 
-# Inline policy for permissions to access resources
+# Inline policy for permissions to access
+# S3 and ElasticSearch resources
 
 resource "aws_iam_role_policy" "lambda_policy" {
     name = "${var.app_name}-access-resources-policy"

diff --git a/infrastructure/modules/s3/buckets_for_lambda.tf b/infrastructure/modules/s3/buckets_for_lambda.tf
@@ -18,7 +18,7 @@ resource "aws_s3_bucket" "source" {
 }
 
 resource "aws_s3_bucket" "target" {
-    bucket = "${var.source_bucket}resize" 
+    bucket = "${var.source_bucket}analyzed" 
     acl = "private"
 
     tags {

diff --git a/infrastructure/terraform/main_terraform.tf b/infrastructure/terraform/main_terraform.tf
@@ -44,8 +44,8 @@ module "s3_buckets" {
 resource "template_file" "lambda_policy" {
     template = "${file("${var.lambda_role_policy_tmpl}")}"
     vars {
-        input_bucket_name = "${module.s3_buckets.source-bucket-id}"
-        html_bucket_name = "${module.s3_buckets.target-bucket-id}"
+        source_bucket_name = "${module.s3_buckets.source-bucket-id}"
+        target_bucket_name = "${module.s3_buckets.target-bucket-id}"
     }
 }
 
@@ -74,8 +74,8 @@ module "lambda_function" {
   source_id     = "${module.s3_buckets.source-bucket-id}"
 
   events        = "s3:ObjectCreated:*"
-  filter_prefix = "images/"
-  filter_suffix = ".jpg"
+  filter_prefix = "data/"
+  filter_suffix = ".csv"
 }
 
 output "lambda_function_arn" { value = "${module.lambda_function.lambda_function_arn}" }

diff --git a/infrastructure/terraform/template_files/lambda_policy_s3_resources.tmpl b/infrastructure/terraform/template_files/lambda_policy_s3_resources.tmpl
@@ -16,7 +16,7 @@
                 "s3:ListBucket"
             ],
             "Resource": [
-                "arn:aws:s3:::${input_bucket_name}"
+                "arn:aws:s3:::${source_bucket_name}"
             ]
         },
         {
@@ -25,7 +25,7 @@
                 "s3:GetObject"
             ],
             "Resource": [
-                "arn:aws:s3:::${input_bucket_name}/*"
+                "arn:aws:s3:::${source_bucket_name}/*"
             ]
         },
         {
@@ -34,7 +34,7 @@
                 "s3:ListBucket"
             ],
             "Resource": [
-                "arn:aws:s3:::${html_bucket_name}"
+                "arn:aws:s3:::${target_bucket_name}"
             ]
         },
         {
@@ -47,8 +47,15 @@
                 "s3:PutObjectAcl"
             ],
             "Resource": [
-                "arn:aws:s3:::${html_bucket_name}/*"
+                "arn:aws:s3:::${target_bucket_name}/*"
             ]
+        },
+        {
+            "Action": [
+                "es:*"
+            ],
+            "Effect": "Allow",
+            "Resource": "arn:aws:es:us-west-2:123456789012:domain/streaming-logs/*"
         }
     ]
 }

diff --git a/infrastructure/terraform/terraform.tfvars b/infrastructure/terraform/terraform.tfvars
@@ -10,4 +10,4 @@ env              = "dev"
 
 source_bucket                = "source_bvc_files"
 lambda_role_policy_tmpl      = "template_files/lambda_policy_s3_resources.tmpl"
-lambda_function_zip_file     = "template_files/lambda_resize_image.zip"
+lambda_function_zip_file     = "../../function/lambda_analyze_csv.zip"