Skip to content
This repository was archived by the owner on Jan 15, 2024. It is now read-only.

Commit fdea1ff

Browse files
author
Aaron Godin
committed
Convert all resource permission implementation methods to only accept uid
1 parent d093362 commit fdea1ff

File tree

5 files changed

+44
-44
lines changed

5 files changed

+44
-44
lines changed

‎dashboard_permissions.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,18 +59,18 @@ func (c *Client) UpdateDashboardPermissionsByUID(uid string, items *PermissionIt
5959
return c.request("POST", path, nil, data, nil)
6060
}
6161

62-
func (c *Client) ListDashboardResourcePermissions(ident ResourceIdent) ([]*ResourcePermission, error) {
63-
return c.listResourcePermissions(DashboardsResource, ident)
62+
func (c *Client) ListDashboardResourcePermissions(uid string) ([]*ResourcePermission, error) {
63+
return c.listResourcePermissions(DashboardsResource, ResourceUID(uid))
6464
}
6565

66-
func (c *Client) SetDashboardResourcePermissions(ident ResourceIdent, body SetResourcePermissionsBody) (*SetResourcePermissionsResponse, error) {
67-
return c.setResourcePermissions(DashboardsResource, ident, body)
66+
func (c *Client) SetDashboardResourcePermissions(uid string, body SetResourcePermissionsBody) (*SetResourcePermissionsResponse, error) {
67+
return c.setResourcePermissions(DashboardsResource, ResourceUID(uid), body)
6868
}
6969

70-
func (c *Client) SetUserDashboardResourcePermissions(ident ResourceIdent, userID int64, permission string) (*SetResourcePermissionsResponse, error) {
70+
func (c *Client) SetUserDashboardResourcePermissions(dashboardUID string, userID int64, permission string) (*SetResourcePermissionsResponse, error) {
7171
return c.setResourcePermissionByAssignment(
7272
DashboardsResource,
73-
ident,
73+
ResourceUID(dashboardUID),
7474
UsersResource,
7575
ResourceID(userID),
7676
SetResourcePermissionBody{
@@ -82,10 +82,10 @@ func (c *Client) SetUserDashboardResourcePermissions(ident ResourceIdent, userID
8282
)
8383
}
8484

85-
func (c *Client) SetTeamDashboardResourcePermissions(ident ResourceIdent, teamID int64, permission string) (*SetResourcePermissionsResponse, error) {
85+
func (c *Client) SetTeamDashboardResourcePermissions(dashboardUID string, teamID int64, permission string) (*SetResourcePermissionsResponse, error) {
8686
return c.setResourcePermissionByAssignment(
8787
DashboardsResource,
88-
ident,
88+
ResourceUID(dashboardUID),
8989
TeamsResource,
9090
ResourceID(teamID),
9191
SetResourcePermissionBody{
@@ -97,10 +97,10 @@ func (c *Client) SetTeamDashboardResourcePermissions(ident ResourceIdent, teamID
9797
)
9898
}
9999

100-
func (c *Client) SetBuiltInRoleDashboardResourcePermissions(ident ResourceIdent, builtInRole string, permission string) (*SetResourcePermissionsResponse, error) {
100+
func (c *Client) SetBuiltInRoleDashboardResourcePermissions(dashboardUID string, builtInRole string, permission string) (*SetResourcePermissionsResponse, error) {
101101
return c.setResourcePermissionByAssignment(
102102
DashboardsResource,
103-
ident,
103+
ResourceUID(dashboardUID),
104104
BuiltInRolesResource,
105105
ResourceUID(builtInRole),
106106
SetResourcePermissionBody{

‎datasource_permissions.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -97,18 +97,18 @@ func (c *Client) RemoveDatasourcePermission(id, permissionID int64) error {
9797
return nil
9898
}
9999

100-
func (c *Client) ListDatasourceResourcePermissions(ident ResourceIdent) ([]*ResourcePermission, error) {
101-
return c.listResourcePermissions(DatasourcesResource, ident)
100+
func (c *Client) ListDatasourceResourcePermissions(uid string) ([]*ResourcePermission, error) {
101+
return c.listResourcePermissions(DatasourcesResource, ResourceUID(uid))
102102
}
103103

104-
func (c *Client) SetDatasourceResourcePermissions(ident ResourceIdent, body SetResourcePermissionsBody) (*SetResourcePermissionsResponse, error) {
105-
return c.setResourcePermissions(DatasourcesResource, ident, body)
104+
func (c *Client) SetDatasourceResourcePermissions(uid string, body SetResourcePermissionsBody) (*SetResourcePermissionsResponse, error) {
105+
return c.setResourcePermissions(DatasourcesResource, ResourceUID(uid), body)
106106
}
107107

108-
func (c *Client) SetUserDatasourceResourcePermissions(ident ResourceIdent, userID int64, permission string) (*SetResourcePermissionsResponse, error) {
108+
func (c *Client) SetUserDatasourceResourcePermissions(datasourceUID string, userID int64, permission string) (*SetResourcePermissionsResponse, error) {
109109
return c.setResourcePermissionByAssignment(
110110
DatasourcesResource,
111-
ident,
111+
ResourceUID(datasourceUID),
112112
UsersResource,
113113
ResourceID(userID),
114114
SetResourcePermissionBody{
@@ -120,10 +120,10 @@ func (c *Client) SetUserDatasourceResourcePermissions(ident ResourceIdent, userI
120120
)
121121
}
122122

123-
func (c *Client) SetTeamDatasourceResourcePermissions(ident ResourceIdent, teamID int64, permission string) (*SetResourcePermissionsResponse, error) {
123+
func (c *Client) SetTeamDatasourceResourcePermissions(datasourceUID string, teamID int64, permission string) (*SetResourcePermissionsResponse, error) {
124124
return c.setResourcePermissionByAssignment(
125125
DatasourcesResource,
126-
ident,
126+
ResourceUID(datasourceUID),
127127
TeamsResource,
128128
ResourceID(teamID),
129129
SetResourcePermissionBody{
@@ -135,10 +135,10 @@ func (c *Client) SetTeamDatasourceResourcePermissions(ident ResourceIdent, teamI
135135
)
136136
}
137137

138-
func (c *Client) SetBuiltInRoleDatasourceResourcePermissions(ident ResourceIdent, builtInRole string, permission string) (*SetResourcePermissionsResponse, error) {
138+
func (c *Client) SetBuiltInRoleDatasourceResourcePermissions(datasourceUID string, builtInRole string, permission string) (*SetResourcePermissionsResponse, error) {
139139
return c.setResourcePermissionByAssignment(
140140
DatasourcesResource,
141-
ident,
141+
ResourceUID(datasourceUID),
142142
BuiltInRolesResource,
143143
ResourceUID(builtInRole),
144144
SetResourcePermissionBody{

‎folder_permissions.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,18 +63,18 @@ func (c *Client) UpdateFolderPermissions(fid string, items *PermissionItems) err
6363
return c.request("POST", path, nil, data, nil)
6464
}
6565

66-
func (c *Client) ListFolderResourcePermissions(ident ResourceIdent) ([]*ResourcePermission, error) {
67-
return c.listResourcePermissions(FoldersResource, ident)
66+
func (c *Client) ListFolderResourcePermissions(uid string) ([]*ResourcePermission, error) {
67+
return c.listResourcePermissions(FoldersResource, ResourceUID(uid))
6868
}
6969

70-
func (c *Client) SetFolderResourcePermissions(ident ResourceIdent, body SetResourcePermissionsBody) (*SetResourcePermissionsResponse, error) {
71-
return c.setResourcePermissions(FoldersResource, ident, body)
70+
func (c *Client) SetFolderResourcePermissions(uid string, body SetResourcePermissionsBody) (*SetResourcePermissionsResponse, error) {
71+
return c.setResourcePermissions(FoldersResource, ResourceUID(uid), body)
7272
}
7373

74-
func (c *Client) SetUserFolderResourcePermissions(ident ResourceIdent, userID int64, permission string) (*SetResourcePermissionsResponse, error) {
74+
func (c *Client) SetUserFolderResourcePermissions(folderUID string, userID int64, permission string) (*SetResourcePermissionsResponse, error) {
7575
return c.setResourcePermissionByAssignment(
7676
FoldersResource,
77-
ident,
77+
ResourceUID(folderUID),
7878
UsersResource,
7979
ResourceID(userID),
8080
SetResourcePermissionBody{
@@ -86,10 +86,10 @@ func (c *Client) SetUserFolderResourcePermissions(ident ResourceIdent, userID in
8686
)
8787
}
8888

89-
func (c *Client) SetTeamFolderResourcePermissions(ident ResourceIdent, teamID int64, permission string) (*SetResourcePermissionsResponse, error) {
89+
func (c *Client) SetTeamFolderResourcePermissions(folderUID string, teamID int64, permission string) (*SetResourcePermissionsResponse, error) {
9090
return c.setResourcePermissionByAssignment(
9191
FoldersResource,
92-
ident,
92+
ResourceUID(folderUID),
9393
TeamsResource,
9494
ResourceID(teamID),
9595
SetResourcePermissionBody{
@@ -101,10 +101,10 @@ func (c *Client) SetTeamFolderResourcePermissions(ident ResourceIdent, teamID in
101101
)
102102
}
103103

104-
func (c *Client) SetBuiltInRoleFolderResourcePermissions(ident ResourceIdent, builtInRole string, permission string) (*SetResourcePermissionsResponse, error) {
104+
func (c *Client) SetBuiltInRoleFolderResourcePermissions(folderUID string, builtInRole string, permission string) (*SetResourcePermissionsResponse, error) {
105105
return c.setResourcePermissionByAssignment(
106106
FoldersResource,
107-
ident,
107+
ResourceUID(folderUID),
108108
BuiltInRolesResource,
109109
ResourceUID(builtInRole),
110110
SetResourcePermissionBody{

‎service_account_permissions.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
package gapi
22

3-
func (c *Client) ListServiceAccountResourcePermissions(ident ResourceIdent) ([]*ResourcePermission, error) {
4-
return c.listResourcePermissions(ServiceAccountsResource, ident)
3+
func (c *Client) ListServiceAccountResourcePermissions(uid string) ([]*ResourcePermission, error) {
4+
return c.listResourcePermissions(ServiceAccountsResource, ResourceUID(uid))
55
}
66

7-
func (c *Client) SetServiceAccountResourcePermissions(ident ResourceIdent, body SetResourcePermissionsBody) (*SetResourcePermissionsResponse, error) {
8-
return c.setResourcePermissions(ServiceAccountsResource, ident, body)
7+
func (c *Client) SetServiceAccountResourcePermissions(uid string, body SetResourcePermissionsBody) (*SetResourcePermissionsResponse, error) {
8+
return c.setResourcePermissions(ServiceAccountsResource, ResourceUID(uid), body)
99
}
1010

11-
func (c *Client) SetUserServiceAccountResourcePermissions(ident ResourceIdent, userID int64, permission string) (*SetResourcePermissionsResponse, error) {
11+
func (c *Client) SetUserServiceAccountResourcePermissions(serviceAccountUID string, userID int64, permission string) (*SetResourcePermissionsResponse, error) {
1212
return c.setResourcePermissionByAssignment(
1313
ServiceAccountsResource,
14-
ident,
14+
ResourceUID(serviceAccountUID),
1515
UsersResource,
1616
ResourceID(userID),
1717
SetResourcePermissionBody{
@@ -23,10 +23,10 @@ func (c *Client) SetUserServiceAccountResourcePermissions(ident ResourceIdent, u
2323
)
2424
}
2525

26-
func (c *Client) SetTeamServiceAccountResourcePermissions(ident ResourceIdent, teamID int64, permission string) (*SetResourcePermissionsResponse, error) {
26+
func (c *Client) SetTeamServiceAccountResourcePermissions(serviceAccountUID string, teamID int64, permission string) (*SetResourcePermissionsResponse, error) {
2727
return c.setResourcePermissionByAssignment(
2828
ServiceAccountsResource,
29-
ident,
29+
ResourceUID(serviceAccountUID),
3030
TeamsResource,
3131
ResourceID(teamID),
3232
SetResourcePermissionBody{

‎team_permissions.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
package gapi
22

3-
func (c *Client) ListTeamResourcePermissions(ident ResourceIdent) ([]*ResourcePermission, error) {
4-
return c.listResourcePermissions(TeamsResource, ident)
3+
func (c *Client) ListTeamResourcePermissions(uid string) ([]*ResourcePermission, error) {
4+
return c.listResourcePermissions(TeamsResource, ResourceUID(uid))
55
}
66

7-
func (c *Client) SetTeamResourcePermissions(ident ResourceIdent, body SetResourcePermissionsBody) (*SetResourcePermissionsResponse, error) {
8-
return c.setResourcePermissions(TeamsResource, ident, body)
7+
func (c *Client) SetTeamResourcePermissions(uid string, body SetResourcePermissionsBody) (*SetResourcePermissionsResponse, error) {
8+
return c.setResourcePermissions(TeamsResource, ResourceUID(uid), body)
99
}
1010

11-
func (c *Client) SetUserTeamResourcePermissions(ident ResourceIdent, userID int64, permission string) (*SetResourcePermissionsResponse, error) {
11+
func (c *Client) SetUserTeamResourcePermissions(teamUID string, userID int64, permission string) (*SetResourcePermissionsResponse, error) {
1212
return c.setResourcePermissionByAssignment(
1313
TeamsResource,
14-
ident,
14+
ResourceUID(teamUID),
1515
UsersResource,
1616
ResourceID(userID),
1717
SetResourcePermissionBody{

0 commit comments

Comments
 (0)