Merge lp:~danilo/juju-core/bug-1135335 into lp:~juju/juju-core/trunk

[Данило Шеган]

Support keypair auth for HP cloud

Add support for 'access-key' and 'secret-key' environment options (or appropriate environment variables) when auth-mode is set to 'keypair' (now supported). Make use of lp:goose r90 (or newer) to do the actual authentication.

https://codereview.appspot.com/8858049/

[Данило Шеган (danilo)]

Reviewers: mp+161377_code.launchpad.net,

Message:
Please take a look.

Description:
Support keypair auth for HP cloud

Add support for 'access-key' and 'secret-key' environment options (or
appropriate environment variables) when auth-mode is set to 'keypair'
(now supported). Make use of goose (see lp:~danilo/goose/bug-1135335)
to do the actual authentication.

This has been tested with the actual HP cloud we've got access to.

https://code.launchpad.net/~danilo/juju-core/bug-1135335/+merge/161377

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/8858049/

Affected files:
   A [revision details]
   M environs/openstack/config.go
   M environs/openstack/config_test.go
   M environs/openstack/local_test.go
   M environs/openstack/provider.go

[Dimiter Naydenov (dimitern)]

LGTM

https://codereview.appspot.com/8858049/

[Данило Шеган (danilo)]

*** Submitted:

Support keypair auth for HP cloud

Add support for 'access-key' and 'secret-key' environment options (or
appropriate environment variables) when auth-mode is set to 'keypair'
(now supported). Make use of lp:goose r90 (or newer) to do the actual
authentication.

R=dimitern, TheMue
CC=
https://codereview.appspot.com/8858049

https://codereview.appspot.com/8858049/

=== modified file 'environs/openstack/config.go'
--- environs/openstack/config.go	2013-04-10 02:56:46 +0000
+++ environs/openstack/config.go	2013-05-09 00:36:24 +0000
@@ -15,6 +15,8 @@
 		"tenant-name":           schema.String(),
 		"auth-url":              schema.String(),
 		"auth-mode":             schema.String(),
+		"access-key":            schema.String(),
+		"secret-key":            schema.String(),
 		"region":                schema.String(),
 		"control-bucket":        schema.String(),
 		"public-bucket":         schema.String(),
@@ -29,6 +31,8 @@
 		"tenant-name":           "",
 		"auth-url":              "",
 		"auth-mode":             string(AuthUserPass),
+		"access-key":            "",
+		"secret-key":            "",
 		"region":                "",
 		"control-bucket":        "",
 		"public-bucket":         "juju-dist",
@@ -68,6 +72,14 @@
 	return c.attrs["auth-mode"].(string)
 }
 
+func (c *environConfig) accessKey() string {
+	return c.attrs["access-key"].(string)
+}
+
+func (c *environConfig) secretKey() string {
+	return c.attrs["secret-key"].(string)
+}
+
 func (c *environConfig) controlBucket() string {
 	return c.attrs["control-bucket"].(string)
 }
@@ -103,6 +115,7 @@
 type AuthMode string
 
 const (
+	AuthKeyPair  AuthMode = "keypair"
 	AuthLegacy   AuthMode = "legacy"
 	AuthUserPass AuthMode = "userpass"
 )
@@ -118,8 +131,9 @@
 	}
 	ecfg := &environConfig{cfg, v.(map[string]interface{})}
 
