fix: update nuv web upload to use the nuv devel minio upload action to ensure it work on both MINIO and CEPH implementation

Author: francescotimperi

web/nuvfile.yml

@@ -17,6 +17,8 @@
 
 version: 3
 
+
+
 tasks:
   upload:
     silent: true
@@ -34,3 +36,8 @@ tasks:
         sh: wsk property get | awk '/whisk namespace/{print $3}'
       APIHOST:
         sh: wsk property get | awk '/whisk API host/{print $4}'
+      AUTHB64:
+        sh: |
+          if test -e ~/.wskprops
+          then source ~/.wskprops; echo $(base64 -e $AUTH)
+          fi        

web/upload.js

@@ -17,7 +17,7 @@
 
 const nuv = require('nuv');
 
-const contentActionAddr = `${process.env.APIHOST}/api/v1/web/whisk-system/nuv/content/${process.env.NUVUSER}`;
+const contentActionAddr = `${process.env.APIHOST}/api/v1/web/whisk-system/nuv/devel_upload/${process.env.MINIO_BUCKET_STATIC}`;
 
 // *** Main ***
 main();
@@ -30,9 +30,8 @@ function main() {
     let verbose = extractBoolFromParam(verboseParam);
     let clean = extractBoolFromParam(cleanParam);
 
-    let minioKey = `MINIO_SECRET_KEY`;
 
-    const minioAuth = process.env[minioKey];
+    const minioAuth = process.env.AUTHB64
 
     const pathFoundAsDir = nuv.isDir(path);
     if (!pathFoundAsDir) {
@@ -66,15 +65,15 @@ function main() {
 
 function uploadContent(file, minioAuth, fileAddr, verbose) {
     console.log(`Uploading ${fileAddr}...`);
-    let res = nuv.nuvExec("curl", "-s", "-X", "PUT", "-T", file, "-H", `minioauth: ${minioAuth}`, `${contentActionAddr}/${fileAddr}`);
+    let res = nuv.nuvExec("curl", "-s", "-X", "PUT", "-T", file, "-H", `x-impersonate-auth: ${minioAuth}`, `${contentActionAddr}/${fileAddr}`);
     if (verbose) {
         console.log(res);
     }
 }
 
 function deleteContent(minioAuth, fileAddr, verbose) {
     console.log(`Deleting ${fileAddr}...`);
-    let res = nuv.nuvExec("curl", "-s", "-X", "DELETE", "-H", `minioauth: ${minioAuth}`, `${contentActionAddr}/${fileAddr}`);
+    let res = nuv.nuvExec("curl", "-s", "-X", "DELETE", "-H", `x-impersonate-auth: ${minioAuth}`, `${contentActionAddr}/${fileAddr}`);
     if (verbose) {
         console.log(res);
     }