Merge branch 'main' into fix/translate-test-lint

Author: iennae

storagetransfer/test/aws-request.test.js

@@ -30,13 +30,25 @@ describe('aws-request', () => {
   let awsSourceBucket;
   let gcsSinkBucket;
 
-  before(async () => {
-    testBucketManager.setupS3();
+  before(async function () {
+    try {
+      testBucketManager.setupS3();
 
-    projectId = await testBucketManager.getProjectId();
-    awsSourceBucket = await testBucketManager.generateS3Bucket();
-    gcsSinkBucket = (await testBucketManager.generateGCSBucket()).name;
-    description = `My transfer job from '${awsSourceBucket}' -> '${gcsSinkBucket}'`;
+      projectId = await testBucketManager.getProjectId();
+      awsSourceBucket = await testBucketManager.generateS3Bucket();
+      gcsSinkBucket = (await testBucketManager.generateGCSBucket()).name;
+      description = `My transfer job from '${awsSourceBucket}' -> '${gcsSinkBucket}'`;
+    } catch (err) {
+      if (
+        err?.code === 'InvalidAccessKeyId' ||
+        err?.message?.includes('Missing credentials in config')
+      ) {
+        console.warn('AWS credentials are missing or invalid.');
+        this.skip();
+      } else {
+        throw err;
+      }
+    }
   });
 
   after(async () => {

storagetransfer/test/azure-request.test.js

@@ -16,6 +16,11 @@
 
 'use strict';
 
+// Since we are running on Node.js 16, crypto is not available globally.
+if (!globalThis.crypto) {
+  globalThis.crypto = require('node:crypto').webcrypto;
+}
+
 const {assert} = require('chai');
 const {after, before, describe, it} = require('mocha');
 
@@ -31,31 +36,44 @@ describe('azure-request', () => {
   let azureSourceContainer;
   let gcsSinkBucket;
 
-  before(async () => {
-    assert(
-      process.env.AZURE_CONNECTION_STRING,
-      'environment variable AZURE_CONNECTION_STRING is required'
-    );
-
-    testBucketManager.setupBlobStorageFromConnectionString(
-      process.env.AZURE_CONNECTION_STRING
-    );
-
-    azureStorageAccount =
-      process.env.AZURE_STORAGE_ACCOUNT ||
-      testBucketManager.blobStorage.accountName;
-
-    projectId = await testBucketManager.getProjectId();
-    azureSourceContainer =
-      await testBucketManager.generateBlobStorageContainer();
-    gcsSinkBucket = (await testBucketManager.generateGCSBucket()).name;
-    description = `My transfer job from '${azureSourceContainer}' -> '${gcsSinkBucket}'`;
-
-    if (!process.env.AZURE_SAS_TOKEN) {
-      // For security purposes we only want to pass this value via environment, not cli
-      process.env.AZURE_SAS_TOKEN = new URL(
-        testBucketManager.blobStorage.storageClientContext.url
-      ).search;
+  before(async function () {
+    try {
+      assert(
+        process.env.AZURE_CONNECTION_STRING,
+        'environment variable AZURE_CONNECTION_STRING is required'
+      );
+
+      testBucketManager.setupBlobStorageFromConnectionString(
+        process.env.AZURE_CONNECTION_STRING
+      );
+
+      azureStorageAccount =
+        process.env.AZURE_STORAGE_ACCOUNT ||
+        testBucketManager.blobStorage.accountName;
+
+      projectId = await testBucketManager.getProjectId();
+      azureSourceContainer =
+        await testBucketManager.generateBlobStorageContainer();
+      gcsSinkBucket = (await testBucketManager.generateGCSBucket()).name;
+      description = `My transfer job from '${azureSourceContainer}' -> '${gcsSinkBucket}'`;
+
+      if (!process.env.AZURE_SAS_TOKEN) {
+        // For security purposes we only want to pass this value via environment, not cli
+        process.env.AZURE_SAS_TOKEN = new URL(
+          testBucketManager.blobStorage.storageClientContext.url
+        ).search;
+      }
+    } catch (err) {
+      if (
+        err?.name === 'AssertionError' ||
+        err?.message?.includes('AZURE_CONNECTION_STRING') ||
+        err?.message?.includes('failed to authenticate')
+      ) {
+        console.warn('Azure credentials are missing, invalid, or expired.');
+        this.skip();
+      } else {
+        throw err;
+      }
     }
   });
 

storagetransfer/test/event-driven-aws-transfer.test.js

@@ -36,13 +36,25 @@ describe('event-driven-aws-transfer', () => {
   let gcsSinkBucket;
   let sqsQueueArn;
 
-  before(async () => {
-    testBucketManager.setupS3();
-    projectId = await testBucketManager.getProjectId();
-    s3SourceBucket = await testBucketManager.generateS3Bucket();
-    gcsSinkBucket = (await testBucketManager.generateGCSBucket()).name;
-    sqsQueueArn = await testQueueManager.generateSqsQueueArn();
-    console.log('Arn: ' + sqsQueueArn);
+  before(async function () {
+    try {
+      testBucketManager.setupS3();
+      projectId = await testBucketManager.getProjectId();
+      s3SourceBucket = await testBucketManager.generateS3Bucket();
+      gcsSinkBucket = (await testBucketManager.generateGCSBucket()).name;
+      sqsQueueArn = await testQueueManager.generateSqsQueueArn();
+      console.log('Arn: ' + sqsQueueArn);
+    } catch (err) {
+      if (
+        err?.code === 'InvalidAccessKeyId' ||
+        err?.message?.includes('Missing credentials in config')
+      ) {
+        console.warn('AWS credentials are missing or invalid.');
+        this.skip();
+      } else {
+        throw err;
+      }
+    }
   });
 
   after(async () => {