Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

feat: support custom Google API endpoint for Spanner and BigQuery data sources (#21008)

Danny Xubf480fac7133
diff --git a/backend/api/mcp/gen/openapi.yaml b/backend/api/mcp/gen/openapi.yaml
index e45fae06fd..57e2403105 100644
--- a/backend/api/mcp/gen/openapi.yaml
+++ b/backend/api/mcp/gen/openapi.yaml
@@ -10363,6 +10363,18 @@ components:
description: |-
Extra connection parameters for the database connection.
For PostgreSQL HA, this can be used to set target_session_attrs=read-write
+ projectId:
+ type: string
+ title: project_id
+ description: |-
+ project_id and instance_id are the GCP resource identifiers.
+ project_id is used by Spanner and BigQuery; instance_id is used by Spanner.
+ For these engines, host and port optionally override the default Google API
+ endpoint (e.g. a Private Service Connect endpoint like
+ spanner-nonprod.p.googleapis.com).
+ instanceId:
+ type: string
+ title: instance_id
- oneOf:
- type: object
properties:
diff --git a/backend/api/v1/instance_service.go b/backend/api/v1/instance_service.go
index 707e602459..0edf3065c4 100644
--- a/backend/api/v1/instance_service.go
+++ b/backend/api/v1/instance_service.go
@@ -730,6 +730,7 @@ func (s *InstanceService) UpdateInstance(ctx context.Context, req *connect.Reque
if err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
+ normalizeGCPDataSources(instance.Metadata.GetEngine(), dataSources)
for _, ds := range dataSources {
if err := validateAndSanitizeDataSourceTLS(ds); err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, err)
@@ -981,6 +982,7 @@ func (s *InstanceService) AddDataSource(ctx context.Context, req *connect.Reques
if instance.Deleted {
return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("instance %q has been deleted", req.Msg.Name))
}
+ normalizeGCPDataSources(instance.Metadata.GetEngine(), []*storepb.DataSource{dataSource})
for _, ds := range instance.Metadata.GetDataSources() {
if ds.GetId() == req.Msg.DataSource.Id {
return nil, connect.NewError(connect.CodeNotFound, errors.New("data source already exists with the same name"))
@@ -1151,6 +1153,10 @@ func (s *InstanceService) UpdateDataSource(ctx context.Context, req *connect.Req
dataSource.MasterPassword = req.Msg.DataSource.MasterPassword
case "extra_connection_parameters":
dataSource.ExtraConnectionParameters = req.Msg.DataSource.ExtraConnectionParameters
+ case "project_id":
+ dataSource.ProjectId = req.Msg.DataSource.ProjectId
+ case "instance_id":
+ dataSource.InstanceId = req.Msg.DataSource.InstanceId
case "azure_credential", "aws_credential", "gcp_credential":
switch req.Msg.DataSource.AuthenticationType {
case v1pb.DataSource_AZURE_IAM:
@@ -1200,6 +1206,7 @@ func (s *InstanceService) UpdateDataSource(ctx context.Context, req *connect.Req
}
clearDataSourceAuthentication(dataSource)
+ normalizeGCPDataSources(instance.Metadata.GetEngine(), []*storepb.DataSource{dataSource})
if err := validateAndSanitizeDataSourceTLS(dataSource); err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
diff --git a/backend/api/v1/instance_service_converter.go b/backend/api/v1/instance_service_converter.go
index f904864736..98db0f1e9c 100644
--- a/backend/api/v1/instance_service_converter.go
+++ b/backend/api/v1/instance_service_converter.go
@@ -1,6 +1,7 @@
package v1
import (
+ "regexp"
"strings"
"connectrpc.com/connect"
@@ -67,6 +68,7 @@ func convertToStoreInstance(instanceID string, instance *v1pb.Instance) (*store.
if err != nil {
return nil, err
}
+ normalizeGCPDataSources(convertEngine(instance.Engine), datasources)
var environmentID *string
if instance.Environment != nil && *instance.Environment != "" {
@@ -123,6 +125,31 @@ func convertToV1InstanceResource(instanceMessage *store.InstanceMessage, activat
}
}
+var legacySpannerHostRegexp = regexp.MustCompile(`^projects/([^/]+)/instances/([^/]+)$`)
+
+// normalizeGCPDataSources rewrites legacy GCP data sources in place. host used
+// to carry the Spanner instance path (projects/<p>/instances/<i>) or the
+// BigQuery project ID; these now live in project_id/instance_id while
+// host/port optionally override the default Google API endpoint.
+func normalizeGCPDataSources(engine storepb.Engine, dataSources []*storepb.DataSource) {
+ for _, ds := range dataSources {
+ switch engine {
+ case storepb.Engine_SPANNER:
+ if m := legacySpannerHostRegexp.FindStringSubmatch(ds.GetHost()); m != nil {
+ ds.ProjectId = m[1]
+ ds.InstanceId = m[2]
+ ds.Host = ""
+ }
+ case storepb.Engine_BIGQUERY:
+ if ds.GetProjectId() == "" && ds.GetHost() != "" {
+ ds.ProjectId = ds.GetHost()
+ ds.Host = ""
+ }
+ default:
+ }
+ }
+}
+
func convertV1DataSources(dataSources []*v1pb.DataSource) ([]*storepb.DataSource, error) {
var values []*storepb.DataSource
for _, ds := range dataSources {
@@ -249,6 +276,8 @@ func convertDataSources(dataSources []*storepb.DataSource) []*v1pb.DataSource {
MasterName: ds.GetMasterName(),
MasterUsername: ds.GetMasterUsername(),
ExtraConnectionParameters: ds.GetExtraConnectionParameters(),
+ ProjectId: ds.GetProjectId(),
+ InstanceId: ds.GetInstanceId(),
SslCaSet: ds.GetSslCa() != "",
SslCertSet: ds.GetSslCert() != "",
SslKeySet: ds.GetSslKey() != "",
@@ -566,6 +595,8 @@ func convertV1DataSource(dataSource *v1pb.DataSource) (*storepb.DataSource, erro
MasterUsername: dataSource.MasterUsername,
MasterPassword: dataSource.MasterPassword,
ExtraConnectionParameters: dataSource.ExtraConnectionParameters,
+ ProjectId: dataSource.ProjectId,
+ InstanceId: dataSource.InstanceId,
}
switch dataSource.AuthenticationType {
diff --git a/backend/api/v1/instance_service_converter_test.go b/backend/api/v1/instance_service_converter_test.go
index 98a27c80ec..a9d1181bc6 100644
--- a/backend/api/v1/instance_service_converter_test.go
+++ b/backend/api/v1/instance_service_converter_test.go
@@ -38,3 +38,94 @@ func TestConvertDataSourceCloudSQLIPType(t *testing.T) {
})
}
}
+
+func TestNormalizeGCPDataSources(t *testing.T) {
+ tests := []struct {
+ name string
+ engine storepb.Engine
+ in *storepb.DataSource
+ wantProjectID string
+ wantInstanceID string
+ wantHost string
+ }{
+ {
+ name: "spanner legacy host is split into project and instance IDs",
+ engine: storepb.Engine_SPANNER,
+ in: &storepb.DataSource{Host: "projects/my-proj/instances/my-inst"},
+ wantProjectID: "my-proj",
+ wantInstanceID: "my-inst",
+ wantHost: "",
+ },
+ {
+ name: "spanner endpoint host is kept as endpoint",
+ engine: storepb.Engine_SPANNER,
+ in: &storepb.DataSource{
+ ProjectId: "my-proj",
+ InstanceId: "my-inst",
+ Host: "spanner-nonprod.p.googleapis.com",
+ },
+ wantProjectID: "my-proj",
+ wantInstanceID: "my-inst",
+ wantHost: "spanner-nonprod.p.googleapis.com",
+ },
+ {
+ name: "spanner new-style without host is untouched",
+ engine: storepb.Engine_SPANNER,
+ in: &storepb.DataSource{ProjectId: "my-proj", InstanceId: "my-inst"},
+ wantProjectID: "my-proj",
+ wantInstanceID: "my-inst",
+ wantHost: "",
+ },
+ {
+ name: "bigquery legacy host becomes project ID",
+ engine: storepb.Engine_BIGQUERY,
+ in: &storepb.DataSource{Host: "my-proj"},
+ wantProjectID: "my-proj",
+ wantHost: "",
+ },
+ {
+ name: "bigquery host is kept as endpoint when project ID is set",
+ engine: storepb.Engine_BIGQUERY,
+ in: &storepb.DataSource{
+ ProjectId: "my-proj",
+ Host: "bigquery-nonprod.p.googleapis.com",
+ },
+ wantProjectID: "my-proj",
+ wantHost: "bigquery-nonprod.p.googleapis.com",
+ },
+ {
+ name: "non-GCP engine is untouched",
+ engine: storepb.Engine_POSTGRES,
+ in: &storepb.DataSource{Host: "projects/my-proj/instances/my-inst"},
+ wantHost: "projects/my-proj/instances/my-inst",
+ },
+ }
+ for _, tc := range tests {
+ t.Run(tc.name, func(t *testing.T) {
+ normalizeGCPDataSources(tc.engine, []*storepb.DataSource{tc.in})
+ require.Equal(t, tc.wantProjectID, tc.in.GetProjectId())
+ require.Equal(t, tc.wantInstanceID, tc.in.GetInstanceId())
+ require.Equal(t, tc.wantHost, tc.in.GetHost())
+ })
+ }
+}
+
+func TestConvertDataSourceGCPFields(t *testing.T) {
+ storeDS, err := convertV1DataSource(&v1pb.DataSource{
+ Type: v1pb.DataSourceType_ADMIN,
+ ProjectId: "my-proj",
+ InstanceId: "my-inst",
+ Host: "spanner-nonprod.p.googleapis.com",
+ Port: "443",
+ })
+ require.NoError(t, err)
+ require.Equal(t, "my-proj", storeDS.GetProjectId(), "v1->store project_id")
+ require.Equal(t, "my-inst", storeDS.GetInstanceId(), "v1->store instance_id")
+
+ v1DSs := convertDataSources([]*storepb.DataSource{storeDS})
+ require.Len(t, v1DSs, 1)
+ require.Equal(t, "my-proj", v1DSs[0].GetProjectId(), "store->v1 project_id")
+ require.Equal(t, "my-inst", v1DSs[0].GetInstanceId(), "store->v1 instance_id")
+ require.Equal(t, "spanner-nonprod.p.googleapis.com", v1DSs[0].GetHost(), "store->v1 host")
+ require.Equal(t, "443", v1DSs[0].GetPort(), "store->v1 port")
+}
diff --git a/backend/generated-go/store/instance.pb.go b/backend/generated-go/store/instance.pb.go
index 6af434450c..b6fee8bcb9 100644
--- a/backend/generated-go/store/instance.pb.go
+++ b/backend/generated-go/store/instance.pb.go
@@ -799,8 +799,15 @@ type DataSource struct {
// Extra connection parameters for the database connection.
// For PostgreSQL HA, this can be used to set target_session_attrs=read-write
ExtraConnectionParameters map[string]string `protobuf:"bytes,36,rep,name=extra_connection_parameters,json=extraConnectionParameters,proto3" json:"extra_connection_parameters,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
- unknownFields protoimpl.UnknownFields
- sizeCache protoimpl.SizeCache
+ // project_id and instance_id are the GCP resource identifiers.
+ // project_id is used by Spanner and BigQuery; instance_id is used by Spanner.
+ // For these engines, host and port optionally override the default Google API
+ // endpoint (e.g. a Private Service Connect endpoint like
+ // spanner-nonprod.p.googleapis.com).
+ ProjectId string `protobuf:"bytes,57,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
+ InstanceId string `protobuf:"bytes,58,opt,name=instance_id,json=instanceId,proto3" json:"instance_id,omitempty"`
+ unknownFields protoimpl.UnknownFields
+ sizeCache protoimpl.SizeCache
}
func (x *DataSource) Reset() {
@@ -1238,6 +1245,20 @@ func (x *DataSource) GetExtraConnectionParameters() map[string]string {
return nil
}
+func (x *DataSource) GetProjectId() string {
+ if x != nil {
+ return x.ProjectId
+ }
+ return ""
+}
+
+func (x *DataSource) GetInstanceId() string {
+ if x != nil {
+ return x.InstanceId
+ }
+ return ""
+}
+
type isDataSource_IamExtension interface {
isDataSource_IamExtension()
}
@@ -2005,7 +2026,7 @@ const file_store_instance_proto_rawDesc = "" +
"\x11_connection_limitB\x0e\n" +
"\f_valid_untilB\f\n" +
"\n" +
- "_attribute\"\xf2\x1d\n" +
+ "_attribute\"\xb2\x1e\n" +
"\n" +
"DataSource\x12\x0e\n" +
"\x02id\x18\x01 \x01(\tR\x02id\x122\n" +
@@ -2069,7 +2090,11 @@ const file_store_instance_proto_rawDesc = "" +
"\n" +
"redis_type\x18\" \x01(\x0e2$.bytebase.store.DataSource.RedisTypeR\tredisType\x12\x18\n" +
"\acluster\x18# \x01(\tR\acluster\x12y\n" +
- "\x1bextra_connection_parameters\x18$ \x03(\v29.bytebase.store.DataSource.ExtraConnectionParametersEntryR\x19extraConnectionParameters\x1a\xaa\x01\n" +
+ "\x1bextra_connection_parameters\x18$ \x03(\v29.bytebase.store.DataSource.ExtraConnectionParametersEntryR\x19extraConnectionParameters\x12\x1d\n" +
+ "\n" +
+ "project_id\x189 \x01(\tR\tprojectId\x12\x1f\n" +
+ "\vinstance_id\x18: \x01(\tR\n" +
+ "instanceId\x1a\xaa\x01\n" +
"\x0fAzureCredential\x12\x1b\n" +
"\ttenant_id\x18\x01 \x01(\tR\btenantId\x12\x1b\n" +
"\tclient_id\x18\x02 \x01(\tR\bclientId\x12#\n" +
diff --git a/backend/generated-go/store/instance_equal.pb.go b/backend/generated-go/store/instance_equal.pb.go
index 5d089c3c7a..02d5aba49a 100644
--- a/backend/generated-go/store/instance_equal.pb.go
+++ b/backend/generated-go/store/instance_equal.pb.go
@@ -385,6 +385,12 @@ func (x *DataSource) Equal(y *DataSource) bool {
return false
}
}
+ if x.ProjectId != y.ProjectId {
+ return false
+ }
+ if x.InstanceId != y.InstanceId {
+ return false
+ }
return true
}
diff --git a/backend/generated-go/v1/instance_service.pb.go b/backend/generated-go/v1/instance_service.pb.go
index 6d57164da4..5c7ff0c56a 100644
--- a/backend/generated-go/v1/instance_service.pb.go
+++ b/backend/generated-go/v1/instance_service.pb.go
@@ -2029,8 +2029,15 @@ type DataSource struct {
// Extra connection parameters for the database connection.
// For PostgreSQL HA, this can be used to set target_session_attrs=read-write
ExtraConnectionParameters map[string]string `protobuf:"bytes,36,rep,name=extra_connection_parameters,json=extraConnectionParameters,proto3" json:"extra_connection_parameters,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
- unknownFields protoimpl.UnknownFields
- sizeCache protoimpl.SizeCache
+ // project_id and instance_id are the GCP resource identifiers.
+ // project_id is used by Spanner and BigQuery; instance_id is used by Spanner.
+ // For these engines, host and port optionally override the default Google API
+ // endpoint (e.g. a Private Service Connect endpoint like
+ // spanner-nonprod.p.googleapis.com).
+ ProjectId string `protobuf:"bytes,57,opt,name=project_id,json=projectId,proto3" json:"project_id,omitempty"`
+ InstanceId string `protobuf:"bytes,58,opt,name=instance_id,json=instanceId,proto3" json:"instance_id,omitempty"`
+ unknownFields protoimpl.UnknownFields
+ sizeCache protoimpl.SizeCache
}
func (x *DataSource) Reset() {
@@ -2426,6 +2433,20 @@ func (x *DataSource) GetExtraConnectionParameters() map[string]string {
return nil
}
+func (x *DataSource) GetProjectId() string {
+ if x != nil {
+ return x.ProjectId
+ }
+ return ""
+}
+
+func (x *DataSource) GetInstanceId() string {
+ if x != nil {
+ return x.InstanceId
+ }
+ return ""
+}
+
type isDataSource_IamExtension interface {
isDataSource_IamExtension()
}
@@ -3172,7 +3193,7 @@ const file_v1_instance_service_proto_rawDesc = "" +
"\x05PLAIN\x10\x01\x12\x0f\n" +
"\vENVIRONMENT\x10\x02\x12\b\n" +
"\x04FILE\x10\x03B\r\n" +
- "\vauth_option\"\xbd\x18\n" +
+ "\vauth_option\"\xfd\x18\n" +
"\n" +
"DataSource\x12\x0e\n" +
"\x02id\x18\x01 \x01(\tR\x02id\x12/\n" +
@@ -3232,7 +3253,11 @@ const file_v1_instance_service_proto_rawDesc = "" +
"\n" +
"redis_type\x18\" \x01(\x0e2!.bytebase.v1.DataSource.RedisTypeR\tredisType\x12\x18\n" +
"\acluster\x18# \x01(\tR\acluster\x12v\n" +
- "\x1bextra_connection_parameters\x18$ \x03(\v26.bytebase.v1.DataSource.ExtraConnectionParametersEntryR\x19extraConnectionParameters\x1au\n" +
+ "\x1bextra_connection_parameters\x18$ \x03(\v26.bytebase.v1.DataSource.ExtraConnectionParametersEntryR\x19extraConnectionParameters\x12\x1d\n" +
+ "\n" +
+ "project_id\x189 \x01(\tR\tprojectId\x12\x1f\n" +
+ "\vinstance_id\x18: \x01(\tR\n" +
+ "instanceId\x1au\n" +
"\x0fAzureCredential\x12\x1b\n" +
"\ttenant_id\x18\x01 \x01(\tR\btenantId\x12\x1b\n" +
"\tclient_id\x18\x02 \x01(\tR\bclientId\x12(\n" +
diff --git a/backend/generated-go/v1/instance_service_equal.pb.go b/backend/generated-go/v1/instance_service_equal.pb.go
index 446552a9c6..78bb04deaf 100644
--- a/backend/generated-go/v1/instance_service_equal.pb.go
+++ b/backend/generated-go/v1/instance_service_equal.pb.go
@@ -744,6 +744,12 @@ func (x *DataSource) Equal(y *DataSource) bool {
return false
}
}
+ if x.ProjectId != y.ProjectId {
+ return false
+ }
+ if x.InstanceId != y.InstanceId {
+ return false
+ }
return true
}
diff --git a/backend/migrator/migration/3.21/0003##migrate_gcp_data_source_fields.sql b/backend/migrator/migration/3.21/0003##migrate_gcp_data_source_fields.sql
new file mode 100644
index 0000000000..3e0567f7aa
--- /dev/null
+++ b/backend/migrator/migration/3.21/0003##migrate_gcp_data_source_fields.sql
@@ -0,0 +1,54 @@
+-- Migrate GCP data sources to the project_id/instance_id fields.
+--
+-- Spanner data sources used to store the instance path in host:
+-- "host": "projects/<project>/instances/<instance>"
+-- BigQuery data sources used to store the project ID in host:
+-- "host": "<project>"
+-- These now live in dedicated fields:
+-- "projectId": "<project>", "instanceId": "<instance>"
+-- and host/port are repurposed as an optional Google API endpoint override.
+
+UPDATE instance
+SET metadata = jsonb_set(
+ metadata,
+ '{dataSources}',
+ (
+ SELECT jsonb_agg(
+ CASE
+ WHEN ds->>'host' ~ '^projects/[^/]+/instances/[^/]+$'
+ THEN (
+ ds || jsonb_build_object(
+ 'projectId', split_part(ds->>'host', '/', 2),
+ 'instanceId', split_part(ds->>'host', '/', 4)
+ )
+ ) - 'host'
+ ELSE ds
+ END
+ ORDER BY ord
+ )
+ FROM jsonb_array_elements(metadata->'dataSources') WITH ORDINALITY AS t(ds, ord)
+ )
+)
+WHERE metadata->>'engine' = 'SPANNER'
+ AND jsonb_typeof(metadata->'dataSources') = 'array'
+ AND jsonb_array_length(metadata->'dataSources') > 0;
+
+UPDATE instance
+SET metadata = jsonb_set(
+ metadata,
+ '{dataSources}',
+ (
+ SELECT jsonb_agg(
+ CASE
+ WHEN ds ? 'host' AND NOT ds ? 'projectId'
+ THEN (ds || jsonb_build_object('projectId', ds->>'host')) - 'host'
+ ELSE ds
+ END
+ ORDER BY ord
+ )
+ FROM jsonb_array_elements(metadata->'dataSources') WITH ORDINALITY AS t(ds, ord)
+ )
+)
+WHERE metadata->>'engine' = 'BIGQUERY'
+ AND jsonb_typeof(metadata->'dataSources') = 'array'
+ AND jsonb_array_length(metadata->'dataSources') > 0;
diff --git a/backend/migrator/migrator_test.go b/backend/migrator/migrator_test.go
index 2d66a67efb..afcade94c0 100644
--- a/backend/migrator/migrator_test.go
+++ b/backend/migrator/migrator_test.go
@@ -17,8 +17,8 @@ import (
func TestLatestVersion(t *testing.T) {
files, err := getSortedVersionedFiles()
require.NoError(t, err)
- require.Equal(t, semver.MustParse("3.21.2"), *files[len(files)-1].version)
- require.Equal(t, "migration/3.21/0002##migrate_instance_sync_databases.sql", files[len(files)-1].path)
+ require.Equal(t, semver.MustParse("3.21.3"), *files[len(files)-1].version)
+ require.Equal(t, "migration/3.21/0003##migrate_gcp_data_source_fields.sql", files[len(files)-1].path)
}
func TestVersionUnique(t *testing.T) {
@@ -90,6 +90,76 @@ func TestMigration3_21_2_MigrateInstanceSyncDatabases(t *testing.T) {
require.JSONEq(t, `{"engine":"POSTGRES"}`, getMetadata("instance-without-sync-databases"))
}
+func TestMigration3_21_3_MigrateGCPDataSourceFields(t *testing.T) {
+ ctx := context.Background()
+ container := testcontainer.GetTestPgContainer(ctx, t)
+ t.Cleanup(func() { container.Close(ctx) })
+
+ db := container.GetDB()
+
+ setup := `
+ CREATE TABLE instance (
+ resource_id TEXT PRIMARY KEY,
+ metadata JSONB NOT NULL DEFAULT '{}'
+ );
+
+ INSERT INTO instance (resource_id, metadata) VALUES
+ (
+ 'spanner-legacy',
+ '{"engine":"SPANNER","dataSources":[{"id":"admin","host":"projects/my-proj/instances/my-inst"}]}'
+ ),
+ (
+ 'spanner-multi-data-source',
+ '{"engine":"SPANNER","dataSources":[{"id":"admin","host":"projects/my-proj/instances/my-inst"},{"id":"ro-1","type":"READ_ONLY","host":"projects/my-proj/instances/my-inst"},{"id":"ro-2","type":"READ_ONLY","host":"projects/my-proj/instances/my-inst"}]}'
+ ),
+ (
+ 'spanner-new-shape',
+ '{"engine":"SPANNER","dataSources":[{"id":"admin","projectId":"my-proj","instanceId":"my-inst","host":"spanner-nonprod.p.googleapis.com"}]}'
+ ),
+ (
+ 'spanner-no-data-sources',
+ '{"engine":"SPANNER","dataSources":[]}'
+ ),
+ (
+ 'bigquery-legacy',
+ '{"engine":"BIGQUERY","dataSources":[{"id":"admin","host":"my-proj"}]}'
+ ),
+ (
+ 'bigquery-new-shape',
+ '{"engine":"BIGQUERY","dataSources":[{"id":"admin","projectId":"my-proj","host":"bigquery-nonprod.p.googleapis.com"}]}'
+ ),
+ (
+ 'postgres-untouched',
+ '{"engine":"POSTGRES","dataSources":[{"id":"admin","host":"localhost","port":"5432"}]}'
+ );
+ `
+ _, err := db.ExecContext(ctx, setup)
+ require.NoError(t, err)
+
+ statement, err := migrationFS.ReadFile("migration/3.21/0003##migrate_gcp_data_source_fields.sql")
+ require.NoError(t, err)
+
+ _, err = db.ExecContext(ctx, string(statement))
+ require.NoError(t, err)
+
+ getMetadata := func(resourceID string) string {
+ t.Helper()
+ var metadata string
+ err := db.QueryRowContext(ctx, `SELECT metadata::text FROM instance WHERE resource_id = $1`, resourceID).Scan(&metadata)
+ require.NoError(t, err)
+ return metadata
+ }
+
+ require.JSONEq(t, `{"engine":"SPANNER","dataSources":[{"id":"admin","projectId":"my-proj","instanceId":"my-inst"}]}`, getMetadata("spanner-legacy"))
+ // JSONEq treats arrays as ordered: this also asserts the data source order is preserved.
+ require.JSONEq(t, `{"engine":"SPANNER","dataSources":[{"id":"admin","projectId":"my-proj","instanceId":"my-inst"},{"id":"ro-1","type":"READ_ONLY","projectId":"my-proj","instanceId":"my-inst"},{"id":"ro-2","type":"READ_ONLY","projectId":"my-proj","instanceId":"my-inst"}]}`, getMetadata("spanner-multi-data-source"))
+ require.JSONEq(t, `{"engine":"SPANNER","dataSources":[{"id":"admin","projectId":"my-proj","instanceId":"my-inst","host":"spanner-nonprod.p.googleapis.com"}]}`, getMetadata("spanner-new-shape"))
+ require.JSONEq(t, `{"engine":"SPANNER","dataSources":[]}`, getMetadata("spanner-no-data-sources"))
+ require.JSONEq(t, `{"engine":"BIGQUERY","dataSources":[{"id":"admin","projectId":"my-proj"}]}`, getMetadata("bigquery-legacy"))
+ require.JSONEq(t, `{"engine":"BIGQUERY","dataSources":[{"id":"admin","projectId":"my-proj","host":"bigquery-nonprod.p.googleapis.com"}]}`, getMetadata("bigquery-new-shape"))
+ require.JSONEq(t, `{"engine":"POSTGRES","dataSources":[{"id":"admin","host":"localhost","port":"5432"}]}`, getMetadata("postgres-untouched"))
+}
+
func TestMigration3_21_1_BackfillUIPlanDraftIssues(t *testing.T) {
ctx := context.Background()
container := testcontainer.GetTestPgContainer(ctx, t)
diff --git a/backend/plugin/db/bigquery/bigquery.go b/backend/plugin/db/bigquery/bigquery.go
index ff10cb060f..c771340c9c 100644
--- a/backend/plugin/db/bigquery/bigquery.go
+++ b/backend/plugin/db/bigquery/bigquery.go
@@ -6,6 +6,7 @@ import (
"database/sql"
"errors"
"fmt"
+ "net"
"time"
"unicode"
@@ -48,8 +49,8 @@ func newDriver() db.Driver {
// Open opens a BigQuery driver. It must connect to a specific database.
// If database isn't provided, part of the driver cannot function.
func (d *Driver) Open(ctx context.Context, _ storepb.Engine, config db.ConnectionConfig) (db.Driver, error) {
- if config.DataSource.Host == "" {
- return nil, errors.New("host cannot be empty")
+ if config.DataSource.ProjectId == "" {
+ return nil, errors.New("project ID cannot be empty")
}
d.config = config
d.connCtx = config.ConnectionContext
@@ -63,7 +64,17 @@ func (d *Driver) Open(ctx context.Context, _ storepb.Engine, config db.Connectio
}
o = append(o, credOption)
}
- client, err := bigquery.NewClient(ctx, config.DataSource.Host, o...)
+ // host and port optionally override the default bigquery.googleapis.com
+ // endpoint, e.g. with a Private Service Connect endpoint. A bare host[:port]
+ // is merged with the default endpoint's scheme and path by the client library.
+ if host := config.DataSource.Host; host != "" {
+ endpoint := host
+ if port := config.DataSource.Port; port != "" {
+ endpoint = net.JoinHostPort(host, port)
+ }
+ o = append(o, option.WithEndpoint(endpoint))
+ }
+ client, err := bigquery.NewClient(ctx, config.DataSource.ProjectId, o...)
if err != nil {
return nil, err
}
diff --git a/backend/plugin/db/spanner/dump.go b/backend/plugin/db/spanner/dump.go
index 6c630610e6..2db32bdb98 100644
--- a/backend/plugin/db/spanner/dump.go
+++ b/backend/plugin/db/spanner/dump.go
@@ -13,7 +13,7 @@ import (
// Dump dumps database.
func (d *Driver) Dump(ctx context.Context, out io.Writer, _ *storepb.DatabaseSchemaMetadata) error {
resp, err := d.dbClient.GetDatabaseDdl(ctx, &databasepb.GetDatabaseDdlRequest{
- Database: getDSN(d.config.DataSource.Host, d.databaseName),
+ Database: getDSN(d.instancePath(), d.databaseName),
})
if err != nil {
return err
diff --git a/backend/plugin/db/spanner/spanner.go b/backend/plugin/db/spanner/spanner.go
index 595ac0e955..935f9832c6 100644
--- a/backend/plugin/db/spanner/spanner.go
+++ b/backend/plugin/db/spanner/spanner.go
@@ -8,6 +8,7 @@ import (
"encoding/json"
"fmt"
"log/slog"
+ "net"
"regexp"
"strconv"
"strings"
@@ -63,8 +64,11 @@ func newDriver() db.Driver {
// Open opens a Spanner driver. It must connect to a specific database.
// If database isn't provided, part of the driver cannot function.
func (d *Driver) Open(ctx context.Context, _ storepb.Engine, config db.ConnectionConfig) (db.Driver, error) {
- if config.DataSource.Host == "" {
- return nil, errors.New("host cannot be empty")
+ if config.DataSource.ProjectId == "" {
+ return nil, errors.New("project ID cannot be empty")
+ }
+ if config.DataSource.InstanceId == "" {
+ return nil, errors.New("instance ID cannot be empty")
}
d.config = config
d.connCtx = config.ConnectionContext
@@ -77,9 +81,19 @@ func (d *Driver) Open(ctx context.Context, _ storepb.Engine, config db.Connectio
}
o = append(o, credOption)
}
+ // host and port optionally override the default spanner.googleapis.com:443
+ // endpoint, e.g. with a Private Service Connect endpoint. gRPC defaults to
+ // port 443 when no port is given.
+ if host := config.DataSource.Host; host != "" {
+ endpoint := host
+ if port := config.DataSource.Port; port != "" {
+ endpoint = net.JoinHostPort(host, port)
+ }
+ o = append(o, option.WithEndpoint(endpoint))
+ }
if config.ConnectionContext.DatabaseName != "" {
d.databaseName = config.ConnectionContext.DatabaseName
- dsn := getDSN(d.config.DataSource.Host, config.ConnectionContext.DatabaseName)
+ dsn := getDSN(d.instancePath(), config.ConnectionContext.DatabaseName)
client, err := spanner.NewClient(
ctx,
dsn,
@@ -111,7 +125,7 @@ func (d *Driver) Close(_ context.Context) error {
// Ping pings the instance.
func (d *Driver) Ping(ctx context.Context) error {
iter := d.dbClient.ListDatabases(ctx, &databasepb.ListDatabasesRequest{
- Parent: d.config.DataSource.Host,
+ Parent: d.instancePath(),
})
_, err := iter.Next()
if err == iterator.Done {
@@ -186,7 +200,7 @@ func (d *Driver) Execute(ctx context.Context, statement string, opts db.ExecuteO
func (d *Driver) executeDDL(ctx context.Context, stmts []string, _ db.ExecuteOptions) (int64, error) {
op, err := d.dbClient.UpdateDatabaseDdl(ctx, &databasepb.UpdateDatabaseDdlRequest{
- Database: getDSN(d.config.DataSource.Host, d.databaseName),
+ Database: getDSN(d.instancePath(), d.databaseName),
Statements: stmts,
})
if err != nil {
@@ -243,7 +257,7 @@ func (d *Driver) executeInAutoCommitMode(ctx context.Context, stmts []string, _
func (d *Driver) creataDatabase(ctx context.Context, createStatement string, extraStatement []string) error {
op, err := d.dbClient.CreateDatabase(ctx, &databasepb.CreateDatabaseRequest{
- Parent: d.config.DataSource.Host,
+ Parent: d.instancePath(),
CreateStatement: createStatement,
ExtraStatements: extraStatement,
})
@@ -302,8 +316,14 @@ func getStatementWithResultLimit(stmt string, limit int) string {
return fmt.Sprintf("WITH result AS (%s) SELECT * FROM result%s;", stmt, limitPart)
}
-func getDSN(host, database string) string {
- return fmt.Sprintf("%s/databases/%s", host, database)
+// instancePath returns the Spanner instance resource name,
+// e.g. projects/<project>/instances/<instance>.
+func (d *Driver) instancePath() string {
+ return fmt.Sprintf("projects/%s/instances/%s", d.config.DataSource.ProjectId, d.config.DataSource.InstanceId)
+}
+
+func getDSN(instancePath, database string) string {
+ return fmt.Sprintf("%s/databases/%s", instancePath, database)
}
// get `<database>` from `projects/<project>/instances/<instance>/databases/<database>`.
@@ -346,7 +366,7 @@ func (d *Driver) QueryConn(ctx context.Context, _ *sql.Conn, statement string, q
}
if util.IsDDL(statement) {
op, err := d.dbClient.UpdateDatabaseDdl(ctx, &databasepb.UpdateDatabaseDdlRequest{
- Database: getDSN(d.config.DataSource.Host, d.databaseName),
+ Database: getDSN(d.instancePath(), d.databaseName),
Statements: []string{statement},
})
if err != nil {
diff --git a/backend/plugin/db/spanner/sync.go b/backend/plugin/db/spanner/sync.go
index 3bda33cfe2..936354cc59 100644
--- a/backend/plugin/db/spanner/sync.go
+++ b/backend/plugin/db/spanner/sync.go
@@ -21,7 +21,7 @@ import (
func (d *Driver) SyncInstance(ctx context.Context) (*db.InstanceMetadata, error) {
var databases []*storepb.DatabaseSchemaMetadata
iter := d.dbClient.ListDatabases(ctx, &databasepb.ListDatabasesRequest{
- Parent: d.config.DataSource.Host,
+ Parent: d.instancePath(),
})
for {
database, err := iter.Next()
@@ -106,7 +106,7 @@ func (d *Driver) SyncDBSchema(ctx context.Context) (*storepb.DatabaseSchemaMetad
}
func (d *Driver) notFoundDatabase(ctx context.Context, databaseName string) (bool, error) {
- dsn := getDSN(d.config.DataSource.Host, databaseName)
+ dsn := getDSN(d.instancePath(), databaseName)
_, err := d.dbClient.GetDatabase(ctx, &databasepb.GetDatabaseRequest{Name: dsn})
if status.Code(err) == codes.NotFound {
return true, nil
diff --git a/frontend/src/components/instance/DataSourceSection.tsx b/frontend/src/components/instance/DataSourceSection.tsx
index 426f243855..46e9a75f3e 100644
--- a/frontend/src/components/instance/DataSourceSection.tsx
+++ b/frontend/src/components/instance/DataSourceSection.tsx
@@ -52,10 +52,10 @@ export function DataSourceSection({
};
if (
basicInfo.engine === Engine.SPANNER ||
- basicInfo.engine === Engine.BIGQUERY ||
- basicInfo.engine === Engine.DYNAMODB
+ basicInfo.engine === Engine.BIGQUERY
) {
- ds.host = adminDataSource.host;
+ ds.projectId = adminDataSource.projectId;
+ ds.instanceId = adminDataSource.instanceId;
}
setDataSourceEditState((prev) => ({
dataSources: [...prev.dataSources, ds],
diff --git a/frontend/src/components/instance/InstanceFormBody.tsx b/frontend/src/components/instance/InstanceFormBody.tsx
index 95ef0fda83..31f63b2192 100644
--- a/frontend/src/components/instance/InstanceFormBody.tsx
+++ b/frontend/src/components/instance/InstanceFormBody.tsx
@@ -61,7 +61,11 @@ import {
engineNameV1,
extractInstanceResourceName,
isDev,
- isValidSpannerHost,
+ isValidBigQueryDataSource,
+ isValidSpannerDataSource,
+ onlyAllowNumber,
+ RE_GCP_INSTANCE_ID,
+ RE_GCP_PROJECT_ID,
supportedEngineV1List,
urlfy,
} from "@/utils";
@@ -83,48 +87,95 @@ import { hasInfoContent, type InfoSection } from "./info-content";
// --- Inline sub-components ---
+function GCPEndpointInput({
+ endpoint,
+ port,
+ placeholder,
+ example,
+ onUpdate,
+ allowEdit,
+}: Readonly<{
+ endpoint: string;
+ port: string;
+ placeholder: string;
+ example: string;
+ onUpdate: (update: { host?: string; port?: string }) => void;
+ allowEdit: boolean;
+}>) {
+ const { t } = useTranslation();
+ const [expanded, setExpanded] = useState(false);
+ const visible = expanded || !!endpoint || !!port;
+
+ if (!visible) {
+ if (!allowEdit) return null;
+ return (
+ <div className="col-span-2">
+ <button
+ type="button"
+ className="text-sm normal-link"
+ onClick={() => setExpanded(true)}
+ >
+ {t("instance.gcp-endpoint-toggle")}
+ </button>
+ </div>
+ );
+ }
+
+ return (
+ <>
+ <FormField title={<>{t("instance.endpoint")}</>}>
+ <Input
+ value={endpoint}
+ placeholder={placeholder}
+ className="w-full"
+ disabled={!allowEdit}
+ onChange={(e) => onUpdate({ host: e.target.value.trim() })}
+ />
+ </FormField>
+ <FormField title={<>{t("instance.port")}</>}>
+ <Input
+ value={port}
+ placeholder="443"
+ className="w-full"
+ disabled={!allowEdit}
+ onChange={(e) => {
+ if (e.target.value && !onlyAllowNumber(e.target.value)) return;
+ onUpdate({ port: e.target.value.trim() });
+ }}
+ />
+ </FormField>
+ <p className="col-span-2 text-xs leading-4 text-control-light">
+ {t("instance.gcp-endpoint-tip", { example })}
+ </p>
+ </>
+ );
+}
+
function SpannerHostInput({
- host,
- onHostChange,
+ projectId,
+ instanceId,
+ endpoint,
+ port,
+ onUpdate,
allowEdit,
}: {
- host: string;
- onHostChange: (host: string) => void;
+ projectId: string;
+ instanceId: string;
+ endpoint: string;
+ port: string;
+ onUpdate: (update: {
+ projectId?: string;
+ instanceId?: string;
+ host?: string;
+ port?: string;
+ }) => void;
allowEdit: boolean;
}) {
const { t } = useTranslation();
- const RE =
- /^projects\/(?<PROJECT_ID>(?:[a-z]|[-.:]|[0-9])*)\/instances\/(?<INSTANCE_ID>(?:[a-z]|[-]|[0-9])*)$/;
- const RE_PROJECT_ID = /^(?:[a-z]|[-.:]|[0-9])+$/;
- const RE_INSTANCE_ID = /^(?:[a-z]|[-]|[0-9])+$/;
-
- const parseProjectId = (h: string) => h.match(RE)?.groups?.PROJECT_ID ?? "";
- const parseInstanceId = (h: string) => h.match(RE)?.groups?.INSTANCE_ID ?? "";
-
- const [projectId, setProjectId] = useState(() => parseProjectId(host));
- const [instanceId, setInstanceId] = useState(() => parseInstanceId(host));
const [dirty, setDirty] = useState(false);
- useEffect(() => {
- if (!host) return;
- setProjectId(parseProjectId(host));
- setInstanceId(parseInstanceId(host));
- }, [host]);
-
- const update = useCallback(
- (pId: string, iId: string) => {
- setDirty(true);
- if (!RE_PROJECT_ID.test(pId) || !RE_INSTANCE_ID.test(iId)) {
- onHostChange("");
- return;
- }
- onHostChange(`projects/${pId}/instances/${iId}`);
- },
- [onHostChange]
- );
-
- const isValidProjectId = RE_PROJECT_ID.test(projectId);
- const isValidInstanceId = RE_INSTANCE_ID.test(instanceId);
+ const isValidProjectId = RE_GCP_PROJECT_ID.test(projectId);
+ const isValidInstanceId = RE_GCP_INSTANCE_ID.test(instanceId);
return (
<div className="grid grid-cols-2 gap-x-2 gap-y-1">
@@ -132,7 +183,7 @@ function SpannerHostInput({
title={
<>
{t("instance.project-id")}
- <span style={{ color: "red" }}> *</span>
+ <span className="text-error"> *</span>
</>
}
>
@@ -143,9 +194,8 @@ function SpannerHostInput({
className={`w-full ${dirty && !isValidProjectId ? "border-error" : ""}`}
disabled={!allowEdit}
onChange={(e) => {
- const v = e.target.value;
- setProjectId(v);
- update(v, instanceId);
+ setDirty(true);
+ onUpdate({ projectId: e.target.value.trim() });
}}
/>
</FormField>
@@ -153,7 +203,7 @@ function SpannerHostInput({
title={
<>
{t("instance.instance-id")}
- <span style={{ color: "red" }}> *</span>
+ <span className="text-error"> *</span>
</>
}
>
@@ -164,9 +214,8 @@ function SpannerHostInput({
className={`w-full ${dirty && !isValidInstanceId ? "border-error" : ""}`}
disabled={!allowEdit}
onChange={(e) => {
- const v = e.target.value;
- setInstanceId(v);
- update(projectId, v);
+ setDirty(true);
+ onUpdate({ instanceId: e.target.value.trim() });
}}
/>
</FormField>
@@ -182,30 +231,39 @@ function SpannerHostInput({
<ExternalLink className="size-4 ml-1" />
</a>
</p>
+ <GCPEndpointInput
+ endpoint={endpoint}
+ port={port}
+ placeholder="spanner.googleapis.com"
+ example="spanner-nonprod.p.googleapis.com"
+ onUpdate={onUpdate}
+ allowEdit={allowEdit}
+ />
</div>
);
}
function BigQueryHostInput({
- host,
- onHostChange,
+ projectId,
+ endpoint,
+ port,
+ onUpdate,
allowEdit,
}: {
- host: string;
- onHostChange: (host: string) => void;
+ projectId: string;
+ endpoint: string;
+ port: string;
+ onUpdate: (update: {
+ projectId?: string;
+ host?: string;
+ port?: string;
+ }) => void;
allowEdit: boolean;
}) {
const { t } = useTranslation();
- const RE_PROJECT_ID = /^(?:[a-z]|[-.:]|[0-9])+$/;
- const [projectId, setProjectId] = useState(() => host || "");
const [dirty, setDirty] = useState(false);
- useEffect(() => {
- if (!host) return;
- setProjectId(host);
- }, [host]);
-
- const isValidProjectId = RE_PROJECT_ID.test(projectId);
+ const isValidProjectId = RE_GCP_PROJECT_ID.test(projectId);
return (
<div className="grid grid-cols-2 gap-x-2 gap-y-1">
@@ -213,7 +271,7 @@ function BigQueryHostInput({
title={
<>
{t("instance.project-id")}
- <span style={{ color: "red" }}> *</span>
+ <span className="text-error"> *</span>
</>
}
>
@@ -224,14 +282,8 @@ function BigQueryHostInput({
className={`w-full ${dirty && !isValidProjectId ? "border-error" : ""}`}
disabled={!allowEdit}
onChange={(e) => {
- const v = e.target.value;
- setProjectId(v);
setDirty(true);
- if (!RE_PROJECT_ID.test(v)) {
- onHostChange("");
- } else {
- onHostChange(v);
- }
+ onUpdate({ projectId: e.target.value.trim() });
}}
/>
</FormField>
@@ -247,6 +299,14 @@ function BigQueryHostInput({
<ExternalLink className="size-4 ml-1" />
</a>
</p>
+ <GCPEndpointInput
+ endpoint={endpoint}
+ port={port}
+ placeholder="bigquery.googleapis.com"
+ example="bigquery-nonprod.p.googleapis.com"
+ onUpdate={onUpdate}
+ allowEdit={allowEdit}
+ />
</div>
);
}
@@ -867,10 +927,10 @@ export function InstanceFormBody({ onOpenInfoPanel }: InstanceFormBodyProps) {
const ds = editingDataSource;
if (!ds) return false;
if (basicInfo.engine === Engine.SPANNER) {
- return isValidSpannerHost(ds.host);
+ return isValidSpannerDataSource(ds);
}
if (basicInfo.engine === Engine.BIGQUERY) {
- return ds.host !== "";
+ return isValidBigQueryDataSource(ds);
}
if (basicInfo.engine !== Engine.DYNAMODB && ds.host === "") {
return false;
@@ -1426,14 +1486,19 @@ export function InstanceFormBody({ onOpenInfoPanel }: InstanceFormBodyProps) {
<div className="sm:col-span-3 sm:col-start-1">
{basicInfo.engine === Engine.SPANNER ? (
<SpannerHostInput
- host={adminDataSource.host}
- onHostChange={(host) => updateAdminDS({ host })}
+ projectId={adminDataSource.projectId}
+ instanceId={adminDataSource.instanceId}
+ endpoint={adminDataSource.host}
+ port={adminDataSource.port}
+ onUpdate={(update) => updateAdminDS(update)}
allowEdit={allowEdit}
/>
) : basicInfo.engine === Engine.BIGQUERY ? (
<BigQueryHostInput
- host={adminDataSource.host}
- onHostChange={(host) => updateAdminDS({ host })}
+ projectId={adminDataSource.projectId}
+ endpoint={adminDataSource.host}
+ port={adminDataSource.port}
+ onUpdate={(update) => updateAdminDS(update)}
allowEdit={allowEdit}
/>
) : (
diff --git a/frontend/src/components/instance/InstanceFormButtons.test.tsx b/frontend/src/components/instance/InstanceFormButtons.test.tsx
index f3cb76b1fb..8a5a1ce845 100644
--- a/frontend/src/components/instance/InstanceFormButtons.test.tsx
+++ b/frontend/src/components/instance/InstanceFormButtons.test.tsx
@@ -70,7 +70,10 @@ vi.mock("@/utils", () => ({
Object.fromEntries(list.map(({ key, value }) => [key, value])),
extractInstanceResourceName: (name: string) =>
name.replace(/^instances\//, ""),
- isValidSpannerHost: (host: string) => host !== "",
+ isValidSpannerDataSource: (ds: { projectId: string; instanceId: string }) =>
+ ds.projectId !== "" && ds.instanceId !== "",
+ isValidBigQueryDataSource: (ds: { projectId: string }) =>
+ ds.projectId !== "",
}));
vi.mock("../ui/alert-dialog", () => ({
diff --git a/frontend/src/components/instance/InstanceFormButtons.tsx b/frontend/src/components/instance/InstanceFormButtons.tsx
index 15612b2b3a..706ccc5d01 100644
--- a/frontend/src/components/instance/InstanceFormButtons.tsx
+++ b/frontend/src/components/instance/InstanceFormButtons.tsx
@@ -28,7 +28,8 @@ import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";
import {
convertKVListToLabels,
extractInstanceResourceName,
- isValidSpannerHost,
+ isValidBigQueryDataSource,
+ isValidSpannerDataSource,
} from "@/utils";
import {
AlertDialog,
@@ -138,17 +139,18 @@ export function InstanceFormButtons({
const allowUpdate = useMemo((): boolean => {
if (!valueChanged) return false;
if (basicInfo.engine === Engine.SPANNER) {
- if (!isValidSpannerHost(adminDataSource.host)) return false;
+ if (!isValidSpannerDataSource(adminDataSource)) return false;
if (readonlyDataSourceList.length > 0) {
- if (readonlyDataSourceList.some((ds) => !isValidSpannerHost(ds.host)))
+ if (readonlyDataSourceList.some((ds) => !isValidSpannerDataSource(ds)))
return false;
}
return !!basicInfo.title.trim();
}
if (basicInfo.engine === Engine.BIGQUERY) {
- if (!adminDataSource.host) return false;
+ if (!isValidBigQueryDataSource(adminDataSource)) return false;
if (readonlyDataSourceList.length > 0) {
- if (readonlyDataSourceList.some((ds) => !ds.host)) return false;
+ if (readonlyDataSourceList.some((ds) => !isValidBigQueryDataSource(ds)))
+ return false;
}
return !!basicInfo.title.trim();
}
diff --git a/frontend/src/components/instance/InstanceFormContext.test.tsx b/frontend/src/components/instance/InstanceFormContext.test.tsx
index 7ad123d2b5..a97769ffd3 100644
--- a/frontend/src/components/instance/InstanceFormContext.test.tsx
+++ b/frontend/src/components/instance/InstanceFormContext.test.tsx
@@ -86,7 +86,10 @@ vi.mock("@/utils", () => ({
instanceV1HasExtraParameters: () => false,
instanceV1HasSSH: () => false,
instanceV1HasSSL: () => false,
- isValidSpannerHost: (host: string) => host !== "",
+ isValidSpannerDataSource: (ds: { projectId: string; instanceId: string }) =>
+ ds.projectId !== "" && ds.instanceId !== "",
+ isValidBigQueryDataSource: (ds: { projectId: string }) =>
+ ds.projectId !== "",
}));
vi.mock("@/utils/connect", () => ({
diff --git a/frontend/src/components/instance/InstanceFormContext.tsx b/frontend/src/components/instance/InstanceFormContext.tsx
index afff9fbe09..85830979e2 100644
--- a/frontend/src/components/instance/InstanceFormContext.tsx
+++ b/frontend/src/components/instance/InstanceFormContext.tsx
@@ -32,7 +32,8 @@ import {
convertKVListToLabels,
convertLabelsToKVList,
hasWorkspacePermissionV2,
- isValidSpannerHost,
+ isValidBigQueryDataSource,
+ isValidSpannerDataSource,
} from "@/utils";
import { extractGrpcErrorMessage } from "@/utils/connect";
import { FeatureModal } from "../ui/feature-modal";
@@ -336,11 +337,13 @@ export function InstanceFormProvider({
if (!hasWorkspacePermissionV2("bb.instances.create")) return false;
if (basicInfo.engine === Engine.SPANNER) {
return (
- !!basicInfo.title.trim() && isValidSpannerHost(adminDataSource.host)
+ !!basicInfo.title.trim() && isValidSpannerDataSource(adminDataSource)
);
}
if (basicInfo.engine === Engine.BIGQUERY) {
- return !!basicInfo.title.trim() && adminDataSource.host !== "";
+ return (
+ !!basicInfo.title.trim() && isValidBigQueryDataSource(adminDataSource)
+ );
}
if (basicInfo.engine !== Engine.DYNAMODB) {
if (adminDataSource.host === "") return false;
diff --git a/frontend/src/locales/en-US.json b/frontend/src/locales/en-US.json
index 10e3e74857..960e9ca35c 100644
--- a/frontend/src/locales/en-US.json
+++ b/frontend/src/locales/en-US.json
@@ -1073,6 +1073,8 @@
"find-gcp-project-id": "To find GCP Project ID, see",
"find-gcp-project-id-and-instance-id": "To find GCP Project ID and instance ID, see",
"force-archive-description": "Force to archive. All databases will be unassigned.",
+ "gcp-endpoint-tip": "Optional. Overrides the default Google API endpoint, e.g. with a Private Service Connect endpoint like {{example}}.",
+ "gcp-endpoint-toggle": "Set a custom API endpoint",
"grants": "Grants",
"host-or-socket": "Host or Socket",
"iam-extension": {
diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.json
index d3a2da6675..2d01d71da2 100644
--- a/frontend/src/locales/es-ES.json
+++ b/frontend/src/locales/es-ES.json
@@ -1073,6 +1073,8 @@
"find-gcp-project-id": "Para encontrar el ID del proyecto de GCP, consulta",
"find-gcp-project-id-and-instance-id": "Para encontrar el ID de proyecto y el ID de instancia de GCP, consulte",
"force-archive-description": "Forzar a archivar. Todas las bases de datos quedarán desasignadas.",
+ "gcp-endpoint-tip": "Opcional. Reemplaza el punto de conexión predeterminado de la API de Google, p. ej., un punto de conexión de Private Service Connect como {{example}}.",
+ "gcp-endpoint-toggle": "Configurar un punto de conexión de API personalizado",
"grants": "Concesiones",
"host-or-socket": "Host o Socket",
"iam-extension": {
diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.json
index 42377b6648..163607cff8 100644
--- a/frontend/src/locales/ja-JP.json
+++ b/frontend/src/locales/ja-JP.json
@@ -1073,6 +1073,8 @@
"find-gcp-project-id": "GCP プロジェクト ID とインスタンス ID を表示するには、次を参照してください。",
"find-gcp-project-id-and-instance-id": "GCP プロジェクト ID の確認方法については、次を参照してください",
"force-archive-description": "アーカイブを強制します。すべてのデータベースの割り当てが解除されます。",
+ "gcp-endpoint-tip": "省略可能。デフォルトの Google API エンドポイントを上書きします(例:Private Service Connect エンドポイント {{example}})。",
+ "gcp-endpoint-toggle": "カスタム API エンドポイントを設定",
"grants": "権限",
"host-or-socket": "ホストまたはソケット",
"iam-extension": {
diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.json
index b54dbf3a1f..bb01a4de4e 100644
--- a/frontend/src/locales/vi-VN.json
+++ b/frontend/src/locales/vi-VN.json
@@ -1073,6 +1073,8 @@
"find-gcp-project-id": "Để tìm ID dự án GCP, xem",
"find-gcp-project-id-and-instance-id": "Để tìm ID dự án GCP và ID phiên bản, xem",
"force-archive-description": "Buộc lưu trữ. Tất cả cơ sở dữ liệu sẽ bị hủy gán.",
+ "gcp-endpoint-tip": "Tùy chọn. Ghi đè điểm cuối Google API mặc định, ví dụ: điểm cuối Private Service Connect như {{example}}.",
+ "gcp-endpoint-toggle": "Thiết lập điểm cuối API tùy chỉnh",
"grants": "Quyền",
"host-or-socket": "Máy chủ hoặc Socket",
"iam-extension": {
diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.json
index d79dc55d45..b2cc981712 100644
--- a/frontend/src/locales/zh-CN.json
+++ b/frontend/src/locales/zh-CN.json
@@ -1073,6 +1073,8 @@
"find-gcp-project-id": "查看 GCP 项目 ID 的方法见",
"find-gcp-project-id-and-instance-id": "查看 GCP 项目 ID 与实例 ID 的方法见",
"force-archive-description": "强制归档。所有数据库均将被取消分配。",
+ "gcp-endpoint-tip": "可选。覆盖默认的 Google API 端点,例如 Private Service Connect 端点 {{example}}。",
+ "gcp-endpoint-toggle": "设置自定义 API 端点",
"grants": "权限",
"host-or-socket": "Host 或 Socket",
"iam-extension": {
diff --git a/frontend/src/types/proto-es/v1/instance_service_pb.d.ts b/frontend/src/types/proto-es/v1/instance_service_pb.d.ts
index 015681641b..7736b2422b 100644
--- a/frontend/src/types/proto-es/v1/instance_service_pb.d.ts
+++ b/frontend/src/types/proto-es/v1/instance_service_pb.d.ts
@@ -1333,6 +1333,22 @@ export declare type DataSource = Message<"bytebase.v1.DataSource"> & {
* @generated from field: map<string, string> extra_connection_parameters = 36;
*/
extraConnectionParameters: { [key: string]: string };
+
+ /**
+ * project_id and instance_id are the GCP resource identifiers.
+ * project_id is used by Spanner and BigQuery; instance_id is used by Spanner.
+ * For these engines, host and port optionally override the default Google API
+ * endpoint (e.g. a Private Service Connect endpoint like
+ * spanner-nonprod.p.googleapis.com).
+ *
+ * @generated from field: string project_id = 57;
+ */
+ projectId: string;
+
+ /**
+ * @generated from field: string instance_id = 58;
+ */
+ instanceId: string;
};
/**
diff --git a/frontend/src/types/proto-es/v1/instance_service_pb.js b/frontend/src/types/proto-es/v1/instance_service_pb.js
index 46b8cbdef3..772850004d 100644
--- a/frontend/src/types/proto-es/v1/instance_service_pb.js
+++ b/frontend/src/types/proto-es/v1/instance_service_pb.js
@@ -17,7 +17,7 @@ import { file_v1_instance_role_service } from "./instance_role_service_pb";
* Describes the file v1/instance_service.proto.
*/
export const file_v1_instance_service = /*@__PURE__*/
- fileDesc("Chl2MS9pbnN0YW5jZV9zZXJ2aWNlLnByb3RvEgtieXRlYmFzZS52MSJBChJHZXRJbnN0YW5jZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vSW5zdGFuY2UidQoUTGlzdEluc3RhbmNlc1JlcXVlc3QSEQoJcGFnZV9zaXplGAEgASgFEhIKCnBhZ2VfdG9rZW4YAiABKAkSFAoMc2hvd19kZWxldGVkGAMgASgIEg4KBmZpbHRlchgEIAEoCRIQCghvcmRlcl9ieRgFIAEoCSJaChVMaXN0SW5zdGFuY2VzUmVzcG9uc2USKAoJaW5zdGFuY2VzGAEgAygLMhUuYnl0ZWJhc2UudjEuSW5zdGFuY2USFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJIpMBChVDcmVhdGVJbnN0YW5jZVJlcXVlc3QSLAoIaW5zdGFuY2UYASABKAsyFS5ieXRlYmFzZS52MS5JbnN0YW5jZUID4EECEhMKC2luc3RhbmNlX2lkGAIgASgJEhUKDXZhbGlkYXRlX29ubHkYAyABKAgSIAoYaW5pdGlhbF9kYXRhYmFzZV9wcm9qZWN0GAQgASgJIo0BChVVcGRhdGVJbnN0YW5jZVJlcXVlc3QSLAoIaW5zdGFuY2UYASABKAsyFS5ieXRlYmFzZS52MS5JbnN0YW5jZUID4EECEi8KC3VwZGF0ZV9tYXNrGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFzaxIVCg1hbGxvd19taXNzaW5nGAMgASgIImIKFURlbGV0ZUluc3RhbmNlUmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9JbnN0YW5jZRINCgVmb3JjZRgCIAEoCBINCgVwdXJnZRgDIAEoCCJGChdVbmRlbGV0ZUluc3RhbmNlUmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9JbnN0YW5jZSJcChNTeW5jSW5zdGFuY2VSZXF1ZXN0EisKBG5hbWUYASABKAlCHeBBAvpBFwoVYnl0ZWJhc2UuY29tL0luc3RhbmNlEhgKEGVuYWJsZV9mdWxsX3N5bmMYAiABKAgiigEKG0xpc3RJbnN0YW5jZURhdGFiYXNlUmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9JbnN0YW5jZRIxCghpbnN0YW5jZRgCIAEoCzIVLmJ5dGViYXNlLnYxLkluc3RhbmNlQgPgQQJIAIgBAUILCglfaW5zdGFuY2UiMQocTGlzdEluc3RhbmNlRGF0YWJhc2VSZXNwb25zZRIRCglkYXRhYmFzZXMYASADKAkiKQoUU3luY0luc3RhbmNlUmVzcG9uc2USEQoJZGF0YWJhc2VzGAEgAygJIlQKGUJhdGNoU3luY0luc3RhbmNlc1JlcXVlc3QSNwoIcmVxdWVzdHMYASADKAsyIC5ieXRlYmFzZS52MS5TeW5jSW5zdGFuY2VSZXF1ZXN0QgPgQQIiHAoaQmF0Y2hTeW5jSW5zdGFuY2VzUmVzcG9uc2UiWAobQmF0Y2hVcGRhdGVJbnN0YW5jZXNSZXF1ZXN0EjkKCHJlcXVlc3RzGAEgAygLMiIuYnl0ZWJhc2UudjEuVXBkYXRlSW5zdGFuY2VSZXF1ZXN0QgPgQQIiSAocQmF0Y2hVcGRhdGVJbnN0YW5jZXNSZXNwb25zZRIoCglpbnN0YW5jZXMYASADKAsyFS5ieXRlYmFzZS52MS5JbnN0YW5jZSKNAQoUQWRkRGF0YVNvdXJjZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vSW5zdGFuY2USMQoLZGF0YV9zb3VyY2UYAiABKAsyFy5ieXRlYmFzZS52MS5EYXRhU291cmNlQgPgQQISFQoNdmFsaWRhdGVfb25seRgDIAEoCCJ5ChdSZW1vdmVEYXRhU291cmNlUmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9JbnN0YW5jZRIxCgtkYXRhX3NvdXJjZRgCIAEoCzIXLmJ5dGViYXNlLnYxLkRhdGFTb3VyY2VCA+BBAiLYAQoXVXBkYXRlRGF0YVNvdXJjZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vSW5zdGFuY2USMQoLZGF0YV9zb3VyY2UYAiABKAsyFy5ieXRlYmFzZS52MS5EYXRhU291cmNlQgPgQQISLwoLdXBkYXRlX21hc2sYAyABKAsyGi5nb29nbGUucHJvdG9idWYuRmllbGRNYXNrEhUKDXZhbGlkYXRlX29ubHkYBCABKAgSFQoNYWxsb3dfbWlzc2luZxgFIAEoCCIiCg1TeW5jRGF0YWJhc2VzEhEKCWRhdGFiYXNlcxgBIAMoCSKBBQoISW5zdGFuY2USDAoEbmFtZRgBIAEoCRIhCgVzdGF0ZRgDIAEoDjISLmJ5dGViYXNlLnYxLlN0YXRlEhcKBXRpdGxlGAQgASgJQgi6SAVyAxjIARIjCgZlbmdpbmUYBSABKA4yEy5ieXRlYmFzZS52MS5FbmdpbmUSGwoOZW5naW5lX3ZlcnNpb24YBiABKAlCA+BBAxIVCg1leHRlcm5hbF9saW5rGAcgASgJEi0KDGRhdGFfc291cmNlcxgIIAMoCzIXLmJ5dGViYXNlLnYxLkRhdGFTb3VyY2USHQoLZW52aXJvbm1lbnQYCSABKAlCA+BBAUgAiAEBEhIKCmFjdGl2YXRpb24YCiABKAgSLQoFcm9sZXMYCyADKAsyGS5ieXRlYmFzZS52MS5JbnN0YW5jZVJvbGVCA+BBAxIwCg1zeW5jX2ludGVydmFsGAwgASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uEjIKDnN5bmNfZGF0YWJhc2VzGA4gASgLMhouYnl0ZWJhc2UudjEuU3luY0RhdGFiYXNlcxI3Cg5sYXN0X3N5bmNfdGltZRgPIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxIxCgZsYWJlbHMYECADKAsyIS5ieXRlYmFzZS52MS5JbnN0YW5jZS5MYWJlbHNFbnRyeRotCgtMYWJlbHNFbnRyeRILCgNrZXkYASABKAkSDQoFdmFsdWUYAiABKAk6AjgBOjDqQS0KFWJ5dGViYXNlLmNvbS9JbnN0YW5jZRIUaW5zdGFuY2VzL3tpbnN0YW5jZX1CDgoMX2Vudmlyb25tZW50Iq8IChhEYXRhU291cmNlRXh0ZXJuYWxTZWNyZXQSRQoLc2VjcmV0X3R5cGUYASABKA4yMC5ieXRlYmFzZS52MS5EYXRhU291cmNlRXh0ZXJuYWxTZWNyZXQuU2VjcmV0VHlwZRILCgN1cmwYAiABKAkSQQoJYXV0aF90eXBlGAMgASgOMi4uYnl0ZWJhc2UudjEuRGF0YVNvdXJjZUV4dGVybmFsU2VjcmV0LkF1dGhUeXBlEksKCGFwcF9yb2xlGAQgASgLMjcuYnl0ZWJhc2UudjEuRGF0YVNvdXJjZUV4dGVybmFsU2VjcmV0LkFwcFJvbGVBdXRoT3B0aW9uSAASFAoFdG9rZW4YBSABKAlCA+BBBEgAEkMKCnRva2VuX3R5cGUYDSABKA4yLy5ieXRlYmFzZS52MS5EYXRhU291cmNlRXh0ZXJuYWxTZWNyZXQuVG9rZW5UeXBlEhMKC2VuZ2luZV9uYW1lGAYgASgJEhMKC3NlY3JldF9uYW1lGAcgASgJEhkKEXBhc3N3b3JkX2tleV9uYW1lGAggASgJEiMKG3NraXBfdmF1bHRfdGxzX3ZlcmlmaWNhdGlvbhgJIAEoCBIZCgx2YXVsdF9zc2xfY2EYCiABKAlCA+BBBBIbCg52YXVsdF9zc2xfY2VydBgLIAEoCUID4EEEEhoKDXZhdWx0X3NzbF9rZXkYDCABKAlCA+BBBBruAQoRQXBwUm9sZUF1dGhPcHRpb24SFAoHcm9sZV9pZBgBIAEoCUID4EEEEhYKCXNlY3JldF9pZBgCIAEoCUID4EEEElAKBHR5cGUYAyABKA4yQi5ieXRlYmFzZS52MS5EYXRhU291cmNlRXh0ZXJuYWxTZWNyZXQuQXBwUm9sZUF1dGhPcHRpb24uU2VjcmV0VHlwZRISCgptb3VudF9wYXRoGAQgASgJIkUKClNlY3JldFR5cGUSGwoXU0VDUkVUX1RZUEVfVU5TUEVDSUZJRUQQABIJCgVQTEFJThABEg8KC0VOVklST05NRU5UEAIigAEKClNlY3JldFR5cGUSGwoXU0VDUkVUX1RZUEVfVU5TUEVDSUZJRUQQABIPCgtWQVVMVF9LVl9WMhABEhcKE0FXU19TRUNSRVRTX01BTkFHRVIQAhIWChJHQ1BfU0VDUkVUX01BTkFHRVIQAxITCg9BWlVSRV9LRVlfVkFVTFQQBCJECghBdXRoVHlwZRIZChVBVVRIX1RZUEVfVU5TUEVDSUZJRUQQABIJCgVUT0tFThABEhIKDlZBVUxUX0FQUF9ST0xFEAIiTQoJVG9rZW5UeXBlEhoKFlRPS0VOX1RZUEVfVU5TUEVDSUZJRUQQABIJCgVQTEFJThABEg8KC0VOVklST05NRU5UEAISCAoERklMRRADQg0KC2F1dGhfb3B0aW9uIqcSCgpEYXRhU291cmNlEgoKAmlkGAEgASgJEikKBHR5cGUYAiABKA4yGy5ieXRlYmFzZS52MS5EYXRhU291cmNlVHlwZRIQCgh1c2VybmFtZRgDIAEoCRIVCghwYXNzd29yZBgEIAEoCUID4EEEEg8KB3VzZV9zc2wYHiABKAgSEwoGc3NsX2NhGAUgASgJQgPgQQQSFQoIc3NsX2NlcnQYBiABKAlCA+BBBBIUCgdzc2xfa2V5GAcgASgJQgPgQQQSGAoLc3NsX2NhX3BhdGgYKSABKAlCA+BBBBIaCg1zc2xfY2VydF9wYXRoGCogASgJQgPgQQQSGQoMc3NsX2tleV9wYXRoGCsgASgJQgPgQQQSFwoKc3NsX2NhX3NldBgsIAEoCEID4EEDEhkKDHNzbF9jZXJ0X3NldBgtIAEoCEID4EEDEhgKC3NzbF9rZXlfc2V0GC4gASgIQgPgQQMSHAoPc3NsX2NhX3BhdGhfc2V0GC8gASgIQgPgQQMSHgoRc3NsX2NlcnRfcGF0aF9zZXQYMCABKAhCA+BBAxIdChBzc2xfa2V5X3BhdGhfc2V0GDEgASgIQgPgQQMSHgoWdmVyaWZ5X3Rsc19jZXJ0aWZpY2F0ZRgnIAEoCBIMCgRob3N0GAggASgJEgwKBHBvcnQYCSABKAkSEAoIZGF0YWJhc2UYCiABKAkSCwoDc3J2GAsgASgIEh8KF2F1dGhlbnRpY2F0aW9uX2RhdGFiYXNlGAwgASgJEhMKC3JlcGxpY2Ffc2V0GBkgASgJEgsKA3NpZBgNIAEoCRIUCgxzZXJ2aWNlX25hbWUYDiABKAkSEAoIc3NoX2hvc3QYDyABKAkSEAoIc3NoX3BvcnQYECABKAkSEAoIc3NoX3VzZXIYESABKAkSGQoMc3NoX3Bhc3N3b3JkGBIgASgJQgPgQQQSHAoPc3NoX3ByaXZhdGVfa2V5GBMgASgJQgPgQQQSJwoaYXV0aGVudGljYXRpb25fcHJpdmF0ZV9rZXkYFCABKAlCA+BBBBIyCiVhdXRoZW50aWNhdGlvbl9wcml2YXRlX2tleV9wYXNzcGhyYXNlGCggASgJQgPgQQQSPgoPZXh0ZXJuYWxfc2VjcmV0GBUgASgLMiUuYnl0ZWJhc2UudjEuRGF0YVNvdXJjZUV4dGVybmFsU2VjcmV0EkcKE2F1dGhlbnRpY2F0aW9uX3R5cGUYFiABKA4yKi5ieXRlYmFzZS52MS5EYXRhU291cmNlLkF1dGhlbnRpY2F0aW9uVHlwZRJBChFjbG91ZF9zcWxfaXBfdHlwZRg4IAEoDjImLmJ5dGViYXNlLnYxLkRhdGFTb3VyY2UuQ2xvdWRTUUxJUFR5cGUSQwoQYXp1cmVfY3JlZGVudGlhbBgXIAEoCzInLmJ5dGViYXNlLnYxLkRhdGFTb3VyY2UuQXp1cmVDcmVkZW50aWFsSAASPwoOYXdzX2NyZWRlbnRpYWwYJSABKAsyJS5ieXRlYmFzZS52MS5EYXRhU291cmNlLkFXU0NyZWRlbnRpYWxIABI/Cg5nY3BfY3JlZGVudGlhbBgmIAEoCzIlLmJ5dGViYXNlLnYxLkRhdGFTb3VyY2UuR0NQQ3JlZGVudGlhbEgAEiwKC3Nhc2xfY29uZmlnGBggASgLMhcuYnl0ZWJhc2UudjEuU0FTTENvbmZpZxJCChRhZGRpdGlvbmFsX2FkZHJlc3NlcxgaIAMoCzIfLmJ5dGViYXNlLnYxLkRhdGFTb3VyY2UuQWRkcmVzc0ID4EEBEhkKEWRpcmVjdF9jb25uZWN0aW9uGBsgASgIEg4KBnJlZ2lvbhgcIAEoCRIUCgx3YXJlaG91c2VfaWQYHSABKAkSEwoLbWFzdGVyX25hbWUYHyABKAkSFwoPbWFzdGVyX3VzZXJuYW1lGCAgASgJEhcKD21hc3Rlcl9wYXNzd29yZBghIAEoCRI1CgpyZWRpc190eXBlGCIgASgOMiEuYnl0ZWJhc2UudjEuRGF0YVNvdXJjZS5SZWRpc1R5cGUSDwoHY2x1c3RlchgjIAEoCRJbChtleHRyYV9jb25uZWN0aW9uX3BhcmFtZXRlcnMYJCADKAsyNi5ieXRlYmFzZS52MS5EYXRhU291cmNlLkV4dHJhQ29ubmVjdGlvblBhcmFtZXRlcnNFbnRyeRpTCg9BenVyZUNyZWRlbnRpYWwSEQoJdGVuYW50X2lkGAEgASgJEhEKCWNsaWVudF9pZBgCIAEoCRIaCg1jbGllbnRfc2VjcmV0GAMgASgJQgPgQQQamAEKDUFXU0NyZWRlbnRpYWwSGgoNYWNjZXNzX2tleV9pZBgBIAEoCUID4EEEEh4KEXNlY3JldF9hY2Nlc3Nfa2V5GAIgASgJQgPgQQQSGgoNc2Vzc2lvbl90b2tlbhgDIAEoCUID4EEEEhUKCHJvbGVfYXJuGAQgASgJQgPgQQQSGAoLZXh0ZXJuYWxfaWQYBSABKAlCA+BBBBolCg1HQ1BDcmVkZW50aWFsEhQKB2NvbnRlbnQYASABKAlCA+BBBBolCgdBZGRyZXNzEgwKBGhvc3QYASABKAkSDAoEcG9ydBgCIAEoCRpACh5FeHRyYUNvbm5lY3Rpb25QYXJhbWV0ZXJzRW50cnkSCwoDa2V5GAEgASgJEg0KBXZhbHVlGAIgASgJOgI4ASJ8ChJBdXRoZW50aWNhdGlvblR5cGUSHgoaQVVUSEVOVElDQVRJT05fVU5TUEVDSUZJRUQQABIMCghQQVNTV09SRBABEhgKFEdPT0dMRV9DTE9VRF9TUUxfSUFNEAISDwoLQVdTX1JEU19JQU0QAxINCglBWlVSRV9JQU0QBCJVCg5DbG91ZFNRTElQVHlwZRIhCh1DTE9VRF9TUUxfSVBfVFlQRV9VTlNQRUNJRklFRBAAEgoKBlBVQkxJQxABEgsKB1BSSVZBVEUQAhIHCgNQU0MQAyJSCglSZWRpc1R5cGUSGgoWUkVESVNfVFlQRV9VTlNQRUNJRklFRBAAEg4KClNUQU5EQUxPTkUQARIMCghTRU5USU5FTBACEgsKB0NMVVNURVIQA0IPCg1pYW1fZXh0ZW5zaW9uIt4BChBJbnN0YW5jZVJlc291cmNlEg0KBXRpdGxlGAEgASgJEiMKBmVuZ2luZRgCIAEoDjITLmJ5dGViYXNlLnYxLkVuZ2luZRIbCg5lbmdpbmVfdmVyc2lvbhgDIAEoCUID4EEDEi0KDGRhdGFfc291cmNlcxgEIAMoCzIXLmJ5dGViYXNlLnYxLkRhdGFTb3VyY2USEgoKYWN0aXZhdGlvbhgFIAEoCBIMCgRuYW1lGAYgASgJEhgKC2Vudmlyb25tZW50GAcgASgJSACIAQFCDgoMX2Vudmlyb25tZW50IkwKClNBU0xDb25maWcSMQoKa3JiX2NvbmZpZxgBIAEoCzIbLmJ5dGViYXNlLnYxLktlcmJlcm9zQ29uZmlnSABCCwoJbWVjaGFuaXNtIpYBCg5LZXJiZXJvc0NvbmZpZxIPCgdwcmltYXJ5GAEgASgJEhAKCGluc3RhbmNlGAIgASgJEg0KBXJlYWxtGAMgASgJEg4KBmtleXRhYhgEIAEoDBIQCghrZGNfaG9zdBgFIAEoCRIQCghrZGNfcG9ydBgGIAEoCRIeChZrZGNfdHJhbnNwb3J0X3Byb3RvY29sGAcgASgJKkcKDkRhdGFTb3VyY2VUeXBlEhsKF0RBVEFfU09VUkNFX1VOU1BFQ0lGSUVEEAASCQoFQURNSU4QARINCglSRUFEX09OTFkQAjLUEAoPSW5zdGFuY2VTZXJ2aWNlEoQBCgtHZXRJbnN0YW5jZRIfLmJ5dGViYXNlLnYxLkdldEluc3RhbmNlUmVxdWVzdBoVLmJ5dGViYXNlLnYxLkluc3RhbmNlIj3aQQRuYW1liuowEGJiLmluc3RhbmNlcy5nZXSQ6jABgtPkkwIYEhYvdjEve25hbWU9aW5zdGFuY2VzLyp9EokBCg1MaXN0SW5zdGFuY2VzEiEuYnl0ZWJhc2UudjEuTGlzdEluc3RhbmNlc1JlcXVlc3QaIi5ieXRlYmFzZS52MS5MaXN0SW5zdGFuY2VzUmVzcG9uc2UiMdpBAIrqMBFiYi5pbnN0YW5jZXMubGlzdJDqMAGC0+STAg8SDS92MS9pbnN0YW5jZXMSlgEKDkNyZWF0ZUluc3RhbmNlEiIuYnl0ZWJhc2UudjEuQ3JlYXRlSW5zdGFuY2VSZXF1ZXN0GhUuYnl0ZWJhc2UudjEuSW5zdGFuY2UiSdpBCGluc3RhbmNliuowE2JiLmluc3RhbmNlcy5jcmVhdGWQ6jABmOowAYLT5JMCGToIaW5zdGFuY2UiDS92MS9pbnN0YW5jZXMStAEKDlVwZGF0ZUluc3RhbmNlEiIuYnl0ZWJhc2UudjEuVXBkYXRlSW5zdGFuY2VSZXF1ZXN0GhUuYnl0ZWJhc2UudjEuSW5zdGFuY2UiZ9pBFGluc3RhbmNlLHVwZGF0ZV9tYXNriuowE2JiLmluc3RhbmNlcy51cGRhdGWQ6jABmOowAYLT5JMCKzoIaW5zdGFuY2UyHy92MS97aW5zdGFuY2UubmFtZT1pbnN0YW5jZXMvKn0SkgEKDkRlbGV0ZUluc3RhbmNlEiIuYnl0ZWJhc2UudjEuRGVsZXRlSW5zdGFuY2VSZXF1ZXN0GhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5IkTaQQRuYW1liuowE2JiLmluc3RhbmNlcy5kZWxldGWQ6jABmOowAYLT5JMCGCoWL3YxL3tuYW1lPWluc3RhbmNlcy8qfRKcAQoQVW5kZWxldGVJbnN0YW5jZRIkLmJ5dGViYXNlLnYxLlVuZGVsZXRlSW5zdGFuY2VSZXF1ZXN0GhUuYnl0ZWJhc2UudjEuSW5zdGFuY2UiS4rqMBViYi5pbnN0YW5jZXMudW5kZWxldGWQ6jABmOowAYLT5JMCJDoBKiIfL3YxL3tuYW1lPWluc3RhbmNlcy8qfTp1bmRlbGV0ZRKUAQoMU3luY0luc3RhbmNlEiAuYnl0ZWJhc2UudjEuU3luY0luc3RhbmNlUmVxdWVzdBohLmJ5dGViYXNlLnYxLlN5bmNJbnN0YW5jZVJlc3BvbnNlIj+K6jARYmIuaW5zdGFuY2VzLnN5bmOQ6jABgtPkkwIgOgEqIhsvdjEve25hbWU9aW5zdGFuY2VzLyp9OnN5bmMSsAEKFExpc3RJbnN0YW5jZURhdGFiYXNlEiguYnl0ZWJhc2UudjEuTGlzdEluc3RhbmNlRGF0YWJhc2VSZXF1ZXN0GikuYnl0ZWJhc2UudjEuTGlzdEluc3RhbmNlRGF0YWJhc2VSZXNwb25zZSJDiuowEGJiLmluc3RhbmNlcy5nZXSQ6jABgtPkkwIlOgEqIiAvdjEve25hbWU9aW5zdGFuY2VzLyp9OmRhdGFiYXNlcxKiAQoSQmF0Y2hTeW5jSW5zdGFuY2VzEiYuYnl0ZWJhc2UudjEuQmF0Y2hTeW5jSW5zdGFuY2VzUmVxdWVzdBonLmJ5dGViYXNlLnYxLkJhdGNoU3luY0luc3RhbmNlc1Jlc3BvbnNlIjuK6jARYmIuaW5zdGFuY2VzLnN5bmOQ6jABgtPkkwIcOgEqIhcvdjEvaW5zdGFuY2VzOmJhdGNoU3luYxKwAQoUQmF0Y2hVcGRhdGVJbnN0YW5jZXMSKC5ieXRlYmFzZS52MS5CYXRjaFVwZGF0ZUluc3RhbmNlc1JlcXVlc3QaKS5ieXRlYmFzZS52MS5CYXRjaFVwZGF0ZUluc3RhbmNlc1Jlc3BvbnNlIkOK6jATYmIuaW5zdGFuY2VzLnVwZGF0ZZDqMAGY6jABgtPkkwIeOgEqIhkvdjEvaW5zdGFuY2VzOmJhdGNoVXBkYXRlEpkBCg1BZGREYXRhU291cmNlEiEuYnl0ZWJhc2UudjEuQWRkRGF0YVNvdXJjZVJlcXVlc3QaFS5ieXRlYmFzZS52MS5JbnN0YW5jZSJOiuowE2JiLmluc3RhbmNlcy51cGRhdGWQ6jABmOowAYLT5JMCKToBKiIkL3YxL3tuYW1lPWluc3RhbmNlcy8qfTphZGREYXRhU291cmNlEqIBChBSZW1vdmVEYXRhU291cmNlEiQuYnl0ZWJhc2UudjEuUmVtb3ZlRGF0YVNvdXJjZVJlcXVlc3QaFS5ieXRlYmFzZS52MS5JbnN0YW5jZSJRiuowE2JiLmluc3RhbmNlcy51cGRhdGWQ6jABmOowAYLT5JMCLDoBKiInL3YxL3tuYW1lPWluc3RhbmNlcy8qfTpyZW1vdmVEYXRhU291cmNlEsYBChBVcGRhdGVEYXRhU291cmNlEiQuYnl0ZWJhc2UudjEuVXBkYXRlRGF0YVNvdXJjZVJlcXVlc3QaFS5ieXRlYmFzZS52MS5JbnN0YW5jZSJ12kEXZGF0YV9zb3VyY2UsdXBkYXRlX21hc2uK6jATYmIuaW5zdGFuY2VzLnVwZGF0ZZDqMAGY6jABgtPkkwI2OgtkYXRhX3NvdXJjZTInL3YxL3tuYW1lPWluc3RhbmNlcy8qfTp1cGRhdGVEYXRhU291cmNlQqoBCg9jb20uYnl0ZWJhc2UudjFCFEluc3RhbmNlU2VydmljZVByb3RvUAFaNGdpdGh1Yi5jb20vYnl0ZWJhc2UvYnl0ZWJhc2UvYmFja2VuZC9nZW5lcmF0ZWQtZ28vdjGiAgNCWFiqAgtCeXRlYmFzZS5WMcoCC0J5dGViYXNlXFYx4gIXQnl0ZWJhc2VcVjFcR1BCTWV0YWRhdGHqAgxCeXRlYmFzZTo6VjFiBnByb3RvMw", [file_buf_validate_validate, file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_duration, file_google_protobuf_empty, file_google_protobuf_field_mask, file_google_protobuf_timestamp, file_v1_annotation, file_v1_common, file_v1_instance_role_service]);
+ fileDesc("Chl2MS9pbnN0YW5jZV9zZXJ2aWNlLnByb3RvEgtieXRlYmFzZS52MSJBChJHZXRJbnN0YW5jZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vSW5zdGFuY2UidQoUTGlzdEluc3RhbmNlc1JlcXVlc3QSEQoJcGFnZV9zaXplGAEgASgFEhIKCnBhZ2VfdG9rZW4YAiABKAkSFAoMc2hvd19kZWxldGVkGAMgASgIEg4KBmZpbHRlchgEIAEoCRIQCghvcmRlcl9ieRgFIAEoCSJaChVMaXN0SW5zdGFuY2VzUmVzcG9uc2USKAoJaW5zdGFuY2VzGAEgAygLMhUuYnl0ZWJhc2UudjEuSW5zdGFuY2USFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJIpMBChVDcmVhdGVJbnN0YW5jZVJlcXVlc3QSLAoIaW5zdGFuY2UYASABKAsyFS5ieXRlYmFzZS52MS5JbnN0YW5jZUID4EECEhMKC2luc3RhbmNlX2lkGAIgASgJEhUKDXZhbGlkYXRlX29ubHkYAyABKAgSIAoYaW5pdGlhbF9kYXRhYmFzZV9wcm9qZWN0GAQgASgJIo0BChVVcGRhdGVJbnN0YW5jZVJlcXVlc3QSLAoIaW5zdGFuY2UYASABKAsyFS5ieXRlYmFzZS52MS5JbnN0YW5jZUID4EECEi8KC3VwZGF0ZV9tYXNrGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFzaxIVCg1hbGxvd19taXNzaW5nGAMgASgIImIKFURlbGV0ZUluc3RhbmNlUmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9JbnN0YW5jZRINCgVmb3JjZRgCIAEoCBINCgVwdXJnZRgDIAEoCCJGChdVbmRlbGV0ZUluc3RhbmNlUmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9JbnN0YW5jZSJcChNTeW5jSW5zdGFuY2VSZXF1ZXN0EisKBG5hbWUYASABKAlCHeBBAvpBFwoVYnl0ZWJhc2UuY29tL0luc3RhbmNlEhgKEGVuYWJsZV9mdWxsX3N5bmMYAiABKAgiigEKG0xpc3RJbnN0YW5jZURhdGFiYXNlUmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9JbnN0YW5jZRIxCghpbnN0YW5jZRgCIAEoCzIVLmJ5dGViYXNlLnYxLkluc3RhbmNlQgPgQQJIAIgBAUILCglfaW5zdGFuY2UiMQocTGlzdEluc3RhbmNlRGF0YWJhc2VSZXNwb25zZRIRCglkYXRhYmFzZXMYASADKAkiKQoUU3luY0luc3RhbmNlUmVzcG9uc2USEQoJZGF0YWJhc2VzGAEgAygJIlQKGUJhdGNoU3luY0luc3RhbmNlc1JlcXVlc3QSNwoIcmVxdWVzdHMYASADKAsyIC5ieXRlYmFzZS52MS5TeW5jSW5zdGFuY2VSZXF1ZXN0QgPgQQIiHAoaQmF0Y2hTeW5jSW5zdGFuY2VzUmVzcG9uc2UiWAobQmF0Y2hVcGRhdGVJbnN0YW5jZXNSZXF1ZXN0EjkKCHJlcXVlc3RzGAEgAygLMiIuYnl0ZWJhc2UudjEuVXBkYXRlSW5zdGFuY2VSZXF1ZXN0QgPgQQIiSAocQmF0Y2hVcGRhdGVJbnN0YW5jZXNSZXNwb25zZRIoCglpbnN0YW5jZXMYASADKAsyFS5ieXRlYmFzZS52MS5JbnN0YW5jZSKNAQoUQWRkRGF0YVNvdXJjZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vSW5zdGFuY2USMQoLZGF0YV9zb3VyY2UYAiABKAsyFy5ieXRlYmFzZS52MS5EYXRhU291cmNlQgPgQQISFQoNdmFsaWRhdGVfb25seRgDIAEoCCJ5ChdSZW1vdmVEYXRhU291cmNlUmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9JbnN0YW5jZRIxCgtkYXRhX3NvdXJjZRgCIAEoCzIXLmJ5dGViYXNlLnYxLkRhdGFTb3VyY2VCA+BBAiLYAQoXVXBkYXRlRGF0YVNvdXJjZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vSW5zdGFuY2USMQoLZGF0YV9zb3VyY2UYAiABKAsyFy5ieXRlYmFzZS52MS5EYXRhU291cmNlQgPgQQISLwoLdXBkYXRlX21hc2sYAyABKAsyGi5nb29nbGUucHJvdG9idWYuRmllbGRNYXNrEhUKDXZhbGlkYXRlX29ubHkYBCABKAgSFQoNYWxsb3dfbWlzc2luZxgFIAEoCCIiCg1TeW5jRGF0YWJhc2VzEhEKCWRhdGFiYXNlcxgBIAMoCSKBBQoISW5zdGFuY2USDAoEbmFtZRgBIAEoCRIhCgVzdGF0ZRgDIAEoDjISLmJ5dGViYXNlLnYxLlN0YXRlEhcKBXRpdGxlGAQgASgJQgi6SAVyAxjIARIjCgZlbmdpbmUYBSABKA4yEy5ieXRlYmFzZS52MS5FbmdpbmUSGwoOZW5naW5lX3ZlcnNpb24YBiABKAlCA+BBAxIVCg1leHRlcm5hbF9saW5rGAcgASgJEi0KDGRhdGFfc291cmNlcxgIIAMoCzIXLmJ5dGViYXNlLnYxLkRhdGFTb3VyY2USHQoLZW52aXJvbm1lbnQYCSABKAlCA+BBAUgAiAEBEhIKCmFjdGl2YXRpb24YCiABKAgSLQoFcm9sZXMYCyADKAsyGS5ieXRlYmFzZS52MS5JbnN0YW5jZVJvbGVCA+BBAxIwCg1zeW5jX2ludGVydmFsGAwgASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uEjIKDnN5bmNfZGF0YWJhc2VzGA4gASgLMhouYnl0ZWJhc2UudjEuU3luY0RhdGFiYXNlcxI3Cg5sYXN0X3N5bmNfdGltZRgPIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxIxCgZsYWJlbHMYECADKAsyIS5ieXRlYmFzZS52MS5JbnN0YW5jZS5MYWJlbHNFbnRyeRotCgtMYWJlbHNFbnRyeRILCgNrZXkYASABKAkSDQoFdmFsdWUYAiABKAk6AjgBOjDqQS0KFWJ5dGViYXNlLmNvbS9JbnN0YW5jZRIUaW5zdGFuY2VzL3tpbnN0YW5jZX1CDgoMX2Vudmlyb25tZW50Iq8IChhEYXRhU291cmNlRXh0ZXJuYWxTZWNyZXQSRQoLc2VjcmV0X3R5cGUYASABKA4yMC5ieXRlYmFzZS52MS5EYXRhU291cmNlRXh0ZXJuYWxTZWNyZXQuU2VjcmV0VHlwZRILCgN1cmwYAiABKAkSQQoJYXV0aF90eXBlGAMgASgOMi4uYnl0ZWJhc2UudjEuRGF0YVNvdXJjZUV4dGVybmFsU2VjcmV0LkF1dGhUeXBlEksKCGFwcF9yb2xlGAQgASgLMjcuYnl0ZWJhc2UudjEuRGF0YVNvdXJjZUV4dGVybmFsU2VjcmV0LkFwcFJvbGVBdXRoT3B0aW9uSAASFAoFdG9rZW4YBSABKAlCA+BBBEgAEkMKCnRva2VuX3R5cGUYDSABKA4yLy5ieXRlYmFzZS52MS5EYXRhU291cmNlRXh0ZXJuYWxTZWNyZXQuVG9rZW5UeXBlEhMKC2VuZ2luZV9uYW1lGAYgASgJEhMKC3NlY3JldF9uYW1lGAcgASgJEhkKEXBhc3N3b3JkX2tleV9uYW1lGAggASgJEiMKG3NraXBfdmF1bHRfdGxzX3ZlcmlmaWNhdGlvbhgJIAEoCBIZCgx2YXVsdF9zc2xfY2EYCiABKAlCA+BBBBIbCg52YXVsdF9zc2xfY2VydBgLIAEoCUID4EEEEhoKDXZhdWx0X3NzbF9rZXkYDCABKAlCA+BBBBruAQoRQXBwUm9sZUF1dGhPcHRpb24SFAoHcm9sZV9pZBgBIAEoCUID4EEEEhYKCXNlY3JldF9pZBgCIAEoCUID4EEEElAKBHR5cGUYAyABKA4yQi5ieXRlYmFzZS52MS5EYXRhU291cmNlRXh0ZXJuYWxTZWNyZXQuQXBwUm9sZUF1dGhPcHRpb24uU2VjcmV0VHlwZRISCgptb3VudF9wYXRoGAQgASgJIkUKClNlY3JldFR5cGUSGwoXU0VDUkVUX1RZUEVfVU5TUEVDSUZJRUQQABIJCgVQTEFJThABEg8KC0VOVklST05NRU5UEAIigAEKClNlY3JldFR5cGUSGwoXU0VDUkVUX1RZUEVfVU5TUEVDSUZJRUQQABIPCgtWQVVMVF9LVl9WMhABEhcKE0FXU19TRUNSRVRTX01BTkFHRVIQAhIWChJHQ1BfU0VDUkVUX01BTkFHRVIQAxITCg9BWlVSRV9LRVlfVkFVTFQQBCJECghBdXRoVHlwZRIZChVBVVRIX1RZUEVfVU5TUEVDSUZJRUQQABIJCgVUT0tFThABEhIKDlZBVUxUX0FQUF9ST0xFEAIiTQoJVG9rZW5UeXBlEhoKFlRPS0VOX1RZUEVfVU5TUEVDSUZJRUQQABIJCgVQTEFJThABEg8KC0VOVklST05NRU5UEAISCAoERklMRRADQg0KC2F1dGhfb3B0aW9uItASCgpEYXRhU291cmNlEgoKAmlkGAEgASgJEikKBHR5cGUYAiABKA4yGy5ieXRlYmFzZS52MS5EYXRhU291cmNlVHlwZRIQCgh1c2VybmFtZRgDIAEoCRIVCghwYXNzd29yZBgEIAEoCUID4EEEEg8KB3VzZV9zc2wYHiABKAgSEwoGc3NsX2NhGAUgASgJQgPgQQQSFQoIc3NsX2NlcnQYBiABKAlCA+BBBBIUCgdzc2xfa2V5GAcgASgJQgPgQQQSGAoLc3NsX2NhX3BhdGgYKSABKAlCA+BBBBIaCg1zc2xfY2VydF9wYXRoGCogASgJQgPgQQQSGQoMc3NsX2tleV9wYXRoGCsgASgJQgPgQQQSFwoKc3NsX2NhX3NldBgsIAEoCEID4EEDEhkKDHNzbF9jZXJ0X3NldBgtIAEoCEID4EEDEhgKC3NzbF9rZXlfc2V0GC4gASgIQgPgQQMSHAoPc3NsX2NhX3BhdGhfc2V0GC8gASgIQgPgQQMSHgoRc3NsX2NlcnRfcGF0aF9zZXQYMCABKAhCA+BBAxIdChBzc2xfa2V5X3BhdGhfc2V0GDEgASgIQgPgQQMSHgoWdmVyaWZ5X3Rsc19jZXJ0aWZpY2F0ZRgnIAEoCBIMCgRob3N0GAggASgJEgwKBHBvcnQYCSABKAkSEAoIZGF0YWJhc2UYCiABKAkSCwoDc3J2GAsgASgIEh8KF2F1dGhlbnRpY2F0aW9uX2RhdGFiYXNlGAwgASgJEhMKC3JlcGxpY2Ffc2V0GBkgASgJEgsKA3NpZBgNIAEoCRIUCgxzZXJ2aWNlX25hbWUYDiABKAkSEAoIc3NoX2hvc3QYDyABKAkSEAoIc3NoX3BvcnQYECABKAkSEAoIc3NoX3VzZXIYESABKAkSGQoMc3NoX3Bhc3N3b3JkGBIgASgJQgPgQQQSHAoPc3NoX3ByaXZhdGVfa2V5GBMgASgJQgPgQQQSJwoaYXV0aGVudGljYXRpb25fcHJpdmF0ZV9rZXkYFCABKAlCA+BBBBIyCiVhdXRoZW50aWNhdGlvbl9wcml2YXRlX2tleV9wYXNzcGhyYXNlGCggASgJQgPgQQQSPgoPZXh0ZXJuYWxfc2VjcmV0GBUgASgLMiUuYnl0ZWJhc2UudjEuRGF0YVNvdXJjZUV4dGVybmFsU2VjcmV0EkcKE2F1dGhlbnRpY2F0aW9uX3R5cGUYFiABKA4yKi5ieXRlYmFzZS52MS5EYXRhU291cmNlLkF1dGhlbnRpY2F0aW9uVHlwZRJBChFjbG91ZF9zcWxfaXBfdHlwZRg4IAEoDjImLmJ5dGViYXNlLnYxLkRhdGFTb3VyY2UuQ2xvdWRTUUxJUFR5cGUSQwoQYXp1cmVfY3JlZGVudGlhbBgXIAEoCzInLmJ5dGViYXNlLnYxLkRhdGFTb3VyY2UuQXp1cmVDcmVkZW50aWFsSAASPwoOYXdzX2NyZWRlbnRpYWwYJSABKAsyJS5ieXRlYmFzZS52MS5EYXRhU291cmNlLkFXU0NyZWRlbnRpYWxIABI/Cg5nY3BfY3JlZGVudGlhbBgmIAEoCzIlLmJ5dGViYXNlLnYxLkRhdGFTb3VyY2UuR0NQQ3JlZGVudGlhbEgAEiwKC3Nhc2xfY29uZmlnGBggASgLMhcuYnl0ZWJhc2UudjEuU0FTTENvbmZpZxJCChRhZGRpdGlvbmFsX2FkZHJlc3NlcxgaIAMoCzIfLmJ5dGViYXNlLnYxLkRhdGFTb3VyY2UuQWRkcmVzc0ID4EEBEhkKEWRpcmVjdF9jb25uZWN0aW9uGBsgASgIEg4KBnJlZ2lvbhgcIAEoCRIUCgx3YXJlaG91c2VfaWQYHSABKAkSEwoLbWFzdGVyX25hbWUYHyABKAkSFwoPbWFzdGVyX3VzZXJuYW1lGCAgASgJEhcKD21hc3Rlcl9wYXNzd29yZBghIAEoCRI1CgpyZWRpc190eXBlGCIgASgOMiEuYnl0ZWJhc2UudjEuRGF0YVNvdXJjZS5SZWRpc1R5cGUSDwoHY2x1c3RlchgjIAEoCRJbChtleHRyYV9jb25uZWN0aW9uX3BhcmFtZXRlcnMYJCADKAsyNi5ieXRlYmFzZS52MS5EYXRhU291cmNlLkV4dHJhQ29ubmVjdGlvblBhcmFtZXRlcnNFbnRyeRISCgpwcm9qZWN0X2lkGDkgASgJEhMKC2luc3RhbmNlX2lkGDogASgJGlMKD0F6dXJlQ3JlZGVudGlhbBIRCgl0ZW5hbnRfaWQYASABKAkSEQoJY2xpZW50X2lkGAIgASgJEhoKDWNsaWVudF9zZWNyZXQYAyABKAlCA+BBBBqYAQoNQVdTQ3JlZGVudGlhbBIaCg1hY2Nlc3Nfa2V5X2lkGAEgASgJQgPgQQQSHgoRc2VjcmV0X2FjY2Vzc19rZXkYAiABKAlCA+BBBBIaCg1zZXNzaW9uX3Rva2VuGAMgASgJQgPgQQQSFQoIcm9sZV9hcm4YBCABKAlCA+BBBBIYCgtleHRlcm5hbF9pZBgFIAEoCUID4EEEGiUKDUdDUENyZWRlbnRpYWwSFAoHY29udGVudBgBIAEoCUID4EEEGiUKB0FkZHJlc3MSDAoEaG9zdBgBIAEoCRIMCgRwb3J0GAIgASgJGkAKHkV4dHJhQ29ubmVjdGlvblBhcmFtZXRlcnNFbnRyeRILCgNrZXkYASABKAkSDQoFdmFsdWUYAiABKAk6AjgBInwKEkF1dGhlbnRpY2F0aW9uVHlwZRIeChpBVVRIRU5USUNBVElPTl9VTlNQRUNJRklFRBAAEgwKCFBBU1NXT1JEEAESGAoUR09PR0xFX0NMT1VEX1NRTF9JQU0QAhIPCgtBV1NfUkRTX0lBTRADEg0KCUFaVVJFX0lBTRAEIlUKDkNsb3VkU1FMSVBUeXBlEiEKHUNMT1VEX1NRTF9JUF9UWVBFX1VOU1BFQ0lGSUVEEAASCgoGUFVCTElDEAESCwoHUFJJVkFURRACEgcKA1BTQxADIlIKCVJlZGlzVHlwZRIaChZSRURJU19UWVBFX1VOU1BFQ0lGSUVEEAASDgoKU1RBTkRBTE9ORRABEgwKCFNFTlRJTkVMEAISCwoHQ0xVU1RFUhADQg8KDWlhbV9leHRlbnNpb24i3gEKEEluc3RhbmNlUmVzb3VyY2USDQoFdGl0bGUYASABKAkSIwoGZW5naW5lGAIgASgOMhMuYnl0ZWJhc2UudjEuRW5naW5lEhsKDmVuZ2luZV92ZXJzaW9uGAMgASgJQgPgQQMSLQoMZGF0YV9zb3VyY2VzGAQgAygLMhcuYnl0ZWJhc2UudjEuRGF0YVNvdXJjZRISCgphY3RpdmF0aW9uGAUgASgIEgwKBG5hbWUYBiABKAkSGAoLZW52aXJvbm1lbnQYByABKAlIAIgBAUIOCgxfZW52aXJvbm1lbnQiTAoKU0FTTENvbmZpZxIxCgprcmJfY29uZmlnGAEgASgLMhsuYnl0ZWJhc2UudjEuS2VyYmVyb3NDb25maWdIAEILCgltZWNoYW5pc20ilgEKDktlcmJlcm9zQ29uZmlnEg8KB3ByaW1hcnkYASABKAkSEAoIaW5zdGFuY2UYAiABKAkSDQoFcmVhbG0YAyABKAkSDgoGa2V5dGFiGAQgASgMEhAKCGtkY19ob3N0GAUgASgJEhAKCGtkY19wb3J0GAYgASgJEh4KFmtkY190cmFuc3BvcnRfcHJvdG9jb2wYByABKAkqRwoORGF0YVNvdXJjZVR5cGUSGwoXREFUQV9TT1VSQ0VfVU5TUEVDSUZJRUQQABIJCgVBRE1JThABEg0KCVJFQURfT05MWRACMtQQCg9JbnN0YW5jZVNlcnZpY2UShAEKC0dldEluc3RhbmNlEh8uYnl0ZWJhc2UudjEuR2V0SW5zdGFuY2VSZXF1ZXN0GhUuYnl0ZWJhc2UudjEuSW5zdGFuY2UiPdpBBG5hbWWK6jAQYmIuaW5zdGFuY2VzLmdldJDqMAGC0+STAhgSFi92MS97bmFtZT1pbnN0YW5jZXMvKn0SiQEKDUxpc3RJbnN0YW5jZXMSIS5ieXRlYmFzZS52MS5MaXN0SW5zdGFuY2VzUmVxdWVzdBoiLmJ5dGViYXNlLnYxLkxpc3RJbnN0YW5jZXNSZXNwb25zZSIx2kEAiuowEWJiLmluc3RhbmNlcy5saXN0kOowAYLT5JMCDxINL3YxL2luc3RhbmNlcxKWAQoOQ3JlYXRlSW5zdGFuY2USIi5ieXRlYmFzZS52MS5DcmVhdGVJbnN0YW5jZVJlcXVlc3QaFS5ieXRlYmFzZS52MS5JbnN0YW5jZSJJ2kEIaW5zdGFuY2WK6jATYmIuaW5zdGFuY2VzLmNyZWF0ZZDqMAGY6jABgtPkkwIZOghpbnN0YW5jZSINL3YxL2luc3RhbmNlcxK0AQoOVXBkYXRlSW5zdGFuY2USIi5ieXRlYmFzZS52MS5VcGRhdGVJbnN0YW5jZVJlcXVlc3QaFS5ieXRlYmFzZS52MS5JbnN0YW5jZSJn2kEUaW5zdGFuY2UsdXBkYXRlX21hc2uK6jATYmIuaW5zdGFuY2VzLnVwZGF0ZZDqMAGY6jABgtPkkwIrOghpbnN0YW5jZTIfL3YxL3tpbnN0YW5jZS5uYW1lPWluc3RhbmNlcy8qfRKSAQoORGVsZXRlSW5zdGFuY2USIi5ieXRlYmFzZS52MS5EZWxldGVJbnN0YW5jZVJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkiRNpBBG5hbWWK6jATYmIuaW5zdGFuY2VzLmRlbGV0ZZDqMAGY6jABgtPkkwIYKhYvdjEve25hbWU9aW5zdGFuY2VzLyp9EpwBChBVbmRlbGV0ZUluc3RhbmNlEiQuYnl0ZWJhc2UudjEuVW5kZWxldGVJbnN0YW5jZVJlcXVlc3QaFS5ieXRlYmFzZS52MS5JbnN0YW5jZSJLiuowFWJiLmluc3RhbmNlcy51bmRlbGV0ZZDqMAGY6jABgtPkkwIkOgEqIh8vdjEve25hbWU9aW5zdGFuY2VzLyp9OnVuZGVsZXRlEpQBCgxTeW5jSW5zdGFuY2USIC5ieXRlYmFzZS52MS5TeW5jSW5zdGFuY2VSZXF1ZXN0GiEuYnl0ZWJhc2UudjEuU3luY0luc3RhbmNlUmVzcG9uc2UiP4rqMBFiYi5pbnN0YW5jZXMuc3luY5DqMAGC0+STAiA6ASoiGy92MS97bmFtZT1pbnN0YW5jZXMvKn06c3luYxKwAQoUTGlzdEluc3RhbmNlRGF0YWJhc2USKC5ieXRlYmFzZS52MS5MaXN0SW5zdGFuY2VEYXRhYmFzZVJlcXVlc3QaKS5ieXRlYmFzZS52MS5MaXN0SW5zdGFuY2VEYXRhYmFzZVJlc3BvbnNlIkOK6jAQYmIuaW5zdGFuY2VzLmdldJDqMAGC0+STAiU6ASoiIC92MS97bmFtZT1pbnN0YW5jZXMvKn06ZGF0YWJhc2VzEqIBChJCYXRjaFN5bmNJbnN0YW5jZXMSJi5ieXRlYmFzZS52MS5CYXRjaFN5bmNJbnN0YW5jZXNSZXF1ZXN0GicuYnl0ZWJhc2UudjEuQmF0Y2hTeW5jSW5zdGFuY2VzUmVzcG9uc2UiO4rqMBFiYi5pbnN0YW5jZXMuc3luY5DqMAGC0+STAhw6ASoiFy92MS9pbnN0YW5jZXM6YmF0Y2hTeW5jErABChRCYXRjaFVwZGF0ZUluc3RhbmNlcxIoLmJ5dGViYXNlLnYxLkJhdGNoVXBkYXRlSW5zdGFuY2VzUmVxdWVzdBopLmJ5dGViYXNlLnYxLkJhdGNoVXBkYXRlSW5zdGFuY2VzUmVzcG9uc2UiQ4rqMBNiYi5pbnN0YW5jZXMudXBkYXRlkOowAZjqMAGC0+STAh46ASoiGS92MS9pbnN0YW5jZXM6YmF0Y2hVcGRhdGUSmQEKDUFkZERhdGFTb3VyY2USIS5ieXRlYmFzZS52MS5BZGREYXRhU291cmNlUmVxdWVzdBoVLmJ5dGViYXNlLnYxLkluc3RhbmNlIk6K6jATYmIuaW5zdGFuY2VzLnVwZGF0ZZDqMAGY6jABgtPkkwIpOgEqIiQvdjEve25hbWU9aW5zdGFuY2VzLyp9OmFkZERhdGFTb3VyY2USogEKEFJlbW92ZURhdGFTb3VyY2USJC5ieXRlYmFzZS52MS5SZW1vdmVEYXRhU291cmNlUmVxdWVzdBoVLmJ5dGViYXNlLnYxLkluc3RhbmNlIlGK6jATYmIuaW5zdGFuY2VzLnVwZGF0ZZDqMAGY6jABgtPkkwIsOgEqIicvdjEve25hbWU9aW5zdGFuY2VzLyp9OnJlbW92ZURhdGFTb3VyY2USxgEKEFVwZGF0ZURhdGFTb3VyY2USJC5ieXRlYmFzZS52MS5VcGRhdGVEYXRhU291cmNlUmVxdWVzdBoVLmJ5dGViYXNlLnYxLkluc3RhbmNlInXaQRdkYXRhX3NvdXJjZSx1cGRhdGVfbWFza4rqMBNiYi5pbnN0YW5jZXMudXBkYXRlkOowAZjqMAGC0+STAjY6C2RhdGFfc291cmNlMicvdjEve25hbWU9aW5zdGFuY2VzLyp9OnVwZGF0ZURhdGFTb3VyY2VCqgEKD2NvbS5ieXRlYmFzZS52MUIUSW5zdGFuY2VTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [file_buf_validate_validate, file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_duration, file_google_protobuf_empty, file_google_protobuf_field_mask, file_google_protobuf_timestamp, file_v1_annotation, file_v1_common, file_v1_instance_role_service]);
/**
* Describes the message bytebase.v1.GetInstanceRequest.
diff --git a/frontend/src/utils/v1/instance.ts b/frontend/src/utils/v1/instance.ts
index ea8febefeb..c3d48b4be9 100644
--- a/frontend/src/utils/v1/instance.ts
+++ b/frontend/src/utils/v1/instance.ts
@@ -50,6 +50,15 @@ export const hostPortOfDataSource = (ds: DataSource | undefined): string => {
if (!ds) {
return "";
}
+ // GCP data sources (Spanner, BigQuery) identify the target by
+ // project ID (+ instance ID); host/port only optionally override
+ // the Google API endpoint.
+ if (ds.projectId) {
+ if (ds.instanceId) {
+ return `projects/${ds.projectId}/instances/${ds.instanceId}`;
+ }
+ return ds.projectId;
+ }
const parts = [ds.host];
if (ds.port) {
parts.push(ds.port);
@@ -402,10 +411,22 @@ export const hasIndexSizeProperty = (
return ![Engine.CLICKHOUSE, Engine.SNOWFLAKE].includes(engine);
};
-export const isValidSpannerHost = (host: string) => {
- const RE =
- /^projects\/(?<PROJECT_ID>(?:[a-z]|[-.:]|[0-9])+)\/instances\/(?<INSTANCE_ID>(?:[a-z]|[-]|[0-9])+)$/;
- return RE.test(host);
+export const RE_GCP_PROJECT_ID = /^[a-z\d.:-]+$/;
+export const RE_GCP_INSTANCE_ID = /^[a-z\d-]+$/;
+
+export const isValidSpannerDataSource = (
+ ds: Pick<DataSource, "projectId" | "instanceId">
+) => {
+ return (
+ RE_GCP_PROJECT_ID.test(ds.projectId) &&
+ RE_GCP_INSTANCE_ID.test(ds.instanceId)
+ );
+};
+
+export const isValidBigQueryDataSource = (
+ ds: Pick<DataSource, "projectId">
+) => {
+ return RE_GCP_PROJECT_ID.test(ds.projectId);
};
export const getFixedPrimaryKey = (engine: Engine) => {
diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yaml
index 2d5112122f..fcab9d11e2 100644
--- a/proto/gen/grpc-doc/openapi.yaml
+++ b/proto/gen/grpc-doc/openapi.yaml
@@ -18394,6 +18394,18 @@ components:
description: |-
Extra connection parameters for the database connection.
For PostgreSQL HA, this can be used to set target_session_attrs=read-write
+ projectId:
+ type: string
+ title: project_id
+ description: |-
+ project_id and instance_id are the GCP resource identifiers.
+ project_id is used by Spanner and BigQuery; instance_id is used by Spanner.
+ For these engines, host and port optionally override the default Google API
+ endpoint (e.g. a Private Service Connect endpoint like
+ spanner-nonprod.p.googleapis.com).
+ instanceId:
+ type: string
+ title: instance_id
- oneOf:
- type: object
properties:
diff --git a/proto/gen/grpc-doc/store/README.md b/proto/gen/grpc-doc/store/README.md
index 2c8d7daf2c..af550da64d 100644
--- a/proto/gen/grpc-doc/store/README.md
+++ b/proto/gen/grpc-doc/store/README.md
@@ -2438,6 +2438,8 @@ OIDCIdentityProviderConfig is the structure for OIDC identity provider config.
| redis_type | [DataSource.RedisType](#bytebase-store-DataSource-RedisType) | | |
| cluster | [string](#string) | | Cluster is the cluster name for the data source. Used by CockroachDB. |
| extra_connection_parameters | [DataSource.ExtraConnectionParametersEntry](#bytebase-store-DataSource-ExtraConnectionParametersEntry) | repeated | Extra connection parameters for the database connection. For PostgreSQL HA, this can be used to set target_session_attrs=read-write |
+| project_id | [string](#string) | | project_id and instance_id are the GCP resource identifiers. project_id is used by Spanner and BigQuery; instance_id is used by Spanner. For these engines, host and port optionally override the default Google API endpoint (e.g. a Private Service Connect endpoint like spanner-nonprod.p.googleapis.com). |
+| instance_id | [string](#string) | | |
diff --git a/proto/gen/grpc-doc/store/index.html b/proto/gen/grpc-doc/store/index.html
index 0b12270573..bd3a791716 100644
--- a/proto/gen/grpc-doc/store/index.html
+++ b/proto/gen/grpc-doc/store/index.html
@@ -7505,6 +7505,24 @@ CLOUD_SQL_IP_TYPE_UNSPECIFIED is treated as PUBLIC for backward compatibility. <
For PostgreSQL HA, this can be used to set target_session_attrs=read-write </p></td>
</tr>
+ <tr>
+ <td>project_id</td>
+ <td><a href="#string">string</a></td>
+ <td></td>
+ <td><p>project_id and instance_id are the GCP resource identifiers.
+project_id is used by Spanner and BigQuery; instance_id is used by Spanner.
+For these engines, host and port optionally override the default Google API
+endpoint (e.g. a Private Service Connect endpoint like
+spanner-nonprod.p.googleapis.com). </p></td>
+ </tr>
+
+ <tr>
+ <td>instance_id</td>
+ <td><a href="#string">string</a></td>
+ <td></td>
+ <td><p> </p></td>
+ </tr>
+
</tbody>
</table>
diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.md
index 6337398b74..80a9e768db 100644
--- a/proto/gen/grpc-doc/v1/README.md
+++ b/proto/gen/grpc-doc/v1/README.md
@@ -2393,6 +2393,8 @@ This value should be 4-63 characters, and valid characters are /[a-z][0-9]-/. |
| redis_type | [DataSource.RedisType](#bytebase-v1-DataSource-RedisType) | | |
| cluster | [string](#string) | | Cluster is the cluster name for the data source. Used by CockroachDB. |
| extra_connection_parameters | [DataSource.ExtraConnectionParametersEntry](#bytebase-v1-DataSource-ExtraConnectionParametersEntry) | repeated | Extra connection parameters for the database connection. For PostgreSQL HA, this can be used to set target_session_attrs=read-write |
+| project_id | [string](#string) | | project_id and instance_id are the GCP resource identifiers. project_id is used by Spanner and BigQuery; instance_id is used by Spanner. For these engines, host and port optionally override the default Google API endpoint (e.g. a Private Service Connect endpoint like spanner-nonprod.p.googleapis.com). |
+| instance_id | [string](#string) | | |
diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.html
index 34018db0d4..4f76d9bb2e 100644
--- a/proto/gen/grpc-doc/v1/index.html
+++ b/proto/gen/grpc-doc/v1/index.html
@@ -7601,6 +7601,24 @@ CLOUD_SQL_IP_TYPE_UNSPECIFIED is treated as PUBLIC for backward compatibility. <
For PostgreSQL HA, this can be used to set target_session_attrs=read-write </p></td>
</tr>
+ <tr>
+ <td>project_id</td>
+ <td><a href="#string">string</a></td>
+ <td></td>
+ <td><p>project_id and instance_id are the GCP resource identifiers.
+project_id is used by Spanner and BigQuery; instance_id is used by Spanner.
+For these engines, host and port optionally override the default Google API
+endpoint (e.g. a Private Service Connect endpoint like
+spanner-nonprod.p.googleapis.com). </p></td>
+ </tr>
+
+ <tr>
+ <td>instance_id</td>
+ <td><a href="#string">string</a></td>
+ <td></td>
+ <td><p> </p></td>
+ </tr>
+
</tbody>
</table>
diff --git a/proto/store/store/instance.proto b/proto/store/store/instance.proto
index e3fb689aab..ef49a0c956 100644
--- a/proto/store/store/instance.proto
+++ b/proto/store/store/instance.proto
@@ -212,6 +212,14 @@ message DataSource {
// Extra connection parameters for the database connection.
// For PostgreSQL HA, this can be used to set target_session_attrs=read-write
map<string, string> extra_connection_parameters = 36;
+
+ // project_id and instance_id are the GCP resource identifiers.
+ // project_id is used by Spanner and BigQuery; instance_id is used by Spanner.
+ // For these engines, host and port optionally override the default Google API
+ // endpoint (e.g. a Private Service Connect endpoint like
+ // spanner-nonprod.p.googleapis.com).
+ string project_id = 57;
+ string instance_id = 58;
}
message SASLConfig {
diff --git a/proto/v1/v1/instance_service.proto b/proto/v1/v1/instance_service.proto
index 62c7949c3a..d4dfac5c68 100644
--- a/proto/v1/v1/instance_service.proto
+++ b/proto/v1/v1/instance_service.proto
@@ -731,6 +731,14 @@ message DataSource {
// Extra connection parameters for the database connection.
// For PostgreSQL HA, this can be used to set target_session_attrs=read-write
map<string, string> extra_connection_parameters = 36;
+
+ // project_id and instance_id are the GCP resource identifiers.
+ // project_id is used by Spanner and BigQuery; instance_id is used by Spanner.
+ // For these engines, host and port optionally override the default Google API
+ // endpoint (e.g. a Private Service Connect endpoint like
+ // spanner-nonprod.p.googleapis.com).
+ string project_id = 57;
+ string instance_id = 58;
}
enum DataSourceType {