Merge branch 'master' into patch-4

distribution/flavors/aws-ec2-cloud/CloudFormation/cloudformation-template.json

@@ -162,6 +162,7 @@
               " --restart=always",
               " -v jenkins-evergreen-data:/evergreen/data",
               " -v $PWD/ssh-agents-private-key:/run/secrets/PRIVATE_KEY:ro",
+              " -e REGION=", {"Ref":"AWS::Region"},
               " -e ARTIFACT_MANAGER_S3_BUCKET_NAME=", {"Ref":"S3BucketForArtifactManager"},
               " -e AGENT_SECURITY_GROUP=", {"Ref":"EvergreenAgentSecurityGroup"},
               " -e AGENT_SUBNET=", {"Ref":"EvergreenSubnet"},

distribution/flavors/aws-ec2-cloud/config/as-code/artifact-manager-s3.yaml

@@ -6,8 +6,7 @@ unclassified:
           provider: s3
 aws:
   awsCredentials:
-    # FIXME: not a sensible default for everyone
-    region: "us-east-1"
+    region: "${REGION}"
   s3:
     # TODO: create through CloudFormation
     container: "${ARTIFACT_MANAGER_S3_BUCKET_NAME}"