Skip to content

Datasource Permissions: Skip lookup for global #2678

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

Merged
stephaniehingtgen merged 1 commit into from
Apr 10, 2026
+13 −0
Merged

Datasource Permissions: Skip lookup for global #2678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions internal/resources/grafana/resource_data_source_permission.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ func resourceDatasourcePermissionGet(d *schema.ResourceData, meta any) (string,
if d.Id() != "" {
client, _, id = OAPIClientFromExistingOrgResource(meta, d.Id())
}
if id == "*" {
return "*", nil
}
resp, err := client.Datasources.GetDataSourceByUID(id)
if err != nil {
return "", err
Expand All @@ -96,6 +99,9 @@ func resourceDatasourcePermissionGetType(d *schema.ResourceData, meta any) (stri
if d.Id() != "" {
client, _, id = OAPIClientFromExistingOrgResource(meta, d.Id())
}
if id == "*" {
return "", nil
}
resp, err := client.Datasources.GetDataSourceByUID(id)
if err != nil {
return "", err
Expand Down
7 changes: 7 additions & 0 deletions internal/resources/grafana/resource_data_source_permission_item.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,16 +204,23 @@ func (r *resourceDatasourcePermissionItem) Delete(ctx context.Context, req resou
}

func (r *resourceDatasourcePermissionItem) datasourceQuery(client *client.GrafanaHTTPAPI, datasourceUID string) error {
if datasourceUID == "*" {
return nil
}
_, err := client.Datasources.GetDataSourceByUID(datasourceUID)
return err
}

// resolveWriteOpts returns the ds_type client option for write operations.
// if dsType is provided it is used directly; otherwise GetDataSourceByUID is called to look it up.
// Wildcard UIDs ("*") skip the lookup entirely since they represent all datasources.
func (r *resourceDatasourcePermissionItem) resolveWriteOpts(orgIDStr, dsUID string, dsType types.String) ([]access_control.ClientOption, error) {
if !dsType.IsNull() && dsType.ValueString() != "" {
return []access_control.ClientOption{withQueryParam("ds_type", dsType.ValueString())}, nil
}
if dsUID == "*" {
return nil, nil
}
c, _, err := r.clientFromNewOrgResource(orgIDStr)
if err != nil {
return nil, err
Expand Down
Loading