grafana/pkg/api
Jo 7940da4803
Fix organization deletion error messages (#107380)
* Fix organization deletion error messages

- Improve error message clarity when attempting to delete active organization
- Fix incorrect 'Failed to update organization' message to 'Failed to delete organization'
- Update comment to be more precise about the check being performed

Fixes #92792

* Improve error handling in organization deletion service

- Add contextual error message when dashboard deletion fails during org deletion
- Include organization ID in error message for better debugging
- Import fmt package for error formatting

This helps administrators understand which specific organization failed
during the deletion process when dashboard cleanup encounters issues.

* Fix typo in unified resource access error message

Change 'Namespace missmatch' to 'Namespace mismatch' for correct spelling.
2025-06-30 13:58:37 +02:00
..
apierrors
avatar
datasource Prometheus: Add support for cloud partners Prometheus data sources (#103482) 2025-04-10 12:49:11 -07:00
dtos Alerting: Allow disabling recording rules write for a data source in the UI (#106664) 2025-06-17 22:55:45 +02:00
frontendlogging
pluginproxy Chore: Rename integration tests to follow the common convention (#105987) 2025-06-29 16:56:24 +02:00
response
routing
static Apply security patch security-patch-202505051005.patch (#105754) 2025-05-21 21:34:05 +03:00
webassets Replace usage of http.DefaultClient and http.DefaultTransport (#104135) 2025-05-09 13:26:39 -04:00
README.md
accesscontrol.go CI: Bump golangci-lint to 2.0.2 (#103572) 2025-04-10 14:42:23 +02:00
admin.go CI: Bump golangci-lint to 2.0.2 (#103572) 2025-04-10 14:42:23 +02:00
admin_encryption.go admin api: Fix reencryption of private_key in signing_key table, introduce test for reencryption (#105010) 2025-05-15 09:51:25 +02:00
admin_provisioning.go
admin_provisioning_test.go
admin_test.go
admin_users.go CI: Bump golangci-lint to 2.0.2 (#103572) 2025-04-10 14:42:23 +02:00
admin_users_test.go
alerting.go
annotations.go Annotations: Use dashboard uids instead of dashboard ids (#106676) 2025-06-13 13:59:24 -05:00
annotations_test.go Annotations: Use dashboard uids instead of dashboard ids (#106676) 2025-06-13 13:59:24 -05:00
api.go Auth: Remove api key endpoints (#106019) 2025-06-04 17:03:06 +03:00
api_test.go
basic_auth.go
basic_auth_test.go
common_test.go
dashboard.go Preferences: Use dashboard uid for the home dashboard (#106666) 2025-06-13 07:10:44 -05:00
dashboard_permission.go CI: Bump golangci-lint to 2.0.2 (#103572) 2025-04-10 14:42:23 +02:00
dashboard_permission_test.go
dashboard_snapshot.go CI: Bump golangci-lint to 2.0.2 (#103572) 2025-04-10 14:42:23 +02:00
dashboard_snapshot_test.go
dashboard_test.go Chore: Rename integration tests to follow the common convention (#105987) 2025-06-29 16:56:24 +02:00
dataproxy.go
datasources.go CI: Bump golangci-lint to 2.0.2 (#103572) 2025-04-10 14:42:23 +02:00
datasources_test.go
ds_query.go
ds_query_test.go
fakes.go
folder.go Folders: Correctly resolve nested folder breadcrumbs (#106344) 2025-06-05 10:02:07 +01:00
folder_bench_test.go RBAC: Remove dashboard and folder guardians (#104646) 2025-05-19 09:48:16 +03:00
folder_permission.go CI: Bump golangci-lint to 2.0.2 (#103572) 2025-04-10 14:42:23 +02:00
folder_permission_test.go
folder_test.go RBAC: Extend folder tests for breadcrumbs (#107002) 2025-06-20 09:07:54 +02:00
frontend_logging.go
frontend_logging_test.go
frontend_metrics.go
frontendsettings.go Alerting: Allow disabling recording rules write for a data source in the UI (#106664) 2025-06-17 22:55:45 +02:00
frontendsettings_test.go Chore: Rename integration tests to follow the common convention (#105987) 2025-06-29 16:56:24 +02:00
grafana_com_proxy.go
health.go
health_test.go
http_server.go admin api: Fix reencryption of private_key in signing_key table, introduce test for reencryption (#105010) 2025-05-15 09:51:25 +02:00
http_server_test.go
index.go i18n: rename locale to regionalFormat (#106585) 2025-06-16 21:53:55 +02:00
login.go CI: Bump golangci-lint to 2.0.2 (#103572) 2025-04-10 14:42:23 +02:00
login_oauth.go
login_oauth_test.go Replace usage of http.DefaultClient and http.DefaultTransport (#104135) 2025-05-09 13:26:39 -04:00
login_test.go
org.go Fix organization deletion error messages (#107380) 2025-06-30 13:58:37 +02:00
org_invite.go CI: Bump golangci-lint to 2.0.2 (#103572) 2025-04-10 14:42:23 +02:00
org_invite_test.go
org_test.go
org_users.go CI: Bump golangci-lint to 2.0.2 (#103572) 2025-04-10 14:42:23 +02:00
org_users_test.go Chore: Rename integration tests to follow the common convention (#105987) 2025-06-29 16:56:24 +02:00
password.go
playlist.go Playlists: Remove kubernetesPlaylists flag (#104171) 2025-04-22 10:39:40 +02:00
plugin_checks.go
plugin_checks_test.go
plugin_dashboards.go CI: Bump golangci-lint to 2.0.2 (#103572) 2025-04-10 14:42:23 +02:00
plugin_dashboards_test.go
plugin_metrics.go
plugin_metrics_test.go
plugin_proxy.go CI: Bump golangci-lint to 2.0.2 (#103572) 2025-04-10 14:42:23 +02:00
plugin_proxy_test.go
plugin_resource.go CI: Bump golangci-lint to 2.0.2 (#103572) 2025-04-10 14:42:23 +02:00
plugin_resource_test.go Chore: Rename integration tests to follow the common convention (#105987) 2025-06-29 16:56:24 +02:00
plugins.go i18n: Fix for translations from plugin settings (#105358) 2025-05-14 10:45:28 +02:00
plugins_test.go Plugins: Add preinstall_sync config - allow plugins to be preinstalled synchronously (#105292) 2025-05-16 10:45:50 -04:00
preferences.go i18n: rename locale to regionalFormat (#106585) 2025-06-16 21:53:55 +02:00
preferences_test.go Preferences: Use dashboard uid for the home dashboard (#106666) 2025-06-13 07:10:44 -05:00
quota.go CI: Bump golangci-lint to 2.0.2 (#103572) 2025-04-10 14:42:23 +02:00
quota_test.go
render.go Rendering: Add support for rate limiter (#103987) 2025-04-24 15:31:19 +02:00
search.go CI: Bump golangci-lint to 2.0.2 (#103572) 2025-04-10 14:42:23 +02:00
short_url.go CI: Bump golangci-lint to 2.0.2 (#103572) 2025-04-10 14:42:23 +02:00
short_url_test.go
signup.go CI: Bump golangci-lint to 2.0.2 (#103572) 2025-04-10 14:42:23 +02:00
swagger.go Revert "Build swagger ui in seperate webpack build" (#104580) 2025-04-25 22:07:43 +01:00
swagger_responses.go
swagger_tags.json
user.go CI: Bump golangci-lint to 2.0.2 (#103572) 2025-04-10 14:42:23 +02:00
user_test.go Chore: Rename integration tests to follow the common convention (#105987) 2025-06-29 16:56:24 +02:00
user_token.go CI: Bump golangci-lint to 2.0.2 (#103572) 2025-04-10 14:42:23 +02:00
user_token_test.go
utils.go

README.md

OpenAPI specifications

Since version 8.4, HTTP API details are specified using OpenAPI v2. Starting from version 9.1, there is also an OpenAPI v3 specification (generated by the v2 one using this script).

OpenAPI annotations

The OpenAPI v2 specification is generated automatically from the annotated Go code using go-swagger which scans the source code for annotation rules. Refer to this getting started guide for getting familiar with the toolkit.

Developers modifying the HTTP API endpoints need to make sure to add the necessary annotations so that their changes are reflected into the generated specifications.

Example of endpoint annotation

The following route defines a PATCH endpoint under the /serviceaccounts/{serviceAccountId} path with tag service_accounts (used for grouping together several routes) and operation ID updateServiceAccount (used for uniquely identifying routes and associate parameters and response with them).

For enterprise endpoints make sure you add the enterprise tag as well.


// swagger:route PATCH /serviceaccounts/{serviceAccountId} service_accounts updateServiceAccount
//
// # Update service account
//
// Required permissions (See note in the [introduction](https://grafana.com/docs/grafana/latest/developers/http_api/serviceaccount/#service-account-api) for an explanation):
// action: `serviceaccounts:write` scope: `serviceaccounts:id:1` (single service account)
//
// Responses:
// 200: updateServiceAccountResponse
// 400: badRequestError
// 401: unauthorisedError
// 403: forbiddenError
// 404: notFoundError
// 500: internalServerError

The go-swagger can discover such annotations by scanning any code imported by pkg/server but by convention we place the endpoint annotations above the endpoint definition.

Example of endpoint parameters

The following struct defines the route parameters for the updateServiceAccount endpoint. The route expects:

  • a path parameter denoting the service account identifier and
  • a body parameter with the new values for the specific service account

// swagger:parameters updateServiceAccount
type UpdateServiceAccountParams struct {
	// in:path
	ServiceAccountId int64 `json:"serviceAccountId"`
	// in:body
	Body serviceaccounts.UpdateServiceAccountForm
}

Example of endpoint response

The following struct defines the response for the updateServiceAccount endpoint in case of a successful 200 response.


// swagger:response updateServiceAccountResponse
type UpdateServiceAccountResponse struct {
	// in:body
	Body struct {
		Message        string                                    `json:"message"`
		ID             int64                                     `json:"id"`
		Name           string                                    `json:"name"`
		ServiceAccount *serviceaccounts.ServiceAccountProfileDTO `json:"serviceaccount"`
	}
}

OpenAPI generation

Developers can re-create the OpenAPI v2 and v3 specifications using the following command:

make swagger-clean && make openapi3-gen

They can observe its output into the public/api-merged.json and public/openapi3.json files.

Finally, they can browser and try out both the OpenAPI v2 and v3 via the Swagger UI editor (served by the grafana server) by navigating to /swagger.

If there are any issues generating the specifications (e.g., diff containing unrelated changes to your PR or unusually large diff), please run the following two commands to ensure your Swagger version is up to date, then re-run the make commands.

  • go install github.com/bwplotka/bingo@latest
  • bingo get github.com/go-swagger/go-swagger/cmd/swagger@v0.30.2