Fixes for attachments

Author: mdbenito

src/utils.ts

@@ -47,42 +47,53 @@ export const migrateAttachments = async (body: string, githubRepoId: number | un
   for (const match of matches) {
     const name = match[1];
     const url = match[2];
-
-    const basename = path.basename(url);
-    const extension = path.extname(url);
-    const mimeType = mime.lookup(basename);
-    const attachmentBuffer = await gitlabHelper.getAttachment(url);
-
-    // Generate new random file name for S3 bucket
-    const id = crypto.randomBytes(16).toString('hex');
-    const newFileName = id + extension;
-    const relativePath = githubRepoId ? `${githubRepoId}/${newFileName}` : newFileName;
-
-    // Doesn't seem like it is easy to upload an issue to github, so upload to S3
-    //https://stackoverflow.com/questions/41581151/how-to-upload-an-image-to-use-in-issue-comments-via-github-api
-
-    const s3url = `https://${s3.bucket}.s3.amazonaws.com/${relativePath}`;
-
-    const s3bucket = new S3();
-    s3bucket.createBucket(() => {
-      const params: S3.PutObjectRequest = {
-        Key: relativePath,
-        Body: attachmentBuffer,
-        ContentType: mimeType === false ? null : mimeType,
-        Bucket: s3.bucket,
-      };
-
-      s3bucket.upload(params, function (err, data) {
-        console.log(`\tUploaded ${basename} to ${s3url}`);
-        if (err) {
-          console.log('ERROR MSG: ', err);
-        }
+    if (s3 && s3.bucket) {
+      const basename = path.basename(url);
+      const extension = path.extname(url);
+      const mimeType = mime.lookup(basename);
+      const attachmentBuffer = await gitlabHelper.getAttachment(url);
+      if (!attachmentBuffer) {
+        continue;
+      }
+
+      // // Generate file name for S3 bucket from URL
+      const hash = crypto.createHash('sha256');
+      hash.update(url);
+      const newFileName = hash.digest('hex') + extension
+      const relativePath = githubRepoId ? `${githubRepoId}/${newFileName}` : newFileName;
+      // Doesn't seem like it is easy to upload an issue to github, so upload to S3
+      //https://stackoverflow.com/questions/41581151/how-to-upload-an-image-to-use-in-issue-comments-via-github-api
+
+      const s3url = `https://${s3.bucket}.s3.amazonaws.com/${relativePath}`;
+
+      const s3bucket = new S3();
+      s3bucket.createBucket(() => {
+        const params: S3.PutObjectRequest = {
+          Key: relativePath,
+          Body: attachmentBuffer,
+          ContentType: mimeType === false ? null : mimeType,
+          Bucket: s3.bucket,
+        };
+
+        s3bucket.upload(params, function (err, data) {
+          console.log(`\tUploading ${basename} to ${s3url}... `);
+          if (err) {
+            console.log('ERROR: ', err);
+          } else {
+            console.log(`\t... success`);
+          }
+        });
       });
-    });
-
-    // Add the new URL to the map
-    offsetToAttachment[match.index] = `![${name}](${s3url})`;
-
+    
+      // Add the new URL to the map
+      offsetToAttachment[match.index] = `![${name}](${s3url})`;
+    } else {
+      // Not using S3: default to old URL, adding absolute path
+      const host = gitlabHelper.host.endsWith('/') 
+                    ? gitlabHelper.host : gitlabHelper.host + '/';
+      const attachmentUrl = host + gitlabHelper.projectPath + url;
+      offsetToAttachment[match.index] = `![${name}](${attachmentUrl})`;
+    }
   }
 
   return body.replace(regexp, ({},{},{},offset,{}) => offsetToAttachment[offset]);