From 4f588ff60a16621aeb9d9763cb18f2de515e9ec4 Mon Sep 17 00:00:00 2001 From: Remco Date: Thu, 19 May 2016 23:33:44 +0200 Subject: [PATCH] disable https, due to performance --- transfersh-server/utils.go | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/transfersh-server/utils.go b/transfersh-server/utils.go index c5afb37..8ce1d98 100644 --- a/transfersh-server/utils.go +++ b/transfersh-server/utils.go @@ -25,15 +25,16 @@ THE SOFTWARE. package main import ( - "github.com/goamz/goamz/aws" - "github.com/goamz/goamz/s3" - "github.com/golang/gddo/httputil/header" "math" "net/http" "net/mail" "strconv" "strings" "time" + + "github.com/goamz/goamz/aws" + "github.com/goamz/goamz/s3" + "github.com/golang/gddo/httputil/header" ) func getBucket() (*s3.Bucket, error) { @@ -42,7 +43,30 @@ func getBucket() (*s3.Bucket, error) { return nil, err } - conn := s3.New(auth, aws.Regions["eu-west-1"]) + var EUWestWithoutHTTPS = aws.Region{ + "eu-west-1", + "https://ec2.eu-west-1.amazonaws.com", + "http://s3-eu-west-1.amazonaws.com", + "", + true, + true, + "https://sdb.eu-west-1.amazonaws.com", + "https://email.eu-west-1.amazonaws.com", + "https://sns.eu-west-1.amazonaws.com", + "https://sqs.eu-west-1.amazonaws.com", + "https://iam.amazonaws.com", + "https://elasticloadbalancing.eu-west-1.amazonaws.com", + "https://dynamodb.eu-west-1.amazonaws.com", + aws.ServiceInfo{"https://monitoring.eu-west-1.amazonaws.com", aws.V2Signature}, + "https://autoscaling.eu-west-1.amazonaws.com", + aws.ServiceInfo{"https://rds.eu-west-1.amazonaws.com", aws.V2Signature}, + "https://sts.amazonaws.com", + "https://cloudformation.eu-west-1.amazonaws.com", + "https://ecs.eu-west-1.amazonaws.com", + "https://streams.dynamodb.eu-west-1.amazonaws.com", + } + + conn := s3.New(auth, EUWestWithoutHTTPS) b := conn.Bucket(config.BUCKET) return b, nil }