move back to not including bucket in s3 address for express zone

.gitignore

@@ -386,5 +386,5 @@ override.tf.json
 # Ignore CLI configuration files
 .terraformrc
 terraform.rc
-
+.tfplan
 # End of https://www.toptal.com/developers/gitignore/api/terraform

common/etc/nginx/include/s3gateway.js

@@ -86,7 +86,7 @@ const INDEX_PAGE = "index.html";
  * Constant defining the service requests are being signed for.
  * @type {string}
  */
-const SERVICE = 's3';
+const SERVICE = 's3express';
 
 /**
  * Transform the headers returned from S3 such that there isn't information

deployments/s3_express/settings.s3express.example

@@ -1,8 +1,8 @@
 S3_BUCKET_NAME=my-bucket-name--usw2-az1--x-s3
-AWS_ACCESS_KEY_ID=<access_key>
-AWS_SECRET_ACCESS_KEY=<secret_access_key>
-AWS_SESSION_TOKEN=<session token>
-S3_SERVER=my-bucket-name--usw2-az1--x-s3.s3express-usw2-az1.us-west-2.amazonaws.com
+AWS_ACCESS_KEY_ID=ZZZZZZZZZZZZZZZZZZZZ
+AWS_SECRET_ACCESS_KEY=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+AWS_SESSION_TOKEN=bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+S3_SERVER=s3express-usw2-az1.us-west-2.amazonaws.com
 S3_SERVER_PORT=443
 S3_SERVER_PROTO=https
 S3_REGION=us-west-2

oss/etc/nginx/templates/upstreams.conf.template

@@ -7,5 +7,5 @@ upstream storage_urls {
 
     # Be sure to specify the port in the S3_SERVER and be sure that port
     # corresponds to the https/http in the proxy_pass directive.
-    server ${S3_SERVER}:${S3_SERVER_PORT};
+    server ${S3_BUCKET_NAME}.${S3_SERVER}:${S3_SERVER_PORT};
 }

plus/etc/nginx/templates/upstreams.conf.template

@@ -9,5 +9,5 @@ upstream storage_urls {
 
     # Be sure to specify the port in the S3_SERVER and be sure that port
     # corresponds to the https/http in the proxy_pass directive.
-    server ${S3_SERVER}:${S3_SERVER_PORT} resolve;
+    server ${S3_BUCKET_NAME}.${S3_SERVER}:${S3_SERVER_PORT} resolve;
 }