From 8625a6c131ca04e4d2d47d90d11301dc9d61bf65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20=C5=A0tibran=C3=BD?= Date: Fri, 14 Mar 2025 10:07:24 +0100 Subject: [PATCH] Export SpannerConnectorConfigToClientOptions function (used by grafana-enterprise). (#102106) * Export SpannerConnectorConfigToClientOptions function (used by grafana-enterprise). --- pkg/services/sqlstore/migrator/spanner_dialect.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/services/sqlstore/migrator/spanner_dialect.go b/pkg/services/sqlstore/migrator/spanner_dialect.go index 81a0a72390c..642bd09b4af 100644 --- a/pkg/services/sqlstore/migrator/spanner_dialect.go +++ b/pkg/services/sqlstore/migrator/spanner_dialect.go @@ -284,7 +284,7 @@ func (s *SpannerDialect) executeDDLStatements(ctx context.Context, engine *xorm. return err } - opts := confToClientOptions(cfg) + opts := SpannerConnectorConfigToClientOptions(cfg) databaseAdminClient, err := database.NewDatabaseAdminClient(ctx, opts...) if err != nil { @@ -309,8 +309,8 @@ func (s *SpannerDialect) executeDDLStatements(ctx context.Context, engine *xorm. return nil } -// Adapted from https://github.com/googleapis/go-sql-spanner/blob/main/driver.go#L341-L477, from version 1.11.1. -func confToClientOptions(connectorConfig spannerdriver.ConnectorConfig) []option.ClientOption { +// SpannerConnectorConfigToClientOptions is adapted from https://github.com/googleapis/go-sql-spanner/blob/main/driver.go#L341-L477, from version 1.11.1. +func SpannerConnectorConfigToClientOptions(connectorConfig spannerdriver.ConnectorConfig) []option.ClientOption { var opts []option.ClientOption if connectorConfig.Host != "" { opts = append(opts, option.WithEndpoint(connectorConfig.Host))