@devtion/actions 0.0.0-bfc9ee4 → 0.0.0-c1f4cbe

package/src/helpers/services.ts

@@ -22,7 +22,7 @@ export const getFirestoreDatabase = (app: FirebaseApp): Firestore => getFirestor
  * @param app <FirebaseApp> - the Firebase application.
  * @returns <Functions> - the Cloud Functions associated to the application.
  */
-export const getFirebaseFunctions = (app: FirebaseApp): Functions => getFunctions(app, 'europe-west1')
+export const getFirebaseFunctions = (app: FirebaseApp): Functions => getFunctions(app, "europe-west1")
 
 /**
  * Retrieve the configuration variables for the AWS services (S3, EC2).
@@ -33,7 +33,7 @@ export const getAWSVariables = (): AWSVariables => {
         !process.env.AWS_ACCESS_KEY_ID ||
         !process.env.AWS_SECRET_ACCESS_KEY ||
         !process.env.AWS_REGION ||
-        !process.env.AWS_ROLE_ARN ||
+        !process.env.AWS_INSTANCE_PROFILE_ARN ||
         !process.env.AWS_AMI_ID
     )
         throw new Error(
@@ -44,7 +44,7 @@ export const getAWSVariables = (): AWSVariables => {
         accessKeyId: process.env.AWS_ACCESS_KEY_ID!,
         secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY!,
         region: process.env.AWS_REGION || "us-east-1",
-        roleArn: process.env.AWS_ROLE_ARN!,
+        instanceProfileArn: process.env.AWS_INSTANCE_PROFILE_ARN!,
         amiId: process.env.AWS_AMI_ID!
     }
 }

package/src/helpers/storage.ts

@@ -3,6 +3,7 @@ import mime from "mime-types"
 import fs, { createWriteStream } from "fs"
 import fetch from "@adobe/node-fetch-retry"
 import https from "https"
+import { GenericBar } from "cli-progress"
 import { ETagWithPartNumber, ChunkWithUrl, TemporaryParticipantContributionData } from "../types/index"
 import { commonTerms } from "./constants"
 import {
@@ -80,6 +81,7 @@ export const getChunksAndPreSignedUrls = async (
  * @param cloudFunctions <Functions> - the Firebase Cloud Functions service instance.
  * @param ceremonyId <string> - the unique identifier of the ceremony.
  * @param alreadyUploadedChunks Array<ETagWithPartNumber> - the temporary information about the already uploaded chunks.
+ * @param logger <GenericBar> - an optional logger to show progress.
  * @returns <Promise<Array<ETagWithPartNumber>>> - the completed (uploaded) chunks information.
  */
 export const uploadParts = async (
@@ -87,11 +89,15 @@ export const uploadParts = async (
     contentType: string | false,
     cloudFunctions?: Functions,
     ceremonyId?: string,
-    alreadyUploadedChunks?: Array<ETagWithPartNumber>
+    alreadyUploadedChunks?: Array<ETagWithPartNumber>,
+    logger?: GenericBar
 ): Promise<Array<ETagWithPartNumber>> => {
     // Keep track of uploaded chunks.
     const uploadedChunks: Array<ETagWithPartNumber> = alreadyUploadedChunks || []
 
+    // if we were passed a logger, start it
+    if (logger) logger.start(chunksWithUrls.length, 0)
+
     // Loop through remaining chunks.
     for (let i = alreadyUploadedChunks ? alreadyUploadedChunks.length : 0; i < chunksWithUrls.length; i += 1) {
         // Consume the pre-signed url to upload the chunk.
@@ -128,6 +134,9 @@ export const uploadParts = async (
         // nb. this must be done only when contributing (not finalizing).
         if (!!ceremonyId && !!cloudFunctions)
             await temporaryStoreCurrentContributionUploadedChunkData(cloudFunctions, ceremonyId, chunk)
+
+        // increment the count on the logger
+        if (logger) logger.increment()
     }
 
     return uploadedChunks
@@ -150,6 +159,7 @@ export const uploadParts = async (
  * @param configStreamChunkSize <number> - size of each chunk into which the artifact is going to be splitted (nb. will be converted in MB).
  * @param [ceremonyId] <string> - the unique identifier of the ceremony (used as a double-edge sword - as identifier and as a check if current contributor is the coordinator finalizing the ceremony).
  * @param [temporaryDataToResumeMultiPartUpload] <TemporaryParticipantContributionData> - the temporary information necessary to resume an already started multi-part upload.
+ * @param logger <GenericBar> - an optional logger to show progress.
  */
 export const multiPartUpload = async (
     cloudFunctions: Functions,
@@ -158,7 +168,8 @@ export const multiPartUpload = async (
     localFilePath: string,
     configStreamChunkSize: number,
     ceremonyId?: string,
-    temporaryDataToResumeMultiPartUpload?: TemporaryParticipantContributionData
+    temporaryDataToResumeMultiPartUpload?: TemporaryParticipantContributionData,
+    logger?: GenericBar
 ) => {
     // The unique identifier of the multi-part upload.
     let multiPartUploadId: string = ""
@@ -198,7 +209,8 @@ export const multiPartUpload = async (
         mime.lookup(localFilePath), // content-type.
         cloudFunctions,
         ceremonyId,
-        alreadyUploadedChunks
+        alreadyUploadedChunks,
+        logger
     )
 
     // Step (3).