Skip to content

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

feat(instance): support Private IP for Google Cloud SQL IAM connections (#20715)

Vincent Huang7332aaa69f7c
diff --git a/backend/api/mcp/gen/openapi.yaml b/backend/api/mcp/gen/openapi.yaml
index 68d951153d..a9fd20f46b 100644
--- a/backend/api/mcp/gen/openapi.yaml
+++ b/backend/api/mcp/gen/openapi.yaml
@@ -10208,6 +10208,12 @@ components:
authenticationType:
title: authentication_type
$ref: '#/components/schemas/bytebase.v1.DataSource.AuthenticationType'
+ cloudSqlIpType:
+ title: cloud_sql_ip_type
+ description: |-
+ cloud_sql_ip_type selects the Cloud SQL IP type for Google Cloud SQL IAM connections.
+ CLOUD_SQL_IP_TYPE_UNSPECIFIED is treated as PUBLIC for backward compatibility.
+ $ref: '#/components/schemas/bytebase.v1.DataSource.CloudSQLIPType'
saslConfig:
title: sasl_config
$ref: '#/components/schemas/bytebase.v1.SASLConfig'
@@ -10343,6 +10349,15 @@ components:
title: client_secret
title: AzureCredential
additionalProperties: false
+ bytebase.v1.DataSource.CloudSQLIPType:
+ type: string
+ title: CloudSQLIPType
+ enum:
+ - CLOUD_SQL_IP_TYPE_UNSPECIFIED
+ - PUBLIC
+ - PRIVATE
+ - PSC
+ description: CloudSQLIPType selects which Cloud SQL IP to dial for Google Cloud SQL IAM connections.
bytebase.v1.DataSource.ExtraConnectionParametersEntry:
type: object
properties:
diff --git a/backend/api/v1/instance_service.go b/backend/api/v1/instance_service.go
index eeb5751ed3..419901649a 100644
--- a/backend/api/v1/instance_service.go
+++ b/backend/api/v1/instance_service.go
@@ -998,6 +998,8 @@ func (s *InstanceService) UpdateDataSource(ctx context.Context, req *connect.Req
dataSource.VerifyTlsCertificate = req.Msg.DataSource.VerifyTlsCertificate
case "redis_type":
dataSource.RedisType = convertV1RedisType(req.Msg.DataSource.RedisType)
+ case "cloud_sql_ip_type":
+ dataSource.CloudSqlIpType = convertV1CloudSQLIPType(req.Msg.DataSource.CloudSqlIpType)
case "master_name":
dataSource.MasterName = req.Msg.DataSource.MasterName
case "master_username":
diff --git a/backend/api/v1/instance_service_converter.go b/backend/api/v1/instance_service_converter.go
index 50b97c6324..5621ddbfd0 100644
--- a/backend/api/v1/instance_service_converter.go
+++ b/backend/api/v1/instance_service_converter.go
@@ -227,6 +227,7 @@ func convertDataSources(dataSources []*storepb.DataSource) []*v1pb.DataSource {
UseSsl: ds.GetUseSsl(),
VerifyTlsCertificate: ds.GetVerifyTlsCertificate(),
RedisType: convertRedisType(ds.GetRedisType()),
+ CloudSqlIpType: convertCloudSQLIPType(ds.GetCloudSqlIpType()),
MasterName: ds.GetMasterName(),
MasterUsername: ds.GetMasterUsername(),
ExtraConnectionParameters: ds.GetExtraConnectionParameters(),
@@ -469,6 +470,32 @@ func convertRedisType(redisType storepb.DataSource_RedisType) v1pb.DataSource_Re
}
}
+func convertV1CloudSQLIPType(ipType v1pb.DataSource_CloudSQLIPType) storepb.DataSource_CloudSQLIPType {
+ switch ipType {
+ case v1pb.DataSource_PUBLIC:
+ return storepb.DataSource_PUBLIC
+ case v1pb.DataSource_PRIVATE:
+ return storepb.DataSource_PRIVATE
+ case v1pb.DataSource_PSC:
+ return storepb.DataSource_PSC
+ default:
+ return storepb.DataSource_CLOUD_SQL_IP_TYPE_UNSPECIFIED
+ }
+}
+
+func convertCloudSQLIPType(ipType storepb.DataSource_CloudSQLIPType) v1pb.DataSource_CloudSQLIPType {
+ switch ipType {
+ case storepb.DataSource_PUBLIC:
+ return v1pb.DataSource_PUBLIC
+ case storepb.DataSource_PRIVATE:
+ return v1pb.DataSource_PRIVATE
+ case storepb.DataSource_PSC:
+ return v1pb.DataSource_PSC
+ default:
+ return v1pb.DataSource_CLOUD_SQL_IP_TYPE_UNSPECIFIED
+ }
+}
+
func convertV1DataSource(dataSource *v1pb.DataSource) (*storepb.DataSource, error) {
dsType, err := convertV1DataSourceType(dataSource.Type)
if err != nil {
@@ -516,6 +543,7 @@ func convertV1DataSource(dataSource *v1pb.DataSource) (*storepb.DataSource, erro
UseSsl: dataSource.UseSsl,
VerifyTlsCertificate: dataSource.VerifyTlsCertificate,
RedisType: convertV1RedisType(dataSource.RedisType),
+ CloudSqlIpType: convertV1CloudSQLIPType(dataSource.CloudSqlIpType),
MasterName: dataSource.MasterName,
MasterUsername: dataSource.MasterUsername,
MasterPassword: dataSource.MasterPassword,
diff --git a/backend/api/v1/instance_service_converter_test.go b/backend/api/v1/instance_service_converter_test.go
new file mode 100644
index 0000000000..98a27c80ec
--- /dev/null
+++ b/backend/api/v1/instance_service_converter_test.go
@@ -0,0 +1,40 @@
+package v1
+
+import (
+ "testing"
+
+ "github.com/stretchr/testify/require"
+
+ storepb "github.com/bytebase/bytebase/backend/generated-go/store"
+ v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
+)
+
+func TestConvertDataSourceCloudSQLIPType(t *testing.T) {
+ tests := []struct {
+ name string
+ v1 v1pb.DataSource_CloudSQLIPType
+ store storepb.DataSource_CloudSQLIPType
+ }{
+ {"unspecified", v1pb.DataSource_CLOUD_SQL_IP_TYPE_UNSPECIFIED, storepb.DataSource_CLOUD_SQL_IP_TYPE_UNSPECIFIED},
+ {"public", v1pb.DataSource_PUBLIC, storepb.DataSource_PUBLIC},
+ {"private", v1pb.DataSource_PRIVATE, storepb.DataSource_PRIVATE},
+ {"psc", v1pb.DataSource_PSC, storepb.DataSource_PSC},
+ }
+ for _, tc := range tests {
+ t.Run(tc.name, func(t *testing.T) {
+ // v1 -> store
+ storeDS, err := convertV1DataSource(&v1pb.DataSource{
+ Type: v1pb.DataSourceType_ADMIN,
+ AuthenticationType: v1pb.DataSource_GOOGLE_CLOUD_SQL_IAM,
+ CloudSqlIpType: tc.v1,
+ })
+ require.NoError(t, err)
+ require.Equal(t, tc.store, storeDS.GetCloudSqlIpType(), "v1->store")
+
+ // store -> v1 round-trip preserves the value
+ v1DSs := convertDataSources([]*storepb.DataSource{storeDS})
+ require.Len(t, v1DSs, 1)
+ require.Equal(t, tc.v1, v1DSs[0].GetCloudSqlIpType(), "store->v1 round-trip")
+ })
+ }
+}
diff --git a/backend/generated-go/store/instance.pb.go b/backend/generated-go/store/instance.pb.go
index 2b63e68abe..5ce14bd2c4 100644
--- a/backend/generated-go/store/instance.pb.go
+++ b/backend/generated-go/store/instance.pb.go
@@ -127,6 +127,59 @@ func (DataSource_AuthenticationType) EnumDescriptor() ([]byte, []int) {
return file_store_instance_proto_rawDescGZIP(), []int{2, 0}
}
+// CloudSQLIPType selects which Cloud SQL IP to dial for Google Cloud SQL IAM connections.
+type DataSource_CloudSQLIPType int32
+
+const (
+ DataSource_CLOUD_SQL_IP_TYPE_UNSPECIFIED DataSource_CloudSQLIPType = 0
+ DataSource_PUBLIC DataSource_CloudSQLIPType = 1
+ DataSource_PRIVATE DataSource_CloudSQLIPType = 2
+ DataSource_PSC DataSource_CloudSQLIPType = 3
+)
+
+// Enum value maps for DataSource_CloudSQLIPType.
+var (
+ DataSource_CloudSQLIPType_name = map[int32]string{
+ 0: "CLOUD_SQL_IP_TYPE_UNSPECIFIED",
+ 1: "PUBLIC",
+ 2: "PRIVATE",
+ 3: "PSC",
+ }
+ DataSource_CloudSQLIPType_value = map[string]int32{
+ "CLOUD_SQL_IP_TYPE_UNSPECIFIED": 0,
+ "PUBLIC": 1,
+ "PRIVATE": 2,
+ "PSC": 3,
+ }
+)
+
+func (x DataSource_CloudSQLIPType) Enum() *DataSource_CloudSQLIPType {
+ p := new(DataSource_CloudSQLIPType)
+ *p = x
+ return p
+}
+
+func (x DataSource_CloudSQLIPType) String() string {
+ return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (DataSource_CloudSQLIPType) Descriptor() protoreflect.EnumDescriptor {
+ return file_store_instance_proto_enumTypes[2].Descriptor()
+}
+
+func (DataSource_CloudSQLIPType) Type() protoreflect.EnumType {
+ return &file_store_instance_proto_enumTypes[2]
+}
+
+func (x DataSource_CloudSQLIPType) Number() protoreflect.EnumNumber {
+ return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Use DataSource_CloudSQLIPType.Descriptor instead.
+func (DataSource_CloudSQLIPType) EnumDescriptor() ([]byte, []int) {
+ return file_store_instance_proto_rawDescGZIP(), []int{2, 1}
+}
+
type DataSource_RedisType int32
const (
@@ -163,11 +216,11 @@ func (x DataSource_RedisType) String() string {
}
func (DataSource_RedisType) Descriptor() protoreflect.EnumDescriptor {
- return file_store_instance_proto_enumTypes[2].Descriptor()
+ return file_store_instance_proto_enumTypes[3].Descriptor()
}
func (DataSource_RedisType) Type() protoreflect.EnumType {
- return &file_store_instance_proto_enumTypes[2]
+ return &file_store_instance_proto_enumTypes[3]
}
func (x DataSource_RedisType) Number() protoreflect.EnumNumber {
@@ -176,7 +229,7 @@ func (x DataSource_RedisType) Number() protoreflect.EnumNumber {
// Deprecated: Use DataSource_RedisType.Descriptor instead.
func (DataSource_RedisType) EnumDescriptor() ([]byte, []int) {
- return file_store_instance_proto_rawDescGZIP(), []int{2, 1}
+ return file_store_instance_proto_rawDescGZIP(), []int{2, 2}
}
type DataSourceExternalSecret_SecretType int32
@@ -222,11 +275,11 @@ func (x DataSourceExternalSecret_SecretType) String() string {
}
func (DataSourceExternalSecret_SecretType) Descriptor() protoreflect.EnumDescriptor {
- return file_store_instance_proto_enumTypes[3].Descriptor()
+ return file_store_instance_proto_enumTypes[4].Descriptor()
}
func (DataSourceExternalSecret_SecretType) Type() protoreflect.EnumType {
- return &file_store_instance_proto_enumTypes[3]
+ return &file_store_instance_proto_enumTypes[4]
}
func (x DataSourceExternalSecret_SecretType) Number() protoreflect.EnumNumber {
@@ -273,11 +326,11 @@ func (x DataSourceExternalSecret_AuthType) String() string {
}
func (DataSourceExternalSecret_AuthType) Descriptor() protoreflect.EnumDescriptor {
- return file_store_instance_proto_enumTypes[4].Descriptor()
+ return file_store_instance_proto_enumTypes[5].Descriptor()
}
func (DataSourceExternalSecret_AuthType) Type() protoreflect.EnumType {
- return &file_store_instance_proto_enumTypes[4]
+ return &file_store_instance_proto_enumTypes[5]
}
func (x DataSourceExternalSecret_AuthType) Number() protoreflect.EnumNumber {
@@ -330,11 +383,11 @@ func (x DataSourceExternalSecret_TokenType) String() string {
}
func (DataSourceExternalSecret_TokenType) Descriptor() protoreflect.EnumDescriptor {
- return file_store_instance_proto_enumTypes[5].Descriptor()
+ return file_store_instance_proto_enumTypes[6].Descriptor()
}
func (DataSourceExternalSecret_TokenType) Type() protoreflect.EnumType {
- return &file_store_instance_proto_enumTypes[5]
+ return &file_store_instance_proto_enumTypes[6]
}
func (x DataSourceExternalSecret_TokenType) Number() protoreflect.EnumNumber {
@@ -379,11 +432,11 @@ func (x DataSourceExternalSecret_AppRoleAuthOption_SecretType) String() string {
}
func (DataSourceExternalSecret_AppRoleAuthOption_SecretType) Descriptor() protoreflect.EnumDescriptor {
- return file_store_instance_proto_enumTypes[6].Descriptor()
+ return file_store_instance_proto_enumTypes[7].Descriptor()
}
func (DataSourceExternalSecret_AppRoleAuthOption_SecretType) Type() protoreflect.EnumType {
- return &file_store_instance_proto_enumTypes[6]
+ return &file_store_instance_proto_enumTypes[7]
}
func (x DataSourceExternalSecret_AppRoleAuthOption_SecretType) Number() protoreflect.EnumNumber {
@@ -672,6 +725,9 @@ type DataSource struct {
ObfuscatedAuthenticationPrivateKeyPassphrase string `protobuf:"bytes,49,opt,name=obfuscated_authentication_private_key_passphrase,json=obfuscatedAuthenticationPrivateKeyPassphrase,proto3" json:"obfuscated_authentication_private_key_passphrase,omitempty"`
ExternalSecret *DataSourceExternalSecret `protobuf:"bytes,21,opt,name=external_secret,json=externalSecret,proto3" json:"external_secret,omitempty"`
AuthenticationType DataSource_AuthenticationType `protobuf:"varint,22,opt,name=authentication_type,json=authenticationType,proto3,enum=bytebase.store.DataSource_AuthenticationType" json:"authentication_type,omitempty"`
+ // cloud_sql_ip_type selects the Cloud SQL IP type for Google Cloud SQL IAM connections.
+ // CLOUD_SQL_IP_TYPE_UNSPECIFIED is treated as PUBLIC for backward compatibility.
+ CloudSqlIpType DataSource_CloudSQLIPType `protobuf:"varint,56,opt,name=cloud_sql_ip_type,json=cloudSqlIpType,proto3,enum=bytebase.store.DataSource_CloudSQLIPType" json:"cloud_sql_ip_type,omitempty"`
// Types that are valid to be assigned to IamExtension:
//
// *DataSource_AzureCredential_
@@ -1013,6 +1069,13 @@ func (x *DataSource) GetAuthenticationType() DataSource_AuthenticationType {
return DataSource_AUTHENTICATION_UNSPECIFIED
}
+func (x *DataSource) GetCloudSqlIpType() DataSource_CloudSQLIPType {
+ if x != nil {
+ return x.CloudSqlIpType
+ }
+ return DataSource_CLOUD_SQL_IP_TYPE_UNSPECIFIED
+}
+
func (x *DataSource) GetIamExtension() isDataSource_IamExtension {
if x != nil {
return x.IamExtension
@@ -1896,7 +1959,7 @@ const file_store_instance_proto_rawDesc = "" +
"\x11_connection_limitB\x0e\n" +
"\f_valid_untilB\f\n" +
"\n" +
- "_attribute\"\xc5\x1c\n" +
+ "_attribute\"\xf2\x1d\n" +
"\n" +
"DataSource\x12\x0e\n" +
"\x02id\x18\x01 \x01(\tR\x02id\x122\n" +
@@ -1941,7 +2004,8 @@ const file_store_instance_proto_rawDesc = "" +
"%authentication_private_key_passphrase\x180 \x01(\tR\"authenticationPrivateKeyPassphrase\x12f\n" +
"0obfuscated_authentication_private_key_passphrase\x181 \x01(\tR,obfuscatedAuthenticationPrivateKeyPassphrase\x12Q\n" +
"\x0fexternal_secret\x18\x15 \x01(\v2(.bytebase.store.DataSourceExternalSecretR\x0eexternalSecret\x12^\n" +
- "\x13authentication_type\x18\x16 \x01(\x0e2-.bytebase.store.DataSource.AuthenticationTypeR\x12authenticationType\x12W\n" +
+ "\x13authentication_type\x18\x16 \x01(\x0e2-.bytebase.store.DataSource.AuthenticationTypeR\x12authenticationType\x12T\n" +
+ "\x11cloud_sql_ip_type\x188 \x01(\x0e2).bytebase.store.DataSource.CloudSQLIPTypeR\x0ecloudSqlIpType\x12W\n" +
"\x10azure_credential\x18\x17 \x01(\v2*.bytebase.store.DataSource.AzureCredentialH\x00R\x0fazureCredential\x12Q\n" +
"\x0eaws_credential\x18- \x01(\v2(.bytebase.store.DataSource.AWSCredentialH\x00R\rawsCredential\x12Q\n" +
"\x0egcp_credential\x18. \x01(\v2(.bytebase.store.DataSource.GCPCredentialH\x00R\rgcpCredential\x12;\n" +
@@ -1989,7 +2053,13 @@ const file_store_instance_proto_rawDesc = "" +
"\bPASSWORD\x10\x01\x12\x18\n" +
"\x14GOOGLE_CLOUD_SQL_IAM\x10\x02\x12\x0f\n" +
"\vAWS_RDS_IAM\x10\x03\x12\r\n" +
- "\tAZURE_IAM\x10\x04\"R\n" +
+ "\tAZURE_IAM\x10\x04\"U\n" +
+ "\x0eCloudSQLIPType\x12!\n" +
+ "\x1dCLOUD_SQL_IP_TYPE_UNSPECIFIED\x10\x00\x12\n" +
+ "\n" +
+ "\x06PUBLIC\x10\x01\x12\v\n" +
+ "\aPRIVATE\x10\x02\x12\a\n" +
+ "\x03PSC\x10\x03\"R\n" +
"\tRedisType\x12\x1a\n" +
"\x16REDIS_TYPE_UNSPECIFIED\x10\x00\x12\x0e\n" +
"\n" +
@@ -2079,61 +2149,63 @@ func file_store_instance_proto_rawDescGZIP() []byte {
return file_store_instance_proto_rawDescData
}
-var file_store_instance_proto_enumTypes = make([]protoimpl.EnumInfo, 7)
+var file_store_instance_proto_enumTypes = make([]protoimpl.EnumInfo, 8)
var file_store_instance_proto_msgTypes = make([]protoimpl.MessageInfo, 13)
var file_store_instance_proto_goTypes = []any{
(DataSourceType)(0), // 0: bytebase.store.DataSourceType
(DataSource_AuthenticationType)(0), // 1: bytebase.store.DataSource.AuthenticationType
- (DataSource_RedisType)(0), // 2: bytebase.store.DataSource.RedisType
- (DataSourceExternalSecret_SecretType)(0), // 3: bytebase.store.DataSourceExternalSecret.SecretType
- (DataSourceExternalSecret_AuthType)(0), // 4: bytebase.store.DataSourceExternalSecret.AuthType
- (DataSourceExternalSecret_TokenType)(0), // 5: bytebase.store.DataSourceExternalSecret.TokenType
- (DataSourceExternalSecret_AppRoleAuthOption_SecretType)(0), // 6: bytebase.store.DataSourceExternalSecret.AppRoleAuthOption.SecretType
- (*Instance)(nil), // 7: bytebase.store.Instance
- (*InstanceRole)(nil), // 8: bytebase.store.InstanceRole
- (*DataSource)(nil), // 9: bytebase.store.DataSource
- (*SASLConfig)(nil), // 10: bytebase.store.SASLConfig
- (*KerberosConfig)(nil), // 11: bytebase.store.KerberosConfig
- (*DataSourceExternalSecret)(nil), // 12: bytebase.store.DataSourceExternalSecret
- nil, // 13: bytebase.store.Instance.LabelsEntry
- (*DataSource_AzureCredential)(nil), // 14: bytebase.store.DataSource.AzureCredential
- (*DataSource_AWSCredential)(nil), // 15: bytebase.store.DataSource.AWSCredential
- (*DataSource_GCPCredential)(nil), // 16: bytebase.store.DataSource.GCPCredential
- (*DataSource_Address)(nil), // 17: bytebase.store.DataSource.Address
- nil, // 18: bytebase.store.DataSource.ExtraConnectionParametersEntry
- (*DataSourceExternalSecret_AppRoleAuthOption)(nil), // 19: bytebase.store.DataSourceExternalSecret.AppRoleAuthOption
- (Engine)(0), // 20: bytebase.store.Engine
- (*durationpb.Duration)(nil), // 21: google.protobuf.Duration
- (*timestamppb.Timestamp)(nil), // 22: google.protobuf.Timestamp
+ (DataSource_CloudSQLIPType)(0), // 2: bytebase.store.DataSource.CloudSQLIPType
+ (DataSource_RedisType)(0), // 3: bytebase.store.DataSource.RedisType
+ (DataSourceExternalSecret_SecretType)(0), // 4: bytebase.store.DataSourceExternalSecret.SecretType
+ (DataSourceExternalSecret_AuthType)(0), // 5: bytebase.store.DataSourceExternalSecret.AuthType
+ (DataSourceExternalSecret_TokenType)(0), // 6: bytebase.store.DataSourceExternalSecret.TokenType
+ (DataSourceExternalSecret_AppRoleAuthOption_SecretType)(0), // 7: bytebase.store.DataSourceExternalSecret.AppRoleAuthOption.SecretType
+ (*Instance)(nil), // 8: bytebase.store.Instance
+ (*InstanceRole)(nil), // 9: bytebase.store.InstanceRole
+ (*DataSource)(nil), // 10: bytebase.store.DataSource
+ (*SASLConfig)(nil), // 11: bytebase.store.SASLConfig
+ (*KerberosConfig)(nil), // 12: bytebase.store.KerberosConfig
+ (*DataSourceExternalSecret)(nil), // 13: bytebase.store.DataSourceExternalSecret
+ nil, // 14: bytebase.store.Instance.LabelsEntry
+ (*DataSource_AzureCredential)(nil), // 15: bytebase.store.DataSource.AzureCredential
+ (*DataSource_AWSCredential)(nil), // 16: bytebase.store.DataSource.AWSCredential
+ (*DataSource_GCPCredential)(nil), // 17: bytebase.store.DataSource.GCPCredential
+ (*DataSource_Address)(nil), // 18: bytebase.store.DataSource.Address
+ nil, // 19: bytebase.store.DataSource.ExtraConnectionParametersEntry
+ (*DataSourceExternalSecret_AppRoleAuthOption)(nil), // 20: bytebase.store.DataSourceExternalSecret.AppRoleAuthOption
+ (Engine)(0), // 21: bytebase.store.Engine
+ (*durationpb.Duration)(nil), // 22: google.protobuf.Duration
+ (*timestamppb.Timestamp)(nil), // 23: google.protobuf.Timestamp
}
var file_store_instance_proto_depIdxs = []int32{
- 20, // 0: bytebase.store.Instance.engine:type_name -> bytebase.store.Engine
- 9, // 1: bytebase.store.Instance.data_sources:type_name -> bytebase.store.DataSource
- 21, // 2: bytebase.store.Instance.sync_interval:type_name -> google.protobuf.Duration
- 22, // 3: bytebase.store.Instance.last_sync_time:type_name -> google.protobuf.Timestamp
- 8, // 4: bytebase.store.Instance.roles:type_name -> bytebase.store.InstanceRole
- 13, // 5: bytebase.store.Instance.labels:type_name -> bytebase.store.Instance.LabelsEntry
+ 21, // 0: bytebase.store.Instance.engine:type_name -> bytebase.store.Engine
+ 10, // 1: bytebase.store.Instance.data_sources:type_name -> bytebase.store.DataSource
+ 22, // 2: bytebase.store.Instance.sync_interval:type_name -> google.protobuf.Duration
+ 23, // 3: bytebase.store.Instance.last_sync_time:type_name -> google.protobuf.Timestamp
+ 9, // 4: bytebase.store.Instance.roles:type_name -> bytebase.store.InstanceRole
+ 14, // 5: bytebase.store.Instance.labels:type_name -> bytebase.store.Instance.LabelsEntry
0, // 6: bytebase.store.DataSource.type:type_name -> bytebase.store.DataSourceType
- 12, // 7: bytebase.store.DataSource.external_secret:type_name -> bytebase.store.DataSourceExternalSecret
+ 13, // 7: bytebase.store.DataSource.external_secret:type_name -> bytebase.store.DataSourceExternalSecret
1, // 8: bytebase.store.DataSource.authentication_type:type_name -> bytebase.store.DataSource.AuthenticationType
- 14, // 9: bytebase.store.DataSource.azure_credential:type_name -> bytebase.store.DataSource.AzureCredential
- 15, // 10: bytebase.store.DataSource.aws_credential:type_name -> bytebase.store.DataSource.AWSCredential
- 16, // 11: bytebase.store.DataSource.gcp_credential:type_name -> bytebase.store.DataSource.GCPCredential
- 10, // 12: bytebase.store.DataSource.sasl_config:type_name -> bytebase.store.SASLConfig
- 17, // 13: bytebase.store.DataSource.additional_addresses:type_name -> bytebase.store.DataSource.Address
- 2, // 14: bytebase.store.DataSource.redis_type:type_name -> bytebase.store.DataSource.RedisType
- 18, // 15: bytebase.store.DataSource.extra_connection_parameters:type_name -> bytebase.store.DataSource.ExtraConnectionParametersEntry
- 11, // 16: bytebase.store.SASLConfig.krb_config:type_name -> bytebase.store.KerberosConfig
- 3, // 17: bytebase.store.DataSourceExternalSecret.secret_type:type_name -> bytebase.store.DataSourceExternalSecret.SecretType
- 4, // 18: bytebase.store.DataSourceExternalSecret.auth_type:type_name -> bytebase.store.DataSourceExternalSecret.AuthType
- 19, // 19: bytebase.store.DataSourceExternalSecret.app_role:type_name -> bytebase.store.DataSourceExternalSecret.AppRoleAuthOption
- 5, // 20: bytebase.store.DataSourceExternalSecret.token_type:type_name -> bytebase.store.DataSourceExternalSecret.TokenType
- 6, // 21: bytebase.store.DataSourceExternalSecret.AppRoleAuthOption.type:type_name -> bytebase.store.DataSourceExternalSecret.AppRoleAuthOption.SecretType
- 22, // [22:22] is the sub-list for method output_type
- 22, // [22:22] is the sub-list for method input_type
- 22, // [22:22] is the sub-list for extension type_name
- 22, // [22:22] is the sub-list for extension extendee
- 0, // [0:22] is the sub-list for field type_name
+ 2, // 9: bytebase.store.DataSource.cloud_sql_ip_type:type_name -> bytebase.store.DataSource.CloudSQLIPType
+ 15, // 10: bytebase.store.DataSource.azure_credential:type_name -> bytebase.store.DataSource.AzureCredential
+ 16, // 11: bytebase.store.DataSource.aws_credential:type_name -> bytebase.store.DataSource.AWSCredential
+ 17, // 12: bytebase.store.DataSource.gcp_credential:type_name -> bytebase.store.DataSource.GCPCredential
+ 11, // 13: bytebase.store.DataSource.sasl_config:type_name -> bytebase.store.SASLConfig
+ 18, // 14: bytebase.store.DataSource.additional_addresses:type_name -> bytebase.store.DataSource.Address
+ 3, // 15: bytebase.store.DataSource.redis_type:type_name -> bytebase.store.DataSource.RedisType
+ 19, // 16: bytebase.store.DataSource.extra_connection_parameters:type_name -> bytebase.store.DataSource.ExtraConnectionParametersEntry
+ 12, // 17: bytebase.store.SASLConfig.krb_config:type_name -> bytebase.store.KerberosConfig
+ 4, // 18: bytebase.store.DataSourceExternalSecret.secret_type:type_name -> bytebase.store.DataSourceExternalSecret.SecretType
+ 5, // 19: bytebase.store.DataSourceExternalSecret.auth_type:type_name -> bytebase.store.DataSourceExternalSecret.AuthType
+ 20, // 20: bytebase.store.DataSourceExternalSecret.app_role:type_name -> bytebase.store.DataSourceExternalSecret.AppRoleAuthOption
+ 6, // 21: bytebase.store.DataSourceExternalSecret.token_type:type_name -> bytebase.store.DataSourceExternalSecret.TokenType
+ 7, // 22: bytebase.store.DataSourceExternalSecret.AppRoleAuthOption.type:type_name -> bytebase.store.DataSourceExternalSecret.AppRoleAuthOption.SecretType
+ 23, // [23:23] is the sub-list for method output_type
+ 23, // [23:23] is the sub-list for method input_type
+ 23, // [23:23] is the sub-list for extension type_name
+ 23, // [23:23] is the sub-list for extension extendee
+ 0, // [0:23] is the sub-list for field type_name
}
func init() { file_store_instance_proto_init() }
@@ -2160,7 +2232,7 @@ func file_store_instance_proto_init() {
File: protoimpl.DescBuilder{
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: unsafe.Slice(unsafe.StringData(file_store_instance_proto_rawDesc), len(file_store_instance_proto_rawDesc)),
- NumEnums: 7,
+ NumEnums: 8,
NumMessages: 13,
NumExtensions: 0,
NumServices: 0,
diff --git a/backend/generated-go/store/instance_equal.pb.go b/backend/generated-go/store/instance_equal.pb.go
index 8700905ccc..15e6194d87 100644
--- a/backend/generated-go/store/instance_equal.pb.go
+++ b/backend/generated-go/store/instance_equal.pb.go
@@ -310,6 +310,9 @@ func (x *DataSource) Equal(y *DataSource) bool {
if x.AuthenticationType != y.AuthenticationType {
return false
}
+ if x.CloudSqlIpType != y.CloudSqlIpType {
+ return false
+ }
if !x.GetAzureCredential().Equal(y.GetAzureCredential()) {
return false
}
diff --git a/backend/generated-go/v1/instance_service.pb.go b/backend/generated-go/v1/instance_service.pb.go
index ae0d3d5104..b0cbaabede 100644
--- a/backend/generated-go/v1/instance_service.pb.go
+++ b/backend/generated-go/v1/instance_service.pb.go
@@ -356,6 +356,59 @@ func (DataSource_AuthenticationType) EnumDescriptor() ([]byte, []int) {
return file_v1_instance_service_proto_rawDescGZIP(), []int{20, 0}
}
+// CloudSQLIPType selects which Cloud SQL IP to dial for Google Cloud SQL IAM connections.
+type DataSource_CloudSQLIPType int32
+
+const (
+ DataSource_CLOUD_SQL_IP_TYPE_UNSPECIFIED DataSource_CloudSQLIPType = 0
+ DataSource_PUBLIC DataSource_CloudSQLIPType = 1
+ DataSource_PRIVATE DataSource_CloudSQLIPType = 2
+ DataSource_PSC DataSource_CloudSQLIPType = 3
+)
+
+// Enum value maps for DataSource_CloudSQLIPType.
+var (
+ DataSource_CloudSQLIPType_name = map[int32]string{
+ 0: "CLOUD_SQL_IP_TYPE_UNSPECIFIED",
+ 1: "PUBLIC",
+ 2: "PRIVATE",
+ 3: "PSC",
+ }
+ DataSource_CloudSQLIPType_value = map[string]int32{
+ "CLOUD_SQL_IP_TYPE_UNSPECIFIED": 0,
+ "PUBLIC": 1,
+ "PRIVATE": 2,
+ "PSC": 3,
+ }
+)
+
+func (x DataSource_CloudSQLIPType) Enum() *DataSource_CloudSQLIPType {
+ p := new(DataSource_CloudSQLIPType)
+ *p = x
+ return p
+}
+
+func (x DataSource_CloudSQLIPType) String() string {
+ return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (DataSource_CloudSQLIPType) Descriptor() protoreflect.EnumDescriptor {
+ return file_v1_instance_service_proto_enumTypes[6].Descriptor()
+}
+
+func (DataSource_CloudSQLIPType) Type() protoreflect.EnumType {
+ return &file_v1_instance_service_proto_enumTypes[6]
+}
+
+func (x DataSource_CloudSQLIPType) Number() protoreflect.EnumNumber {
+ return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Use DataSource_CloudSQLIPType.Descriptor instead.
+func (DataSource_CloudSQLIPType) EnumDescriptor() ([]byte, []int) {
+ return file_v1_instance_service_proto_rawDescGZIP(), []int{20, 1}
+}
+
type DataSource_RedisType int32
const (
@@ -392,11 +445,11 @@ func (x DataSource_RedisType) String() string {
}
func (DataSource_RedisType) Descriptor() protoreflect.EnumDescriptor {
- return file_v1_instance_service_proto_enumTypes[6].Descriptor()
+ return file_v1_instance_service_proto_enumTypes[7].Descriptor()
}
func (DataSource_RedisType) Type() protoreflect.EnumType {
- return &file_v1_instance_service_proto_enumTypes[6]
+ return &file_v1_instance_service_proto_enumTypes[7]
}
func (x DataSource_RedisType) Number() protoreflect.EnumNumber {
@@ -405,7 +458,7 @@ func (x DataSource_RedisType) Number() protoreflect.EnumNumber {
// Deprecated: Use DataSource_RedisType.Descriptor instead.
func (DataSource_RedisType) EnumDescriptor() ([]byte, []int) {
- return file_v1_instance_service_proto_rawDescGZIP(), []int{20, 1}
+ return file_v1_instance_service_proto_rawDescGZIP(), []int{20, 2}
}
type GetInstanceRequest struct {
@@ -1893,6 +1946,9 @@ type DataSource struct {
AuthenticationPrivateKeyPassphrase string `protobuf:"bytes,40,opt,name=authentication_private_key_passphrase,json=authenticationPrivateKeyPassphrase,proto3" json:"authentication_private_key_passphrase,omitempty"`
ExternalSecret *DataSourceExternalSecret `protobuf:"bytes,21,opt,name=external_secret,json=externalSecret,proto3" json:"external_secret,omitempty"`
AuthenticationType DataSource_AuthenticationType `protobuf:"varint,22,opt,name=authentication_type,json=authenticationType,proto3,enum=bytebase.v1.DataSource_AuthenticationType" json:"authentication_type,omitempty"`
+ // cloud_sql_ip_type selects the Cloud SQL IP type for Google Cloud SQL IAM connections.
+ // CLOUD_SQL_IP_TYPE_UNSPECIFIED is treated as PUBLIC for backward compatibility.
+ CloudSqlIpType DataSource_CloudSQLIPType `protobuf:"varint,56,opt,name=cloud_sql_ip_type,json=cloudSqlIpType,proto3,enum=bytebase.v1.DataSource_CloudSQLIPType" json:"cloud_sql_ip_type,omitempty"`
// Types that are valid to be assigned to IamExtension:
//
// *DataSource_AzureCredential_
@@ -2198,6 +2254,13 @@ func (x *DataSource) GetAuthenticationType() DataSource_AuthenticationType {
return DataSource_AUTHENTICATION_UNSPECIFIED
}
+func (x *DataSource) GetCloudSqlIpType() DataSource_CloudSQLIPType {
+ if x != nil {
+ return x.CloudSqlIpType
+ }
+ return DataSource_CLOUD_SQL_IP_TYPE_UNSPECIFIED
+}
+
func (x *DataSource) GetIamExtension() isDataSource_IamExtension {
if x != nil {
return x.IamExtension
@@ -3052,7 +3115,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\"\x93\x17\n" +
+ "\vauth_option\"\xbd\x18\n" +
"\n" +
"DataSource\x12\x0e\n" +
"\x02id\x18\x01 \x01(\tR\x02id\x12/\n" +
@@ -3094,7 +3157,8 @@ const file_v1_instance_service_proto_rawDesc = "" +
"\x1aauthentication_private_key\x18\x14 \x01(\tB\x03\xe0A\x04R\x18authenticationPrivateKey\x12V\n" +
"%authentication_private_key_passphrase\x18( \x01(\tB\x03\xe0A\x04R\"authenticationPrivateKeyPassphrase\x12N\n" +
"\x0fexternal_secret\x18\x15 \x01(\v2%.bytebase.v1.DataSourceExternalSecretR\x0eexternalSecret\x12[\n" +
- "\x13authentication_type\x18\x16 \x01(\x0e2*.bytebase.v1.DataSource.AuthenticationTypeR\x12authenticationType\x12T\n" +
+ "\x13authentication_type\x18\x16 \x01(\x0e2*.bytebase.v1.DataSource.AuthenticationTypeR\x12authenticationType\x12Q\n" +
+ "\x11cloud_sql_ip_type\x188 \x01(\x0e2&.bytebase.v1.DataSource.CloudSQLIPTypeR\x0ecloudSqlIpType\x12T\n" +
"\x10azure_credential\x18\x17 \x01(\v2'.bytebase.v1.DataSource.AzureCredentialH\x00R\x0fazureCredential\x12N\n" +
"\x0eaws_credential\x18% \x01(\v2%.bytebase.v1.DataSource.AWSCredentialH\x00R\rawsCredential\x12N\n" +
"\x0egcp_credential\x18& \x01(\v2%.bytebase.v1.DataSource.GCPCredentialH\x00R\rgcpCredential\x128\n" +
@@ -3136,7 +3200,13 @@ const file_v1_instance_service_proto_rawDesc = "" +
"\bPASSWORD\x10\x01\x12\x18\n" +
"\x14GOOGLE_CLOUD_SQL_IAM\x10\x02\x12\x0f\n" +
"\vAWS_RDS_IAM\x10\x03\x12\r\n" +
- "\tAZURE_IAM\x10\x04\"R\n" +
+ "\tAZURE_IAM\x10\x04\"U\n" +
+ "\x0eCloudSQLIPType\x12!\n" +
+ "\x1dCLOUD_SQL_IP_TYPE_UNSPECIFIED\x10\x00\x12\n" +
+ "\n" +
+ "\x06PUBLIC\x10\x01\x12\v\n" +
+ "\aPRIVATE\x10\x02\x12\a\n" +
+ "\x03PSC\x10\x03\"R\n" +
"\tRedisType\x12\x1a\n" +
"\x16REDIS_TYPE_UNSPECIFIED\x10\x00\x12\x0e\n" +
"\n" +
@@ -3200,7 +3270,7 @@ func file_v1_instance_service_proto_rawDescGZIP() []byte {
return file_v1_instance_service_proto_rawDescData
}
-var file_v1_instance_service_proto_enumTypes = make([]protoimpl.EnumInfo, 7)
+var file_v1_instance_service_proto_enumTypes = make([]protoimpl.EnumInfo, 8)
var file_v1_instance_service_proto_msgTypes = make([]protoimpl.MessageInfo, 31)
var file_v1_instance_service_proto_goTypes = []any{
(DataSourceType)(0), // 0: bytebase.v1.DataSourceType
@@ -3209,115 +3279,117 @@ var file_v1_instance_service_proto_goTypes = []any{
(DataSourceExternalSecret_TokenType)(0), // 3: bytebase.v1.DataSourceExternalSecret.TokenType
(DataSourceExternalSecret_AppRoleAuthOption_SecretType)(0), // 4: bytebase.v1.DataSourceExternalSecret.AppRoleAuthOption.SecretType
(DataSource_AuthenticationType)(0), // 5: bytebase.v1.DataSource.AuthenticationType
- (DataSource_RedisType)(0), // 6: bytebase.v1.DataSource.RedisType
- (*GetInstanceRequest)(nil), // 7: bytebase.v1.GetInstanceRequest
- (*ListInstancesRequest)(nil), // 8: bytebase.v1.ListInstancesRequest
- (*ListInstancesResponse)(nil), // 9: bytebase.v1.ListInstancesResponse
- (*CreateInstanceRequest)(nil), // 10: bytebase.v1.CreateInstanceRequest
- (*UpdateInstanceRequest)(nil), // 11: bytebase.v1.UpdateInstanceRequest
- (*DeleteInstanceRequest)(nil), // 12: bytebase.v1.DeleteInstanceRequest
- (*UndeleteInstanceRequest)(nil), // 13: bytebase.v1.UndeleteInstanceRequest
- (*SyncInstanceRequest)(nil), // 14: bytebase.v1.SyncInstanceRequest
- (*ListInstanceDatabaseRequest)(nil), // 15: bytebase.v1.ListInstanceDatabaseRequest
- (*ListInstanceDatabaseResponse)(nil), // 16: bytebase.v1.ListInstanceDatabaseResponse
- (*SyncInstanceResponse)(nil), // 17: bytebase.v1.SyncInstanceResponse
- (*BatchSyncInstancesRequest)(nil), // 18: bytebase.v1.BatchSyncInstancesRequest
- (*BatchSyncInstancesResponse)(nil), // 19: bytebase.v1.BatchSyncInstancesResponse
- (*BatchUpdateInstancesRequest)(nil), // 20: bytebase.v1.BatchUpdateInstancesRequest
- (*BatchUpdateInstancesResponse)(nil), // 21: bytebase.v1.BatchUpdateInstancesResponse
- (*AddDataSourceRequest)(nil), // 22: bytebase.v1.AddDataSourceRequest
- (*RemoveDataSourceRequest)(nil), // 23: bytebase.v1.RemoveDataSourceRequest
- (*UpdateDataSourceRequest)(nil), // 24: bytebase.v1.UpdateDataSourceRequest
- (*Instance)(nil), // 25: bytebase.v1.Instance
- (*DataSourceExternalSecret)(nil), // 26: bytebase.v1.DataSourceExternalSecret
- (*DataSource)(nil), // 27: bytebase.v1.DataSource
- (*InstanceResource)(nil), // 28: bytebase.v1.InstanceResource
- (*SASLConfig)(nil), // 29: bytebase.v1.SASLConfig
- (*KerberosConfig)(nil), // 30: bytebase.v1.KerberosConfig
- nil, // 31: bytebase.v1.Instance.LabelsEntry
- (*DataSourceExternalSecret_AppRoleAuthOption)(nil), // 32: bytebase.v1.DataSourceExternalSecret.AppRoleAuthOption
- (*DataSource_AzureCredential)(nil), // 33: bytebase.v1.DataSource.AzureCredential
- (*DataSource_AWSCredential)(nil), // 34: bytebase.v1.DataSource.AWSCredential
- (*DataSource_GCPCredential)(nil), // 35: bytebase.v1.DataSource.GCPCredential
- (*DataSource_Address)(nil), // 36: bytebase.v1.DataSource.Address
- nil, // 37: bytebase.v1.DataSource.ExtraConnectionParametersEntry
- (*fieldmaskpb.FieldMask)(nil), // 38: google.protobuf.FieldMask
- (State)(0), // 39: bytebase.v1.State
- (Engine)(0), // 40: bytebase.v1.Engine
- (*InstanceRole)(nil), // 41: bytebase.v1.InstanceRole
- (*durationpb.Duration)(nil), // 42: google.protobuf.Duration
- (*timestamppb.Timestamp)(nil), // 43: google.protobuf.Timestamp
- (*emptypb.Empty)(nil), // 44: google.protobuf.Empty
+ (DataSource_CloudSQLIPType)(0), // 6: bytebase.v1.DataSource.CloudSQLIPType
+ (DataSource_RedisType)(0), // 7: bytebase.v1.DataSource.RedisType
+ (*GetInstanceRequest)(nil), // 8: bytebase.v1.GetInstanceRequest
+ (*ListInstancesRequest)(nil), // 9: bytebase.v1.ListInstancesRequest
+ (*ListInstancesResponse)(nil), // 10: bytebase.v1.ListInstancesResponse
+ (*CreateInstanceRequest)(nil), // 11: bytebase.v1.CreateInstanceRequest
+ (*UpdateInstanceRequest)(nil), // 12: bytebase.v1.UpdateInstanceRequest
+ (*DeleteInstanceRequest)(nil), // 13: bytebase.v1.DeleteInstanceRequest
+ (*UndeleteInstanceRequest)(nil), // 14: bytebase.v1.UndeleteInstanceRequest
+ (*SyncInstanceRequest)(nil), // 15: bytebase.v1.SyncInstanceRequest
+ (*ListInstanceDatabaseRequest)(nil), // 16: bytebase.v1.ListInstanceDatabaseRequest
+ (*ListInstanceDatabaseResponse)(nil), // 17: bytebase.v1.ListInstanceDatabaseResponse
+ (*SyncInstanceResponse)(nil), // 18: bytebase.v1.SyncInstanceResponse
+ (*BatchSyncInstancesRequest)(nil), // 19: bytebase.v1.BatchSyncInstancesRequest
+ (*BatchSyncInstancesResponse)(nil), // 20: bytebase.v1.BatchSyncInstancesResponse
+ (*BatchUpdateInstancesRequest)(nil), // 21: bytebase.v1.BatchUpdateInstancesRequest
+ (*BatchUpdateInstancesResponse)(nil), // 22: bytebase.v1.BatchUpdateInstancesResponse
+ (*AddDataSourceRequest)(nil), // 23: bytebase.v1.AddDataSourceRequest
+ (*RemoveDataSourceRequest)(nil), // 24: bytebase.v1.RemoveDataSourceRequest
+ (*UpdateDataSourceRequest)(nil), // 25: bytebase.v1.UpdateDataSourceRequest
+ (*Instance)(nil), // 26: bytebase.v1.Instance
+ (*DataSourceExternalSecret)(nil), // 27: bytebase.v1.DataSourceExternalSecret
+ (*DataSource)(nil), // 28: bytebase.v1.DataSource
+ (*InstanceResource)(nil), // 29: bytebase.v1.InstanceResource
+ (*SASLConfig)(nil), // 30: bytebase.v1.SASLConfig
+ (*KerberosConfig)(nil), // 31: bytebase.v1.KerberosConfig
+ nil, // 32: bytebase.v1.Instance.LabelsEntry
+ (*DataSourceExternalSecret_AppRoleAuthOption)(nil), // 33: bytebase.v1.DataSourceExternalSecret.AppRoleAuthOption
+ (*DataSource_AzureCredential)(nil), // 34: bytebase.v1.DataSource.AzureCredential
+ (*DataSource_AWSCredential)(nil), // 35: bytebase.v1.DataSource.AWSCredential
+ (*DataSource_GCPCredential)(nil), // 36: bytebase.v1.DataSource.GCPCredential
+ (*DataSource_Address)(nil), // 37: bytebase.v1.DataSource.Address
+ nil, // 38: bytebase.v1.DataSource.ExtraConnectionParametersEntry
+ (*fieldmaskpb.FieldMask)(nil), // 39: google.protobuf.FieldMask
+ (State)(0), // 40: bytebase.v1.State
+ (Engine)(0), // 41: bytebase.v1.Engine
+ (*InstanceRole)(nil), // 42: bytebase.v1.InstanceRole
+ (*durationpb.Duration)(nil), // 43: google.protobuf.Duration
+ (*timestamppb.Timestamp)(nil), // 44: google.protobuf.Timestamp
+ (*emptypb.Empty)(nil), // 45: google.protobuf.Empty
}
var file_v1_instance_service_proto_depIdxs = []int32{
- 25, // 0: bytebase.v1.ListInstancesResponse.instances:type_name -> bytebase.v1.Instance
- 25, // 1: bytebase.v1.CreateInstanceRequest.instance:type_name -> bytebase.v1.Instance
- 25, // 2: bytebase.v1.UpdateInstanceRequest.instance:type_name -> bytebase.v1.Instance
- 38, // 3: bytebase.v1.UpdateInstanceRequest.update_mask:type_name -> google.protobuf.FieldMask
- 25, // 4: bytebase.v1.ListInstanceDatabaseRequest.instance:type_name -> bytebase.v1.Instance
- 14, // 5: bytebase.v1.BatchSyncInstancesRequest.requests:type_name -> bytebase.v1.SyncInstanceRequest
- 11, // 6: bytebase.v1.BatchUpdateInstancesRequest.requests:type_name -> bytebase.v1.UpdateInstanceRequest
- 25, // 7: bytebase.v1.BatchUpdateInstancesResponse.instances:type_name -> bytebase.v1.Instance
- 27, // 8: bytebase.v1.AddDataSourceRequest.data_source:type_name -> bytebase.v1.DataSource
- 27, // 9: bytebase.v1.RemoveDataSourceRequest.data_source:type_name -> bytebase.v1.DataSource
- 27, // 10: bytebase.v1.UpdateDataSourceRequest.data_source:type_name -> bytebase.v1.DataSource
- 38, // 11: bytebase.v1.UpdateDataSourceRequest.update_mask:type_name -> google.protobuf.FieldMask
- 39, // 12: bytebase.v1.Instance.state:type_name -> bytebase.v1.State
- 40, // 13: bytebase.v1.Instance.engine:type_name -> bytebase.v1.Engine
- 27, // 14: bytebase.v1.Instance.data_sources:type_name -> bytebase.v1.DataSource
- 41, // 15: bytebase.v1.Instance.roles:type_name -> bytebase.v1.InstanceRole
- 42, // 16: bytebase.v1.Instance.sync_interval:type_name -> google.protobuf.Duration
- 43, // 17: bytebase.v1.Instance.last_sync_time:type_name -> google.protobuf.Timestamp
- 31, // 18: bytebase.v1.Instance.labels:type_name -> bytebase.v1.Instance.LabelsEntry
+ 26, // 0: bytebase.v1.ListInstancesResponse.instances:type_name -> bytebase.v1.Instance
+ 26, // 1: bytebase.v1.CreateInstanceRequest.instance:type_name -> bytebase.v1.Instance
+ 26, // 2: bytebase.v1.UpdateInstanceRequest.instance:type_name -> bytebase.v1.Instance
+ 39, // 3: bytebase.v1.UpdateInstanceRequest.update_mask:type_name -> google.protobuf.FieldMask
+ 26, // 4: bytebase.v1.ListInstanceDatabaseRequest.instance:type_name -> bytebase.v1.Instance
+ 15, // 5: bytebase.v1.BatchSyncInstancesRequest.requests:type_name -> bytebase.v1.SyncInstanceRequest
+ 12, // 6: bytebase.v1.BatchUpdateInstancesRequest.requests:type_name -> bytebase.v1.UpdateInstanceRequest
+ 26, // 7: bytebase.v1.BatchUpdateInstancesResponse.instances:type_name -> bytebase.v1.Instance
+ 28, // 8: bytebase.v1.AddDataSourceRequest.data_source:type_name -> bytebase.v1.DataSource
+ 28, // 9: bytebase.v1.RemoveDataSourceRequest.data_source:type_name -> bytebase.v1.DataSource
+ 28, // 10: bytebase.v1.UpdateDataSourceRequest.data_source:type_name -> bytebase.v1.DataSource
+ 39, // 11: bytebase.v1.UpdateDataSourceRequest.update_mask:type_name -> google.protobuf.FieldMask
+ 40, // 12: bytebase.v1.Instance.state:type_name -> bytebase.v1.State
+ 41, // 13: bytebase.v1.Instance.engine:type_name -> bytebase.v1.Engine
+ 28, // 14: bytebase.v1.Instance.data_sources:type_name -> bytebase.v1.DataSource
+ 42, // 15: bytebase.v1.Instance.roles:type_name -> bytebase.v1.InstanceRole
+ 43, // 16: bytebase.v1.Instance.sync_interval:type_name -> google.protobuf.Duration
+ 44, // 17: bytebase.v1.Instance.last_sync_time:type_name -> google.protobuf.Timestamp
+ 32, // 18: bytebase.v1.Instance.labels:type_name -> bytebase.v1.Instance.LabelsEntry
1, // 19: bytebase.v1.DataSourceExternalSecret.secret_type:type_name -> bytebase.v1.DataSourceExternalSecret.SecretType
2, // 20: bytebase.v1.DataSourceExternalSecret.auth_type:type_name -> bytebase.v1.DataSourceExternalSecret.AuthType
- 32, // 21: bytebase.v1.DataSourceExternalSecret.app_role:type_name -> bytebase.v1.DataSourceExternalSecret.AppRoleAuthOption
+ 33, // 21: bytebase.v1.DataSourceExternalSecret.app_role:type_name -> bytebase.v1.DataSourceExternalSecret.AppRoleAuthOption
3, // 22: bytebase.v1.DataSourceExternalSecret.token_type:type_name -> bytebase.v1.DataSourceExternalSecret.TokenType
0, // 23: bytebase.v1.DataSource.type:type_name -> bytebase.v1.DataSourceType
- 26, // 24: bytebase.v1.DataSource.external_secret:type_name -> bytebase.v1.DataSourceExternalSecret
+ 27, // 24: bytebase.v1.DataSource.external_secret:type_name -> bytebase.v1.DataSourceExternalSecret
5, // 25: bytebase.v1.DataSource.authentication_type:type_name -> bytebase.v1.DataSource.AuthenticationType
- 33, // 26: bytebase.v1.DataSource.azure_credential:type_name -> bytebase.v1.DataSource.AzureCredential
- 34, // 27: bytebase.v1.DataSource.aws_credential:type_name -> bytebase.v1.DataSource.AWSCredential
- 35, // 28: bytebase.v1.DataSource.gcp_credential:type_name -> bytebase.v1.DataSource.GCPCredential
- 29, // 29: bytebase.v1.DataSource.sasl_config:type_name -> bytebase.v1.SASLConfig
- 36, // 30: bytebase.v1.DataSource.additional_addresses:type_name -> bytebase.v1.DataSource.Address
- 6, // 31: bytebase.v1.DataSource.redis_type:type_name -> bytebase.v1.DataSource.RedisType
- 37, // 32: bytebase.v1.DataSource.extra_connection_parameters:type_name -> bytebase.v1.DataSource.ExtraConnectionParametersEntry
- 40, // 33: bytebase.v1.InstanceResource.engine:type_name -> bytebase.v1.Engine
- 27, // 34: bytebase.v1.InstanceResource.data_sources:type_name -> bytebase.v1.DataSource
- 30, // 35: bytebase.v1.SASLConfig.krb_config:type_name -> bytebase.v1.KerberosConfig
- 4, // 36: bytebase.v1.DataSourceExternalSecret.AppRoleAuthOption.type:type_name -> bytebase.v1.DataSourceExternalSecret.AppRoleAuthOption.SecretType
- 7, // 37: bytebase.v1.InstanceService.GetInstance:input_type -> bytebase.v1.GetInstanceRequest
- 8, // 38: bytebase.v1.InstanceService.ListInstances:input_type -> bytebase.v1.ListInstancesRequest
- 10, // 39: bytebase.v1.InstanceService.CreateInstance:input_type -> bytebase.v1.CreateInstanceRequest
- 11, // 40: bytebase.v1.InstanceService.UpdateInstance:input_type -> bytebase.v1.UpdateInstanceRequest
- 12, // 41: bytebase.v1.InstanceService.DeleteInstance:input_type -> bytebase.v1.DeleteInstanceRequest
- 13, // 42: bytebase.v1.InstanceService.UndeleteInstance:input_type -> bytebase.v1.UndeleteInstanceRequest
- 14, // 43: bytebase.v1.InstanceService.SyncInstance:input_type -> bytebase.v1.SyncInstanceRequest
- 15, // 44: bytebase.v1.InstanceService.ListInstanceDatabase:input_type -> bytebase.v1.ListInstanceDatabaseRequest
- 18, // 45: bytebase.v1.InstanceService.BatchSyncInstances:input_type -> bytebase.v1.BatchSyncInstancesRequest
- 20, // 46: bytebase.v1.InstanceService.BatchUpdateInstances:input_type -> bytebase.v1.BatchUpdateInstancesRequest
- 22, // 47: bytebase.v1.InstanceService.AddDataSource:input_type -> bytebase.v1.AddDataSourceRequest
- 23, // 48: bytebase.v1.InstanceService.RemoveDataSource:input_type -> bytebase.v1.RemoveDataSourceRequest
- 24, // 49: bytebase.v1.InstanceService.UpdateDataSource:input_type -> bytebase.v1.UpdateDataSourceRequest
- 25, // 50: bytebase.v1.InstanceService.GetInstance:output_type -> bytebase.v1.Instance
- 9, // 51: bytebase.v1.InstanceService.ListInstances:output_type -> bytebase.v1.ListInstancesResponse
- 25, // 52: bytebase.v1.InstanceService.CreateInstance:output_type -> bytebase.v1.Instance
- 25, // 53: bytebase.v1.InstanceService.UpdateInstance:output_type -> bytebase.v1.Instance
- 44, // 54: bytebase.v1.InstanceService.DeleteInstance:output_type -> google.protobuf.Empty
- 25, // 55: bytebase.v1.InstanceService.UndeleteInstance:output_type -> bytebase.v1.Instance
- 17, // 56: bytebase.v1.InstanceService.SyncInstance:output_type -> bytebase.v1.SyncInstanceResponse
- 16, // 57: bytebase.v1.InstanceService.ListInstanceDatabase:output_type -> bytebase.v1.ListInstanceDatabaseResponse
- 19, // 58: bytebase.v1.InstanceService.BatchSyncInstances:output_type -> bytebase.v1.BatchSyncInstancesResponse
- 21, // 59: bytebase.v1.InstanceService.BatchUpdateInstances:output_type -> bytebase.v1.BatchUpdateInstancesResponse
- 25, // 60: bytebase.v1.InstanceService.AddDataSource:output_type -> bytebase.v1.Instance
- 25, // 61: bytebase.v1.InstanceService.RemoveDataSource:output_type -> bytebase.v1.Instance
- 25, // 62: bytebase.v1.InstanceService.UpdateDataSource:output_type -> bytebase.v1.Instance
- 50, // [50:63] is the sub-list for method output_type
- 37, // [37:50] is the sub-list for method input_type
- 37, // [37:37] is the sub-list for extension type_name
- 37, // [37:37] is the sub-list for extension extendee
- 0, // [0:37] is the sub-list for field type_name
+ 6, // 26: bytebase.v1.DataSource.cloud_sql_ip_type:type_name -> bytebase.v1.DataSource.CloudSQLIPType
+ 34, // 27: bytebase.v1.DataSource.azure_credential:type_name -> bytebase.v1.DataSource.AzureCredential
+ 35, // 28: bytebase.v1.DataSource.aws_credential:type_name -> bytebase.v1.DataSource.AWSCredential
+ 36, // 29: bytebase.v1.DataSource.gcp_credential:type_name -> bytebase.v1.DataSource.GCPCredential
+ 30, // 30: bytebase.v1.DataSource.sasl_config:type_name -> bytebase.v1.SASLConfig
+ 37, // 31: bytebase.v1.DataSource.additional_addresses:type_name -> bytebase.v1.DataSource.Address
+ 7, // 32: bytebase.v1.DataSource.redis_type:type_name -> bytebase.v1.DataSource.RedisType
+ 38, // 33: bytebase.v1.DataSource.extra_connection_parameters:type_name -> bytebase.v1.DataSource.ExtraConnectionParametersEntry
+ 41, // 34: bytebase.v1.InstanceResource.engine:type_name -> bytebase.v1.Engine
+ 28, // 35: bytebase.v1.InstanceResource.data_sources:type_name -> bytebase.v1.DataSource
+ 31, // 36: bytebase.v1.SASLConfig.krb_config:type_name -> bytebase.v1.KerberosConfig
+ 4, // 37: bytebase.v1.DataSourceExternalSecret.AppRoleAuthOption.type:type_name -> bytebase.v1.DataSourceExternalSecret.AppRoleAuthOption.SecretType
+ 8, // 38: bytebase.v1.InstanceService.GetInstance:input_type -> bytebase.v1.GetInstanceRequest
+ 9, // 39: bytebase.v1.InstanceService.ListInstances:input_type -> bytebase.v1.ListInstancesRequest
+ 11, // 40: bytebase.v1.InstanceService.CreateInstance:input_type -> bytebase.v1.CreateInstanceRequest
+ 12, // 41: bytebase.v1.InstanceService.UpdateInstance:input_type -> bytebase.v1.UpdateInstanceRequest
+ 13, // 42: bytebase.v1.InstanceService.DeleteInstance:input_type -> bytebase.v1.DeleteInstanceRequest
+ 14, // 43: bytebase.v1.InstanceService.UndeleteInstance:input_type -> bytebase.v1.UndeleteInstanceRequest
+ 15, // 44: bytebase.v1.InstanceService.SyncInstance:input_type -> bytebase.v1.SyncInstanceRequest
+ 16, // 45: bytebase.v1.InstanceService.ListInstanceDatabase:input_type -> bytebase.v1.ListInstanceDatabaseRequest
+ 19, // 46: bytebase.v1.InstanceService.BatchSyncInstances:input_type -> bytebase.v1.BatchSyncInstancesRequest
+ 21, // 47: bytebase.v1.InstanceService.BatchUpdateInstances:input_type -> bytebase.v1.BatchUpdateInstancesRequest
+ 23, // 48: bytebase.v1.InstanceService.AddDataSource:input_type -> bytebase.v1.AddDataSourceRequest
+ 24, // 49: bytebase.v1.InstanceService.RemoveDataSource:input_type -> bytebase.v1.RemoveDataSourceRequest
+ 25, // 50: bytebase.v1.InstanceService.UpdateDataSource:input_type -> bytebase.v1.UpdateDataSourceRequest
+ 26, // 51: bytebase.v1.InstanceService.GetInstance:output_type -> bytebase.v1.Instance
+ 10, // 52: bytebase.v1.InstanceService.ListInstances:output_type -> bytebase.v1.ListInstancesResponse
+ 26, // 53: bytebase.v1.InstanceService.CreateInstance:output_type -> bytebase.v1.Instance
+ 26, // 54: bytebase.v1.InstanceService.UpdateInstance:output_type -> bytebase.v1.Instance
+ 45, // 55: bytebase.v1.InstanceService.DeleteInstance:output_type -> google.protobuf.Empty
+ 26, // 56: bytebase.v1.InstanceService.UndeleteInstance:output_type -> bytebase.v1.Instance
+ 18, // 57: bytebase.v1.InstanceService.SyncInstance:output_type -> bytebase.v1.SyncInstanceResponse
+ 17, // 58: bytebase.v1.InstanceService.ListInstanceDatabase:output_type -> bytebase.v1.ListInstanceDatabaseResponse
+ 20, // 59: bytebase.v1.InstanceService.BatchSyncInstances:output_type -> bytebase.v1.BatchSyncInstancesResponse
+ 22, // 60: bytebase.v1.InstanceService.BatchUpdateInstances:output_type -> bytebase.v1.BatchUpdateInstancesResponse
+ 26, // 61: bytebase.v1.InstanceService.AddDataSource:output_type -> bytebase.v1.Instance
+ 26, // 62: bytebase.v1.InstanceService.RemoveDataSource:output_type -> bytebase.v1.Instance
+ 26, // 63: bytebase.v1.InstanceService.UpdateDataSource:output_type -> bytebase.v1.Instance
+ 51, // [51:64] is the sub-list for method output_type
+ 38, // [38:51] is the sub-list for method input_type
+ 38, // [38:38] is the sub-list for extension type_name
+ 38, // [38:38] is the sub-list for extension extendee
+ 0, // [0:38] is the sub-list for field type_name
}
func init() { file_v1_instance_service_proto_init() }
@@ -3348,7 +3420,7 @@ func file_v1_instance_service_proto_init() {
File: protoimpl.DescBuilder{
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: unsafe.Slice(unsafe.StringData(file_v1_instance_service_proto_rawDesc), len(file_v1_instance_service_proto_rawDesc)),
- NumEnums: 7,
+ NumEnums: 8,
NumMessages: 31,
NumExtensions: 0,
NumServices: 1,
diff --git a/backend/generated-go/v1/instance_service_equal.pb.go b/backend/generated-go/v1/instance_service_equal.pb.go
index 1537bbc6cb..fdaf933779 100644
--- a/backend/generated-go/v1/instance_service_equal.pb.go
+++ b/backend/generated-go/v1/instance_service_equal.pb.go
@@ -669,6 +669,9 @@ func (x *DataSource) Equal(y *DataSource) bool {
if x.AuthenticationType != y.AuthenticationType {
return false
}
+ if x.CloudSqlIpType != y.CloudSqlIpType {
+ return false
+ }
if !x.GetAzureCredential().Equal(y.GetAzureCredential()) {
return false
}
diff --git a/backend/plugin/db/util/connection.go b/backend/plugin/db/util/connection.go
index 8c8092aec6..e07560b15b 100644
--- a/backend/plugin/db/util/connection.go
+++ b/backend/plugin/db/util/connection.go
@@ -14,6 +14,7 @@ import (
"github.com/pkg/errors"
"google.golang.org/api/option"
+ storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/plugin/db"
)
@@ -39,14 +40,28 @@ func GetAWSConnectionConfig(ctx context.Context, connCfg db.ConnectionConfig) (a
}
func GetGCPConnectionConfig(ctx context.Context, connCfg db.ConnectionConfig) (*cloudsqlconn.Dialer, error) {
+ // WithIAMAuthN enables IAM database authentication.
+ opts := []cloudsqlconn.Option{cloudsqlconn.WithIAMAuthN()}
+ // WithCredentialsJSON provides Cloud SQL Admin API access when a service account key is set.
if gcpCredential := connCfg.DataSource.GetGcpCredential(); gcpCredential != nil && len(gcpCredential.Content) > 0 {
- // Need BOTH: WithCredentialsJSON for API access AND WithIAMAuthN for IAM database authentication
- return cloudsqlconn.NewDialer(ctx,
- cloudsqlconn.WithCredentialsJSON([]byte(gcpCredential.Content)),
- cloudsqlconn.WithIAMAuthN(),
- )
+ opts = append(opts, cloudsqlconn.WithCredentialsJSON([]byte(gcpCredential.Content)))
+ }
+ opts = append(opts, cloudSQLDialOptions(connCfg.DataSource)...)
+ return cloudsqlconn.NewDialer(ctx, opts...)
+}
+
+// cloudSQLDialOptions selects the Cloud SQL IP type (private or PSC) for Google
+// Cloud SQL IAM connections. Public IP is the cloudsqlconn default, so no option
+// is needed for PUBLIC or unspecified.
+func cloudSQLDialOptions(ds *storepb.DataSource) []cloudsqlconn.Option {
+ switch ds.GetCloudSqlIpType() {
+ case storepb.DataSource_PRIVATE:
+ return []cloudsqlconn.Option{cloudsqlconn.WithDefaultDialOptions(cloudsqlconn.WithPrivateIP())}
+ case storepb.DataSource_PSC:
+ return []cloudsqlconn.Option{cloudsqlconn.WithDefaultDialOptions(cloudsqlconn.WithPSC())}
+ default:
+ return nil
}
- return cloudsqlconn.NewDialer(ctx, cloudsqlconn.WithIAMAuthN())
}
// GCPCredentialOption returns the appropriate option.ClientOption for the given
diff --git a/backend/plugin/db/util/connection_test.go b/backend/plugin/db/util/connection_test.go
index 44e9553bfa..277252b7ba 100644
--- a/backend/plugin/db/util/connection_test.go
+++ b/backend/plugin/db/util/connection_test.go
@@ -4,6 +4,8 @@ package util
import (
"strings"
"testing"
+
+ storepb "github.com/bytebase/bytebase/backend/generated-go/store"
)
func TestGCPCredentialOption(t *testing.T) {
@@ -66,3 +68,23 @@ func TestGCPCredentialOption(t *testing.T) {
})
}
}
+
+func TestCloudSQLDialOptions(t *testing.T) {
+ tests := []struct {
+ name string
+ ipType storepb.DataSource_CloudSQLIPType
+ wantLen int
+ }{
+ {"unspecified defaults to public", storepb.DataSource_CLOUD_SQL_IP_TYPE_UNSPECIFIED, 0},
+ {"public", storepb.DataSource_PUBLIC, 0},
+ {"private", storepb.DataSource_PRIVATE, 1},
+ {"psc", storepb.DataSource_PSC, 1},
+ }
+ for _, tc := range tests {
+ t.Run(tc.name, func(t *testing.T) {
+ if got := cloudSQLDialOptions(&storepb.DataSource{CloudSqlIpType: tc.ipType}); len(got) != tc.wantLen {
+ t.Errorf("cloudSQLDialOptions(%v) = %d options, want %d", tc.ipType, len(got), tc.wantLen)
+ }
+ })
+ }
+}
diff --git a/frontend/src/locales/en-US.json b/frontend/src/locales/en-US.json
index 0a5c15fa85..76f8804910 100644
--- a/frontend/src/locales/en-US.json
+++ b/frontend/src/locales/en-US.json
@@ -925,6 +925,13 @@
"archive-instance-instance-name": "Archive instance '{{0}}'?",
"archived-instances-will-not-be-displayed": "Archived instances will not be displayed.",
"authentication-database": "Authentication Database",
+ "cloud-sql-ip-type": {
+ "description": "Select which Cloud SQL IP to connect through. Use Private IP or PSC when the instance has no public IP and Bytebase runs inside the same VPC.",
+ "label": "Cloud SQL IP type",
+ "private": "Private IP",
+ "psc": "Private Service Connect (PSC)",
+ "public": "Public IP"
+ },
"connection-info": "Connection info",
"connection-options": "Connection Options",
"create-gcp-credentials": "To create credentials, see",
diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.json
index b1d5c8e79f..7dd529268e 100644
--- a/frontend/src/locales/es-ES.json
+++ b/frontend/src/locales/es-ES.json
@@ -925,6 +925,13 @@
"archive-instance-instance-name": "¿Archivar la instancia '{{0}}'?",
"archived-instances-will-not-be-displayed": "Las instancias archivadas no se mostrarán.",
"authentication-database": "Base de datos de autenticación",
+ "cloud-sql-ip-type": {
+ "description": "Selecciona a través de qué IP de Cloud SQL conectarse. Usa IP privada o PSC cuando la instancia no tiene IP pública y Bytebase se ejecuta dentro de la misma VPC.",
+ "label": "Tipo de IP de Cloud SQL",
+ "private": "IP privada",
+ "psc": "Private Service Connect (PSC)",
+ "public": "IP pública"
+ },
"connection-info": "Información de conexión",
"connection-options": "Opciones de conexión",
"create-gcp-credentials": "Para crear credenciales, consulte",
diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.json
index 3a44f073e9..f961e3f672 100644
--- a/frontend/src/locales/ja-JP.json
+++ b/frontend/src/locales/ja-JP.json
@@ -925,6 +925,13 @@
"archive-instance-instance-name": "インスタンス '{{0}}' をアーカイブしますか?",
"archived-instances-will-not-be-displayed": "アーカイブされたインスタンスは表示されなくなります。",
"authentication-database": "認証データベース",
+ "cloud-sql-ip-type": {
+ "description": "接続に使用する Cloud SQL の IP を選択します。インスタンスにパブリック IP がなく、Bytebase が同じ VPC 内で実行されている場合は、プライベート IP または PSC を使用してください。",
+ "label": "Cloud SQL IP タイプ",
+ "private": "プライベート IP",
+ "psc": "Private Service Connect (PSC)",
+ "public": "パブリック IP"
+ },
"connection-info": "接続情報",
"connection-options": "接続オプション",
"create-gcp-credentials": "認証情報の作成方法については、を参照してください",
diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.json
index 820f7d98ea..3a17733734 100644
--- a/frontend/src/locales/vi-VN.json
+++ b/frontend/src/locales/vi-VN.json
@@ -925,6 +925,13 @@
"archive-instance-instance-name": "Lưu trữ phiên bản '{{0}}'?",
"archived-instances-will-not-be-displayed": "Các phiên bản đã lưu trữ sẽ không được hiển thị.",
"authentication-database": "Cơ sở dữ liệu xác thực",
+ "cloud-sql-ip-type": {
+ "description": "Chọn IP Cloud SQL nào để kết nối. Dùng IP riêng hoặc PSC khi instance không có IP công khai và Bytebase chạy trong cùng một VPC.",
+ "label": "Loại IP Cloud SQL",
+ "private": "IP riêng",
+ "psc": "Private Service Connect (PSC)",
+ "public": "IP công khai"
+ },
"connection-info": "Thông tin kết nối",
"connection-options": "Tùy chọn kết nối",
"create-gcp-credentials": "Để tạo thông tin xác thực, xem",
diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.json
index eac1d492b5..73b4e38b63 100644
--- a/frontend/src/locales/zh-CN.json
+++ b/frontend/src/locales/zh-CN.json
@@ -925,6 +925,13 @@
"archive-instance-instance-name": "归档实例'{{0}}'?",
"archived-instances-will-not-be-displayed": "不再会显示已归档实例。",
"authentication-database": "认证数据库",
+ "cloud-sql-ip-type": {
+ "description": "选择通过哪个 Cloud SQL IP 进行连接。当实例没有公共 IP 且 Bytebase 运行在同一 VPC 内时,请使用私有 IP 或 PSC。",
+ "label": "Cloud SQL IP 类型",
+ "private": "私有 IP",
+ "psc": "Private Service Connect (PSC)",
+ "public": "公共 IP"
+ },
"connection-info": "连接信息",
"connection-options": "连接选项",
"create-gcp-credentials": "创建凭据的方法见",
diff --git a/frontend/src/react/components/instance/CredentialSourceForm.test.tsx b/frontend/src/react/components/instance/CredentialSourceForm.test.tsx
index fd99545c0a..4618d7d199 100644
--- a/frontend/src/react/components/instance/CredentialSourceForm.test.tsx
+++ b/frontend/src/react/components/instance/CredentialSourceForm.test.tsx
@@ -3,11 +3,17 @@ import type { ReactElement } from "react";
import { act } from "react";
import { createRoot } from "react-dom/client";
import { describe, expect, test, vi } from "vitest";
+import { Engine } from "@/types/proto-es/v1/common_pb";
import {
DataSource_AuthenticationType,
+ DataSource_CloudSQLIPType,
DataSourceSchema,
} from "@/types/proto-es/v1/instance_service_pb";
-import { CredentialSourceForm } from "./CredentialSourceForm";
+import {
+ CredentialSourceForm,
+ offeredCloudSQLIPTypes,
+ showsCloudSQLIPType,
+} from "./CredentialSourceForm";
import type { EditDataSource } from "./common";
(
@@ -78,6 +84,7 @@ describe("CredentialSourceForm", () => {
const { container, unmount } = render(
<CredentialSourceForm
dataSource={makeDataSource(authenticationType)}
+ engine={Engine.POSTGRES}
allowEdit={true}
onDataSourceChange={vi.fn()}
/>
@@ -87,4 +94,63 @@ describe("CredentialSourceForm", () => {
unmount();
});
+
+ test("shows the Cloud SQL IP selector only for Cloud SQL MySQL/Postgres IAM", () => {
+ const { GOOGLE_CLOUD_SQL_IAM, PASSWORD } = DataSource_AuthenticationType;
+ expect(showsCloudSQLIPType(Engine.MYSQL, GOOGLE_CLOUD_SQL_IAM)).toBe(true);
+ expect(showsCloudSQLIPType(Engine.POSTGRES, GOOGLE_CLOUD_SQL_IAM)).toBe(
+ true
+ );
+ // Spanner/BigQuery reuse the Google IAM auth type but do not use cloudsqlconn.
+ expect(showsCloudSQLIPType(Engine.SPANNER, GOOGLE_CLOUD_SQL_IAM)).toBe(
+ false
+ );
+ expect(showsCloudSQLIPType(Engine.BIGQUERY, GOOGLE_CLOUD_SQL_IAM)).toBe(
+ false
+ );
+ expect(showsCloudSQLIPType(Engine.POSTGRES, PASSWORD)).toBe(false);
+ });
+
+ test("renders the selector for Postgres GCP IAM but not for Spanner", () => {
+ const shown = render(
+ <CredentialSourceForm
+ dataSource={makeDataSource(
+ DataSource_AuthenticationType.GOOGLE_CLOUD_SQL_IAM
+ )}
+ engine={Engine.POSTGRES}
+ allowEdit={true}
+ onDataSourceChange={vi.fn()}
+ />
+ );
+ expect(shown.container.textContent).toContain(
+ "instance.cloud-sql-ip-type.label"
+ );
+ shown.unmount();
+
+ const spanner = render(
+ <CredentialSourceForm
+ dataSource={makeDataSource(
+ DataSource_AuthenticationType.GOOGLE_CLOUD_SQL_IAM
+ )}
+ engine={Engine.SPANNER}
+ allowEdit={true}
+ onDataSourceChange={vi.fn()}
+ />
+ );
+ expect(spanner.container.textContent).not.toContain(
+ "instance.cloud-sql-ip-type.label"
+ );
+ spanner.unmount();
+ });
+
+ test("offers Public and Private only, grandfathering an existing PSC value", () => {
+ const { PUBLIC, PRIVATE, PSC, CLOUD_SQL_IP_TYPE_UNSPECIFIED } =
+ DataSource_CloudSQLIPType;
+ expect(offeredCloudSQLIPTypes(CLOUD_SQL_IP_TYPE_UNSPECIFIED)).toEqual([
+ PUBLIC,
+ PRIVATE,
+ ]);
+ expect(offeredCloudSQLIPTypes(PRIVATE)).toEqual([PUBLIC, PRIVATE]);
+ expect(offeredCloudSQLIPTypes(PSC)).toEqual([PUBLIC, PRIVATE, PSC]);
+ });
});
diff --git a/frontend/src/react/components/instance/CredentialSourceForm.tsx b/frontend/src/react/components/instance/CredentialSourceForm.tsx
index 90adef71f1..4710bc482e 100644
--- a/frontend/src/react/components/instance/CredentialSourceForm.tsx
+++ b/frontend/src/react/components/instance/CredentialSourceForm.tsx
@@ -8,12 +8,21 @@ import {
} from "react";
import { Trans, useTranslation } from "react-i18next";
import { Input } from "@/react/components/ui/input";
+import {
+ Select,
+ SelectContent,
+ SelectItem,
+ SelectTrigger,
+ SelectValue,
+} from "@/react/components/ui/select";
import { Textarea } from "@/react/components/ui/textarea";
import { useServerState } from "@/react/hooks/useAppState";
+import { Engine } from "@/types/proto-es/v1/common_pb";
import {
DataSource_AuthenticationType,
DataSource_AWSCredentialSchema,
DataSource_AzureCredentialSchema,
+ DataSource_CloudSQLIPType,
DataSource_GCPCredentialSchema,
} from "@/types/proto-es/v1/instance_service_pb";
import type { EditDataSource } from "./common";
@@ -22,15 +31,17 @@ type CredentialSource = "default" | "specific-credential";
interface CredentialSourceFormProps {
dataSource: EditDataSource;
+ engine: Engine;
allowEdit: boolean;
onDataSourceChange: (updates: Partial<EditDataSource>) => void;
}
function CredentialSourceForm({
dataSource,
+ engine,
allowEdit,
onDataSourceChange,
-}: CredentialSourceFormProps) {
+}: Readonly<CredentialSourceFormProps>) {
const { t } = useTranslation();
const { isSaaSMode } = useServerState();
@@ -272,6 +283,108 @@ function CredentialSourceForm({
authenticationType={dataSource.authenticationType}
/>
)}
+
+ {showsCloudSQLIPType(engine, dataSource.authenticationType) && (
+ <CloudSQLIPTypeField
+ value={dataSource.cloudSqlIpType}
+ allowEdit={allowEdit}
+ onChange={(cloudSqlIpType) => onDataSourceChange({ cloudSqlIpType })}
+ />
+ )}
+ </div>
+ );
+}
+
+// The Cloud SQL IP type only applies to Cloud SQL connections (which use the
+// cloudsqlconn dialer). Google Cloud SQL IAM auth is also offered for Spanner and
+// BigQuery, whose drivers do not use cloudsqlconn, so restrict the selector to the
+// Cloud SQL MySQL/Postgres engines.
+export function showsCloudSQLIPType(
+ engine: Engine,
+ authType: DataSource_AuthenticationType
+): boolean {
+ return (
+ authType === DataSource_AuthenticationType.GOOGLE_CLOUD_SQL_IAM &&
+ (engine === Engine.MYSQL || engine === Engine.POSTGRES)
+ );
+}
+
+// PSC is accepted via the API and Terraform provider but not offered in the UI
+// until it is verified end-to-end. An instance that already has PSC set (via the
+// API) still shows it so the stored value renders correctly.
+export function offeredCloudSQLIPTypes(
+ current: DataSource_CloudSQLIPType
+): DataSource_CloudSQLIPType[] {
+ const offered = [
+ DataSource_CloudSQLIPType.PUBLIC,
+ DataSource_CloudSQLIPType.PRIVATE,
+ ];
+ if (current === DataSource_CloudSQLIPType.PSC) {
+ offered.push(DataSource_CloudSQLIPType.PSC);
+ }
+ return offered;
+}
+
+function CloudSQLIPTypeField({
+ value,
+ allowEdit,
+ onChange,
+}: Readonly<{
+ value: DataSource_CloudSQLIPType;
+ allowEdit: boolean;
+ onChange: (value: DataSource_CloudSQLIPType) => void;
+}>) {
+ const { t } = useTranslation();
+ // Treat unspecified as public for display, matching the backend default.
+ const current =
+ value === DataSource_CloudSQLIPType.CLOUD_SQL_IP_TYPE_UNSPECIFIED
+ ? DataSource_CloudSQLIPType.PUBLIC
+ : value;
+ const label = (ipType: DataSource_CloudSQLIPType) => {
+ switch (ipType) {
+ case DataSource_CloudSQLIPType.PRIVATE:
+ return t("instance.cloud-sql-ip-type.private");
+ case DataSource_CloudSQLIPType.PSC:
+ return t("instance.cloud-sql-ip-type.psc");
+ default:
+ return t("instance.cloud-sql-ip-type.public");
+ }
+ };
+ const options = offeredCloudSQLIPTypes(current).map((ipType) => ({
+ value: ipType,
+ label: label(ipType),
+ }));
+
+ return (
+ <div className="mt-4 sm:col-span-3 sm:col-start-1">
+ <label className="textlabel block">
+ {t("instance.cloud-sql-ip-type.label")}
+ </label>
+ <Select
+ value={String(current)}
+ disabled={!allowEdit}
+ onValueChange={(val) => {
+ if (val != null) onChange(Number(val) as DataSource_CloudSQLIPType);
+ }}
+ >
+ <SelectTrigger className="mt-2 w-full">
+ <SelectValue>
+ {(v: string | null) =>
+ options.find((o) => String(o.value) === v)?.label ?? null
+ }
+ </SelectValue>
+ </SelectTrigger>
+ <SelectContent>
+ {options.map((o) => (
+ <SelectItem key={o.value} value={String(o.value)}>
+ {o.label}
+ </SelectItem>
+ ))}
+ </SelectContent>
+ </Select>
+ <p className="textinfolabel mt-1">
+ {t("instance.cloud-sql-ip-type.description")}
+ </p>
</div>
);
}
diff --git a/frontend/src/react/components/instance/DataSourceForm.tsx b/frontend/src/react/components/instance/DataSourceForm.tsx
index daeaa29751..20b2cdbac8 100644
--- a/frontend/src/react/components/instance/DataSourceForm.tsx
+++ b/frontend/src/react/components/instance/DataSourceForm.tsx
@@ -809,6 +809,7 @@ export function DataSourceForm({
{isIAM && (
<CredentialSourceForm
dataSource={dataSource}
+ engine={basicInfo.engine}
allowEdit={allowEdit}
onDataSourceChange={update}
/>
@@ -1617,6 +1618,7 @@ export function DataSourceForm({
</div>
<CredentialSourceForm
dataSource={dataSource}
+ engine={basicInfo.engine}
allowEdit={allowEdit}
onDataSourceChange={update}
/>
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 68bbbac1dd..290e37a9cf 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
@@ -1207,6 +1207,14 @@ export declare type DataSource = Message<"bytebase.v1.DataSource"> & {
*/
authenticationType: DataSource_AuthenticationType;
+ /**
+ * cloud_sql_ip_type selects the Cloud SQL IP type for Google Cloud SQL IAM connections.
+ * CLOUD_SQL_IP_TYPE_UNSPECIFIED is treated as PUBLIC for backward compatibility.
+ *
+ * @generated from field: bytebase.v1.DataSource.CloudSQLIPType cloud_sql_ip_type = 56;
+ */
+ cloudSqlIpType: DataSource_CloudSQLIPType;
+
/**
* @generated from oneof bytebase.v1.DataSource.iam_extension
*/
@@ -1449,6 +1457,38 @@ export enum DataSource_AuthenticationType {
*/
export declare const DataSource_AuthenticationTypeSchema: GenEnum<DataSource_AuthenticationType>;
+/**
+ * CloudSQLIPType selects which Cloud SQL IP to dial for Google Cloud SQL IAM connections.
+ *
+ * @generated from enum bytebase.v1.DataSource.CloudSQLIPType
+ */
+export enum DataSource_CloudSQLIPType {
+ /**
+ * @generated from enum value: CLOUD_SQL_IP_TYPE_UNSPECIFIED = 0;
+ */
+ CLOUD_SQL_IP_TYPE_UNSPECIFIED = 0,
+
+ /**
+ * @generated from enum value: PUBLIC = 1;
+ */
+ PUBLIC = 1,
+
+ /**
+ * @generated from enum value: PRIVATE = 2;
+ */
+ PRIVATE = 2,
+
+ /**
+ * @generated from enum value: PSC = 3;
+ */
+ PSC = 3,
+}
+
+/**
+ * Describes the enum bytebase.v1.DataSource.CloudSQLIPType.
+ */
+export declare const DataSource_CloudSQLIPTypeSchema: GenEnum<DataSource_CloudSQLIPType>;
+
/**
* @generated from enum bytebase.v1.DataSource.RedisType
*/
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 2457333476..10641f2947 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+kEXChVieXRlYmFzZS5jb20vSW5zdGFuY2UidQoUTGlzdEluc3RhbmNlc1JlcXVlc3QSEQoJcGFnZV9zaXplGAEgASgFEhIKCnBhZ2VfdG9rZW4YAiABKAkSFAoMc2hvd19kZWxldGVkGAMgASgIEg4KBmZpbHRlchgEIAEoCRIQCghvcmRlcl9ieRgFIAEoCSJaChVMaXN0SW5zdGFuY2VzUmVzcG9uc2USKAoJaW5zdGFuY2VzGAEgAygLMhUuYnl0ZWJhc2UudjEuSW5zdGFuY2USFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJInEKFUNyZWF0ZUluc3RhbmNlUmVxdWVzdBIsCghpbnN0YW5jZRgBIAEoCzIVLmJ5dGViYXNlLnYxLkluc3RhbmNlQgPgQQISEwoLaW5zdGFuY2VfaWQYAiABKAkSFQoNdmFsaWRhdGVfb25seRgDIAEoCCKNAQoVVXBkYXRlSW5zdGFuY2VSZXF1ZXN0EiwKCGluc3RhbmNlGAEgASgLMhUuYnl0ZWJhc2UudjEuSW5zdGFuY2VCA+BBAhIvCgt1cGRhdGVfbWFzaxgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2sSFQoNYWxsb3dfbWlzc2luZxgDIAEoCCJiChVEZWxldGVJbnN0YW5jZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vSW5zdGFuY2USDQoFZm9yY2UYAiABKAgSDQoFcHVyZ2UYAyABKAgiRgoXVW5kZWxldGVJbnN0YW5jZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vSW5zdGFuY2UiXAoTU3luY0luc3RhbmNlUmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9JbnN0YW5jZRIYChBlbmFibGVfZnVsbF9zeW5jGAIgASgIIooBChtMaXN0SW5zdGFuY2VEYXRhYmFzZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vSW5zdGFuY2USMQoIaW5zdGFuY2UYAiABKAsyFS5ieXRlYmFzZS52MS5JbnN0YW5jZUID4EECSACIAQFCCwoJX2luc3RhbmNlIjEKHExpc3RJbnN0YW5jZURhdGFiYXNlUmVzcG9uc2USEQoJZGF0YWJhc2VzGAEgAygJIikKFFN5bmNJbnN0YW5jZVJlc3BvbnNlEhEKCWRhdGFiYXNlcxgBIAMoCSJUChlCYXRjaFN5bmNJbnN0YW5jZXNSZXF1ZXN0EjcKCHJlcXVlc3RzGAEgAygLMiAuYnl0ZWJhc2UudjEuU3luY0luc3RhbmNlUmVxdWVzdEID4EECIhwKGkJhdGNoU3luY0luc3RhbmNlc1Jlc3BvbnNlIlgKG0JhdGNoVXBkYXRlSW5zdGFuY2VzUmVxdWVzdBI5CghyZXF1ZXN0cxgBIAMoCzIiLmJ5dGViYXNlLnYxLlVwZGF0ZUluc3RhbmNlUmVxdWVzdEID4EECIkgKHEJhdGNoVXBkYXRlSW5zdGFuY2VzUmVzcG9uc2USKAoJaW5zdGFuY2VzGAEgAygLMhUuYnl0ZWJhc2UudjEuSW5zdGFuY2UijQEKFEFkZERhdGFTb3VyY2VSZXF1ZXN0EisKBG5hbWUYASABKAlCHeBBAvpBFwoVYnl0ZWJhc2UuY29tL0luc3RhbmNlEjEKC2RhdGFfc291cmNlGAIgASgLMhcuYnl0ZWJhc2UudjEuRGF0YVNvdXJjZUID4EECEhUKDXZhbGlkYXRlX29ubHkYAyABKAgieQoXUmVtb3ZlRGF0YVNvdXJjZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vSW5zdGFuY2USMQoLZGF0YV9zb3VyY2UYAiABKAsyFy5ieXRlYmFzZS52MS5EYXRhU291cmNlQgPgQQIi2AEKF1VwZGF0ZURhdGFTb3VyY2VSZXF1ZXN0EisKBG5hbWUYASABKAlCHeBBAvpBFwoVYnl0ZWJhc2UuY29tL0luc3RhbmNlEjEKC2RhdGFfc291cmNlGAIgASgLMhcuYnl0ZWJhc2UudjEuRGF0YVNvdXJjZUID4EECEi8KC3VwZGF0ZV9tYXNrGAMgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFzaxIVCg12YWxpZGF0ZV9vbmx5GAQgASgIEhUKDWFsbG93X21pc3NpbmcYBSABKAgi5QQKCEluc3RhbmNlEgwKBG5hbWUYASABKAkSIQoFc3RhdGUYAyABKA4yEi5ieXRlYmFzZS52MS5TdGF0ZRIXCgV0aXRsZRgEIAEoCUIIukgFcgMYyAESIwoGZW5naW5lGAUgASgOMhMuYnl0ZWJhc2UudjEuRW5naW5lEhsKDmVuZ2luZV92ZXJzaW9uGAYgASgJQgPgQQMSFQoNZXh0ZXJuYWxfbGluaxgHIAEoCRItCgxkYXRhX3NvdXJjZXMYCCADKAsyFy5ieXRlYmFzZS52MS5EYXRhU291cmNlEh0KC2Vudmlyb25tZW50GAkgASgJQgPgQQFIAIgBARISCgphY3RpdmF0aW9uGAogASgIEi0KBXJvbGVzGAsgAygLMhkuYnl0ZWJhc2UudjEuSW5zdGFuY2VSb2xlQgPgQQMSMAoNc3luY19pbnRlcnZhbBgMIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbhIWCg5zeW5jX2RhdGFiYXNlcxgOIAMoCRI3Cg5sYXN0X3N5bmNfdGltZRgPIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxIxCgZsYWJlbHMYECADKAsyIS5ieXRlYmFzZS52MS5JbnN0YW5jZS5MYWJlbHNFbnRyeRotCgtMYWJlbHNFbnRyeRILCgNrZXkYASABKAkSDQoFdmFsdWUYAiABKAk6AjgBOjDqQS0KFWJ5dGViYXNlLmNvbS9JbnN0YW5jZRIUaW5zdGFuY2VzL3tpbnN0YW5jZX1CDgoMX2Vudmlyb25tZW50Iq8IChhEYXRhU291cmNlRXh0ZXJuYWxTZWNyZXQSRQoLc2VjcmV0X3R5cGUYASABKA4yMC5ieXRlYmFzZS52MS5EYXRhU291cmNlRXh0ZXJuYWxTZWNyZXQuU2VjcmV0VHlwZRILCgN1cmwYAiABKAkSQQoJYXV0aF90eXBlGAMgASgOMi4uYnl0ZWJhc2UudjEuRGF0YVNvdXJjZUV4dGVybmFsU2VjcmV0LkF1dGhUeXBlEksKCGFwcF9yb2xlGAQgASgLMjcuYnl0ZWJhc2UudjEuRGF0YVNvdXJjZUV4dGVybmFsU2VjcmV0LkFwcFJvbGVBdXRoT3B0aW9uSAASFAoFdG9rZW4YBSABKAlCA+BBBEgAEkMKCnRva2VuX3R5cGUYDSABKA4yLy5ieXRlYmFzZS52MS5EYXRhU291cmNlRXh0ZXJuYWxTZWNyZXQuVG9rZW5UeXBlEhMKC2VuZ2luZV9uYW1lGAYgASgJEhMKC3NlY3JldF9uYW1lGAcgASgJEhkKEXBhc3N3b3JkX2tleV9uYW1lGAggASgJEiMKG3NraXBfdmF1bHRfdGxzX3ZlcmlmaWNhdGlvbhgJIAEoCBIZCgx2YXVsdF9zc2xfY2EYCiABKAlCA+BBBBIbCg52YXVsdF9zc2xfY2VydBgLIAEoCUID4EEEEhoKDXZhdWx0X3NzbF9rZXkYDCABKAlCA+BBBBruAQoRQXBwUm9sZUF1dGhPcHRpb24SFAoHcm9sZV9pZBgBIAEoCUID4EEEEhYKCXNlY3JldF9pZBgCIAEoCUID4EEEElAKBHR5cGUYAyABKA4yQi5ieXRlYmFzZS52MS5EYXRhU291cmNlRXh0ZXJuYWxTZWNyZXQuQXBwUm9sZUF1dGhPcHRpb24uU2VjcmV0VHlwZRISCgptb3VudF9wYXRoGAQgASgJIkUKClNlY3JldFR5cGUSGwoXU0VDUkVUX1RZUEVfVU5TUEVDSUZJRUQQABIJCgVQTEFJThABEg8KC0VOVklST05NRU5UEAIigAEKClNlY3JldFR5cGUSGwoXU0VDUkVUX1RZUEVfVU5TUEVDSUZJRUQQABIPCgtWQVVMVF9LVl9WMhABEhcKE0FXU19TRUNSRVRTX01BTkFHRVIQAhIWChJHQ1BfU0VDUkVUX01BTkFHRVIQAxITCg9BWlVSRV9LRVlfVkFVTFQQBCJECghBdXRoVHlwZRIZChVBVVRIX1RZUEVfVU5TUEVDSUZJRUQQABIJCgVUT0tFThABEhIKDlZBVUxUX0FQUF9ST0xFEAIiTQoJVG9rZW5UeXBlEhoKFlRPS0VOX1RZUEVfVU5TUEVDSUZJRUQQABIJCgVQTEFJThABEg8KC0VOVklST05NRU5UEAISCAoERklMRRADQg0KC2F1dGhfb3B0aW9uIo0RCgpEYXRhU291cmNlEgoKAmlkGAEgASgJEikKBHR5cGUYAiABKA4yGy5ieXRlYmFzZS52MS5EYXRhU291cmNlVHlwZRIQCgh1c2VybmFtZRgDIAEoCRIVCghwYXNzd29yZBgEIAEoCUID4EEEEg8KB3VzZV9zc2wYHiABKAgSEwoGc3NsX2NhGAUgASgJQgPgQQQSFQoIc3NsX2NlcnQYBiABKAlCA+BBBBIUCgdzc2xfa2V5GAcgASgJQgPgQQQSGAoLc3NsX2NhX3BhdGgYKSABKAlCA+BBBBIaCg1zc2xfY2VydF9wYXRoGCogASgJQgPgQQQSGQoMc3NsX2tleV9wYXRoGCsgASgJQgPgQQQSFwoKc3NsX2NhX3NldBgsIAEoCEID4EEDEhkKDHNzbF9jZXJ0X3NldBgtIAEoCEID4EEDEhgKC3NzbF9rZXlfc2V0GC4gASgIQgPgQQMSHAoPc3NsX2NhX3BhdGhfc2V0GC8gASgIQgPgQQMSHgoRc3NsX2NlcnRfcGF0aF9zZXQYMCABKAhCA+BBAxIdChBzc2xfa2V5X3BhdGhfc2V0GDEgASgIQgPgQQMSHgoWdmVyaWZ5X3Rsc19jZXJ0aWZpY2F0ZRgnIAEoCBIMCgRob3N0GAggASgJEgwKBHBvcnQYCSABKAkSEAoIZGF0YWJhc2UYCiABKAkSCwoDc3J2GAsgASgIEh8KF2F1dGhlbnRpY2F0aW9uX2RhdGFiYXNlGAwgASgJEhMKC3JlcGxpY2Ffc2V0GBkgASgJEgsKA3NpZBgNIAEoCRIUCgxzZXJ2aWNlX25hbWUYDiABKAkSEAoIc3NoX2hvc3QYDyABKAkSEAoIc3NoX3BvcnQYECABKAkSEAoIc3NoX3VzZXIYESABKAkSGQoMc3NoX3Bhc3N3b3JkGBIgASgJQgPgQQQSHAoPc3NoX3ByaXZhdGVfa2V5GBMgASgJQgPgQQQSJwoaYXV0aGVudGljYXRpb25fcHJpdmF0ZV9rZXkYFCABKAlCA+BBBBIyCiVhdXRoZW50aWNhdGlvbl9wcml2YXRlX2tleV9wYXNzcGhyYXNlGCggASgJQgPgQQQSPgoPZXh0ZXJuYWxfc2VjcmV0GBUgASgLMiUuYnl0ZWJhc2UudjEuRGF0YVNvdXJjZUV4dGVybmFsU2VjcmV0EkcKE2F1dGhlbnRpY2F0aW9uX3R5cGUYFiABKA4yKi5ieXRlYmFzZS52MS5EYXRhU291cmNlLkF1dGhlbnRpY2F0aW9uVHlwZRJDChBhenVyZV9jcmVkZW50aWFsGBcgASgLMicuYnl0ZWJhc2UudjEuRGF0YVNvdXJjZS5BenVyZUNyZWRlbnRpYWxIABI/Cg5hd3NfY3JlZGVudGlhbBglIAEoCzIlLmJ5dGViYXNlLnYxLkRhdGFTb3VyY2UuQVdTQ3JlZGVudGlhbEgAEj8KDmdjcF9jcmVkZW50aWFsGCYgASgLMiUuYnl0ZWJhc2UudjEuRGF0YVNvdXJjZS5HQ1BDcmVkZW50aWFsSAASLAoLc2FzbF9jb25maWcYGCABKAsyFy5ieXRlYmFzZS52MS5TQVNMQ29uZmlnEkIKFGFkZGl0aW9uYWxfYWRkcmVzc2VzGBogAygLMh8uYnl0ZWJhc2UudjEuRGF0YVNvdXJjZS5BZGRyZXNzQgPgQQESGQoRZGlyZWN0X2Nvbm5lY3Rpb24YGyABKAgSDgoGcmVnaW9uGBwgASgJEhQKDHdhcmVob3VzZV9pZBgdIAEoCRITCgttYXN0ZXJfbmFtZRgfIAEoCRIXCg9tYXN0ZXJfdXNlcm5hbWUYICABKAkSFwoPbWFzdGVyX3Bhc3N3b3JkGCEgASgJEjUKCnJlZGlzX3R5cGUYIiABKA4yIS5ieXRlYmFzZS52MS5EYXRhU291cmNlLlJlZGlzVHlwZRIPCgdjbHVzdGVyGCMgASgJElsKG2V4dHJhX2Nvbm5lY3Rpb25fcGFyYW1ldGVycxgkIAMoCzI2LmJ5dGViYXNlLnYxLkRhdGFTb3VyY2UuRXh0cmFDb25uZWN0aW9uUGFyYW1ldGVyc0VudHJ5GlMKD0F6dXJlQ3JlZGVudGlhbBIRCgl0ZW5hbnRfaWQYASABKAkSEQoJY2xpZW50X2lkGAIgASgJEhoKDWNsaWVudF9zZWNyZXQYAyABKAlCA+BBBBqYAQoNQVdTQ3JlZGVudGlhbBIaCg1hY2Nlc3Nfa2V5X2lkGAEgASgJQgPgQQQSHgoRc2VjcmV0X2FjY2Vzc19rZXkYAiABKAlCA+BBBBIaCg1zZXNzaW9uX3Rva2VuGAMgASgJQgPgQQQSFQoIcm9sZV9hcm4YBCABKAlCA+BBBBIYCgtleHRlcm5hbF9pZBgFIAEoCUID4EEEGiUKDUdDUENyZWRlbnRpYWwSFAoHY29udGVudBgBIAEoCUID4EEEGiUKB0FkZHJlc3MSDAoEaG9zdBgBIAEoCRIMCgRwb3J0GAIgASgJGkAKHkV4dHJhQ29ubmVjdGlvblBhcmFtZXRlcnNFbnRyeRILCgNrZXkYASABKAkSDQoFdmFsdWUYAiABKAk6AjgBInwKEkF1dGhlbnRpY2F0aW9uVHlwZRIeChpBVVRIRU5USUNBVElPTl9VTlNQRUNJRklFRBAAEgwKCFBBU1NXT1JEEAESGAoUR09PR0xFX0NMT1VEX1NRTF9JQU0QAhIPCgtBV1NfUkRTX0lBTRADEg0KCUFaVVJFX0lBTRAEIlIKCVJlZGlzVHlwZRIaChZSRURJU19UWVBFX1VOU1BFQ0lGSUVEEAASDgoKU1RBTkRBTE9ORRABEgwKCFNFTlRJTkVMEAISCwoHQ0xVU1RFUhADQg8KDWlhbV9leHRlbnNpb24i3gEKEEluc3RhbmNlUmVzb3VyY2USDQoFdGl0bGUYASABKAkSIwoGZW5naW5lGAIgASgOMhMuYnl0ZWJhc2UudjEuRW5naW5lEhsKDmVuZ2luZV92ZXJzaW9uGAMgASgJQgPgQQMSLQoMZGF0YV9zb3VyY2VzGAQgAygLMhcuYnl0ZWJhc2UudjEuRGF0YVNvdXJjZRISCgphY3RpdmF0aW9uGAUgASgIEgwKBG5hbWUYBiABKAkSGAoLZW52aXJvbm1lbnQYByABKAlIAIgBAUIOCgxfZW52aXJvbm1lbnQiTAoKU0FTTENvbmZpZxIxCgprcmJfY29uZmlnGAEgASgLMhsuYnl0ZWJhc2UudjEuS2VyYmVyb3NDb25maWdIAEILCgltZWNoYW5pc20ilgEKDktlcmJlcm9zQ29uZmlnEg8KB3ByaW1hcnkYASABKAkSEAoIaW5zdGFuY2UYAiABKAkSDQoFcmVhbG0YAyABKAkSDgoGa2V5dGFiGAQgASgMEhAKCGtkY19ob3N0GAUgASgJEhAKCGtkY19wb3J0GAYgASgJEh4KFmtkY190cmFuc3BvcnRfcHJvdG9jb2wYByABKAkqRwoORGF0YVNvdXJjZVR5cGUSGwoXREFUQV9TT1VSQ0VfVU5TUEVDSUZJRUQQABIJCgVBRE1JThABEg0KCVJFQURfT05MWRACMtQQCg9JbnN0YW5jZVNlcnZpY2UShAEKC0dldEluc3RhbmNlEh8uYnl0ZWJhc2UudjEuR2V0SW5zdGFuY2VSZXF1ZXN0GhUuYnl0ZWJhc2UudjEuSW5zdGFuY2UiPdpBBG5hbWWK6jAQYmIuaW5zdGFuY2VzLmdldJDqMAGC0+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]);
+ fileDesc("Chl2MS9pbnN0YW5jZV9zZXJ2aWNlLnByb3RvEgtieXRlYmFzZS52MSJBChJHZXRJbnN0YW5jZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vSW5zdGFuY2UidQoUTGlzdEluc3RhbmNlc1JlcXVlc3QSEQoJcGFnZV9zaXplGAEgASgFEhIKCnBhZ2VfdG9rZW4YAiABKAkSFAoMc2hvd19kZWxldGVkGAMgASgIEg4KBmZpbHRlchgEIAEoCRIQCghvcmRlcl9ieRgFIAEoCSJaChVMaXN0SW5zdGFuY2VzUmVzcG9uc2USKAoJaW5zdGFuY2VzGAEgAygLMhUuYnl0ZWJhc2UudjEuSW5zdGFuY2USFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJInEKFUNyZWF0ZUluc3RhbmNlUmVxdWVzdBIsCghpbnN0YW5jZRgBIAEoCzIVLmJ5dGViYXNlLnYxLkluc3RhbmNlQgPgQQISEwoLaW5zdGFuY2VfaWQYAiABKAkSFQoNdmFsaWRhdGVfb25seRgDIAEoCCKNAQoVVXBkYXRlSW5zdGFuY2VSZXF1ZXN0EiwKCGluc3RhbmNlGAEgASgLMhUuYnl0ZWJhc2UudjEuSW5zdGFuY2VCA+BBAhIvCgt1cGRhdGVfbWFzaxgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2sSFQoNYWxsb3dfbWlzc2luZxgDIAEoCCJiChVEZWxldGVJbnN0YW5jZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vSW5zdGFuY2USDQoFZm9yY2UYAiABKAgSDQoFcHVyZ2UYAyABKAgiRgoXVW5kZWxldGVJbnN0YW5jZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vSW5zdGFuY2UiXAoTU3luY0luc3RhbmNlUmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9JbnN0YW5jZRIYChBlbmFibGVfZnVsbF9zeW5jGAIgASgIIooBChtMaXN0SW5zdGFuY2VEYXRhYmFzZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vSW5zdGFuY2USMQoIaW5zdGFuY2UYAiABKAsyFS5ieXRlYmFzZS52MS5JbnN0YW5jZUID4EECSACIAQFCCwoJX2luc3RhbmNlIjEKHExpc3RJbnN0YW5jZURhdGFiYXNlUmVzcG9uc2USEQoJZGF0YWJhc2VzGAEgAygJIikKFFN5bmNJbnN0YW5jZVJlc3BvbnNlEhEKCWRhdGFiYXNlcxgBIAMoCSJUChlCYXRjaFN5bmNJbnN0YW5jZXNSZXF1ZXN0EjcKCHJlcXVlc3RzGAEgAygLMiAuYnl0ZWJhc2UudjEuU3luY0luc3RhbmNlUmVxdWVzdEID4EECIhwKGkJhdGNoU3luY0luc3RhbmNlc1Jlc3BvbnNlIlgKG0JhdGNoVXBkYXRlSW5zdGFuY2VzUmVxdWVzdBI5CghyZXF1ZXN0cxgBIAMoCzIiLmJ5dGViYXNlLnYxLlVwZGF0ZUluc3RhbmNlUmVxdWVzdEID4EECIkgKHEJhdGNoVXBkYXRlSW5zdGFuY2VzUmVzcG9uc2USKAoJaW5zdGFuY2VzGAEgAygLMhUuYnl0ZWJhc2UudjEuSW5zdGFuY2UijQEKFEFkZERhdGFTb3VyY2VSZXF1ZXN0EisKBG5hbWUYASABKAlCHeBBAvpBFwoVYnl0ZWJhc2UuY29tL0luc3RhbmNlEjEKC2RhdGFfc291cmNlGAIgASgLMhcuYnl0ZWJhc2UudjEuRGF0YVNvdXJjZUID4EECEhUKDXZhbGlkYXRlX29ubHkYAyABKAgieQoXUmVtb3ZlRGF0YVNvdXJjZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vSW5zdGFuY2USMQoLZGF0YV9zb3VyY2UYAiABKAsyFy5ieXRlYmFzZS52MS5EYXRhU291cmNlQgPgQQIi2AEKF1VwZGF0ZURhdGFTb3VyY2VSZXF1ZXN0EisKBG5hbWUYASABKAlCHeBBAvpBFwoVYnl0ZWJhc2UuY29tL0luc3RhbmNlEjEKC2RhdGFfc291cmNlGAIgASgLMhcuYnl0ZWJhc2UudjEuRGF0YVNvdXJjZUID4EECEi8KC3VwZGF0ZV9tYXNrGAMgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFzaxIVCg12YWxpZGF0ZV9vbmx5GAQgASgIEhUKDWFsbG93X21pc3NpbmcYBSABKAgi5QQKCEluc3RhbmNlEgwKBG5hbWUYASABKAkSIQoFc3RhdGUYAyABKA4yEi5ieXRlYmFzZS52MS5TdGF0ZRIXCgV0aXRsZRgEIAEoCUIIukgFcgMYyAESIwoGZW5naW5lGAUgASgOMhMuYnl0ZWJhc2UudjEuRW5naW5lEhsKDmVuZ2luZV92ZXJzaW9uGAYgASgJQgPgQQMSFQoNZXh0ZXJuYWxfbGluaxgHIAEoCRItCgxkYXRhX3NvdXJjZXMYCCADKAsyFy5ieXRlYmFzZS52MS5EYXRhU291cmNlEh0KC2Vudmlyb25tZW50GAkgASgJQgPgQQFIAIgBARISCgphY3RpdmF0aW9uGAogASgIEi0KBXJvbGVzGAsgAygLMhkuYnl0ZWJhc2UudjEuSW5zdGFuY2VSb2xlQgPgQQMSMAoNc3luY19pbnRlcnZhbBgMIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbhIWCg5zeW5jX2RhdGFiYXNlcxgOIAMoCRI3Cg5sYXN0X3N5bmNfdGltZRgPIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+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]);
/**
* Describes the message bytebase.v1.GetInstanceRequest.
@@ -261,11 +261,25 @@ export const DataSource_AuthenticationTypeSchema = /*@__PURE__*/
export const DataSource_AuthenticationType = /*@__PURE__*/
tsEnum(DataSource_AuthenticationTypeSchema);
+/**
+ * Describes the enum bytebase.v1.DataSource.CloudSQLIPType.
+ */
+export const DataSource_CloudSQLIPTypeSchema = /*@__PURE__*/
+ enumDesc(file_v1_instance_service, 20, 1);
+
+/**
+ * CloudSQLIPType selects which Cloud SQL IP to dial for Google Cloud SQL IAM connections.
+ *
+ * @generated from enum bytebase.v1.DataSource.CloudSQLIPType
+ */
+export const DataSource_CloudSQLIPType = /*@__PURE__*/
+ tsEnum(DataSource_CloudSQLIPTypeSchema);
+
/**
* Describes the enum bytebase.v1.DataSource.RedisType.
*/
export const DataSource_RedisTypeSchema = /*@__PURE__*/
- enumDesc(file_v1_instance_service, 20, 1);
+ enumDesc(file_v1_instance_service, 20, 2);
/**
* @generated from enum bytebase.v1.DataSource.RedisType
diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yaml
index 6631bb7198..b3a78e67b0 100644
--- a/proto/gen/grpc-doc/openapi.yaml
+++ b/proto/gen/grpc-doc/openapi.yaml
@@ -18160,6 +18160,12 @@ components:
authenticationType:
title: authentication_type
$ref: '#/components/schemas/bytebase.v1.DataSource.AuthenticationType'
+ cloudSqlIpType:
+ title: cloud_sql_ip_type
+ description: |-
+ cloud_sql_ip_type selects the Cloud SQL IP type for Google Cloud SQL IAM connections.
+ CLOUD_SQL_IP_TYPE_UNSPECIFIED is treated as PUBLIC for backward compatibility.
+ $ref: '#/components/schemas/bytebase.v1.DataSource.CloudSQLIPType'
saslConfig:
title: sasl_config
$ref: '#/components/schemas/bytebase.v1.SASLConfig'
@@ -18301,6 +18307,15 @@ components:
writeOnly: true
title: AzureCredential
additionalProperties: false
+ bytebase.v1.DataSource.CloudSQLIPType:
+ type: string
+ title: CloudSQLIPType
+ enum:
+ - CLOUD_SQL_IP_TYPE_UNSPECIFIED
+ - PUBLIC
+ - PRIVATE
+ - PSC
+ description: CloudSQLIPType selects which Cloud SQL IP to dial for Google Cloud SQL IAM connections.
bytebase.v1.DataSource.ExtraConnectionParametersEntry:
type: object
properties:
diff --git a/proto/gen/grpc-doc/store/README.md b/proto/gen/grpc-doc/store/README.md
index cb2754b6e7..5ebc5fe130 100644
--- a/proto/gen/grpc-doc/store/README.md
+++ b/proto/gen/grpc-doc/store/README.md
@@ -142,6 +142,7 @@
- [SASLConfig](#bytebase-store-SASLConfig)
- [DataSource.AuthenticationType](#bytebase-store-DataSource-AuthenticationType)
+ - [DataSource.CloudSQLIPType](#bytebase-store-DataSource-CloudSQLIPType)
- [DataSource.RedisType](#bytebase-store-DataSource-RedisType)
- [DataSourceExternalSecret.AppRoleAuthOption.SecretType](#bytebase-store-DataSourceExternalSecret-AppRoleAuthOption-SecretType)
- [DataSourceExternalSecret.AuthType](#bytebase-store-DataSourceExternalSecret-AuthType)
@@ -2379,6 +2380,7 @@ OIDCIdentityProviderConfig is the structure for OIDC identity provider config.
| obfuscated_authentication_private_key_passphrase | [string](#string) | | |
| external_secret | [DataSourceExternalSecret](#bytebase-store-DataSourceExternalSecret) | | |
| authentication_type | [DataSource.AuthenticationType](#bytebase-store-DataSource-AuthenticationType) | | |
+| cloud_sql_ip_type | [DataSource.CloudSQLIPType](#bytebase-store-DataSource-CloudSQLIPType) | | cloud_sql_ip_type selects the Cloud SQL IP type for Google Cloud SQL IAM connections. CLOUD_SQL_IP_TYPE_UNSPECIFIED is treated as PUBLIC for backward compatibility. |
| azure_credential | [DataSource.AzureCredential](#bytebase-store-DataSource-AzureCredential) | | |
| aws_credential | [DataSource.AWSCredential](#bytebase-store-DataSource-AWSCredential) | | |
| gcp_credential | [DataSource.GCPCredential](#bytebase-store-DataSource-GCPCredential) | | |
@@ -2649,6 +2651,20 @@ InstanceRole is the API message for instance role.
+<a name="bytebase-store-DataSource-CloudSQLIPType"></a>
+
+### DataSource.CloudSQLIPType
+CloudSQLIPType selects which Cloud SQL IP to dial for Google Cloud SQL IAM connections.
+
+| Name | Number | Description |
+| ---- | ------ | ----------- |
+| CLOUD_SQL_IP_TYPE_UNSPECIFIED | 0 | |
+| PUBLIC | 1 | |
+| PRIVATE | 2 | |
+| PSC | 3 | |
+
+
+
<a name="bytebase-store-DataSource-RedisType"></a>
### DataSource.RedisType
diff --git a/proto/gen/grpc-doc/store/index.html b/proto/gen/grpc-doc/store/index.html
index 732a08711b..f1d1e12b3b 100644
--- a/proto/gen/grpc-doc/store/index.html
+++ b/proto/gen/grpc-doc/store/index.html
@@ -728,6 +728,10 @@
<a href="#bytebase.store.DataSource.AuthenticationType"><span class="badge">E</span>DataSource.AuthenticationType</a>
</li>
+ <li>
+ <a href="#bytebase.store.DataSource.CloudSQLIPType"><span class="badge">E</span>DataSource.CloudSQLIPType</a>
+ </li>
+
<li>
<a href="#bytebase.store.DataSource.RedisType"><span class="badge">E</span>DataSource.RedisType</a>
</li>
@@ -7257,6 +7261,14 @@ Used for authentication when connecting to the data source. </p></td>
<td><p> </p></td>
</tr>
+ <tr>
+ <td>cloud_sql_ip_type</td>
+ <td><a href="#bytebase.store.DataSource.CloudSQLIPType">DataSource.CloudSQLIPType</a></td>
+ <td></td>
+ <td><p>cloud_sql_ip_type selects the Cloud SQL IP type for Google Cloud SQL IAM connections.
+CLOUD_SQL_IP_TYPE_UNSPECIFIED is treated as PUBLIC for backward compatibility. </p></td>
+ </tr>
+
<tr>
<td>azure_credential</td>
<td><a href="#bytebase.store.DataSource.AzureCredential">DataSource.AzureCredential</a></td>
@@ -8076,6 +8088,41 @@ For MySQL, it is the global privileges as GRANT statements, which means it only
</tbody>
</table>
+ <h3 id="bytebase.store.DataSource.CloudSQLIPType">DataSource.CloudSQLIPType</h3>
+ <p>CloudSQLIPType selects which Cloud SQL IP to dial for Google Cloud SQL IAM connections.</p>
+ <table class="enum-table">
+ <thead>
+ <tr><td>Name</td><td>Number</td><td>Description</td></tr>
+ </thead>
+ <tbody>
+
+ <tr>
+ <td>CLOUD_SQL_IP_TYPE_UNSPECIFIED</td>
+ <td>0</td>
+ <td><p></p></td>
+ </tr>
+
+ <tr>
+ <td>PUBLIC</td>
+ <td>1</td>
+ <td><p></p></td>
+ </tr>
+
+ <tr>
+ <td>PRIVATE</td>
+ <td>2</td>
+ <td><p></p></td>
+ </tr>
+
+ <tr>
+ <td>PSC</td>
+ <td>3</td>
+ <td><p></p></td>
+ </tr>
+
+ </tbody>
+ </table>
+
<h3 id="bytebase.store.DataSource.RedisType">DataSource.RedisType</h3>
<p></p>
<table class="enum-table">
diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.md
index 62976fd01d..884596fbdd 100644
--- a/proto/gen/grpc-doc/v1/README.md
+++ b/proto/gen/grpc-doc/v1/README.md
@@ -136,6 +136,7 @@
- [UpdateInstanceRequest](#bytebase-v1-UpdateInstanceRequest)
- [DataSource.AuthenticationType](#bytebase-v1-DataSource-AuthenticationType)
+ - [DataSource.CloudSQLIPType](#bytebase-v1-DataSource-CloudSQLIPType)
- [DataSource.RedisType](#bytebase-v1-DataSource-RedisType)
- [DataSourceExternalSecret.AppRoleAuthOption.SecretType](#bytebase-v1-DataSourceExternalSecret-AppRoleAuthOption-SecretType)
- [DataSourceExternalSecret.AuthType](#bytebase-v1-DataSourceExternalSecret-AuthType)
@@ -2371,6 +2372,7 @@ This value should be 4-63 characters, and valid characters are /[a-z][0-9]-/. |
| authentication_private_key_passphrase | [string](#string) | | Passphrase for the encrypted PKCS#8 private key. Only used when the private key is encrypted. |
| external_secret | [DataSourceExternalSecret](#bytebase-v1-DataSourceExternalSecret) | | |
| authentication_type | [DataSource.AuthenticationType](#bytebase-v1-DataSource-AuthenticationType) | | |
+| cloud_sql_ip_type | [DataSource.CloudSQLIPType](#bytebase-v1-DataSource-CloudSQLIPType) | | cloud_sql_ip_type selects the Cloud SQL IP type for Google Cloud SQL IAM connections. CLOUD_SQL_IP_TYPE_UNSPECIFIED is treated as PUBLIC for backward compatibility. |
| azure_credential | [DataSource.AzureCredential](#bytebase-v1-DataSource-AzureCredential) | | |
| aws_credential | [DataSource.AWSCredential](#bytebase-v1-DataSource-AWSCredential) | | |
| gcp_credential | [DataSource.GCPCredential](#bytebase-v1-DataSource-GCPCredential) | | |
@@ -2841,6 +2843,20 @@ The instance&#39;s `name` field is used to identify the instance to update. Form
+<a name="bytebase-v1-DataSource-CloudSQLIPType"></a>
+
+### DataSource.CloudSQLIPType
+CloudSQLIPType selects which Cloud SQL IP to dial for Google Cloud SQL IAM connections.
+
+| Name | Number | Description |
+| ---- | ------ | ----------- |
+| CLOUD_SQL_IP_TYPE_UNSPECIFIED | 0 | |
+| PUBLIC | 1 | |
+| PRIVATE | 2 | |
+| PSC | 3 | |
+
+
+
<a name="bytebase-v1-DataSource-RedisType"></a>
### DataSource.RedisType
diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.html
index 0624c5528b..8e03f6c48a 100644
--- a/proto/gen/grpc-doc/v1/index.html
+++ b/proto/gen/grpc-doc/v1/index.html
@@ -690,6 +690,10 @@
<a href="#bytebase.v1.DataSource.AuthenticationType"><span class="badge">E</span>DataSource.AuthenticationType</a>
</li>
+ <li>
+ <a href="#bytebase.v1.DataSource.CloudSQLIPType"><span class="badge">E</span>DataSource.CloudSQLIPType</a>
+ </li>
+
<li>
<a href="#bytebase.v1.DataSource.RedisType"><span class="badge">E</span>DataSource.RedisType</a>
</li>
@@ -7464,6 +7468,14 @@ Used for authentication when connecting to the data source. </p></td>
<td><p> </p></td>
</tr>
+ <tr>
+ <td>cloud_sql_ip_type</td>
+ <td><a href="#bytebase.v1.DataSource.CloudSQLIPType">DataSource.CloudSQLIPType</a></td>
+ <td></td>
+ <td><p>cloud_sql_ip_type selects the Cloud SQL IP type for Google Cloud SQL IAM connections.
+CLOUD_SQL_IP_TYPE_UNSPECIFIED is treated as PUBLIC for backward compatibility. </p></td>
+ </tr>
+
<tr>
<td>azure_credential</td>
<td><a href="#bytebase.v1.DataSource.AzureCredential">DataSource.AzureCredential</a></td>
@@ -8722,6 +8734,41 @@ In this situation, `update_mask` is ignored. </p></td>
</tbody>
</table>
+ <h3 id="bytebase.v1.DataSource.CloudSQLIPType">DataSource.CloudSQLIPType</h3>
+ <p>CloudSQLIPType selects which Cloud SQL IP to dial for Google Cloud SQL IAM connections.</p>
+ <table class="enum-table">
+ <thead>
+ <tr><td>Name</td><td>Number</td><td>Description</td></tr>
+ </thead>
+ <tbody>
+
+ <tr>
+ <td>CLOUD_SQL_IP_TYPE_UNSPECIFIED</td>
+ <td>0</td>
+ <td><p></p></td>
+ </tr>
+
+ <tr>
+ <td>PUBLIC</td>
+ <td>1</td>
+ <td><p></p></td>
+ </tr>
+
+ <tr>
+ <td>PRIVATE</td>
+ <td>2</td>
+ <td><p></p></td>
+ </tr>
+
+ <tr>
+ <td>PSC</td>
+ <td>3</td>
+ <td><p></p></td>
+ </tr>
+
+ </tbody>
+ </table>
+
<h3 id="bytebase.v1.DataSource.RedisType">DataSource.RedisType</h3>
<p></p>
<table class="enum-table">
diff --git a/proto/store/store/instance.proto b/proto/store/store/instance.proto
index 5c8c31a13b..e414f8ab75 100644
--- a/proto/store/store/instance.proto
+++ b/proto/store/store/instance.proto
@@ -128,6 +128,17 @@ message DataSource {
}
AuthenticationType authentication_type = 22;
+ // CloudSQLIPType selects which Cloud SQL IP to dial for Google Cloud SQL IAM connections.
+ enum CloudSQLIPType {
+ CLOUD_SQL_IP_TYPE_UNSPECIFIED = 0;
+ PUBLIC = 1;
+ PRIVATE = 2;
+ PSC = 3;
+ }
+ // cloud_sql_ip_type selects the Cloud SQL IP type for Google Cloud SQL IAM connections.
+ // CLOUD_SQL_IP_TYPE_UNSPECIFIED is treated as PUBLIC for backward compatibility.
+ CloudSQLIPType cloud_sql_ip_type = 56;
+
message AzureCredential {
string tenant_id = 1;
string client_id = 2;
diff --git a/proto/v1/v1/instance_service.proto b/proto/v1/v1/instance_service.proto
index c28f4da9f3..bd7b21fd93 100644
--- a/proto/v1/v1/instance_service.proto
+++ b/proto/v1/v1/instance_service.proto
@@ -648,6 +648,17 @@ message DataSource {
}
AuthenticationType authentication_type = 22;
+ // CloudSQLIPType selects which Cloud SQL IP to dial for Google Cloud SQL IAM connections.
+ enum CloudSQLIPType {
+ CLOUD_SQL_IP_TYPE_UNSPECIFIED = 0;
+ PUBLIC = 1;
+ PRIVATE = 2;
+ PSC = 3;
+ }
+ // cloud_sql_ip_type selects the Cloud SQL IP type for Google Cloud SQL IAM connections.
+ // CLOUD_SQL_IP_TYPE_UNSPECIFIED is treated as PUBLIC for backward compatibility.
+ CloudSQLIPType cloud_sql_ip_type = 56;
+
message AzureCredential {
string tenant_id = 1;
string client_id = 2;