From 570146fb364ace26412ae73a1f80c9cf39d69516 Mon Sep 17 00:00:00 2001 From: Ryan McKinley Date: Tue, 9 Dec 2025 15:39:01 +0300 Subject: [PATCH] openapi --- pkg/registry/apis/datasource/openapi.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkg/registry/apis/datasource/openapi.go b/pkg/registry/apis/datasource/openapi.go index 0540ac6414d..73b625a250a 100644 --- a/pkg/registry/apis/datasource/openapi.go +++ b/pkg/registry/apis/datasource/openapi.go @@ -10,6 +10,7 @@ import ( "k8s.io/kube-openapi/pkg/validation/spec" common "github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1" + datasourceV0 "github.com/grafana/grafana/pkg/apis/datasource/v0alpha1" "github.com/grafana/grafana/pkg/registry/apis/query/queryschema" "github.com/grafana/grafana/pkg/services/apiserver/builder" ) @@ -94,6 +95,10 @@ func (b *DataSourceAPIBuilder) PostProcessOpenAPI(oas *spec3.OpenAPI) (*spec3.Op if err != nil { return nil, err } + return applyCustomSchemas(root, ds, oas, custom) +} + +func applyCustomSchemas(root string, ds *spec.Schema, oas *spec3.OpenAPI, custom *datasourceV0.DataSourceOpenAPIExtension) (*spec3.OpenAPI, error) { if custom == nil { return oas, nil // nothing special } @@ -188,5 +193,5 @@ func (b *DataSourceAPIBuilder) PostProcessOpenAPI(oas *spec3.OpenAPI) (*spec3.Op oas.Paths.Paths[prefix+k] = v } } - return oas, err + return oas, nil }