Updates scripts and fixes bug in lambda invoke

tao · May 7, 2016 · 68b0868 · 68b0868
1 parent 48e6dfe
commit 68b0868
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 13 deletions.
diff --git a/lib/services/playlistService.js b/lib/services/playlistService.js
@@ -1,9 +1,9 @@
 'use strict';
-var lambdaInvoke = require('../utils/lambda-invoke-promise');
+var lambdaInvoke = require('../utils/lambda-invoke');
 
 exports.addTrack = function (track) {
   var params = {
-    FunctionName: 's3-save',
+    FunctionName: 's3-save-v1',
     Payload: {
       data: track,
       bucket: process.env.S3_BUCKET
@@ -21,7 +21,7 @@ exports.addTrack = function (track) {
 
 exports.retrievePlaylist = function (param) {
   var params = {
-    FunctionName: 's3-get',
+    FunctionName: 's3-get-v1',
     Payload: {
       bucket: process.env.S3_BUCKET
     }

diff --git a/lib/services/suggestionsService.js b/lib/services/suggestionsService.js
@@ -1,9 +1,9 @@
 'use strict';
-var lambdaInvoke = require('../utils/lambda-invoke-promise');
+var lambdaInvoke = require('../utils/lambda-invoke');
 
 exports.retrieveSongSuggestions = function (query, limit) {
   var params = {
-    FunctionName: 'song-suggester',
+    FunctionName: 'song-suggester-v1',
     Payload: {
       query,
       limit

diff --git a/lib/utils/lambda-invoke.js b/lib/utils/lambda-invoke.js
@@ -2,15 +2,15 @@ var AWS = require('aws-sdk');
 var Lambda = new AWS.Lambda();
 AWS.config.region = 'eu-west-1';
 
-exports.invoke = function (functionName, payload) {
-  var params = {
-    FunctionName: functionName,
+exports.invoke = function (params) {
+  var p = {
+    FunctionName: params.FunctionName,
     InvocationType: 'RequestResponse',
-    Payload: JSON.stringify(payload),
+    Payload: JSON.stringify(params.Payload),
     LogType: 'None'
   };
   return new Promise(function (resolve, reject) {
-    Lambda.invoke(params, function (err, data) {
+    Lambda.invoke(p, function (err, data) {
       if (err) return reject(err);
       var payload = JSON.parse(data.Payload);
       if (payload.errorMessage) return reject(payload);

diff --git a/scripts/create-api.sh b/scripts/create-api.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-api_name='serverless-graphql-demo-fac'
+api_name='serverless-graphql-demo-saturday'
 api_description="Graphql endpoint"
 root_path=/
 resource_path=graphql

diff --git a/scripts/create-iam.sh b/scripts/create-iam.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-role_name='lambda_execution_s3_fac_test'
+role_name='lambda_execution_weekend_test_1'
 
 # IAM trust policy
 
@@ -44,6 +44,15 @@ aws iam put-role-policy \
         "Resource": [
           "arn:aws:s3:::*"
         ]
+      },
+      {
+        "Effect": "Allow",
+        "Action": [
+          "lambda:*"
+        ],
+        "Resource": [
+          "arn:aws:lambda:*:*:*"
+        ]
       }
     ]
   }'

diff --git a/scripts/create-s3-bucket.sh b/scripts/create-s3-bucket.sh
@@ -1,4 +1,4 @@
-bucket="serverless-graphql-demo-fac"
+bucket="gql-test-1"
 region="eu-west-1"
 
 aws s3api create-bucket \