Merge pull request #29 from wdstar/catbox-s3-patch

fix: add path-style URL switch flag for S3 strategy.
screwdriver-cd · Feb 13, 2018 · d4453f2 · d4453f2
2 parents d1ef510 + 4e1ec5b
commit d4453f2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/config/custom-environment-variables.yaml b/config/custom-environment-variables.yaml
@@ -42,6 +42,8 @@ strategy:
         endpoint: S3_ENDPOINT
         # Specific signature version for KMS encrypted objects
         signatureVersion: S3_SIG_VER
+        # Whether to force path style URLs for S3 objects.
+        forcePathStyle: S3_FORCE_PATH_STYLE
 
 ecosystem:
     ui: ECOSYSTEM_UI
diff --git a/config/default.yaml b/config/default.yaml
@@ -50,6 +50,8 @@ strategy:
         region: YOUR-REGION
         # Amazon S3 bucket that you have write access to
         bucket: YOUR-BUCKET-ID
+        # Whether to force path style URLs for S3 objects.
+        forcePathStyle: false
 
 ecosystem:
     ui: https://cd.screwdriver.cd
diff --git a/vendor/catbox-s3/lib/index.js b/vendor/catbox-s3/lib/index.js
@@ -113,6 +113,10 @@ internals.Connection.prototype.start = function (callback) {
         clientOptions.signatureVersion = this.settings.signatureVersion;
     }
 
+    if (this.settings.forcePathStyle) {
+        clientOptions.s3ForcePathStyle = this.settings.forcePathStyle;
+    }
+
     this.client = new AWS.S3(clientOptions);
 
     internals.testBucketAccess(this.client, this.settings, (err, data) => {