ft: provide pathStyle option to support S3C

lib/Config.js

@@ -195,6 +195,13 @@ function locationConstraintAssert(locationConstraints) {
             // eslint-disable-next-line no-param-reassign
             locationConstraints[l].details.https = true;
         }
+        if (details.pathStyle !== undefined) {
+            assert(typeof details.pathStyle === 'boolean', 'bad config: ' +
+                'locationConstraints[region].pathStyle must be a boolean');
+        } else {
+            // eslint-disable-next-line no-param-reassign
+            locationConstraints[l].details.pathStyle = false;
+        }
         if (locationConstraints[l].type === 'azure') {
             azureLocationConstraintAssert(l, locationConstraints[l]);
         }

lib/data/locationConstraintParser.js

@@ -54,6 +54,7 @@ function parseLC() {
                     timeout: 0 }
                 : { agent: connectionAgent, timeout: 0 };
             const sslEnabled = locationObj.details.https === true;
+            const pathStyle = locationObj.details.pathStyle;
             // TODO: HTTP requests to AWS are not supported with V4 auth for
             // non-file streams which are used by Backbeat. This option will be
             // removed once CA certs, proxy setup feature is implemented.
@@ -73,6 +74,7 @@ function parseLC() {
                 signatureVersion,
                 sslEnabled,
                 maxRetries: 0,
+                s3ForcePathStyle: pathStyle,
             };
             // users can either include the desired profile name from their
             // ~/.aws/credentials file or include the accessKeyId and

tests/locationConfig/locationConfigTests.json

@@ -65,6 +65,17 @@
             "credentialsProfile": "default_2"
         }
     },
+    "awsbackendPathStyle": {
+        "type": "aws_s3",
+        "legacyAwsBehavior": true,
+        "details": {
+            "awsEndpoint": "s3.amazonaws.com",
+            "bucketName": "multitester555",
+            "bucketMatch": true,
+            "credentialsProfile": "default",
+            "pathStyle": true
+        }
+    },
     "azurebackend": {
         "type": "azure",
         "legacyAwsBehavior": true,

tests/unit/testConfigs/locConstraintAssert.js

@@ -5,11 +5,11 @@ class LocationConstraint {
     constructor(type, legacyAwsBehavior, details) {
         this.type = type || 'scality';
         this.legacyAwsBehavior = legacyAwsBehavior || false;
-        this.details = details || {
+        this.details = Object.assign({}, {
             awsEndpoint: 's3.amazonaws.com',
             bucketName: 'tester',
             credentialsProfile: 'default',
-        };
+        }, details || {});
     }
 }
 
@@ -224,4 +224,61 @@ describe('locationConstraintAssert', () => {
         '/bad location constraint: "azurefaketest" ' +
         'azureStorageAccessKey is not a valid base64 string/');
     });
+
+    it('should set https to true by default', () => {
+        const usEast1 = new LocationConstraint();
+        const locationConstraint = new LocationConstraint('aws_s3', true);
+        assert.doesNotThrow(() => {
+            locationConstraintAssert({
+                'us-east-1': usEast1,
+                'awshttpsDefault': locationConstraint,
+            });
+        }, '/bad location constraint awshttpsDefault,' +
+        'incorrect default config for https');
+        assert.strictEqual(locationConstraint.details.https, true,
+            'https config should be true');
+    });
+
+    it('should override default if https is set to false', () => {
+        const usEast1 = new LocationConstraint();
+        const locationConstraint = new LocationConstraint('aws_s3', true, {
+            https: false,
+        });
+        assert.doesNotThrow(() => {
+            locationConstraintAssert({
+                'us-east-1': usEast1,
+                'awshttpsFalse': locationConstraint,
+            });
+        }, '/bad location constraint awshttpsFalse,' +
+        'incorrect config for https');
+        assert.strictEqual(locationConstraint.details.https, false,
+            'https config should be false');
+    });
+
+    it('should set pathStyle config option to false by default', () => {
+        const usEast1 = new LocationConstraint();
+        const locationConstraint = new LocationConstraint('aws_s3', true);
+        assert.doesNotThrow(() => {
+            locationConstraintAssert({
+                'us-east-1': usEast1,
+                'awsdefaultstyle': locationConstraint,
+            });
+        }, '/bad location constraint, unable to set default config');
+        assert.strictEqual(locationConstraint.details.pathStyle, false,
+            'pathstyle config should be false');
+    });
+
+    it('should override default if pathStyle is set to true', () => {
+        const usEast1 = new LocationConstraint();
+        const locationConstraint = new LocationConstraint('aws_s3', true,
+        { pathStyle: true });
+        assert.doesNotThrow(() => {
+            locationConstraintAssert({
+                'us-east-1': usEast1,
+                'awspathstyle': locationConstraint,
+            });
+        }, '/bad location constraint, unable to set pathSytle config');
+        assert.strictEqual(locationConstraint.details.pathStyle, true,
+            'pathstyle config should be true');
+    });
 });