69 support for azure blob storage

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+  "editor.tabSize": 2,
+  "editor.indentSize": 2
+}

lib/aws-s3.js

@@ -46,8 +46,9 @@ module.exports = class AWSAttachmentsService extends require("./basic") {
       const missingFields = requiredFields.filter(field => !creds[field])
 
       if (missingFields.length > 0) {
-        logConfig.configValidation('objectStore.credentials', creds, false,
-          `Object Store credentials missing: ${missingFields.join(', ')}`)
+        if (Object.keys(creds).includes('container_name')) {
+          throw new Error('Azure Blob Storage credentials found where AWS S3 credentials expected, please check your service bindings.')
+        }
         throw new Error(`Missing Object Store credentials: ${missingFields.join(', ')}`)
       }
 
@@ -429,21 +430,21 @@ module.exports = class AWSAttachmentsService extends require("./basic") {
    * @param {import('express').NextFunction} next - The next middleware function
    */
   async updateContentHandler(req, next) {
-    logConfig.debug(`[S3 Upload] Uploading file using updateContentHandler for ${req.target.name}`)
+    logConfig.debug(`[AWS S3] Uploading file using updateContentHandler for ${req.target.name}`)
 
     // Check separate object store instances
     if (separateObjectStore) {
       const tenantID = cds.context.tenant
       await this.createClientS3(tenantID)
     }
 
-    const targetID = req.data.ID || req.params[1]?.ID || req.params[1];
+    const targetID = req.data.ID || req.params[1]?.ID || req.params[1]
     if (!targetID) {
-      req.reject(400, "Missing ID in request");
+      req.reject(400, "Missing ID in request")
     }
 
     if (req?.data?.content) {
-      const response = await SELECT.from(req.target, { ID: targetID }).columns("url");
+      const response = await SELECT.from(req.target, { ID: targetID }).columns("url")
       if (response?.url) {
         const Key = response.url
         const input = {
@@ -460,7 +461,7 @@ module.exports = class AWSAttachmentsService extends require("./basic") {
         const keys = { ID: targetID }
 
         const scanRequestJob = cds.spawn(async () => {
-          await scanRequest(req.target, keys, req)
+          await scanRequest(req.target, keys)
         })
 
         scanRequestJob.on('error', async (err) => {
@@ -470,12 +471,12 @@ module.exports = class AWSAttachmentsService extends require("./basic") {
             { keys, errorMessage: err.message })
         })
 
-        logConfig.debug(`[S3 Upload] Uploaded file using updateContentHandler for ${req.target.name}`)
+        logConfig.debug(`[AWS S3] Uploaded file using updateContentHandler for ${req.target.name}`)
       }
     } else if (req?.data?.note) {
       const key = { ID: targetID }
       await super.update(req.target, key, { note: req.data.note })
-      logConfig.debug(`[S3 Upload] Updated file upload with note for ${req.target.name}`)
+      logConfig.debug(`[AWS S3] Updated file upload with note for ${req.target.name}`)
     } else {
       next()
     }
@@ -603,7 +604,7 @@ module.exports = class AWSAttachmentsService extends require("./basic") {
    */
   async delete(Key) {
     const tenantID = cds.context.tenant
-    logConfig.debug(`[S3 Upload] Executing delete for file ${Key} in bucket ${this.bucket}`)
+    logConfig.debug(`[AWS S3] Executing delete for file ${Key} in bucket ${this.bucket}`)
 
     // Check separate object store instances
     if (separateObjectStore) {
@@ -620,6 +621,7 @@ module.exports = class AWSAttachmentsService extends require("./basic") {
   }
 
   /**
+   * Requires implementation as delete of infected attachment is specific to storage service
    * @inheritdoc
    */
   async deleteInfectedAttachment(Attachments, key) {