Skip to content

remove spaceId from userroles.Get (breaking change) #251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

remove spaceId from userroles.Get (breaking change) #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d64291
remove spaceId from userroles.Get (breaking change)
zentron May 31, 2024
e00e3c9
Update test
zentron Jun 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions pkg/userroles/user_role_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/user_role_service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down