updated sls and added runAPI

sassoftware · Sep 17, 2018 · 56c02d6 · 56c02d6
1 parent 8e65572
commit 56c02d6
Show file tree

Hide file tree

Showing 48 changed files with 538 additions and 1,676 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,14 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "score",
+            "program": "${workspaceFolder}\\index.js"
+        }
+    ]
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,22 @@
+Changes
+
+# Version 0.5.0
+
+ - Added AWS serverless functions for scroing and sentiment analysis
+ - cleaned up the examples
+ - Added an inventory of the examples in the README.md file
+
+
+ # Version 0.5.1
+
+  - Added sls-image serverless example
+
+# Version 0.6.0
+
+## Organization of repository
+- Moved all nodejs samples into the examples/samples sub-directory. Makes it easier to view the repository
+
+## Serverless functions
+- Moved all the common parts of serverless.yml into awsenv.yml in the root directory.
+- Added index.js to the root of each serverless functions to export the entries to serverless.yml. Motivation was the next item.
+- Added runAPI.js to help with debugging the serverless functions end points(see README file for more information)
diff --git a/README.md b/README.md
@@ -102,3 +102,42 @@ The serverless subdirectory has examples of using restaf to build AWS serverless
 - sls-image - display an image for a SAS VA report
 
 
+### Configuring the serverless.yml
+
+In this version the serverless.yml references the awsenv.yml file to get information that is usually common between all 
+the serverless functions ( vpc, subnets etc...). 
+
+
+## Poor Man's version of debugging of Serverless functions
+
+IDE's like VSCode have capability to debug serverless functions. But not all users use this IDE.
+So I built a very simple way to invoke the API endpoints in nodejs debugger. 
+
+### Configuration
+
+In the env file add the following three options (see reataf.env for an example)
+
+```
+
+SLS=<serverless function name in examples dir>    <-- ex: sls-scoreAstore
+SLSPATH=path    <-- the specific sls path ex: score
+SLSPAYLOAD=<payload file path> <-- a json file with the payload(if POST or PUT)ex: score.json
+
+```
+
+### Execution
+
+To run with nodejs inspect issue the following command
+
+```
+npm run debugAPI <envfile with the information discussed above>
+```
+
+Then follow standard nodejs debugging process
+
+To run without debug turned on issue the following command
+
+```
+npm run runAPI <envfile with the information discussed above>
+
+
diff --git a/awsenv.yml b/awsenv.yml
@@ -0,0 +1,16 @@
+
+role: arn:yourrole
+vpc:
+  securityGroupIds:
+    - sg1
+  subnetIds:
+    - subnet1
+    - subnet2
+deploymentBucket:
+  name: bucket1
+environment:
+  VIYA_SERVER: http://xx.xxx.xx.xx
+  CLIENTID: raf
+  CLIENTSECRET: raf
+  USER: superuser
+  PASSWORD: superfly
diff --git a/change.md b/change.md
diff --git a/data/astoreLarge/Simple_CNN.astore b/data/astoreLarge/Simple_CNN.astore
diff --git a/data/sasdata/Simple_CNN.sashdat b/data/sasdata/Simple_CNN.sashdat
diff --git a/examples/codeTable.js b/examples/codeTable.js
diff --git a/examples/addCaslib.js → examples/samples/addCaslib.js b/examples/addCaslib.js → examples/samples/addCaslib.js
@@ -21,6 +21,7 @@ let restaf         = require('restaf');
 let payload        = require('./config')('restaf.env');
 let casSetup       = require('./lib/casSetup');
 let runAction      = require('./lib/runAction');
+let path           = '/u/kumar/casdata/astore'; /* this must be accessible to CAS server */
 
 let store = restaf.initStore();
 
@@ -34,12 +35,13 @@ async function example (store, payload, ...actionSets) {
             activeOnAdd: true,
             dataSource : { srcType: 'path' },
             name       : 'mycaslib',
-            path       : '/xyz',
+            path       : path,
             subdirectories: false
         }
     }
 
     let r = await runAction(store, session, p, 'Assign caslib')
+
 
 }
 example(store, payload,null)

diff --git a/examples/addServices.js → examples/samples/addServices.js b/examples/addServices.js → examples/samples/addServices.js
diff --git a/examples/addbadServices.js → examples/samples/addbadServices.js b/examples/addbadServices.js → examples/samples/addbadServices.js
diff --git a/examples/appdata.js → examples/samples/appdata.js b/examples/appdata.js → examples/samples/appdata.js
diff --git a/examples/astoreDescribe.js → examples/samples/astoreDescribe.js b/examples/astoreDescribe.js → examples/samples/astoreDescribe.js
diff --git a/examples/casEcho.js → examples/samples/casEcho.js b/examples/casEcho.js → examples/samples/casEcho.js
diff --git a/examples/casFetch.js → examples/samples/casFetch.js b/examples/casFetch.js → examples/samples/casFetch.js
diff --git a/examples/casSentiment.js → examples/samples/casSentiment.js b/examples/casSentiment.js → examples/samples/casSentiment.js
diff --git a/examples/casSessions.js → examples/samples/casSessions.js b/examples/casSessions.js → examples/samples/casSessions.js
diff --git a/examples/casTables.js → examples/samples/casTables.js b/examples/casTables.js → examples/samples/casTables.js
diff --git a/examples/casUpload.js → examples/samples/casUpload.js b/examples/casUpload.js → examples/samples/casUpload.js
diff --git a/examples/casUploadAstore.js → examples/samples/casUploadAstore.js b/examples/casUploadAstore.js → examples/samples/casUploadAstore.js
diff --git a/examples/casUploadDataset.js → examples/samples/casUploadDataset.js b/examples/casUploadDataset.js → examples/samples/casUploadDataset.js
diff --git a/examples/casUploadimages.js → examples/samples/casUploadimages.js b/examples/casUploadimages.js → examples/samples/casUploadimages.js
diff --git a/examples/casds.js → examples/samples/casds.js b/examples/casds.js → examples/samples/casds.js
diff --git a/examples/computeds.js → examples/samples/computeds.js b/examples/computeds.js → examples/samples/computeds.js
diff --git a/examples/config.js → examples/samples/config.js b/examples/config.js → examples/samples/config.js
diff --git a/examples/jobdefinition.js → examples/samples/jobdefinition.js b/examples/jobdefinition.js → examples/samples/jobdefinition.js
diff --git a/examples/logon.js → examples/samples/logon.js b/examples/logon.js → examples/samples/logon.js
diff --git a/examples/paginate.js → examples/samples/paginate.js b/examples/paginate.js → examples/samples/paginate.js
diff --git a/examples/reportElements.js → examples/samples/reportElements.js b/examples/reportElements.js → examples/samples/reportElements.js
diff --git a/examples/reportImage.js → examples/samples/reportImage.js b/examples/reportImage.js → examples/samples/reportImage.js
diff --git a/examples/reportList.js → examples/samples/reportList.js b/examples/reportList.js → examples/samples/reportList.js
diff --git a/examples/request.js → examples/samples/request.js b/examples/request.js → examples/samples/request.js
diff --git a/examples/submit.js → examples/samples/submit.js b/examples/submit.js → examples/samples/submit.js
diff --git a/examples/serverless/sls-image/index.js b/examples/serverless/sls-image/index.js
@@ -0,0 +1,23 @@
+/*
+ * ------------------------------------------------------------------------------------
+ *   Copyright (c) SAS Institute Inc.
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ * ---------------------------------------------------------------------------------------
+ *
+ */
+ 'use strict';
+
+ let app   = require('./src/app').app;
+ let image = require('./src/image').image;
+
+ module.exports = { app, image};
diff --git a/examples/serverless/sls-image/lib/setError.js b/examples/serverless/sls-image/lib/setError.js
@@ -23,6 +23,5 @@ module.exports = function setError(data) {
         headers   : {"Content-Type": "text/plain"},
         body      : (typeof data === 'object' ) ? JSON.stringify(data) : data
     }
-    console.log(JSON.stringify(err, null, 4));
     return err;
   }