Merge lp:~gz/goose/client_identity_refactor_fix into lp:~gophers/goose/trunk

[Martin Packman]

Fixes up a couple of things from the client refactoring to get the identity service to build correctly again. This includes addressing one of the points from review about the naming of the token field.

[Dimiter Naydenov (dimitern)]

LGTM - I suppose the build error was because Auth was expecting *Credentials, so passing &creds solved it.

review: Approve

[Martin Packman (gz)]

Right, only affected those tests but worth a fixup landing.

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 2012-11-21 16:20, Martin Packman wrote:
> Martin Packman has proposed merging
> lp:~gz/goose/client_identity_refactor_fix into lp:goose.
>
> Requested reviews: The Go Language Gophers (gophers)
>
> For more details, see:
> https://code.launchpad.net/~gz/goose/client_identity_refactor_fix/+merge/135394
>
> Fixes up a couple of things from the client refactoring to get the
> identity service to build correctly again. This includes addressing
> one of the points from review about the naming of the token field.
>

 review: needsinfo

I thought the TokenId => Token was considered controversial. So I'm
not sure if that is ready to land before we discuss it.

*I* like the change :). But I would like to have the conversation and
not sidestep Ian on it.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (Cygwin)
Comment: Using GnuPG with undefined - http://www.enigmail.net/

iEYEARECAAYFAlCs4AEACgkQJdeBCYSNAAP7QwCeJ1oXtPHIoje/YWbo78DuRzxh
GwgAoILxZSY5eW++01DaWuBozuqY9But
=oUS9
-----END PGP SIGNATURE-----

review: Needs Information

[Martin Packman (gz)]

Yes, unfortunately I read Ian's response on the review comments only after making this change. Because the identity package tests still asserted on Token, rather than using the rename to TokenId brought in with client, something needed to change. Will respond to the point on the original branch review.

=== modified file 'client/client.go'
--- client/client.go	2012-11-21 08:46:00 +0000
+++ client/client.go	2012-11-21 12:21:20 +0000
@@ -37,7 +37,7 @@
 
 	//TODO - store service urls by region.
 	ServiceURLs map[string]string
-	TokenId     string
+	Token       string
 	TenantId    string
 	UserId      string
 }
@@ -67,7 +67,7 @@
 		return
 	}
 
-	c.TokenId = authDetails.TokenId
+	c.Token = authDetails.Token
 	c.TenantId = authDetails.TenantId
 	c.UserId = authDetails.UserId
 	c.ServiceURLs = authDetails.ServiceURLs
@@ -75,7 +75,7 @@
 }
 
 func (c *OpenStackClient) IsAuthenticated() bool {
-	return c.TokenId != ""
+	return c.Token != ""
 }
 
 type Link struct {
@@ -635,7 +635,7 @@
 	if requestData.ReqHeaders == nil {
 		requestData.ReqHeaders = make(http.Header)
 	}
-	requestData.ReqHeaders.Add("X-Auth-Token", c.TokenId)
+	requestData.ReqHeaders.Add("X-Auth-Token", c.Token)
 	return
 }
 

=== modified file 'identity/identity.go'
--- identity/identity.go	2012-11-21 07:56:19 +0000
+++ identity/identity.go	2012-11-21 12:21:20 +0000
@@ -10,7 +10,7 @@
 )
 
 type AuthDetails struct {
-	TokenId     string
+	Token       string
 	TenantId    string
 	UserId      string
 	ServiceURLs map[string]string

=== modified file 'identity/legacy.go'
--- identity/legacy.go	2012-11-21 07:56:19 +0000
+++ identity/legacy.go	2012-11-21 12:21:20 +0000
@@ -31,8 +31,8 @@
 			response.StatusCode, response.Status, content)
 	}
 	details := &AuthDetails{}
-	details.TokenId = response.Header.Get("X-Auth-Token")
-	if details.TokenId == "" {
+	details.Token = response.Header.Get("X-Auth-Token")
+	if details.Token == "" {
 		return nil, fmt.Errorf("Did not get valid Token from auth request")
 	}
 	nova_url := response.Header.Get("X-Server-Management-Url")

=== modified file 'identity/legacy_test.go'
--- identity/legacy_test.go	2012-11-11 11:13:52 +0000
+++ identity/legacy_test.go	2012-11-21 12:21:20 +0000
@@ -19,7 +19,7 @@
 	service.SetManagementURL("http://management/url")
 	var l Authenticator = &Legacy{}
 	creds := Credentials{User: "joe-user", URL: s.Server.URL, Secrets: "secrets"}
-	auth, err := l.Auth(creds)
+	auth, err := l.Auth(&creds)
 	c.Assert(err, IsNil)
 	c.Assert(auth.Token, Equals, token)
 	c.Assert(auth.ServiceURLs, DeepEquals, map[string]string{"compute": "http://management/url"})
@@ -31,7 +31,7 @@
 	_ = service.AddUser("joe-user", "secrets")
 	var l Authenticator = &Legacy{}
 	creds := Credentials{User: "joe-user", URL: s.Server.URL, Secrets: "bad-secrets"}
-	auth, err := l.Auth(creds)
+	auth, err := l.Auth(&creds)
 	c.Assert(err, NotNil)
 	c.Assert(auth, IsNil)
 }

=== modified file 'identity/userpass.go'
--- identity/userpass.go	2012-11-21 08:46:00 +0000
+++ identity/userpass.go	2012-11-21 12:21:20 +0000
@@ -94,7 +94,7 @@
 	if respToken.Id == "" {
 		return nil, fmt.Errorf("Did not get valid Token from auth request")
 	}
-	details.TokenId = respToken.Id
+	details.Token = respToken.Id
 	details.TenantId = respToken.Tenant.Id
 	details.UserId = access.User.Id
 	details.ServiceURLs = make(map[string]string, len(access.ServiceCatalog))

=== modified file 'identity/userpass_test.go'
--- identity/userpass_test.go	2012-11-11 11:13:52 +0000
+++ identity/userpass_test.go	2012-11-21 12:21:20 +0000
@@ -18,7 +18,7 @@
 	token := service.AddUser("joe-user", "secrets")
 	var l Authenticator = &UserPass{}
 	creds := Credentials{User: "joe-user", URL: s.Server.URL, Secrets: "secrets"}
-	auth, err := l.Auth(creds)
+	auth, err := l.Auth(&creds)
 	c.Assert(err, IsNil)
 	c.Assert(auth.Token, Equals, token)
 	// c.Assert(auth.ServiceURLs, DeepEquals, map[string]string{"compute": "http://management/url"})