From 6d642919c6ef7ffae594336193013a2842d1be0c Mon Sep 17 00:00:00 2001 From: Robert E Date: Fri, 31 May 2024 22:37:50 +1000 Subject: [PATCH 1/2] remove spaceId from userroles.Get (breaking change) --- pkg/userroles/user_role_service.go | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkg/userroles/user_role_service.go b/pkg/userroles/user_role_service.go index 32077730..ba79c303 100644 --- a/pkg/userroles/user_role_service.go +++ b/pkg/userroles/user_role_service.go @@ -149,17 +149,11 @@ func Add(client newclient.Client, userRole *UserRole) (*UserRole, error) { // Get returns a collection of user roles based on the criteria defined by its // input query parameter. If an error occurs, an empty collection is returned // along with the associated error. -func Get(client newclient.Client, spaceID string, userRolesQuery UserRolesQuery) (*resources.Resources[*UserRole], error) { - spaceID, err := internal.GetSpaceID(spaceID, client.GetSpaceID()) - if err != nil { - return nil, err - } - +func Get(client newclient.Client, userRolesQuery UserRolesQuery) (*resources.Resources[*UserRole], error) { values, _ := uritemplates.Struct2map(userRolesQuery) if values == nil { values = map[string]any{} } - values["spaceId"] = spaceID expandedUri, err := client.URITemplateCache().Expand(userRolesTemplate, values) if err != nil { From e00e3c9923659afaefa7bfe7ca27e8ab25c1785d Mon Sep 17 00:00:00 2001 From: Robert E Date: Sat, 1 Jun 2024 19:52:01 +1000 Subject: [PATCH 2/2] Update test --- test/e2e/user_role_service_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/user_role_service_test.go b/test/e2e/user_role_service_test.go index ff64fbdd..555f41d1 100644 --- a/test/e2e/user_role_service_test.go +++ b/test/e2e/user_role_service_test.go @@ -184,7 +184,7 @@ func TestUserRoleServiceAddGetDelete_NewClient(t *testing.T) { query := userroles.UserRolesQuery{ IDs: []string{userRole.GetID()}, } - userRolesToCompare, err := userroles.Get(client, client.GetSpaceID(), query) + userRolesToCompare, err := userroles.Get(client, query) require.NoError(t, err) require.NotNil(t, userRolesToCompare) for _, userRoleToCompare := range userRolesToCompare.Items {