-	authMode := ecfg.authMode()
-	switch AuthMode(authMode) {
+	authMode := AuthMode(ecfg.authMode())
+	switch authMode {
+	case AuthKeyPair:
 	case AuthLegacy:
 	case AuthUserPass:
 	default:
@@ -134,17 +148,32 @@
 	}
 	cred := identity.CredentialsFromEnv()
 	format := "required environment variable not set for credentials attribute: %s"
-	if ecfg.username() == "" {
-		if cred.User == "" {
-			return nil, fmt.Errorf(format, "User")
-		}
-		ecfg.attrs["username"] = cred.User
-	}
-	if ecfg.password() == "" {
-		if cred.Secrets == "" {
-			return nil, fmt.Errorf(format, "Secrets")
-		}
-		ecfg.attrs["password"] = cred.Secrets
+	if authMode == AuthUserPass || authMode == AuthLegacy {
+		if ecfg.username() == "" {
+			if cred.User == "" {
+				return nil, fmt.Errorf(format, "User")
+			}
+			ecfg.attrs["username"] = cred.User
+		}
+		if ecfg.password() == "" {
+			if cred.Secrets == "" {
+				return nil, fmt.Errorf(format, "Secrets")
+			}
+			ecfg.attrs["password"] = cred.Secrets
+		}
+	} else if authMode == AuthKeyPair {
+		if ecfg.accessKey() == "" {
+			if cred.User == "" {
+				return nil, fmt.Errorf(format, "User")
+			}
+			ecfg.attrs["access-key"] = cred.User
+		}
+		if ecfg.secretKey() == "" {
+			if cred.Secrets == "" {
+				return nil, fmt.Errorf(format, "Secrets")
+			}
+			ecfg.attrs["secret-key"] = cred.Secrets
+		}
 	}
 	if ecfg.authURL() == "" {
 		if cred.URL == "" {
 
=== modified file 'environs/openstack/config_test.go'
--- environs/openstack/config_test.go	2013-04-09 18:26:11 +0000
+++ environs/openstack/config_test.go	2013-05-09 00:36:24 +0000
@@ -49,6 +49,8 @@
 	tenantName    string
 	authMode      string
 	authURL       string
+	accessKey     string
+	secretKey     string
 	firewallMode  config.FirewallMode
 	err           string
 }
@@ -125,6 +127,12 @@
 	if t.authMode != "" {
 		c.Assert(ecfg.authMode(), Equals, t.authMode)
 	}
+	if t.accessKey != "" {
+		c.Assert(ecfg.accessKey(), Equals, t.accessKey)
+	}
+	if t.secretKey != "" {
+		c.Assert(ecfg.secretKey(), Equals, t.secretKey)
+	}
 	if t.username != "" {
 		c.Assert(ecfg.username(), Equals, t.username)
 		c.Assert(ecfg.password(), Equals, t.password)
@@ -265,6 +273,36 @@
 		},
 		err: ".*invalid authorization mode.*",
 	}, {
+		summary: "keypair authorization mode",
+		config: attrs{
+			"auth-mode":  "keypair",
+			"access-key": "MyAccessKey",
+			"secret-key": "MySecretKey",
+		},
+		authMode:  "keypair",
+		accessKey: "MyAccessKey",
+		secretKey: "MySecretKey",
+	}, {
+		summary: "keypair authorization mode without access key",
+		config: attrs{
+			"auth-mode":  "keypair",
+			"secret-key": "MySecretKey",
+		},
+		envVars: map[string]string{
+			"OS_USERNAME": "",
+		},
+		err: "required environment variable not set for credentials attribute: User",
+	}, {
+		summary: "keypair authorization mode without secret key",
+		config: attrs{
+			"auth-mode":  "keypair",
+			"access-key": "MyAccessKey",
+		},
+		envVars: map[string]string{
+			"OS_PASSWORD": "",
+		},
+		err: "required environment variable not set for credentials attribute: Secrets",
+	}, {
 		summary: "invalid auth-url format",
 		config: attrs{
 			"auth-url": "invalid",
 
=== modified file 'environs/openstack/local_test.go'
--- environs/openstack/local_test.go	2013-04-29 01:39:21 +0000
+++ environs/openstack/local_test.go	2013-05-09 00:36:24 +0000
@@ -130,7 +130,7 @@
 	s.Server.Config.Handler = s.Mux
 	cred.URL = s.Server.URL
 	c.Logf("Started service at: %v", s.Server.URL)
-	s.Service = openstackservice.New(cred)
+	s.Service = openstackservice.New(cred, identity.AuthUserPass)
 	s.Service.SetupHTTP(s.Mux)
 	openstack.ShortTimeouts(true)
 }
 
=== modified file 'environs/openstack/provider.go'
--- environs/openstack/provider.go	2013-04-23 04:03:33 +0000
+++ environs/openstack/provider.go	2013-05-09 00:36:24 +0000
@@ -540,6 +540,10 @@
 		authMode = identity.AuthLegacy
 	case AuthUserPass:
 		authMode = identity.AuthUserPass
+	case AuthKeyPair:
+		authMode = identity.AuthKeyPair
+		cred.User = ecfg.accessKey()
+		cred.Secrets = ecfg.secretKey()
 	}
 	return client.NewClient(cred, authMode, nil)
 }