From 4160429b7152f690d2d6980372da3d212b70193a Mon Sep 17 00:00:00 2001 From: Gabriel MABILLE Date: Tue, 5 Oct 2021 09:39:00 +0200 Subject: [PATCH] AccessControl: rename data source id read action (#39966) --- .../access-control/fine-grained-access-control-references.md | 2 +- docs/sources/enterprise/access-control/permissions.md | 2 +- docs/sources/http_api/data_source.md | 2 +- pkg/api/roles.go | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/sources/enterprise/access-control/fine-grained-access-control-references.md b/docs/sources/enterprise/access-control/fine-grained-access-control-references.md index b3a346d9c27..80d2a56cab9 100644 --- a/docs/sources/enterprise/access-control/fine-grained-access-control-references.md +++ b/docs/sources/enterprise/access-control/fine-grained-access-control-references.md @@ -29,7 +29,7 @@ The reference information that follows complements conceptual information about | `fixed:settings:admin:edit` | All permissions from `fixed:settings:admin:read` and
`settings:write` | Update settings | | `fixed:datasources:editor:read` | `datasources:explore` | Allows to access the **Explore** tab | | `fixed:datasources:admin` | `datasources:read`
`datasources:create`
`datasources:write`
`datasources:delete` | Allows to create, read, update, delete data sources. | -| `fixed:datasources:id:viewer` | `datasources:id:read` | Allows to read data source IDs. | +| `fixed:datasources:id:viewer` | `datasources.id:read` | Allows to read data source IDs. | | `fixed:datasources:permissions:admin` | `datasources.permissions:create`
`datasources.permissions:read`
`datasources.permissions:delete`
`datasources.permissions:toggle` | Allows to create, read, delete, enable, or disable data source permissions | ## Default built-in role assignments diff --git a/docs/sources/enterprise/access-control/permissions.md b/docs/sources/enterprise/access-control/permissions.md index 82deb89faec..168181fd552 100644 --- a/docs/sources/enterprise/access-control/permissions.md +++ b/docs/sources/enterprise/access-control/permissions.md @@ -68,7 +68,7 @@ The following list contains fine-grained access control actions. | `server.stats:read` | n/a | Read server stats | | `datasources:explore` | n/a | Enable access to the **Explore** tab. | | `datasources:read` | n/a
`datasources:*`
`datasources:id:*`
`datasources:uid:*`
`datasources:name:*` | List data sources. | -| `datasources:id:read` | `datasources:*`
`datasources:name:*` | Read data source IDs. | +| `datasources.id:read` | `datasources:*`
`datasources:name:*` | Read data source IDs. | | `datasources:create` | n/a | Create data sources. | | `datasources:write` | `datasources:*`
`datasources:id:*` | Update data sources. | | `datasources:delete` | `datasources:id:*`
`datasources:uid:*`
`datasources:name:*` | Delete data sources. | diff --git a/docs/sources/http_api/data_source.md b/docs/sources/http_api/data_source.md index 80e595399be..902d1030a7b 100644 --- a/docs/sources/http_api/data_source.md +++ b/docs/sources/http_api/data_source.md @@ -244,7 +244,7 @@ See note in the [introduction]({{< ref "#data-source-api" >}}) for an explanatio | Action | Scope | | ------------------- | ---------------------------------------------------------------------------------------------- | -| datasources:id:read | datasources:\*
datasources:name:\*
datasources:name:test_datasource (single data source) | +| datasources.id:read | datasources:\*
datasources:name:\*
datasources:name:test_datasource (single data source) | ### Examples diff --git a/pkg/api/roles.go b/pkg/api/roles.go index 77244c3ffc8..78e30c520d9 100644 --- a/pkg/api/roles.go +++ b/pkg/api/roles.go @@ -13,7 +13,7 @@ const ( ActionDatasourcesCreate = "datasources:create" ActionDatasourcesWrite = "datasources:write" ActionDatasourcesDelete = "datasources:delete" - ActionDatasourcesIDRead = "datasources:id:read" + ActionDatasourcesIDRead = "datasources.id:read" ) // API related scopes @@ -74,7 +74,7 @@ func (hs *HTTPServer) declareFixedRoles() error { }, { Role: accesscontrol.RoleDTO{ - Version: 1, + Version: 2, Name: "fixed:datasources:id:viewer", Description: "Gives access to read datasources ID", Permissions: []accesscontrol.Permission{