vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-07-20 12:47:35 +00:00
Code Issues Projects Releases Wiki Activity

swift: Fallback to TempAuth

Browse Source
This commit is contained in:
Sebastien Badia
2015-02-10 12:19:34 +01:00
parent 20adfd49a7
commit 26a65b2336
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
swift/public.go
+9 -3
View File
@@ -31,13 +31,19 @@ var (
// keys, tenant and tenantId // keys, tenant and tenantId
func NewPublishedStorage(username string, password string, authUrl string, tenant string, tenantId string, container string, prefix string) (*PublishedStorage, error) { func NewPublishedStorage(username string, password string, authUrl string, tenant string, tenantId string, container string, prefix string) (*PublishedStorage, error) {
if username == "" { if username == "" {
username = os.Getenv("OS_USERNAME") if username = os.Getenv("OS_USERNAME"); username == "" {
username = os.Getenv("ST_USER")
}
} }
if password == "" { if password == "" {
password = os.Getenv("OS_PASSWORD") if password = os.Getenv("OS_PASSWORD"); password == "" {
password = os.Getenv("ST_KEY")
}
} }
if authUrl == "" { if authUrl == "" {
authUrl = os.Getenv("OS_AUTH_URL") if authUrl = os.Getenv("OS_AUTH_URL"); authUrl == "" {
authUrl = os.Getenv("ST_AUTH")
}
} }
if tenant == "" { if tenant == "" {
tenant = os.Getenv("OS_TENANT_NAME") tenant = os.Getenv("OS_TENANT_NAME")