From 3613b73b3d5f0a4b5b0b9d30cdfd1b35e9a1e3d8 Mon Sep 17 00:00:00 2001 From: zengchen1024 Date: Thu, 17 Jan 2019 16:48:03 +0800 Subject: [PATCH] fix don't check when auth by token --- auth_options.go | 6 ------ openstack/identity/v3/tokens/testing/requests_test.go | 8 -------- 2 files changed, 14 deletions(-) diff --git a/auth_options.go b/auth_options.go index a7a23129c..1d9eefdda 100644 --- a/auth_options.go +++ b/auth_options.go @@ -180,12 +180,6 @@ func (opts *AuthOptions) ToTokenV3CreateMap(scope map[string]interface{}) (map[s if opts.UserID != "" { return nil, ErrUserIDWithToken{} } - if opts.DomainID != "" { - return nil, ErrDomainIDWithToken{} - } - if opts.DomainName != "" { - return nil, ErrDomainNameWithToken{} - } // Configure the request for Token authentication. req.Auth.Identity.Methods = []string{"token"} diff --git a/openstack/identity/v3/tokens/testing/requests_test.go b/openstack/identity/v3/tokens/testing/requests_test.go index bd4a066e4..0819a182d 100644 --- a/openstack/identity/v3/tokens/testing/requests_test.go +++ b/openstack/identity/v3/tokens/testing/requests_test.go @@ -318,14 +318,6 @@ func TestCreateFailureTokenIDUserID(t *testing.T) { authTokenPostErr(t, tokens.AuthOptions{UserID: "something", TokenID: "12345"}, nil, true, golangsdk.ErrUserIDWithToken{}) } -func TestCreateFailureTokenIDDomainID(t *testing.T) { - authTokenPostErr(t, tokens.AuthOptions{DomainID: "something", TokenID: "12345"}, nil, true, golangsdk.ErrDomainIDWithToken{}) -} - -func TestCreateFailureTokenIDDomainName(t *testing.T) { - authTokenPostErr(t, tokens.AuthOptions{DomainName: "something", TokenID: "12345"}, nil, true, golangsdk.ErrDomainNameWithToken{}) -} - func TestCreateFailureMissingUser(t *testing.T) { options := tokens.AuthOptions{Password: "supersecure"} authTokenPostErr(t, options, nil, false, golangsdk.ErrUsernameOrUserID{})