AWS-SDK: Fixing broken exports

src/containers/AdminCampaignStats.jsx

@@ -424,9 +424,10 @@ class AdminCampaignStats extends React.Component {
           message={
             <span>
               Export started -
-              {this.props.organizationData &&
-                this.props.organizationData.emailEnabled &&
-                " we'll e-mail you when it's done. "}
+              {(this.props.organizationData &&
+                this.props.organizationData.emailEnabled) ?
+                " we'll e-mail you when it's done. " :
+                " check your Spoke directory. "}
               {campaign.cacheable && (
                 <span>
                   <Link

src/workers/jobs.js

@@ -28,7 +28,7 @@ import { rawIngestMethod } from "../extensions/contact-loaders";
 
 import { Lambda } from "@aws-sdk/client-lambda";
 import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
-import { GetObjectCommand, S3 } from "@aws-sdk/client-s3";
+import { CreateBucketCommand, GetObjectCommand, waitUntilBucketExists, S3Client, PutObjectCommand } from "@aws-sdk/client-s3";
 import { SQS } from "@aws-sdk/client-sqs";
 import Papa from "papaparse";
 import moment from "moment";
@@ -861,46 +861,74 @@ export async function exportCampaign(job) {
     (process.env.AWS_ACCESS_KEY_ID && process.env.AWS_SECRET_ACCESS_KEY)
   ) {
     try {
-      const s3bucket = new S3({
-        // The transformation for params is not implemented.
-        // Refer to UPGRADING.md on aws-sdk-js-v3 for changes needed.
-        // Please create/upvote feature request on aws-sdk-js-codemod for params.
-        params: { Bucket: process.env.AWS_S3_BUCKET_NAME }
+      const client = new S3Client({
+        region: process.env.AWS_REGION
       });
+      const bucketName = process.env.AWS_S3_BUCKET_NAME;
+      const command = new CreateBucketCommand({ Bucket : bucketName });
+
+      // this can return Location and $metadata, we just don't need that info
+      await client.send(command);
+
+      // verifies that the bucket exists before moving forward
+      // if for some reason this fails, Spoke defensively deletes the job
+      await waitUntilBucketExists({ client, maxWaitTime: 60 }, { Bucket : bucketName });
+
       const campaignTitle = campaign.title
         .replace(/ /g, "_")
         .replace(/\//g, "_");
       const key = `${campaignTitle}-${moment().format(
         "YYYY-MM-DD-HH-mm-ss"
       )}.csv`;
       const messageKey = `${key}-messages.csv`;
-      let params = { Key: key, Body: campaignCsv };
-      await s3bucket.putObject(params);
-      params = { Key: key, Expires: 86400 };
-      const campaignExportUrl = await await getSignedUrl(s3bucket, new GetObjectCommand(params), {
-        expiresIn: "/* add value from 'Expires' from v2 call if present, else remove */"
-      });
-      params = { Key: messageKey, Body: messageCsv };
-      await s3bucket.putObject(params);
-      params = { Key: messageKey, Expires: 86400 };
-      const campaignMessagesExportUrl = await await getSignedUrl(s3bucket, new GetObjectCommand(params), {
-        expiresIn: "/* add value from 'Expires' from v2 call if present, else remove */"
-      });
+      let params = { Key: key, 
+                     Body: campaignCsv, 
+                     Bucket: bucketName };
+      await client.send(new PutObjectCommand(params));
+      params = { Key: key, 
+                 Expires: 86400, 
+                 Bucket: bucketName };
+      const campaignExportUrl = await getSignedUrl(client, new GetObjectCommand(params));
+      params = { Key: messageKey, 
+                 Body: messageCsv, 
+                 Bucket: bucketName };
+      await client.send(new PutObjectCommand(params));
+      params = { Key: messageKey, 
+                 Expires: 86400,
+                 Bucket: bucketName };
+      const campaignMessagesExportUrl = await getSignedUrl(client, new GetObjectCommand(params));
       exportResults.campaignExportUrl = campaignExportUrl;
       exportResults.campaignMessagesExportUrl = campaignMessagesExportUrl;
 
-      await sendEmail({
-        to: user.email,
-        subject: `Export ready for ${campaign.title}`,
-        text: `Your Spoke exports are ready! These URLs will be valid for 24 hours.
-        Campaign export: ${campaignExportUrl}
-        Message export: ${campaignMessagesExportUrl}`
-      }).catch(err => {
-        log.error(err);
-        log.info(`Campaign Export URL - ${campaignExportUrl}`);
-        log.info(`Campaign Messages Export URL - ${campaignMessagesExportUrl}`);
-      });
-      log.info(`Successfully exported ${id}`);
+      // extreme check on email set-up
+      if ((
+        process.env.EMAIL_FROM &&
+        process.env.EMAIL_HOST &&
+        process.env.EMAIL_HOST_PASSOWRD &&
+        process.env.EMAIL_HOST_PORT &&
+        process.env.EMAIL_HOST_USER) ||
+        (
+        process.env.MAILGUN_DOMIAN &&
+        process.env.MAILGUN_SMTP_LOGN &&
+        process.env.MAILGUN_SMTP_PASSWORD &&
+        process.env.MAILGUN_SMTP_PORT &&
+        process.env.MAILGUN_SMTP_SERVER &&
+        process.env.MAILGUN_PUBLIC_KEY
+        )
+      ) {
+        await sendEmail({
+          to: user.email,
+          subject: `Export ready for ${campaign.title}`,
+          text: `Your Spoke exports are ready! These URLs will be valid for 24 hours.
+          Campaign export: ${campaignExportUrl}
+          Message export: ${campaignMessagesExportUrl}`
+        }).catch(err => {
+          log.error(err);
+          log.info(`Campaign Export URL - ${campaignExportUrl}`);
+          log.info(`Campaign Messages Export URL - ${campaignMessagesExportUrl}`);
+        });
+        log.info(`Successfully exported ${id}`);
+      }
     } catch (err) {
       log.error(err);
       exportResults.error = err.message;