dsl struct tags; wip
diff --git a/openstack/identity/v2/tokens/errors.go b/openstack/identity/v2/tokens/errors.go
deleted file mode 100644
index 12570f5..0000000
--- a/openstack/identity/v2/tokens/errors.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package tokens
-
-import "fmt"
-
-var (
- // ErrUserIDProvided is returned if you attempt to authenticate with a UserID.
- ErrUserIDProvided = unacceptedAttributeErr("UserID")
-
- // ErrAPIKeyProvided is returned if you attempt to authenticate with an APIKey.
- ErrAPIKeyProvided = unacceptedAttributeErr("APIKey")
-
- // ErrDomainIDProvided is returned if you attempt to authenticate with a DomainID.
- ErrDomainIDProvided = unacceptedAttributeErr("DomainID")
-
- // ErrDomainNameProvided is returned if you attempt to authenticate with a DomainName.
- ErrDomainNameProvided = unacceptedAttributeErr("DomainName")
-)
-
-func unacceptedAttributeErr(attribute string) error {
- return fmt.Errorf("The base Identity V2 API does not accept authentication by %s", attribute)
-}
diff --git a/openstack/identity/v2/tokens/requests.go b/openstack/identity/v2/tokens/requests.go
index 6064bc7..a2a0685 100644
--- a/openstack/identity/v2/tokens/requests.go
+++ b/openstack/identity/v2/tokens/requests.go
@@ -4,74 +4,9 @@
// AuthOptionsBuilder describes any argument that may be passed to the Create call.
type AuthOptionsBuilder interface {
-
// ToTokenCreateMap assembles the Create request body, returning an error if parameters are
// missing or inconsistent.
- ToTokenCreateMap() (map[string]interface{}, error)
-}
-
-// AuthOptions wraps a gophercloud AuthOptions in order to adhere to the AuthOptionsBuilder
-// interface.
-type AuthOptions struct {
- gophercloud.AuthOptions
-}
-
-// WrapOptions embeds a root AuthOptions struct in a package-specific one.
-func WrapOptions(original gophercloud.AuthOptions) AuthOptions {
- return AuthOptions{AuthOptions: original}
-}
-
-// ToTokenCreateMap converts AuthOptions into nested maps that can be serialized into a JSON
-// request.
-func (auth AuthOptions) ToTokenCreateMap() (map[string]interface{}, error) {
- // Error out if an unsupported auth option is present.
- if auth.UserID != "" {
- return nil, ErrUserIDProvided
- }
- if auth.APIKey != "" {
- return nil, ErrAPIKeyProvided
- }
- if auth.DomainID != "" {
- return nil, ErrDomainIDProvided
- }
- if auth.DomainName != "" {
- return nil, ErrDomainNameProvided
- }
-
- // Populate the request map.
- authMap := make(map[string]interface{})
-
- if auth.Username != "" {
- if auth.Password == "" {
- err := gophercloud.ErrMissingInput{}
- err.Function = "tokens.ToTokenCreateMap"
- err.Argument = "tokens.AuthOptions.Password"
- return nil, err
- }
- authMap["passwordCredentials"] = map[string]interface{}{
- "username": auth.Username,
- "password": auth.Password,
- }
- } else if auth.TokenID != "" {
- authMap["token"] = map[string]interface{}{
- "id": auth.TokenID,
- }
- } else {
- err := gophercloud.ErrMissingInput{}
- err.Function = "tokens.ToTokenCreateMap"
- err.Argument = "tokens.AuthOptions.Username/tokens.AuthOptions.TokenID"
- err.Info = "You must provide either username/password or tenantID/token values."
- return nil, err
- }
-
- if auth.TenantID != "" {
- authMap["tenantId"] = auth.TenantID
- }
- if auth.TenantName != "" {
- authMap["tenantName"] = auth.TenantName
- }
-
- return map[string]interface{}{"auth": authMap}, nil
+ ToTokenV2CreateMap() (map[string]interface{}, error)
}
// Create authenticates to the identity service and attempts to acquire a Token.
@@ -79,23 +14,23 @@
// Generally, rather than interact with this call directly, end users should call openstack.AuthenticatedClient(),
// which abstracts all of the gory details about navigating service catalogs and such.
func Create(client *gophercloud.ServiceClient, auth AuthOptionsBuilder) CreateResult {
- request, err := auth.ToTokenCreateMap()
+ var r CreateResult
+ b, err := auth.ToTokenV2CreateMap()
if err != nil {
- return CreateResult{gophercloud.Result{Err: err}}
+ r.Err = err
+ return r
}
-
- var result CreateResult
- _, result.Err = client.Post(CreateURL(client), request, &result.Body, &gophercloud.RequestOpts{
+ _, r.Err = client.Post(CreateURL(client), b, &r.Body, &gophercloud.RequestOpts{
OkCodes: []int{200, 203},
})
- return result
+ return r
}
// Get validates and retrieves information for user's token.
func Get(client *gophercloud.ServiceClient, token string) GetResult {
- var result GetResult
- _, result.Err = client.Get(GetURL(client, token), &result.Body, &gophercloud.RequestOpts{
+ var r GetResult
+ _, r.Err = client.Get(GetURL(client, token), &r.Body, &gophercloud.RequestOpts{
OkCodes: []int{200, 203},
})
- return result
+ return r
}
diff --git a/openstack/identity/v2/tokens/requests_test.go b/openstack/identity/v2/tokens/requests_test.go
index 9b3273e..d25c2d7 100644
--- a/openstack/identity/v2/tokens/requests_test.go
+++ b/openstack/identity/v2/tokens/requests_test.go
@@ -1,6 +1,7 @@
package tokens
import (
+ "reflect"
"testing"
"github.com/gophercloud/gophercloud"
@@ -12,8 +13,7 @@
th.SetupHTTP()
defer th.TeardownHTTP()
HandleTokenPost(t, requestJSON)
-
- return Create(client.ServiceClient(), AuthOptions{options})
+ return Create(client.ServiceClient(), options)
}
func tokenPostErr(t *testing.T, options gophercloud.AuthOptions, expectedErr error) {
@@ -21,15 +21,30 @@
defer th.TeardownHTTP()
HandleTokenPost(t, "")
- actualErr := Create(client.ServiceClient(), AuthOptions{options}).Err
- th.CheckDeepEquals(t, expectedErr, actualErr)
+ actualErr := Create(client.ServiceClient(), options).Err
+ th.CheckDeepEquals(t, reflect.TypeOf(expectedErr), reflect.TypeOf(actualErr))
+}
+
+func TestCreateWithToken(t *testing.T) {
+ options := gophercloud.AuthOptions{
+ TokenID: "cbc36478b0bd8e67e89469c7749d4127",
+ }
+
+ IsSuccessful(t, tokenPost(t, options, `
+ {
+ "auth": {
+ "token": {
+ "id": "cbc36478b0bd8e67e89469c7749d4127"
+ }
+ }
+ }
+ `))
}
func TestCreateWithPassword(t *testing.T) {
- options := gophercloud.AuthOptions{
- Username: "me",
- Password: "swordfish",
- }
+ options := gophercloud.AuthOptions{}
+ options.Username = "me"
+ options.Password = "swordfish"
IsSuccessful(t, tokenPost(t, options, `
{
@@ -44,11 +59,10 @@
}
func TestCreateTokenWithTenantID(t *testing.T) {
- options := gophercloud.AuthOptions{
- Username: "me",
- Password: "opensesame",
- TenantID: "fc394f2ab2df4114bde39905f800dc57",
- }
+ options := gophercloud.AuthOptions{}
+ options.Username = "me"
+ options.Password = "opensesame"
+ options.TenantID = "fc394f2ab2df4114bde39905f800dc57"
IsSuccessful(t, tokenPost(t, options, `
{
@@ -64,11 +78,10 @@
}
func TestCreateTokenWithTenantName(t *testing.T) {
- options := gophercloud.AuthOptions{
- Username: "me",
- Password: "opensesame",
- TenantName: "demo",
- }
+ options := gophercloud.AuthOptions{}
+ options.Username = "me"
+ options.Password = "opensesame"
+ options.TenantName = "demo"
IsSuccessful(t, tokenPost(t, options, `
{
@@ -83,63 +96,21 @@
`))
}
-func TestProhibitUserID(t *testing.T) {
- options := gophercloud.AuthOptions{
- Username: "me",
- UserID: "1234",
- Password: "thing",
- }
-
- tokenPostErr(t, options, ErrUserIDProvided)
-}
-
-func TestProhibitAPIKey(t *testing.T) {
- options := gophercloud.AuthOptions{
- Username: "me",
- Password: "thing",
- APIKey: "123412341234",
- }
-
- tokenPostErr(t, options, ErrAPIKeyProvided)
-}
-
-func TestProhibitDomainID(t *testing.T) {
- options := gophercloud.AuthOptions{
- Username: "me",
- Password: "thing",
- DomainID: "1234",
- }
-
- tokenPostErr(t, options, ErrDomainIDProvided)
-}
-
-func TestProhibitDomainName(t *testing.T) {
- options := gophercloud.AuthOptions{
- Username: "me",
- Password: "thing",
- DomainName: "wat",
- }
-
- tokenPostErr(t, options, ErrDomainNameProvided)
-}
-
func TestRequireUsername(t *testing.T) {
- options := gophercloud.AuthOptions{
- Password: "thing",
- }
+ options := gophercloud.AuthOptions{}
+ options.Password = "thing"
+
expected := gophercloud.ErrMissingInput{}
- expected.Function = "tokens.ToTokenCreateMap"
expected.Argument = "tokens.AuthOptions.Username/tokens.AuthOptions.TokenID"
expected.Info = "You must provide either username/password or tenantID/token values."
tokenPostErr(t, options, expected)
}
func TestRequirePassword(t *testing.T) {
- options := gophercloud.AuthOptions{
- Username: "me",
- }
+ options := gophercloud.AuthOptions{}
+ options.Username = "me"
+
expected := gophercloud.ErrMissingInput{}
- expected.Function = "tokens.ToTokenCreateMap"
expected.Argument = "tokens.AuthOptions.Password"
tokenPostErr(t, options, expected)
}