@naanlang/naan 1.0.6 → 1.0.7

package/plugins/serviceAws/psm_aws.nlg

@@ -47,7 +47,11 @@ closure psmaConnector(psm, local connClassID, connector, watch) {
         {
             label:          "Bucket"
             placeholder:    "e.g. myBucketName"
-            key:            "bucketName" }
+            key:            "bucketName" },
+        {
+            label:          "Endpoint"
+            placeholder:    "custom URL"
+            key:            "endpoint" }
         ]
     }
 
@@ -59,6 +63,7 @@ closure psmaConnector(psm, local connClassID, connector, watch) {
             `(error, creds) = connector.vault.accessResource(resID)
             if creds && (!resource.region || resource.region == creds.region)
                 && (!resource.bucketName || resource.bucketName == creds.bucketName)
+                && (!resource.endpoint || resource.endpoint == creds.endpoint)
                 && (!resource.label || resource.label == creds.label)
                 return (resID)
         }
@@ -75,6 +80,7 @@ closure psmaConnector(psm, local connClassID, connector, watch) {
     //      keySecret   - AWS IAM keySecret
     //      region      - AWS region
     //      bucketName  - AWS bucketName
+    //      endpoint    - custom URL
     //      hidden      - [optional] don't enumerate to user
     //      locked      - [optional] don't allow user delete
     // The return value is an (error, resID) tuple. Error, if non-false, is a dictionary of field
@@ -90,6 +96,8 @@ closure psmaConnector(psm, local connClassID, connector, watch) {
             region: resource.region,
             bucketName: resource.bucketName
         }
+        if resource.endpoint
+            creds.endpoint = resource.endpoint
         errors = { }
         if resource.label
             creds.label = resource.label
@@ -107,6 +115,8 @@ closure psmaConnector(psm, local connClassID, connector, watch) {
             errors.region = "required field"
         if badField(resource.bucketName)
             errors.bucketName = "required field"
+        if resource.endpoint && badField(resource.endpoint)
+            errors.endpoint = "invalid field"
         if length(errors) > 0
             error = errors
         else {
@@ -164,6 +174,8 @@ closure psmaConnector(psm, local connClassID, connector, watch) {
             resource.region = creds.region
         if string(creds.bucketName)
             resource.bucketName = creds.bucketName
+        if string(creds.endpoint)
+            resource.endpoint = creds.endpoint
         list(false, resource)
     }
 
@@ -209,22 +221,28 @@ closure psmaConnector(psm, local connClassID, connector, watch) {
     //
     // Return an S3 access object, which is the credentials to access an AWS S3 bucket.
 
-    connector.access = function access(resID, local error, creds, s3b) {
+    connector.access = function access(resID, local error, creds, params, s3b) {
         `(error, creds) = connector.vault.accessResource(resID)
         if error
             return (list(error))                                            // can't access that resource
         if !awsSDK.S3
             return (list(Error("S3 connector: no AWS SDK available")))
+        params = {
+            region:                     creds.region
+            credentials: {
+                accessKeyId:            creds.keyID
+                secretAccessKey:        creds.keySecret
+            }
+        }
         s3b = {
-            s3: xnew(awsSDK.S3, {
-                region:                 creds.region
-                credentials: {
-                    accessKeyId:        creds.keyID
-                    secretAccessKey:    creds.keySecret
-                }})
             bucketName:                 creds.bucketName
             region:                     creds.region
         }
+        if creds.endpoint {
+            params.endpoint = creds.endpoint
+            s3b.endpoint = creds.endpoint
+        }
+        s3b.s3 = xnew(awsSDK.S3, params)
         list(false, s3b)
     }
 
@@ -232,10 +250,11 @@ closure psmaConnector(psm, local connClassID, connector, watch) {
     //
     // Connect to an AWS bucket filesystem, returning a view.
     
-    connector.connect = function connect(resID, service, args, local error,  s3b, db, table) {
+    connector.connect = function connect(resID, service, args,
+        local error,  s3b, db, rootpath, table) {
         `(error, s3b) = connector.access(resID)
         if !error
-            `(error, db) = S3DB(s3b)                                        // get S3 bucket as a database
+            `(error, db) = S3DB(s3b, args.1)                                // get S3 bucket as a database
         if error
             list(error)
         else if service == "NideDB"
@@ -244,7 +263,7 @@ closure psmaConnector(psm, local connClassID, connector, watch) {
             rootpath = args.0                                               // connect to a NideFS filesystem
             if !rootpath
                 return (Error("mandatory rootpath missing"))
-            `(error, table) = db.table(rootpath)
+            `(error, table) = db.table(rootpath, args.1)                    // args.1 is table options; see dawsTable
             if error
                 list(error)
             else

package/plugins/serviceAws/serviceAws.nlg

@@ -26,10 +26,8 @@ function sawsInit(local manifest) {
         require("frameworks/common").LiveImport()
         require("./aws_utils.nlg")
         function sawsPostload() {
-            if js.lambda
-                awsSDK = js.r("/opt/aws-sdk-node.min.js")                   // SDK is a layer
-            else if js.g
-                awsSDK = js.r("aws-sdk-node.min")                           // SDK must be in search path
+            if js.g
+                awsSDK = js.r(JSpath.join(js.d, module.locpath, "./aws/aws-sdk-node.min.js"))
             else
                 awsSDK = JsLoadScript(JSpath.join(module.locpath, "./aws/aws-sdk.min.js"), "awsSdk")
             module.exports.awsSDK = awsSDK