From 03a2153bd8a556ae3cb14a92d3d4495ec1e64124 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Tue, 19 Aug 2025 20:31:38 +0300
Subject: [PATCH] merge main

---
 pkg/registry/apis/datasource/admission.go | 4 ++--
 pkg/registry/apis/datasource/openapi.go   | 4 ++--
 pkg/registry/apis/datasource/register.go  | 6 +++---
 pkg/registry/apis/query/connections.go    | 8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkg/registry/apis/datasource/admission.go b/pkg/registry/apis/datasource/admission.go
index 513d0e47e3f..976103a6ade 100644
--- a/pkg/registry/apis/datasource/admission.go
+++ b/pkg/registry/apis/datasource/admission.go
@@ -21,7 +21,7 @@ func (b *DataSourceAPIBuilder) Validate(ctx context.Context, a admission.Attribu
 func (b *DataSourceAPIBuilder) Mutate(ctx context.Context, a admission.Attributes, o admission.ObjectInterfaces) (err error) {
 	obj := a.GetObject()
 
-	if b.specProvider == nil || obj == nil || a.GetOperation() == admission.Connect {
+	if b.schemaProvider == nil || obj == nil || a.GetOperation() == admission.Connect {
 		return nil // This is normal for sub-resource
 	}
 
@@ -30,7 +30,7 @@ func (b *DataSourceAPIBuilder) Mutate(ctx context.Context, a admission.Attribute
 		return fmt.Errorf("expected datasource object")
 	}
 
-	info, err := b.specProvider()
+	info, err := b.schemaProvider()
 	if err != nil {
 		return err
 	}
diff --git a/pkg/registry/apis/datasource/openapi.go b/pkg/registry/apis/datasource/openapi.go
index e3e3df468fa..0cf5cf0eefe 100644
--- a/pkg/registry/apis/datasource/openapi.go
+++ b/pkg/registry/apis/datasource/openapi.go
@@ -54,11 +54,11 @@ func (b *DataSourceAPIBuilder) PostProcessOpenAPI(oas *spec3.OpenAPI) (*spec3.Op
 	ds.Properties["apiVersion"] = *spec.StringProperty().WithEnum(b.GetGroupVersion().String())
 	ds.Properties["kind"] = *spec.StringProperty().WithEnum("DataSource")
 
-	if b.specProvider == nil {
+	if b.schemaProvider == nil {
 		return oas, nil
 	}
 
-	custom, err := b.specProvider()
+	custom, err := b.schemaProvider()
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/registry/apis/datasource/register.go b/pkg/registry/apis/datasource/register.go
index dce60f6528d..dc72374d7ed 100644
--- a/pkg/registry/apis/datasource/register.go
+++ b/pkg/registry/apis/datasource/register.go
@@ -46,7 +46,7 @@ type DataSourceAPIBuilder struct {
 	datasources     PluginDatasourceProvider
 	contextProvider PluginContextWrapper
 	accessControl   accesscontrol.AccessControl
-	specProvider    func() (*datasourceV0.DataSourceOpenAPIExtension, error) // TODO? include query types
+	schemaProvider  func() (*datasourceV0.DataSourceOpenAPIExtension, error) // TODO? include query types
 	queryTypes      *queryV0.QueryTypeDefinitionList
 	log             log.Logger
 }
@@ -98,9 +98,9 @@ func RegisterAPIService(
 			return nil, err
 		}
 
-		// HARDCODE spec access
+		// HARDCODE schema access
 		if ds.ID == "grafana-testdata-datasource" {
-			builder.specProvider = hardcoded.TestdataOpenAPIExtension
+			builder.schemaProvider = hardcoded.TestdataOpenAPIExtension
 		}
 
 		apiRegistrar.RegisterAPI(builder)
diff --git a/pkg/registry/apis/query/connections.go b/pkg/registry/apis/query/connections.go
index f67629da453..36d22a146e3 100644
--- a/pkg/registry/apis/query/connections.go
+++ b/pkg/registry/apis/query/connections.go
@@ -152,10 +152,10 @@ func (q *connectionsProvider) asConnection(ds *datasources.DataSource, ns string
 		},
 		Title: ds.Name,
 		Datasource: queryV0.DataSourceConnectionRef{
-			Group:    gv.Group,
-			Version:  gv.Version,
-			Name:     ds.UID,
-			PluginID: ds.Type,
+			Group:   gv.Group,
+			Version: gv.Version,
+			Name:    ds.UID,
+			Plugin:  ds.Type,
 		},
 	}
 	v.UID = gapiutil.CalculateClusterWideUID(v) // indicates if the value changed on the server