CLDSRV-717: Skip based on configured location

To unify with S3C

Author: BourgoisMickael

tests/functional/aws-node-sdk/lib/utility/test-utils.js

@@ -11,10 +11,15 @@ if (config.backends.data === 'multiple') {
     describeSkipIfNotMultipleOrCeph = isCEPH ? describe.skip : describe.skip; // always skip
 }
 
+function hasLocation(lc) {
+    return config.locationConstraints[lc] !== undefined;
+}
+
 module.exports = {
     isCEPH,
     itSkipCeph,
     describeSkipIfCeph,
     describeSkipIfNotMultiple,
     describeSkipIfNotMultipleOrCeph,
+    hasLocation,
 };

tests/multipleBackend/routes/routeBackbeat.js

@@ -1,5 +1,4 @@
 const assert = require('assert');
-const AWS = require('aws-sdk');
 const async = require('async');
 const crypto = require('crypto');
 const { v4: uuidv4 } = require('uuid');
@@ -8,23 +7,23 @@ const versionIdUtils = versioning.VersionID;
 
 const { makeid } = require('../../unit/helpers');
 const { makeRequest, makeBackbeatRequest } = require('../../functional/raw-node/utils/makeRequest');
-const BucketUtility =
-      require('../../functional/aws-node-sdk/lib/utility/bucket-util');
-const { describeSkipIfNotMultipleOrCeph, itSkipCeph } = require('../../functional/aws-node-sdk/lib/utility/test-utils');
+const BucketUtility = require('../../functional/aws-node-sdk/lib/utility/bucket-util');
+const {
+    describeSkipIfNotMultipleOrCeph,
+    itSkipCeph,
+    hasLocation
+} = require('../../functional/aws-node-sdk/lib/utility/test-utils');
 const {
     awsLocation,
+    awsS3: awsClient,
+    awsBucket,
     azureLocation,
     getAzureContainerName,
     getAzureClient,
 } = require('../../functional/aws-node-sdk/test/multipleBackend/utils');
-const { getRealAwsConfig } =
-      require('../../functional/aws-node-sdk/test/support/awsConfig');
 const { getCredentials } = require('../../functional/aws-node-sdk/test/support/credentials');
 const { config } = require('../../../lib/Config');
 
-const awsConfig = getRealAwsConfig(awsLocation);
-const awsClient = new AWS.S3(awsConfig);
-const awsBucket = config.locationConstraints[awsLocation].details.bucketName;
 const azureClient = getAzureClient();
 const containerName = getAzureContainerName(azureLocation);
 
@@ -165,6 +164,10 @@ function updateStorageClass(data, storageClass) {
 function generateUniqueBucketName(prefix, suffix = uuidv4()) {
     return `${prefix}-${suffix.substring(0, 8)}`.substring(0, 63);
 }
+const describeIfLocationAws = hasLocation(awsLocation) ? describe : describe.skip;
+const itIfLocationAwsSkipCeph = hasLocation(awsLocation) ? itSkipCeph : it.skip;
+const itIfLocationAws = hasLocation(awsLocation) ? it : it.skip;
+const itIfLocationAzure = hasLocation(azureLocation) ? it : it.skip;
 
 // FIXME: does not pass for Ceph, see CLDSRV-443
 describeSkipIfNotMultipleOrCeph('backbeat DELETE routes', () => {
@@ -1657,7 +1660,7 @@ describe('backbeat routes', () => {
             });
         });
 
-        itSkipCeph('should PUT tags for a non-versioned bucket', function test(done) {
+        itIfLocationAwsSkipCeph('should PUT tags for a non-versioned bucket (awslocation)', function test(done) {
             this.timeout(10000);
             const bucket = NONVERSIONED_BUCKET;
             const awsKey = uuidv4();
@@ -2364,7 +2367,8 @@ describe('backbeat routes', () => {
             });
         });
     });
-    describe('backbeat multipart upload operations', function test() {
+
+    describeIfLocationAws('backbeat multipart upload operations (external location)', function test() {
         this.timeout(10000);
 
         // The ceph image does not support putting tags during initiate MPU.
@@ -2575,12 +2579,13 @@ describe('backbeat routes', () => {
                 }, err => {
                     // should error out as location shall no longer exist
                     assert(err);
+                    assert.strictEqual(err.statusCode, 503);
                     done();
                 }),
             ], done);
         });
 
-        itSkipCeph('should batch delete a versioned AWS location', done => {
+        itIfLocationAwsSkipCeph('should batch delete a versioned AWS location', done => {
             let versionId;
             const awsKey = `${TEST_BUCKET}/batch-delete-test-key-${makeid(8)}`;
 
@@ -2677,7 +2682,7 @@ describe('backbeat routes', () => {
             ], done);
         });
 
-        it('should not put delete tags if the source is not Azure and ' +
+        itIfLocationAws('should not put delete tags if the source is not Azure and ' +
         'if-unmodified-since header is not provided', done => {
             const awsKey = uuidv4();
             async.series([
@@ -2720,7 +2725,7 @@ describe('backbeat routes', () => {
             ], done);
         });
 
-        itSkipCeph('should not put tags if the source is not Azure and ' +
+        itIfLocationAwsSkipCeph('should not put tags if the source is not Azure and ' +
         'if-unmodified-since condition is not met', done => {
             const awsKey = uuidv4();
             async.series([
@@ -2765,7 +2770,7 @@ describe('backbeat routes', () => {
             ], done);
         });
 
-        itSkipCeph('should put tags if the source is not Azure and ' +
+        itIfLocationAwsSkipCeph('should put tags if the source is not Azure and ' +
         'if-unmodified-since condition is met', done => {
             const awsKey = uuidv4();
             let lastModified;
@@ -2835,7 +2840,7 @@ describe('backbeat routes', () => {
             ], done);
         });
 
-        it('should not delete the object if the source is Azure and ' +
+        itIfLocationAzure('should not delete the object if the source is Azure and ' +
         'if-unmodified-since condition is not met', done => {
             const blob = uuidv4();
             async.series([
@@ -2881,7 +2886,7 @@ describe('backbeat routes', () => {
             ], done);
         });
 
-        it('should delete the object if the source is Azure and ' +
+        itIfLocationAzure('should delete the object if the source is Azure and ' +
         'if-unmodified-since condition is met', done => {
             const blob = uuidv4();
             let lastModified;