set up basic streamed upload for bluemix

CaffeineFusion · CaffeineFusion · commit 2e4130d60039 · 2019-01-23T11:30:57.000+11:00
diff --git a/src/bluemix/config.json b/src/bluemix/config.json
@@ -1,13 +1,13 @@
 {
-	"project_id":"307972859230",
-	"bucket_name":"image_api_307972859230",
+	"bucket_name":"image-api",
+	"public_endpoint":"s3.au-syd.cloud-object-storage.appdomain.cloud",
 	"keys": {
 		"path":"./keys",
 		"cloud_storage": {
-			"path":"./../../keys/cloudStorage.json"
+			"path":"./keys/ibm_storage.json"
 		},
 		"cloud_functions": {
-			"path":"./../../keys/functions.json"
+			"path":"./keys/ibm_functions.json"
 		}
 	}
 }
diff --git a/src/bluemix/experiments/upload.js b/src/bluemix/experiments/upload.js
@@ -7,43 +7,34 @@ const request = require('request');
 const path = require('path');
 const Storage = require('ibm-cos-sdk');
 
-const config = require('./../../keys/ibm_storage.json');
+const config = require('./../config.json');
+const key = require('./../keys/ibm_storage.json');
 
-let storage = new Storage.S3(config);
+const s3Config = {
+	endpoint: 's3.au-syd.cloud-object-storage.appdomain.cloud',
+	apiKeyId: key.apikey,
+	ibmAuthEndpoint: 'https://iam.ng.bluemix.net/oidc/token',
+	serviceInstanceId: key.resource_instance_id,
+};
+
+let storage = new Storage.S3(s3Config);
 
 // Returns a Promise object which resolves to a stream.
 function uploadByURL(url, bucket, fileName) {
-	//let file = bucket.file(fileName);
 	return new Promise((resolve, reject) => {
 		request(url)
 			.on('response', (response) => { response.pause(); resolve(response); })
 			.on('error', (reject));
 	}).then((response) => {
-		return storage.putObject({ Bucket:bucket, Key:fileName, Body:response })
+		return storage.upload({ Bucket:bucket, Key:fileName, Body:response }) //putObject did not work for streams due to Sigv4
 			.promise();
-	}) 
+	})
 		.catch((error) => { return { error }; }); // TODO: Add more detailed error handling. - statusCode etc.
 }
 
 exports.upload = function (url) {
-	return uploadByURL(url, storage.bucket(config.bucket_name), path.basename(url));
+	return uploadByURL(url, config.bucket_name, path.basename(url));
 };
-/*
-function createTextFile(bucketName, itemName, fileText) {
-    console.log(`Creating new item: ${itemName}`);
-    return cos.putObject({
-        Bucket: bucketName,
-        Key: itemName,
-        Body: fileText
-    }).promise()
-    .then(() => {
-        console.log(`Item: ${itemName} created!`);
-    })
-    .catch((e) => {
-        console.error(`ERROR: ${e.code} - ${e.message}\n`);
-    });
-}
-*/
 
 /**
  *
diff --git a/src/bluemix/package-lock.json b/src/bluemix/package-lock.json

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`{`
`2`		`- "project_id":"307972859230",`
`3`		`- "bucket_name":"image_api_307972859230",`
	`2`	`+ "bucket_name":"image-api",`
	`3`	`+ "public_endpoint":"s3.au-syd.cloud-object-storage.appdomain.cloud",`
`4`	`4`	`"keys": {`
`5`	`5`	`"path":"./keys",`
`6`	`6`	`"cloud_storage": {`
`7`		`- "path":"./../../keys/cloudStorage.json"`
	`7`	`+ "path":"./keys/ibm_storage.json"`
`8`	`8`	`},`
`9`	`9`	`"cloud_functions": {`
`10`		`- "path":"./../../keys/functions.json"`
	`10`	`+ "path":"./keys/ibm_functions.json"`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`	`}`