Fix authorization with raw credentials

opentelekomcloud · Mar 27, 2020 · 1dc73b0 · 1dc73b0
1 parent 863a687
commit 1dc73b0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@ export PATH:=/usr/local/go/bin:$(PATH)
 exec_path := /usr/local/bin/
 exec_name := docker-machine-driver-otc
 
-VERSION := 0.2.1b1
+VERSION := 0.2.1b2
 
 
 default: test build

diff --git a/driver/opentelekomcloud.go b/driver/opentelekomcloud.go
@@ -224,7 +224,6 @@ func (d *Driver) Authenticate() error {
 			ProjectID:         d.ProjectID,
 			ProjectDomainName: d.DomainName,
 			ProjectDomainID:   d.DomainID,
-			DefaultDomain:     d.DomainName,
 			Token:             d.Token,
 		},
 	}

diff --git a/driver/services/client.go b/driver/services/client.go
@@ -85,6 +85,18 @@ func (c *Client) Authenticate(opts *clientconfig.ClientOpts) error {
 		}
 		c.endpointType = getEndpointType(cloud.EndpointType)
 		c.region = cloud.RegionName
+	} else {
+		if ao.DomainID == "" {
+			ao.DomainID = opts.AuthInfo.ProjectDomainID
+		}
+		if ao.DomainName == "" {
+			ao.DomainName = opts.AuthInfo.ProjectDomainName
+		}
+		if opts.RegionName == "" {
+			opts.RegionName = defaultRegion
+		}
+		c.endpointType = getEndpointType(opts.EndpointType)
+		c.region = opts.RegionName
 	}
 
 	userAgent := fmt.Sprintf("docker-machine/v%d", version.APIVersion)