daniel
/
distribution
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1739 from cezarsa/master 

[Swift] Expose EndpointType parameter in driver
master
Richard Scothern 2016-06-15 10:33:48 -07:00 committed by GitHub
parent 81fc3d6933 7b97265d95
commit d303d5c1ac
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/storage/driver/swift/swift.go
View File

@ -72,6 +72,7 @@ type Parameters struct {
AuthVersion int AuthVersion int
Container string Container string
Prefix string Prefix string
EndpointType string
InsecureSkipVerify bool InsecureSkipVerify bool
ChunkSize int ChunkSize int
SecretKey string SecretKey string
@ -182,6 +183,7 @@ func New(params Parameters) (*Driver, error) {
Domain: params.Domain, Domain: params.Domain,
DomainId: params.DomainID, DomainId: params.DomainID,
TrustId: params.TrustID, TrustId: params.TrustID,
EndpointType: swift.EndpointType(params.EndpointType),
Transport: transport, Transport: transport,
ConnectTimeout: 60 * time.Second, ConnectTimeout: 60 * time.Second,
Timeout: 15 * 60 * time.Second, Timeout: 15 * 60 * time.Second,

3
docs/storage/driver/swift/swift_test.go
View File

@ -34,6 +34,7 @@ func init() {
container string container string
region string region string
AuthVersion int AuthVersion int
endpointType string
insecureSkipVerify bool insecureSkipVerify bool
secretKey string secretKey string
accessKey string accessKey string
@ -54,6 +55,7 @@ func init() {
container = os.Getenv("SWIFT_CONTAINER_NAME") container = os.Getenv("SWIFT_CONTAINER_NAME")
region = os.Getenv("SWIFT_REGION_NAME") region = os.Getenv("SWIFT_REGION_NAME")
AuthVersion, _ = strconv.Atoi(os.Getenv("SWIFT_AUTH_VERSION")) AuthVersion, _ = strconv.Atoi(os.Getenv("SWIFT_AUTH_VERSION"))
endpointType = os.Getenv("SWIFT_ENDPOINT_TYPE")
insecureSkipVerify, _ = strconv.ParseBool(os.Getenv("SWIFT_INSECURESKIPVERIFY")) insecureSkipVerify, _ = strconv.ParseBool(os.Getenv("SWIFT_INSECURESKIPVERIFY"))
secretKey = os.Getenv("SWIFT_SECRET_KEY") secretKey = os.Getenv("SWIFT_SECRET_KEY")
accessKey = os.Getenv("SWIFT_ACCESS_KEY") accessKey = os.Getenv("SWIFT_ACCESS_KEY")
@ -90,6 +92,7 @@ func init() {
AuthVersion, AuthVersion,
container, container,
root, root,
endpointType,
insecureSkipVerify, insecureSkipVerify,
defaultChunkSize, defaultChunkSize,
secretKey, secretKey,