Skip to content

Commit

Permalink
Merge pull request #2953 from stephenfin/remove-identity-extensions
Browse files Browse the repository at this point in the history 
Remove 'openstack/identity/extensions' module
  • Loading branch information
@mandre
mandre committed Apr 2, 2024
2 parents b8db9fe + 5d2ddba commit 830ec42
Show file tree
Hide file tree
Showing 61 changed files with 411 additions and 238 deletions.
9 changes: 9 additions & 0 deletions auth_options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ type AuthScope struct {
DomainID string
DomainName string
System bool
TrustID string
}

// ToTokenV2CreateMap allows AuthOptions to satisfy the AuthOptionsBuilder
Expand Down Expand Up @@ -430,6 +431,14 @@ func (opts *AuthOptions) ToTokenV3ScopeMap() (map[string]interface{}, error) {
}, nil
}

if opts.Scope.TrustID != "" {
return map[string]interface{}{
"OS-TRUST:trust": map[string]string{
"id": opts.Scope.TrustID,
},
}, nil
}

if opts.Scope.ProjectName != "" {
// ProjectName provided: either DomainID or DomainName must also be supplied.
// ProjectID may not be supplied.
Expand Down
2 changes: 1 addition & 1 deletion internal/acceptance/openstack/client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/gophercloud/gophercloud/v2/internal/acceptance/tools"
"github.com/gophercloud/gophercloud/v2/openstack"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/credentials"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/extensions/ec2tokens"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/ec2tokens"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/tokens"
th "github.com/gophercloud/gophercloud/v2/testhelper"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/acceptance/openstack/identity/v2/identity.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/gophercloud/gophercloud/v2"
"github.com/gophercloud/gophercloud/v2/internal/acceptance/tools"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v2/extensions/admin/roles"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v2/roles"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v2/tenants"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v2/users"
th "github.com/gophercloud/gophercloud/v2/testhelper"
Expand Down
2 changes: 1 addition & 1 deletion internal/acceptance/openstack/identity/v2/role_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/gophercloud/gophercloud/v2/internal/acceptance/clients"
"github.com/gophercloud/gophercloud/v2/internal/acceptance/tools"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v2/extensions/admin/roles"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v2/roles"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v2/users"
th "github.com/gophercloud/gophercloud/v2/testhelper"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/acceptance/openstack/identity/v3/credentials_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/gophercloud/gophercloud/v2/internal/acceptance/tools"
"github.com/gophercloud/gophercloud/v2/openstack"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/credentials"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/extensions/ec2tokens"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/ec2tokens"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/tokens"
th "github.com/gophercloud/gophercloud/v2/testhelper"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/acceptance/openstack/identity/v3/ec2credentials_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/gophercloud/gophercloud/v2/internal/acceptance/clients"
"github.com/gophercloud/gophercloud/v2/internal/acceptance/tools"
"github.com/gophercloud/gophercloud/v2/openstack"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/extensions/ec2credentials"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/ec2credentials"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/tokens"
th "github.com/gophercloud/gophercloud/v2/testhelper"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/acceptance/openstack/identity/v3/federation_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/gophercloud/gophercloud/v2"
"github.com/gophercloud/gophercloud/v2/internal/acceptance/clients"
"github.com/gophercloud/gophercloud/v2/internal/acceptance/tools"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/extensions/federation"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/federation"
th "github.com/gophercloud/gophercloud/v2/testhelper"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/acceptance/openstack/identity/v3/identity.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import (
"github.com/gophercloud/gophercloud/v2"
"github.com/gophercloud/gophercloud/v2/internal/acceptance/tools"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/domains"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/extensions/trusts"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/groups"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/projects"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/regions"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/roles"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/services"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/trusts"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/users"
th "github.com/gophercloud/gophercloud/v2/testhelper"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/acceptance/openstack/identity/v3/oauth1_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/gophercloud/gophercloud/v2/internal/acceptance/clients"
"github.com/gophercloud/gophercloud/v2/internal/acceptance/tools"
"github.com/gophercloud/gophercloud/v2/openstack"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/extensions/oauth1"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/oauth1"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/tokens"
th "github.com/gophercloud/gophercloud/v2/testhelper"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/acceptance/openstack/identity/v3/projectendpoint_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/gophercloud/gophercloud/v2/internal/acceptance/clients"
"github.com/gophercloud/gophercloud/v2/internal/acceptance/tools"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/endpoints"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/extensions/projectendpoints"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/projectendpoints"
th "github.com/gophercloud/gophercloud/v2/testhelper"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/acceptance/openstack/identity/v3/trusts_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"github.com/gophercloud/gophercloud/v2/internal/acceptance/clients"
"github.com/gophercloud/gophercloud/v2/internal/acceptance/tools"
"github.com/gophercloud/gophercloud/v2/openstack"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/extensions/trusts"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/roles"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/tokens"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/trusts"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/users"
th "github.com/gophercloud/gophercloud/v2/testhelper"
)
Expand Down
4 changes: 2 additions & 2 deletions openstack/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (

"github.com/gophercloud/gophercloud/v2"
tokens2 "github.com/gophercloud/gophercloud/v2/openstack/identity/v2/tokens"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/extensions/ec2tokens"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/extensions/oauth1"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/ec2tokens"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/oauth1"
tokens3 "github.com/gophercloud/gophercloud/v2/openstack/identity/v3/tokens"
"github.com/gophercloud/gophercloud/v2/openstack/utils"
)
Expand Down
24 changes: 24 additions & 0 deletions openstack/identity/v2/extensions/requests.go
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package extensions

import (
"context"

"github.com/gophercloud/gophercloud/v2"
common "github.com/gophercloud/gophercloud/v2/openstack/common/extensions"
"github.com/gophercloud/gophercloud/v2/pagination"
)

// Get retrieves information for a specific extension using its alias.
func Get(ctx context.Context, c *gophercloud.ServiceClient, alias string) common.GetResult {
return common.Get(ctx, c, alias)
}

// List returns a Pager which allows you to iterate over the full collection of extensions.
// It does not accept query parameters.
func List(c *gophercloud.ServiceClient) pagination.Pager {
return common.List(c).WithPageCreator(func(r pagination.PageResult) pagination.Page {
return ExtensionPage{
ExtensionPage: common.ExtensionPage{SinglePageBase: pagination.SinglePageBase(r)},
}
})
}
18 changes: 0 additions & 18 deletions openstack/identity/v2/extensions/delegate.go → openstack/identity/v2/extensions/results.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
package extensions

import (
"context"

"github.com/gophercloud/gophercloud/v2"
common "github.com/gophercloud/gophercloud/v2/openstack/common/extensions"
"github.com/gophercloud/gophercloud/v2/pagination"
)
Expand Down Expand Up @@ -31,18 +28,3 @@ func ExtractExtensions(page pagination.Page) ([]common.Extension, error) {
err := page.(ExtensionPage).ExtractInto(&s)
return s.Extensions.Values, err
}

// Get retrieves information for a specific extension using its alias.
func Get(ctx context.Context, c *gophercloud.ServiceClient, alias string) common.GetResult {
return common.Get(ctx, c, alias)
}

// List returns a Pager which allows you to iterate over the full collection of extensions.
// It does not accept query parameters.
func List(c *gophercloud.ServiceClient) pagination.Pager {
return common.List(c).WithPageCreator(func(r pagination.PageResult) pagination.Page {
return ExtensionPage{
ExtensionPage: common.ExtensionPage{SinglePageBase: pagination.SinglePageBase(r)},
}
})
}
0 ...ty/v2/extensions/testing/delegate_test.go → ...ty/v2/extensions/testing/requests_test.go
View file
File renamed without changes.
0 ...identity/v2/extensions/admin/roles/doc.go → openstack/identity/v2/roles/doc.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...ity/v2/extensions/admin/roles/requests.go → openstack/identity/v2/roles/requests.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ func List(client *gophercloud.ServiceClient) pagination.Pager {
// a user. This is confined to the scope of the user's tenant - so the tenant
// ID is a required argument.
func AddUser(ctx context.Context, client *gophercloud.ServiceClient, tenantID, userID, roleID string) (r UserRoleResult) {
resp, err := client.Put(ctx, userRoleURL(client, tenantID, userID, roleID), nil, nil, &gophercloud.RequestOpts{
resp, err := client.Put(ctx, userTenantRoleURL(client, tenantID, userID, roleID), nil, nil, &gophercloud.RequestOpts{
OkCodes: []int{200, 201},
})
_, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
Expand All @@ -30,7 +30,7 @@ func AddUser(ctx context.Context, client *gophercloud.ServiceClient, tenantID, u
// from a user. This is confined to the scope of the user's tenant - so the
// tenant ID is a required argument.
func DeleteUser(ctx context.Context, client *gophercloud.ServiceClient, tenantID, userID, roleID string) (r UserRoleResult) {
resp, err := client.Delete(ctx, userRoleURL(client, tenantID, userID, roleID), nil)
resp, err := client.Delete(ctx, userTenantRoleURL(client, tenantID, userID, roleID), nil)
_, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
return
}
0 ...tity/v2/extensions/admin/roles/results.go → openstack/identity/v2/roles/results.go
View file
File renamed without changes.
0 .../v2/extensions/admin/roles/testing/doc.go → openstack/identity/v2/roles/testing/doc.go
View file
File renamed without changes.
0 ...ions/admin/roles/testing/fixtures_test.go → ...dentity/v2/roles/testing/fixtures_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ions/admin/roles/testing/requests_test.go → ...dentity/v2/roles/testing/requests_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"testing"

"github.com/gophercloud/gophercloud/v2/openstack/identity/v2/extensions/admin/roles"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v2/roles"
"github.com/gophercloud/gophercloud/v2/pagination"
th "github.com/gophercloud/gophercloud/v2/testhelper"
"github.com/gophercloud/gophercloud/v2/testhelper/client"
Expand Down
2 changes: 1 addition & 1 deletion ...dentity/v2/extensions/admin/roles/urls.go → openstack/identity/v2/roles/urls.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ func rootURL(c *gophercloud.ServiceClient) string {
return c.ServiceURL(ExtPath, RolePath)
}

func userRoleURL(c *gophercloud.ServiceClient, tenantID, userID, roleID string) string {
func userTenantRoleURL(c *gophercloud.ServiceClient, tenantID, userID, roleID string) string {
return c.ServiceURL("tenants", tenantID, UserPath, userID, RolePath, ExtPath, roleID)
}
0 ...ntity/v3/extensions/ec2credentials/doc.go → openstack/identity/v3/ec2credentials/doc.go
View file
File renamed without changes.
0 .../v3/extensions/ec2credentials/requests.go → ...ck/identity/v3/ec2credentials/requests.go
View file
File renamed without changes.
0 ...y/v3/extensions/ec2credentials/results.go → ...ack/identity/v3/ec2credentials/results.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...s/ec2credentials/testing/fixtures_test.go → ...3/ec2credentials/testing/fixtures_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"net/http"
"testing"

"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/extensions/ec2credentials"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/ec2credentials"
th "github.com/gophercloud/gophercloud/v2/testhelper"
"github.com/gophercloud/gophercloud/v2/testhelper/client"
)
Expand Down
2 changes: 1 addition & 1 deletion ...s/ec2credentials/testing/requests_test.go → ...3/ec2credentials/testing/requests_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"testing"

"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/extensions/ec2credentials"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/ec2credentials"
"github.com/gophercloud/gophercloud/v2/pagination"
th "github.com/gophercloud/gophercloud/v2/testhelper"
"github.com/gophercloud/gophercloud/v2/testhelper/client"
Expand Down
0 ...tity/v3/extensions/ec2credentials/urls.go → openstack/identity/v3/ec2credentials/urls.go
View file
File renamed without changes.
0 ...k/identity/v3/extensions/ec2tokens/doc.go → openstack/identity/v3/ec2tokens/doc.go
View file
File renamed without changes.
0 ...ntity/v3/extensions/ec2tokens/requests.go → openstack/identity/v3/ec2tokens/requests.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...nsions/ec2tokens/testing/requests_test.go → ...ity/v3/ec2tokens/testing/requests_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"time"

"github.com/gophercloud/gophercloud/v2"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/extensions/ec2tokens"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/ec2tokens"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/tokens"
tokens_testing "github.com/gophercloud/gophercloud/v2/openstack/identity/v3/tokens/testing"
"github.com/gophercloud/gophercloud/v2/testhelper"
Expand Down
0 .../identity/v3/extensions/ec2tokens/urls.go → openstack/identity/v3/ec2tokens/urls.go
View file
File renamed without changes.
0 .../identity/v3/extensions/federation/doc.go → openstack/identity/v3/federation/doc.go
View file
File renamed without changes.
0 ...tity/v3/extensions/federation/requests.go → openstack/identity/v3/federation/requests.go
View file
File renamed without changes.
0 ...ntity/v3/extensions/federation/results.go → openstack/identity/v3/federation/results.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...sions/federation/testing/fixtures_test.go → ...ty/v3/federation/testing/fixtures_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"net/http"
"testing"

"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/extensions/federation"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/federation"
th "github.com/gophercloud/gophercloud/v2/testhelper"
"github.com/gophercloud/gophercloud/v2/testhelper/client"
)
Expand Down
2 changes: 1 addition & 1 deletion ...sions/federation/testing/requests_test.go → ...ty/v3/federation/testing/requests_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"testing"

"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/extensions/federation"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/federation"
"github.com/gophercloud/gophercloud/v2/pagination"
th "github.com/gophercloud/gophercloud/v2/testhelper"
"github.com/gophercloud/gophercloud/v2/testhelper/client"
Expand Down
0 ...identity/v3/extensions/federation/urls.go → openstack/identity/v3/federation/urls.go
View file
File renamed without changes.
0 ...tack/identity/v3/extensions/oauth1/doc.go → openstack/identity/v3/oauth1/doc.go
View file
File renamed without changes.
0 ...identity/v3/extensions/oauth1/requests.go → openstack/identity/v3/oauth1/requests.go
View file
File renamed without changes.
0 .../identity/v3/extensions/oauth1/results.go → openstack/identity/v3/oauth1/results.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...xtensions/oauth1/testing/fixtures_test.go → ...entity/v3/oauth1/testing/fixtures_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"testing"
"time"

"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/extensions/oauth1"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/oauth1"
tokens "github.com/gophercloud/gophercloud/v2/openstack/identity/v3/tokens/testing"
"github.com/gophercloud/gophercloud/v2/testhelper"
"github.com/gophercloud/gophercloud/v2/testhelper/client"
Expand Down
2 changes: 1 addition & 1 deletion ...xtensions/oauth1/testing/requests_test.go → ...entity/v3/oauth1/testing/requests_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"testing"
"time"

"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/extensions/oauth1"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/oauth1"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/tokens"
"github.com/gophercloud/gophercloud/v2/pagination"
th "github.com/gophercloud/gophercloud/v2/testhelper"
Expand Down
0 ...ack/identity/v3/extensions/oauth1/urls.go → openstack/identity/v3/oauth1/urls.go
View file
File renamed without changes.
0 ...ity/v3/extensions/projectendpoints/doc.go → ...stack/identity/v3/projectendpoints/doc.go
View file
File renamed without changes.
0 ...3/extensions/projectendpoints/requests.go → .../identity/v3/projectendpoints/requests.go
View file
File renamed without changes.
0 ...v3/extensions/projectendpoints/results.go → ...k/identity/v3/projectendpoints/results.go
View file
File renamed without changes.
0 ...xtensions/projectendpoints/testing/doc.go → ...entity/v3/projectendpoints/testing/doc.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...projectendpoints/testing/requests_test.go → ...projectendpoints/testing/requests_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"testing"

"github.com/gophercloud/gophercloud/v2"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/extensions/projectendpoints"
"github.com/gophercloud/gophercloud/v2/openstack/identity/v3/projectendpoints"
"github.com/gophercloud/gophercloud/v2/pagination"
th "github.com/gophercloud/gophercloud/v2/testhelper"
"github.com/gophercloud/gophercloud/v2/testhelper/client"
Expand Down
0 ...ty/v3/extensions/projectendpoints/urls.go → ...tack/identity/v3/projectendpoints/urls.go
View file
File renamed without changes.
1 change: 1 addition & 0 deletions openstack/identity/v3/tokens/requests.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ type Scope struct {
DomainID string
DomainName string
System bool
TrustID string
}

// AuthOptionsBuilder provides the ability for extensions to add additional
Expand Down
21 changes: 21 additions & 0 deletions openstack/identity/v3/tokens/results.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,18 @@ type Project struct {
Name string `json:"name"`
}

type TrustUser struct {
ID string `json:"id"`
}

// Trust provides information about trust with which User is authorized.
type Trust struct {
ID string `json:"id"`
Impersonation bool `json:"impersonation"`
TrusteeUserID TrustUser `json:"trustee_user"`
TrustorUserID TrustUser `json:"trustor_user"`
}

// commonResult is the response from a request. A commonResult has various
// methods which can be used to extract different details about the result.
type commonResult struct {
Expand Down Expand Up @@ -160,6 +172,15 @@ func (r commonResult) ExtractDomain() (*Domain, error) {
return s.Domain, err
}

// ExtractTrust returns Trust to which User is authorized.
func (r commonResult) ExtractTrust() (*Trust, error) {
var s struct {
Trust *Trust `json:"OS-TRUST:trust"`
}
err := r.ExtractInto(&s)
return s.Trust, err
}

// CreateResult is the response from a Create request. Use ExtractToken()
// to interpret it as a Token, or ExtractServiceCatalog() to interpret it
// as a service catalog.
Expand Down

0 comments on commit 830ec42

Please sign in to comment.