From 3f68c345ec9c39e09b5fe23ea89fbf5414b74501 Mon Sep 17 00:00:00 2001 From: Jaex Date: Sat, 9 Dec 2017 15:35:07 +0300 Subject: [PATCH] Update S3 endpoints --- ShareX.UploadersLib/FileUploaders/AmazonS3.cs | 16 +++++++--------- .../FileUploaders/AmazonS3Endpoint.cs | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/ShareX.UploadersLib/FileUploaders/AmazonS3.cs b/ShareX.UploadersLib/FileUploaders/AmazonS3.cs index 1d0a0d1d7..f24c24bfb 100644 --- a/ShareX.UploadersLib/FileUploaders/AmazonS3.cs +++ b/ShareX.UploadersLib/FileUploaders/AmazonS3.cs @@ -69,22 +69,20 @@ public sealed class AmazonS3 : FileUploader public static List Endpoints { get; } = new List() { - new AmazonS3Endpoint("Asia Pacific (Tokyo)", "s3-ap-northeast-1.amazonaws.com", "ap-northeast-1"), - new AmazonS3Endpoint("Asia Pacific (Seoul)", "s3.ap-northeast-2.amazonaws.com", "ap-northeast-2"), new AmazonS3Endpoint("Asia Pacific (Mumbai)", "s3.ap-south-1.amazonaws.com", "ap-south-1"), + new AmazonS3Endpoint("Asia Pacific (Seoul)", "s3.ap-northeast-2.amazonaws.com", "ap-northeast-2"), new AmazonS3Endpoint("Asia Pacific (Singapore)", "s3-ap-southeast-1.amazonaws.com", "ap-southeast-1"), new AmazonS3Endpoint("Asia Pacific (Sydney)", "s3-ap-southeast-2.amazonaws.com", "ap-southeast-2"), + new AmazonS3Endpoint("Asia Pacific (Tokyo)", "s3-ap-northeast-1.amazonaws.com", "ap-northeast-1"), new AmazonS3Endpoint("Canada (Central)", "s3.ca-central-1.amazonaws.com", "ca-central-1"), - new AmazonS3Endpoint("EU Central (Frankfurt)", "s3.eu-central-1.amazonaws.com", "eu-central-1"), - new AmazonS3Endpoint("EU West (Ireland)", "s3-eu-west-1.amazonaws.com", "eu-west-1"), - new AmazonS3Endpoint("EU West (London)", "s3.eu-west-2.amazonaws.com", "eu-west-2"), - new AmazonS3Endpoint("South America (Sao Paulo)", "s3-sa-east-1.amazonaws.com", "sa-east-1"), - new AmazonS3Endpoint("US East (Virginia)", "s3.amazonaws.com", "us-east-1"), + new AmazonS3Endpoint("EU (Frankfurt)", "s3.eu-central-1.amazonaws.com", "eu-central-1"), + new AmazonS3Endpoint("EU (Ireland)", "s3-eu-west-1.amazonaws.com", "eu-west-1"), + new AmazonS3Endpoint("EU (London)", "s3.eu-west-2.amazonaws.com", "eu-west-2"), + new AmazonS3Endpoint("South America (São Paulo)", "s3-sa-east-1.amazonaws.com", "sa-east-1"), + new AmazonS3Endpoint("US East (N. Virginia)", "s3.amazonaws.com", "us-east-1"), new AmazonS3Endpoint("US East (Ohio)", "s3.us-east-2.amazonaws.com", "us-east-2"), new AmazonS3Endpoint("US West (N. California)", "s3-us-west-1.amazonaws.com", "us-west-1"), new AmazonS3Endpoint("US West (Oregon)", "s3-us-west-2.amazonaws.com", "us-west-2"), - new AmazonS3Endpoint("China (Beijing)", "s3.cn-north-1.amazonaws.com.cn", "cn-north-1"), - new AmazonS3Endpoint("US GovCloud West (Oregon)", "s3-us-gov-west-1.amazonaws.com", "us-gov-west-1"), new AmazonS3Endpoint("DreamObjects", "objects-us-west-1.dream.io") }; diff --git a/ShareX.UploadersLib/FileUploaders/AmazonS3Endpoint.cs b/ShareX.UploadersLib/FileUploaders/AmazonS3Endpoint.cs index ba947f66c..b1c71f400 100644 --- a/ShareX.UploadersLib/FileUploaders/AmazonS3Endpoint.cs +++ b/ShareX.UploadersLib/FileUploaders/AmazonS3Endpoint.cs @@ -46,7 +46,7 @@ public AmazonS3Endpoint(string name, string endpoint, string region) public override string ToString() { - return $"{Name} [{Endpoint}]"; + return Name; } } } \ No newline at end of file