Skip to content

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

chore: support passphrase for snowflake authentication private key (#18309)

ecmadaof82b572765fc
diff --git a/backend/api/v1/instance_service.go b/backend/api/v1/instance_service.go
index 47b7c82f84..54e0e2484b 100644
--- a/backend/api/v1/instance_service.go
+++ b/backend/api/v1/instance_service.go
@@ -748,6 +748,8 @@ func (s *InstanceService) UpdateDataSource(ctx context.Context, req *connect.Req
dataSource.SshPrivateKey = req.Msg.DataSource.SshPrivateKey
case "authentication_private_key":
dataSource.AuthenticationPrivateKey = req.Msg.DataSource.AuthenticationPrivateKey
+ case "authentication_private_key_passphrase":
+ dataSource.AuthenticationPrivateKeyPassphrase = req.Msg.DataSource.AuthenticationPrivateKeyPassphrase
case "external_secret":
externalSecret, err := convertV1DataSourceExternalSecret(req.Msg.DataSource.ExternalSecret)
if err != nil {
diff --git a/backend/api/v1/instance_service_converter.go b/backend/api/v1/instance_service_converter.go
index 13969e387c..b0aaa7df6a 100644
--- a/backend/api/v1/instance_service_converter.go
+++ b/backend/api/v1/instance_service_converter.go
@@ -455,41 +455,42 @@ func convertV1DataSource(dataSource *v1pb.DataSource) (*storepb.DataSource, erro
saslConfig := convertV1DataSourceSaslConfig(dataSource.SaslConfig)
storeDataSource := &storepb.DataSource{
- Id: dataSource.Id,
- Type: dsType,
- Username: dataSource.Username,
- Password: dataSource.Password,
- SslCa: dataSource.SslCa,
- SslCert: dataSource.SslCert,
- SslKey: dataSource.SslKey,
- Host: dataSource.Host,
- Port: dataSource.Port,
- Database: dataSource.Database,
- Srv: dataSource.Srv,
- AuthenticationDatabase: dataSource.AuthenticationDatabase,
- Sid: dataSource.Sid,
- ServiceName: dataSource.ServiceName,
- SshHost: dataSource.SshHost,
- SshPort: dataSource.SshPort,
- SshUser: dataSource.SshUser,
- SshPassword: dataSource.SshPassword,
- SshPrivateKey: dataSource.SshPrivateKey,
- AuthenticationPrivateKey: dataSource.AuthenticationPrivateKey,
- ExternalSecret: externalSecret,
- SaslConfig: saslConfig,
- AuthenticationType: convertV1AuthenticationType(dataSource.AuthenticationType),
- AdditionalAddresses: convertAdditionalAddresses(dataSource.AdditionalAddresses),
- ReplicaSet: dataSource.ReplicaSet,
- DirectConnection: dataSource.DirectConnection,
- Region: dataSource.Region,
- WarehouseId: dataSource.WarehouseId,
- UseSsl: dataSource.UseSsl,
- VerifyTlsCertificate: dataSource.VerifyTlsCertificate,
- RedisType: convertV1RedisType(dataSource.RedisType),
- MasterName: dataSource.MasterName,
- MasterUsername: dataSource.MasterUsername,
- MasterPassword: dataSource.MasterPassword,
- ExtraConnectionParameters: dataSource.ExtraConnectionParameters,
+ Id: dataSource.Id,
+ Type: dsType,
+ Username: dataSource.Username,
+ Password: dataSource.Password,
+ SslCa: dataSource.SslCa,
+ SslCert: dataSource.SslCert,
+ SslKey: dataSource.SslKey,
+ Host: dataSource.Host,
+ Port: dataSource.Port,
+ Database: dataSource.Database,
+ Srv: dataSource.Srv,
+ AuthenticationDatabase: dataSource.AuthenticationDatabase,
+ Sid: dataSource.Sid,
+ ServiceName: dataSource.ServiceName,
+ SshHost: dataSource.SshHost,
+ SshPort: dataSource.SshPort,
+ SshUser: dataSource.SshUser,
+ SshPassword: dataSource.SshPassword,
+ SshPrivateKey: dataSource.SshPrivateKey,
+ AuthenticationPrivateKey: dataSource.AuthenticationPrivateKey,
+ AuthenticationPrivateKeyPassphrase: dataSource.AuthenticationPrivateKeyPassphrase,
+ ExternalSecret: externalSecret,
+ SaslConfig: saslConfig,
+ AuthenticationType: convertV1AuthenticationType(dataSource.AuthenticationType),
+ AdditionalAddresses: convertAdditionalAddresses(dataSource.AdditionalAddresses),
+ ReplicaSet: dataSource.ReplicaSet,
+ DirectConnection: dataSource.DirectConnection,
+ Region: dataSource.Region,
+ WarehouseId: dataSource.WarehouseId,
+ UseSsl: dataSource.UseSsl,
+ VerifyTlsCertificate: dataSource.VerifyTlsCertificate,
+ RedisType: convertV1RedisType(dataSource.RedisType),
+ MasterName: dataSource.MasterName,
+ MasterUsername: dataSource.MasterUsername,
+ MasterPassword: dataSource.MasterPassword,
+ ExtraConnectionParameters: dataSource.ExtraConnectionParameters,
}
switch dataSource.AuthenticationType {
diff --git a/backend/generated-go/store/instance.pb.go b/backend/generated-go/store/instance.pb.go
index 50763ab004..b973bfe00c 100644
--- a/backend/generated-go/store/instance.pb.go
+++ b/backend/generated-go/store/instance.pb.go
@@ -608,10 +608,13 @@ type DataSource struct {
ObfuscatedSshPrivateKey string `protobuf:"bytes,19,opt,name=obfuscated_ssh_private_key,json=obfuscatedSshPrivateKey,proto3" json:"obfuscated_ssh_private_key,omitempty"`
// PKCS#8 private key in PEM format. If it's empty string, no private key is required.
// Used for authentication when connecting to the data source.
- AuthenticationPrivateKey string `protobuf:"bytes,43,opt,name=authentication_private_key,json=authenticationPrivateKey,proto3" json:"authentication_private_key,omitempty"`
- ObfuscatedAuthenticationPrivateKey string `protobuf:"bytes,20,opt,name=obfuscated_authentication_private_key,json=obfuscatedAuthenticationPrivateKey,proto3" json:"obfuscated_authentication_private_key,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"`
+ AuthenticationPrivateKey string `protobuf:"bytes,43,opt,name=authentication_private_key,json=authenticationPrivateKey,proto3" json:"authentication_private_key,omitempty"`
+ ObfuscatedAuthenticationPrivateKey string `protobuf:"bytes,20,opt,name=obfuscated_authentication_private_key,json=obfuscatedAuthenticationPrivateKey,proto3" json:"obfuscated_authentication_private_key,omitempty"`
+ // Passphrase for the encrypted PKCS#8 private key. Only used when the private key is encrypted.
+ AuthenticationPrivateKeyPassphrase string `protobuf:"bytes,48,opt,name=authentication_private_key_passphrase,json=authenticationPrivateKeyPassphrase,proto3" json:"authentication_private_key_passphrase,omitempty"`
+ 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"`
// Types that are valid to be assigned to IamExtension:
//
// *DataSource_AzureCredential_
@@ -883,6 +886,20 @@ func (x *DataSource) GetObfuscatedAuthenticationPrivateKey() string {
return ""
}
+func (x *DataSource) GetAuthenticationPrivateKeyPassphrase() string {
+ if x != nil {
+ return x.AuthenticationPrivateKeyPassphrase
+ }
+ return ""
+}
+
+func (x *DataSource) GetObfuscatedAuthenticationPrivateKeyPassphrase() string {
+ if x != nil {
+ return x.ObfuscatedAuthenticationPrivateKeyPassphrase
+ }
+ return ""
+}
+
func (x *DataSource) GetExternalSecret() *DataSourceExternalSecret {
if x != nil {
return x.ExternalSecret
@@ -1772,7 +1789,7 @@ const file_store_instance_proto_rawDesc = "" +
"\x11_connection_limitB\x0e\n" +
"\f_valid_untilB\f\n" +
"\n" +
- "_attribute\"\xff\x18\n" +
+ "_attribute\"\xba\x1a\n" +
"\n" +
"DataSource\x12\x0e\n" +
"\x02id\x18\x01 \x01(\tR\x02id\x122\n" +
@@ -1807,6 +1824,8 @@ const file_store_instance_proto_rawDesc = "" +
"\x1aobfuscated_ssh_private_key\x18\x13 \x01(\tR\x17obfuscatedSshPrivateKey\x12<\n" +
"\x1aauthentication_private_key\x18+ \x01(\tR\x18authenticationPrivateKey\x12Q\n" +
"%obfuscated_authentication_private_key\x18\x14 \x01(\tR\"obfuscatedAuthenticationPrivateKey\x12Q\n" +
+ "%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" +
"\x10azure_credential\x18\x17 \x01(\v2*.bytebase.store.DataSource.AzureCredentialH\x00R\x0fazureCredential\x12Q\n" +
diff --git a/backend/generated-go/store/instance_equal.pb.go b/backend/generated-go/store/instance_equal.pb.go
index d0d2ccedc4..9a41bb4851 100644
--- a/backend/generated-go/store/instance_equal.pb.go
+++ b/backend/generated-go/store/instance_equal.pb.go
@@ -283,6 +283,12 @@ func (x *DataSource) Equal(y *DataSource) bool {
if x.ObfuscatedAuthenticationPrivateKey != y.ObfuscatedAuthenticationPrivateKey {
return false
}
+ if x.AuthenticationPrivateKeyPassphrase != y.AuthenticationPrivateKeyPassphrase {
+ return false
+ }
+ if x.ObfuscatedAuthenticationPrivateKeyPassphrase != y.ObfuscatedAuthenticationPrivateKeyPassphrase {
+ return false
+ }
if !x.ExternalSecret.Equal(y.ExternalSecret) {
return false
}
diff --git a/backend/generated-go/v1/instance_service.pb.go b/backend/generated-go/v1/instance_service.pb.go
index dd96047226..8083e41b60 100644
--- a/backend/generated-go/v1/instance_service.pb.go
+++ b/backend/generated-go/v1/instance_service.pb.go
@@ -1793,9 +1793,11 @@ type DataSource struct {
SshPrivateKey string `protobuf:"bytes,19,opt,name=ssh_private_key,json=sshPrivateKey,proto3" json:"ssh_private_key,omitempty"`
// PKCS#8 private key in PEM format. If it's empty string, no private key is required.
// Used for authentication when connecting to the data source.
- AuthenticationPrivateKey string `protobuf:"bytes,20,opt,name=authentication_private_key,json=authenticationPrivateKey,proto3" json:"authentication_private_key,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"`
+ AuthenticationPrivateKey string `protobuf:"bytes,20,opt,name=authentication_private_key,json=authenticationPrivateKey,proto3" json:"authentication_private_key,omitempty"`
+ // Passphrase for the encrypted PKCS#8 private key. Only used when the private key is encrypted.
+ 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"`
// Types that are valid to be assigned to IamExtension:
//
// *DataSource_AzureCredential_
@@ -2017,6 +2019,13 @@ func (x *DataSource) GetAuthenticationPrivateKey() string {
return ""
}
+func (x *DataSource) GetAuthenticationPrivateKeyPassphrase() string {
+ if x != nil {
+ return x.AuthenticationPrivateKeyPassphrase
+ }
+ return ""
+}
+
func (x *DataSource) GetExternalSecret() *DataSourceExternalSecret {
if x != nil {
return x.ExternalSecret
@@ -2877,7 +2886,7 @@ const file_v1_instance_service_proto_rawDesc = "" +
"\x15AUTH_TYPE_UNSPECIFIED\x10\x00\x12\t\n" +
"\x05TOKEN\x10\x01\x12\x12\n" +
"\x0eVAULT_APP_ROLE\x10\x02B\r\n" +
- "\vauth_option\"\xcd\x13\n" +
+ "\vauth_option\"\xa5\x14\n" +
"\n" +
"DataSource\x12\x0e\n" +
"\x02id\x18\x01 \x01(\tR\x02id\x12/\n" +
@@ -2904,7 +2913,8 @@ const file_v1_instance_service_proto_rawDesc = "" +
"\bssh_user\x18\x11 \x01(\tR\asshUser\x12&\n" +
"\fssh_password\x18\x12 \x01(\tB\x03\xe0A\x04R\vsshPassword\x12+\n" +
"\x0fssh_private_key\x18\x13 \x01(\tB\x03\xe0A\x04R\rsshPrivateKey\x12A\n" +
- "\x1aauthentication_private_key\x18\x14 \x01(\tB\x03\xe0A\x04R\x18authenticationPrivateKey\x12N\n" +
+ "\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" +
"\x10azure_credential\x18\x17 \x01(\v2'.bytebase.v1.DataSource.AzureCredentialH\x00R\x0fazureCredential\x12N\n" +
diff --git a/backend/generated-go/v1/instance_service_equal.pb.go b/backend/generated-go/v1/instance_service_equal.pb.go
index d5e59a7d47..3c19fa7adf 100644
--- a/backend/generated-go/v1/instance_service_equal.pb.go
+++ b/backend/generated-go/v1/instance_service_equal.pb.go
@@ -630,6 +630,9 @@ func (x *DataSource) Equal(y *DataSource) bool {
if x.AuthenticationPrivateKey != y.AuthenticationPrivateKey {
return false
}
+ if x.AuthenticationPrivateKeyPassphrase != y.AuthenticationPrivateKeyPassphrase {
+ return false
+ }
if !x.ExternalSecret.Equal(y.ExternalSecret) {
return false
}
diff --git a/backend/plugin/db/snowflake/snowflake.go b/backend/plugin/db/snowflake/snowflake.go
index a11a89f4b8..3ddef740cb 100644
--- a/backend/plugin/db/snowflake/snowflake.go
+++ b/backend/plugin/db/snowflake/snowflake.go
@@ -73,19 +73,22 @@ func (d *Driver) Open(_ context.Context, dbType storepb.Engine, config db.Connec
// buildSnowflakeDSN returns the Snowflake Golang DSN and a redacted version of the DSN.
func buildSnowflakeDSN(config db.ConnectionConfig) (string, string, error) {
snowConfig := &snow.Config{
- User: config.DataSource.Username,
- Password: config.Password,
+ User: config.DataSource.Username,
}
if config.ConnectionContext.DatabaseName != "" {
snowConfig.Database = fmt.Sprintf(`"%s"`, config.ConnectionContext.DatabaseName)
}
if config.DataSource.GetAuthenticationPrivateKey() != "" {
- rsaPrivKey, err := decodeRSAPrivateKey(config.DataSource.GetAuthenticationPrivateKey())
+ // Use key-pair authentication (JWT) - password is not required
+ rsaPrivKey, err := decodeRSAPrivateKey(config.DataSource.GetAuthenticationPrivateKey(), config.DataSource.GetAuthenticationPrivateKeyPassphrase())
if err != nil {
return "", "", errors.Wrapf(err, "failed to decode rsa private key")
}
snowConfig.PrivateKey = rsaPrivKey
snowConfig.Authenticator = snow.AuthTypeJwt
+ } else {
+ // Use password authentication
+ snowConfig.Password = config.Password
}
// Host can also be account e.g. xma12345, or xma12345@host_ip where host_ip is the proxy server IP.
@@ -412,7 +415,7 @@ func (*Driver) QueryConn(ctx context.Context, conn *sql.Conn, statement string,
return results, nil
}
-func decodeRSAPrivateKey(key string) (*rsa.PrivateKey, error) {
+func decodeRSAPrivateKey(key, passphrase string) (*rsa.PrivateKey, error) {
block, _ := pem.Decode([]byte(key))
if block == nil {
return nil, errors.Errorf("failed to get private key PEM block from key")
@@ -432,8 +435,7 @@ func decodeRSAPrivateKey(key string) (*rsa.PrivateKey, error) {
// NOTE: As of Jun 2024, Golang's official library does not support passcode-encrypted PKCS8 private key. And
// Snowflake do not introduce an external library to achieve this due to the security purposes.
// We introduce https://pkg.go.dev/github.com/youmark/pkcs8 to help us to achieve this goal.
- // TODO(zp): Assume the passphrase is empty because we do not have input area in frontend.
- pk, err := pkcs8.ParsePKCS8PrivateKeyRSA([]byte(block.Bytes), []byte(""))
+ pk, err := pkcs8.ParsePKCS8PrivateKeyRSA(block.Bytes, []byte(passphrase))
if err != nil {
return nil, errors.Wrapf(err, "failed to parse pkcs8 private key to rsa private key with passphrase")
}
diff --git a/backend/store/instance.go b/backend/store/instance.go
index d85b1f459e..f489f473c4 100644
--- a/backend/store/instance.go
+++ b/backend/store/instance.go
@@ -383,6 +383,8 @@ func (s *Store) obfuscateInstance(ctx context.Context, instance *storepb.Instanc
ds.SshPrivateKey = ""
ds.ObfuscatedAuthenticationPrivateKey = common.Obfuscate(ds.GetAuthenticationPrivateKey(), secret)
ds.AuthenticationPrivateKey = ""
+ ds.ObfuscatedAuthenticationPrivateKeyPassphrase = common.Obfuscate(ds.GetAuthenticationPrivateKeyPassphrase(), secret)
+ ds.AuthenticationPrivateKeyPassphrase = ""
ds.ObfuscatedMasterPassword = common.Obfuscate(ds.GetMasterPassword(), secret)
ds.MasterPassword = ""
@@ -465,6 +467,12 @@ func (s *Store) unObfuscateInstance(ctx context.Context, instance *storepb.Insta
}
ds.AuthenticationPrivateKey = authenticationPrivateKey
+ authenticationPrivateKeyPassphrase, err := common.Unobfuscate(ds.GetObfuscatedAuthenticationPrivateKeyPassphrase(), secret)
+ if err != nil {
+ return err
+ }
+ ds.AuthenticationPrivateKeyPassphrase = authenticationPrivateKeyPassphrase
+
masterPassword, err := common.Unobfuscate(ds.GetObfuscatedMasterPassword(), secret)
if err != nil {
return err
diff --git a/frontend/src/components/InstanceForm/Buttons.vue b/frontend/src/components/InstanceForm/Buttons.vue
index d540cf11e9..0b10db609f 100644
--- a/frontend/src/components/InstanceForm/Buttons.vue
+++ b/frontend/src/components/InstanceForm/Buttons.vue
@@ -423,7 +423,11 @@ const doUpdate = async () => {
}
pendingRequestRunners.push(() =>
- instanceV1Store.updateDataSource(inst, editing, updateMask)
+ instanceV1Store.updateDataSource({
+ instance: inst.name,
+ dataSource: editing,
+ updateMask,
+ })
);
};
const maybeQueueUpdateAdminDataSource = async () => {
@@ -464,7 +468,10 @@ const doUpdate = async () => {
}
pendingRequestRunners.push(() =>
- instanceV1Store.createDataSource(inst, patch)
+ instanceV1Store.createDataSource({
+ instance: inst.name,
+ dataSource: patch,
+ })
);
} else {
const original = inst.dataSources.find((ds) => ds.id === editing.id);
diff --git a/frontend/src/components/InstanceForm/DataSourceSection/DataSourceForm.vue b/frontend/src/components/InstanceForm/DataSourceSection/DataSourceForm.vue
index 296f90c8bd..5db5eb1246 100644
--- a/frontend/src/components/InstanceForm/DataSourceSection/DataSourceForm.vue
+++ b/frontend/src/components/InstanceForm/DataSourceSection/DataSourceForm.vue
@@ -778,6 +778,21 @@ MIIEvQ...
:allow-edit="allowEdit"
/>
</div>
+ <div class="sm:col-span-3 sm:col-start-1">
+ <div class="textlabel block">
+ {{ $t("data-source.private-key-passphrase") }}
+ </div>
+ <div class="textinfolabel text-sm">
+ {{ $t("data-source.private-key-passphrase-tip") }}
+ </div>
+ <NInput
+ v-model:value="dataSource.authenticationPrivateKeyPassphrase"
+ type="password"
+ class="mt-2 w-full"
+ :disabled="!allowEdit"
+ :placeholder="$t('data-source.private-key-passphrase-placeholder')"
+ />
+ </div>
</template>
<template v-if="basicInfo.engine === Engine.DATABRICKS">
@@ -1420,9 +1435,9 @@ const handleSSHChange = (
watch(
() => props.dataSource.authenticationPrivateKey,
- () => {
+ (privateKey) => {
const ds = props.dataSource;
- ds.updateAuthenticationPrivateKey = true;
+ ds.useEmptyPassword = !!privateKey;
}
);
diff --git a/frontend/src/components/InstanceForm/common.ts b/frontend/src/components/InstanceForm/common.ts
index 8bf27e606a..caed1526d1 100644
--- a/frontend/src/components/InstanceForm/common.ts
+++ b/frontend/src/components/InstanceForm/common.ts
@@ -26,7 +26,6 @@ export type EditDataSource = DataSource & {
useEmptyPassword?: boolean;
useEmptyMasterPassword?: boolean;
updateSsl?: boolean;
- updateAuthenticationPrivateKey?: boolean;
extraConnectionParameters?: Record<string, string>;
};
@@ -131,8 +130,7 @@ export const calcDataSourceUpdateMask = (
const updateMask = new Set(
calcUpdateMask(editing, original, true /* toSnakeCase */)
);
- const { useEmptyPassword, updateSsl, updateAuthenticationPrivateKey } =
- editState;
+ const { useEmptyPassword, updateSsl } = editState;
if (useEmptyPassword) {
// We need to implicitly set "password" need to be updated
// if the "use empty password" option if checked
@@ -145,9 +143,6 @@ export const calcDataSourceUpdateMask = (
updateMask.add("ssl_key");
updateMask.add("ssl_cert");
}
- if (updateAuthenticationPrivateKey) {
- updateMask.add("authentication_private_key");
- }
if (updateMask.has("iam_extension")) {
updateMask.delete("iam_extension");
diff --git a/frontend/src/components/InstanceForm/context.ts b/frontend/src/components/InstanceForm/context.ts
index 1c885cc10c..cb045de0c4 100644
--- a/frontend/src/components/InstanceForm/context.ts
+++ b/frontend/src/components/InstanceForm/context.ts
@@ -1,16 +1,14 @@
import { create } from "@bufbuild/protobuf";
-import { createContextValues } from "@connectrpc/connect";
import Emittery from "emittery";
import { cloneDeep, isEqual, omit } from "lodash-es";
import { useDialog } from "naive-ui";
import type { InjectionKey, Ref } from "vue";
import { computed, inject, provide, ref, watch } from "vue";
import { useI18n } from "vue-i18n";
-import { instanceServiceClientConnect } from "@/grpcweb";
-import { silentContextKey } from "@/grpcweb/context-key";
import {
pushNotification,
useEnvironmentV1Store,
+ useInstanceV1Store,
useSubscriptionV1Store,
} from "@/store";
import { Engine, State } from "@/types/proto-es/v1/common_pb";
@@ -19,21 +17,17 @@ import type {
Instance,
} from "@/types/proto-es/v1/instance_service_pb";
import {
- AddDataSourceRequestSchema,
- CreateInstanceRequestSchema,
DataSource_AuthenticationType,
DataSource_RedisType,
DataSourceExternalSecret_AuthType,
DataSourceExternalSecret_SecretType,
DataSourceType,
InstanceSchema,
- UpdateDataSourceRequestSchema,
} from "@/types/proto-es/v1/instance_service_pb";
import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";
import {
convertKVListToLabels,
convertLabelsToKVList,
- extractInstanceResourceName,
hasWorkspacePermissionV2,
isValidSpannerHost,
} from "@/utils";
@@ -62,6 +56,7 @@ export const provideInstanceFormContext = (baseContext: {
instance: Ref<Instance | undefined>;
hideAdvancedFeatures: Ref<boolean | undefined>;
}) => {
+ const instanceStore = useInstanceV1Store();
const $d = useDialog();
const { t } = useI18n();
const events = new Emittery<{
@@ -281,8 +276,7 @@ export const provideInstanceFormContext = (baseContext: {
"useEmptyPassword",
"updatedMasterPassword",
"useEmptyMasterPassword",
- "updateSsl",
- "updateAuthenticationPrivateKey"
+ "updateSsl"
)
);
if (edit.updatedPassword) {
@@ -398,14 +392,7 @@ export const provideInstanceFormContext = (baseContext: {
);
instance.dataSources = [dataSourceCreate];
try {
- const request = create(CreateInstanceRequestSchema, {
- instance,
- instanceId: extractInstanceResourceName(instance.name),
- validateOnly: true,
- });
- await instanceServiceClientConnect.createInstance(request, {
- contextValues: createContextValues().set(silentContextKey, true),
- });
+ await instanceStore.createInstance(instance, true /* validateOnly */);
return ok();
} catch (err) {
return fail(dataSourceCreate.host, err);
@@ -417,14 +404,11 @@ export const provideInstanceFormContext = (baseContext: {
// When read-only data source is about to be created, use
// editingDataSource + AddDataSourceRequest.validateOnly = true
try {
- const request = create(AddDataSourceRequestSchema, {
- name: instance.value!.name,
+ await instanceStore.createDataSource({
+ instance: instance.value!.name,
dataSource: ds,
validateOnly: true,
});
- await instanceServiceClientConnect.addDataSource(request, {
- contextValues: createContextValues().set(silentContextKey, true),
- });
return ok();
} catch (err) {
return fail(ds.host, err);
@@ -440,15 +424,12 @@ export const provideInstanceFormContext = (baseContext: {
throw new Error("should never reach this line");
}
const updateMask = calcDataSourceUpdateMask(ds, original, editingDS);
- const request = create(UpdateDataSourceRequestSchema, {
- name: instance.value!.name,
+ await instanceStore.updateDataSource({
+ instance: instance.value!.name,
dataSource: ds,
- updateMask: { paths: updateMask },
+ updateMask,
validateOnly: true,
});
- await instanceServiceClientConnect.updateDataSource(request, {
- contextValues: createContextValues().set(silentContextKey, true),
- });
return ok();
} catch (err) {
return fail(ds.host, err);
diff --git a/frontend/src/locales/en-US.json b/frontend/src/locales/en-US.json
index a29d710400..f6ee03e41f 100644
--- a/frontend/src/locales/en-US.json
+++ b/frontend/src/locales/en-US.json
@@ -1977,6 +1977,9 @@
},
"data-source": {
"snowflake-keypair-tip": "Key-pair authentication",
+ "private-key-passphrase": "Private Key Passphrase",
+ "private-key-passphrase-tip": "Optional passphrase for encrypted private keys",
+ "private-key-passphrase-placeholder": "Leave empty if your private key is not encrypted",
"extra-params": {
"self": "Extra Parameters",
"description": "Additional parameters for database connection string"
diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.json
index 3f9a33d5a2..5080f9a3f2 100644
--- a/frontend/src/locales/es-ES.json
+++ b/frontend/src/locales/es-ES.json
@@ -1977,6 +1977,9 @@
},
"data-source": {
"snowflake-keypair-tip": "Autenticación de par de claves",
+ "private-key-passphrase": "Frase de contraseña de clave privada",
+ "private-key-passphrase-tip": "Frase de contraseña opcional para claves privadas cifradas",
+ "private-key-passphrase-placeholder": "Deje vacío si su clave privada no está cifrada",
"extra-params": {
"self": "Parámetros adicionales",
"description": "Parámetros adicionales para la cadena de conexión de la base de datos"
diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.json
index 4de9677b24..ec7f35a702 100644
--- a/frontend/src/locales/ja-JP.json
+++ b/frontend/src/locales/ja-JP.json
@@ -1977,6 +1977,9 @@
},
"data-source": {
"snowflake-keypair-tip": "キーペア認証",
+ "private-key-passphrase": "秘密鍵のパスフレーズ",
+ "private-key-passphrase-tip": "暗号化された秘密鍵のオプションパスフレーズ",
+ "private-key-passphrase-placeholder": "秘密鍵が暗号化されていない場合は空のままにしてください",
"extra-params": {
"self": "追加のパラメーター",
"description": "データベース接続文字列の追加パラメーター"
diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.json
index a0510f7433..308a909fc8 100644
--- a/frontend/src/locales/vi-VN.json
+++ b/frontend/src/locales/vi-VN.json
@@ -1977,6 +1977,9 @@
},
"data-source": {
"snowflake-keypair-tip": "Xác thực cặp khóa",
+ "private-key-passphrase": "Mật khẩu khóa riêng",
+ "private-key-passphrase-tip": "Mật khẩu tùy chọn cho khóa riêng được mã hóa",
+ "private-key-passphrase-placeholder": "Để trống nếu khóa riêng của bạn không được mã hóa",
"extra-params": {
"self": "Thông số bổ sung",
"description": "Các tham số bổ sung cho chuỗi kết nối cơ sở dữ liệu"
diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.json
index 08b568f133..100484e9e6 100644
--- a/frontend/src/locales/zh-CN.json
+++ b/frontend/src/locales/zh-CN.json
@@ -1977,6 +1977,9 @@
},
"data-source": {
"snowflake-keypair-tip": "密钥对认证",
+ "private-key-passphrase": "私钥密码",
+ "private-key-passphrase-tip": "加密私钥的可选密码",
+ "private-key-passphrase-placeholder": "如果私钥未加密,请留空",
"extra-params": {
"self": "额外的参数",
"description": "数据库连接字符串的其他参数"
diff --git a/frontend/src/store/modules/v1/instance.ts b/frontend/src/store/modules/v1/instance.ts
index d8e06ccb3e..bdca1fa0ae 100644
--- a/frontend/src/store/modules/v1/instance.ts
+++ b/frontend/src/store/modules/v1/instance.ts
@@ -99,12 +99,24 @@ export const useInstanceV1Store = defineStore("instance_v1", () => {
});
return list;
};
- const createInstance = async (instance: Instance) => {
+ const createInstance = async (
+ instance: Instance,
+ validateOnly: boolean = false
+ ) => {
const request = create(CreateInstanceRequestSchema, {
instance: instance,
instanceId: extractInstanceResourceName(instance.name),
+ validateOnly: validateOnly,
});
- const response = await instanceServiceClientConnect.createInstance(request);
+ const response = await instanceServiceClientConnect.createInstance(
+ request,
+ {
+ contextValues: createContextValues().set(
+ silentContextKey,
+ validateOnly
+ ),
+ }
+ );
const instances = upsertInstances([response]);
return instances[0];
@@ -216,30 +228,52 @@ export const useInstanceV1Store = defineStore("instance_v1", () => {
instanceRequestCache.set(name, request);
return request;
};
- const createDataSource = async (
- instance: Instance,
- dataSource: DataSource
- ) => {
+ const createDataSource = async ({
+ instance,
+ dataSource,
+ validateOnly,
+ }: {
+ instance: string;
+ dataSource: DataSource;
+ validateOnly?: boolean;
+ }) => {
const request = create(AddDataSourceRequestSchema, {
- name: instance.name,
+ name: instance,
dataSource: dataSource,
+ validateOnly,
+ });
+ const response = await instanceServiceClientConnect.addDataSource(request, {
+ contextValues: createContextValues().set(silentContextKey, validateOnly),
});
- const response = await instanceServiceClientConnect.addDataSource(request);
const [updatedInstance] = upsertInstances([response]);
return updatedInstance;
};
- const updateDataSource = async (
- instance: Instance,
- dataSource: DataSource,
- updateMask: string[]
- ) => {
+ const updateDataSource = async ({
+ instance,
+ dataSource,
+ updateMask,
+ validateOnly,
+ }: {
+ instance: string;
+ dataSource: DataSource;
+ updateMask: string[];
+ validateOnly?: boolean;
+ }) => {
const request = create(UpdateDataSourceRequestSchema, {
- name: instance.name,
+ name: instance,
dataSource: dataSource,
updateMask: { paths: updateMask },
+ validateOnly,
});
- const response =
- await instanceServiceClientConnect.updateDataSource(request);
+ const response = await instanceServiceClientConnect.updateDataSource(
+ request,
+ {
+ contextValues: createContextValues().set(
+ silentContextKey,
+ validateOnly
+ ),
+ }
+ );
const [updatedInstance] = upsertInstances([response]);
return updatedInstance;
};
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 8543473e0e..032f5cfa87 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
@@ -1067,6 +1067,13 @@ export declare type DataSource = Message<"bytebase.v1.DataSource"> & {
*/
authenticationPrivateKey: string;
+ /**
+ * Passphrase for the encrypted PKCS#8 private key. Only used when the private key is encrypted.
+ *
+ * @generated from field: string authentication_private_key_passphrase = 40;
+ */
+ authenticationPrivateKeyPassphrase: string;
+
/**
* @generated from field: bytebase.v1.DataSourceExternalSecret external_secret = 21;
*/
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 aecf36144b..03ac49769f 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+kEXChVieXRlYmFzZS5jb20vSW5zdGFuY2UiYwoUTGlzdEluc3RhbmNlc1JlcXVlc3QSEQoJcGFnZV9zaXplGAEgASgFEhIKCnBhZ2VfdG9rZW4YAiABKAkSFAoMc2hvd19kZWxldGVkGAMgASgIEg4KBmZpbHRlchgEIAEoCSJaChVMaXN0SW5zdGFuY2VzUmVzcG9uc2USKAoJaW5zdGFuY2VzGAEgAygLMhUuYnl0ZWJhc2UudjEuSW5zdGFuY2USFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJInEKFUNyZWF0ZUluc3RhbmNlUmVxdWVzdBIsCghpbnN0YW5jZRgBIAEoCzIVLmJ5dGViYXNlLnYxLkluc3RhbmNlQgPgQQISEwoLaW5zdGFuY2VfaWQYAiABKAkSFQoNdmFsaWRhdGVfb25seRgDIAEoCCKNAQoVVXBkYXRlSW5zdGFuY2VSZXF1ZXN0EiwKCGluc3RhbmNlGAEgASgLMhUuYnl0ZWJhc2UudjEuSW5zdGFuY2VCA+BBAhIvCgt1cGRhdGVfbWFzaxgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2sSFQoNYWxsb3dfbWlzc2luZxgDIAEoCCJiChVEZWxldGVJbnN0YW5jZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vSW5zdGFuY2USDQoFZm9yY2UYAiABKAgSDQoFcHVyZ2UYAyABKAgiRgoXVW5kZWxldGVJbnN0YW5jZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vSW5zdGFuY2UiXAoTU3luY0luc3RhbmNlUmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9JbnN0YW5jZRIYChBlbmFibGVfZnVsbF9zeW5jGAIgASgIIooBChtMaXN0SW5zdGFuY2VEYXRhYmFzZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vSW5zdGFuY2USMQoIaW5zdGFuY2UYAiABKAsyFS5ieXRlYmFzZS52MS5JbnN0YW5jZUID4EECSACIAQFCCwoJX2luc3RhbmNlIjEKHExpc3RJbnN0YW5jZURhdGFiYXNlUmVzcG9uc2USEQoJZGF0YWJhc2VzGAEgAygJIikKFFN5bmNJbnN0YW5jZVJlc3BvbnNlEhEKCWRhdGFiYXNlcxgBIAMoCSJUChlCYXRjaFN5bmNJbnN0YW5jZXNSZXF1ZXN0EjcKCHJlcXVlc3RzGAEgAygLMiAuYnl0ZWJhc2UudjEuU3luY0luc3RhbmNlUmVxdWVzdEID4EECIhwKGkJhdGNoU3luY0luc3RhbmNlc1Jlc3BvbnNlIlgKG0JhdGNoVXBkYXRlSW5zdGFuY2VzUmVxdWVzdBI5CghyZXF1ZXN0cxgBIAMoCzIiLmJ5dGViYXNlLnYxLlVwZGF0ZUluc3RhbmNlUmVxdWVzdEID4EECIkgKHEJhdGNoVXBkYXRlSW5zdGFuY2VzUmVzcG9uc2USKAoJaW5zdGFuY2VzGAEgAygLMhUuYnl0ZWJhc2UudjEuSW5zdGFuY2UijQEKFEFkZERhdGFTb3VyY2VSZXF1ZXN0EisKBG5hbWUYASABKAlCHeBBAvpBFwoVYnl0ZWJhc2UuY29tL0luc3RhbmNlEjEKC2RhdGFfc291cmNlGAIgASgLMhcuYnl0ZWJhc2UudjEuRGF0YVNvdXJjZUID4EECEhUKDXZhbGlkYXRlX29ubHkYAyABKAgieQoXUmVtb3ZlRGF0YVNvdXJjZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vSW5zdGFuY2USMQoLZGF0YV9zb3VyY2UYAiABKAsyFy5ieXRlYmFzZS52MS5EYXRhU291cmNlQgPgQQIi2AEKF1VwZGF0ZURhdGFTb3VyY2VSZXF1ZXN0EisKBG5hbWUYASABKAlCHeBBAvpBFwoVYnl0ZWJhc2UuY29tL0luc3RhbmNlEjEKC2RhdGFfc291cmNlGAIgASgLMhcuYnl0ZWJhc2UudjEuRGF0YVNvdXJjZUID4EECEi8KC3VwZGF0ZV9tYXNrGAMgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFzaxIVCg12YWxpZGF0ZV9vbmx5GAQgASgIEhUKDWFsbG93X21pc3NpbmcYBSABKAgiggUKCEluc3RhbmNlEgwKBG5hbWUYASABKAkSIQoFc3RhdGUYAyABKA4yEi5ieXRlYmFzZS52MS5TdGF0ZRIXCgV0aXRsZRgEIAEoCUIIukgFcgMYyAESIwoGZW5naW5lGAUgASgOMhMuYnl0ZWJhc2UudjEuRW5naW5lEhsKDmVuZ2luZV92ZXJzaW9uGAYgASgJQgPgQQMSFQoNZXh0ZXJuYWxfbGluaxgHIAEoCRItCgxkYXRhX3NvdXJjZXMYCCADKAsyFy5ieXRlYmFzZS52MS5EYXRhU291cmNlEh0KC2Vudmlyb25tZW50GAkgASgJQgPgQQFIAIgBARISCgphY3RpdmF0aW9uGAogASgIEi0KBXJvbGVzGAwgAygLMhkuYnl0ZWJhc2UudjEuSW5zdGFuY2VSb2xlQgPgQQMSMAoNc3luY19pbnRlcnZhbBgNIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbhIbChNtYXhpbXVtX2Nvbm5lY3Rpb25zGA4gASgFEhYKDnN5bmNfZGF0YWJhc2VzGA8gAygJEjcKDmxhc3Rfc3luY190aW1lGBAgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEjEKBmxhYmVscxgRIAMoCzIhLmJ5dGViYXNlLnYxLkluc3RhbmNlLkxhYmVsc0VudHJ5Gi0KC0xhYmVsc0VudHJ5EgsKA2tleRgBIAEoCRINCgV2YWx1ZRgCIAEoCToCOAE6MOpBLQoVYnl0ZWJhc2UuY29tL0luc3RhbmNlEhRpbnN0YW5jZXMve2luc3RhbmNlfUIOCgxfZW52aXJvbm1lbnQihQcKGERhdGFTb3VyY2VFeHRlcm5hbFNlY3JldBJFCgtzZWNyZXRfdHlwZRgBIAEoDjIwLmJ5dGViYXNlLnYxLkRhdGFTb3VyY2VFeHRlcm5hbFNlY3JldC5TZWNyZXRUeXBlEgsKA3VybBgCIAEoCRJBCglhdXRoX3R5cGUYAyABKA4yLi5ieXRlYmFzZS52MS5EYXRhU291cmNlRXh0ZXJuYWxTZWNyZXQuQXV0aFR5cGUSSwoIYXBwX3JvbGUYBCABKAsyNy5ieXRlYmFzZS52MS5EYXRhU291cmNlRXh0ZXJuYWxTZWNyZXQuQXBwUm9sZUF1dGhPcHRpb25IABIUCgV0b2tlbhgFIAEoCUID4EEESAASEwoLZW5naW5lX25hbWUYBiABKAkSEwoLc2VjcmV0X25hbWUYByABKAkSGQoRcGFzc3dvcmRfa2V5X25hbWUYCCABKAkSIwobc2tpcF92YXVsdF90bHNfdmVyaWZpY2F0aW9uGAkgASgIEhkKDHZhdWx0X3NzbF9jYRgKIAEoCUID4EEEEhsKDnZhdWx0X3NzbF9jZXJ0GAsgASgJQgPgQQQSGgoNdmF1bHRfc3NsX2tleRgMIAEoCUID4EEEGu4BChFBcHBSb2xlQXV0aE9wdGlvbhIUCgdyb2xlX2lkGAEgASgJQgPgQQQSFgoJc2VjcmV0X2lkGAIgASgJQgPgQQQSUAoEdHlwZRgDIAEoDjJCLmJ5dGViYXNlLnYxLkRhdGFTb3VyY2VFeHRlcm5hbFNlY3JldC5BcHBSb2xlQXV0aE9wdGlvbi5TZWNyZXRUeXBlEhIKCm1vdW50X3BhdGgYBCABKAkiRQoKU2VjcmV0VHlwZRIbChdTRUNSRVRfVFlQRV9VTlNQRUNJRklFRBAAEgkKBVBMQUlOEAESDwoLRU5WSVJPTk1FTlQQAiJrCgpTZWNyZXRUeXBlEhsKF1NFQ1JFVF9UWVBFX1VOU1BFQ0lGSUVEEAASDwoLVkFVTFRfS1ZfVjIQARIXChNBV1NfU0VDUkVUU19NQU5BR0VSEAISFgoSR0NQX1NFQ1JFVF9NQU5BR0VSEAMiRAoIQXV0aFR5cGUSGQoVQVVUSF9UWVBFX1VOU1BFQ0lGSUVEEAASCQoFVE9LRU4QARISCg5WQVVMVF9BUFBfUk9MRRACQg0KC2F1dGhfb3B0aW9uIt0OCgpEYXRhU291cmNlEgoKAmlkGAEgASgJEikKBHR5cGUYAiABKA4yGy5ieXRlYmFzZS52MS5EYXRhU291cmNlVHlwZRIQCgh1c2VybmFtZRgDIAEoCRIVCghwYXNzd29yZBgEIAEoCUID4EEEEg8KB3VzZV9zc2wYHiABKAgSEwoGc3NsX2NhGAUgASgJQgPgQQQSFQoIc3NsX2NlcnQYBiABKAlCA+BBBBIUCgdzc2xfa2V5GAcgASgJQgPgQQQSHgoWdmVyaWZ5X3Rsc19jZXJ0aWZpY2F0ZRgnIAEoCBIMCgRob3N0GAggASgJEgwKBHBvcnQYCSABKAkSEAoIZGF0YWJhc2UYCiABKAkSCwoDc3J2GAsgASgIEh8KF2F1dGhlbnRpY2F0aW9uX2RhdGFiYXNlGAwgASgJEhMKC3JlcGxpY2Ffc2V0GBkgASgJEgsKA3NpZBgNIAEoCRIUCgxzZXJ2aWNlX25hbWUYDiABKAkSEAoIc3NoX2hvc3QYDyABKAkSEAoIc3NoX3BvcnQYECABKAkSEAoIc3NoX3VzZXIYESABKAkSGQoMc3NoX3Bhc3N3b3JkGBIgASgJQgPgQQQSHAoPc3NoX3ByaXZhdGVfa2V5GBMgASgJQgPgQQQSJwoaYXV0aGVudGljYXRpb25fcHJpdmF0ZV9rZXkYFCABKAlCA+BBBBI+Cg9leHRlcm5hbF9zZWNyZXQYFSABKAsyJS5ieXRlYmFzZS52MS5EYXRhU291cmNlRXh0ZXJuYWxTZWNyZXQSRwoTYXV0aGVudGljYXRpb25fdHlwZRgWIAEoDjIqLmJ5dGViYXNlLnYxLkRhdGFTb3VyY2UuQXV0aGVudGljYXRpb25UeXBlEkMKEGF6dXJlX2NyZWRlbnRpYWwYFyABKAsyJy5ieXRlYmFzZS52MS5EYXRhU291cmNlLkF6dXJlQ3JlZGVudGlhbEgAEj8KDmF3c19jcmVkZW50aWFsGCUgASgLMiUuYnl0ZWJhc2UudjEuRGF0YVNvdXJjZS5BV1NDcmVkZW50aWFsSAASPwoOZ2NwX2NyZWRlbnRpYWwYJiABKAsyJS5ieXRlYmFzZS52MS5EYXRhU291cmNlLkdDUENyZWRlbnRpYWxIABIsCgtzYXNsX2NvbmZpZxgYIAEoCzIXLmJ5dGViYXNlLnYxLlNBU0xDb25maWcSQgoUYWRkaXRpb25hbF9hZGRyZXNzZXMYGiADKAsyHy5ieXRlYmFzZS52MS5EYXRhU291cmNlLkFkZHJlc3NCA+BBARIZChFkaXJlY3RfY29ubmVjdGlvbhgbIAEoCBIOCgZyZWdpb24YHCABKAkSFAoMd2FyZWhvdXNlX2lkGB0gASgJEhMKC21hc3Rlcl9uYW1lGB8gASgJEhcKD21hc3Rlcl91c2VybmFtZRggIAEoCRIXCg9tYXN0ZXJfcGFzc3dvcmQYISABKAkSNQoKcmVkaXNfdHlwZRgiIAEoDjIhLmJ5dGViYXNlLnYxLkRhdGFTb3VyY2UuUmVkaXNUeXBlEg8KB2NsdXN0ZXIYIyABKAkSWwobZXh0cmFfY29ubmVjdGlvbl9wYXJhbWV0ZXJzGCQgAygLMjYuYnl0ZWJhc2UudjEuRGF0YVNvdXJjZS5FeHRyYUNvbm5lY3Rpb25QYXJhbWV0ZXJzRW50cnkaUwoPQXp1cmVDcmVkZW50aWFsEhEKCXRlbmFudF9pZBgBIAEoCRIRCgljbGllbnRfaWQYAiABKAkSGgoNY2xpZW50X3NlY3JldBgDIAEoCUID4EEEGpgBCg1BV1NDcmVkZW50aWFsEhoKDWFjY2Vzc19rZXlfaWQYASABKAlCA+BBBBIeChFzZWNyZXRfYWNjZXNzX2tleRgCIAEoCUID4EEEEhoKDXNlc3Npb25fdG9rZW4YAyABKAlCA+BBBBIVCghyb2xlX2FybhgEIAEoCUID4EEEEhgKC2V4dGVybmFsX2lkGAUgASgJQgPgQQQaJQoNR0NQQ3JlZGVudGlhbBIUCgdjb250ZW50GAEgASgJQgPgQQQaJQoHQWRkcmVzcxIMCgRob3N0GAEgASgJEgwKBHBvcnQYAiABKAkaQAoeRXh0cmFDb25uZWN0aW9uUGFyYW1ldGVyc0VudHJ5EgsKA2tleRgBIAEoCRINCgV2YWx1ZRgCIAEoCToCOAEifAoSQXV0aGVudGljYXRpb25UeXBlEh4KGkFVVEhFTlRJQ0FUSU9OX1VOU1BFQ0lGSUVEEAASDAoIUEFTU1dPUkQQARIYChRHT09HTEVfQ0xPVURfU1FMX0lBTRACEg8KC0FXU19SRFNfSUFNEAMSDQoJQVpVUkVfSUFNEAQiUgoJUmVkaXNUeXBlEhoKFlJFRElTX1RZUEVfVU5TUEVDSUZJRUQQABIOCgpTVEFOREFMT05FEAESDAoIU0VOVElORUwQAhILCgdDTFVTVEVSEANCDwoNaWFtX2V4dGVuc2lvbiLeAQoQSW5zdGFuY2VSZXNvdXJjZRINCgV0aXRsZRgBIAEoCRIjCgZlbmdpbmUYAiABKA4yEy5ieXRlYmFzZS52MS5FbmdpbmUSGwoOZW5naW5lX3ZlcnNpb24YAyABKAlCA+BBAxItCgxkYXRhX3NvdXJjZXMYBCADKAsyFy5ieXRlYmFzZS52MS5EYXRhU291cmNlEhIKCmFjdGl2YXRpb24YBSABKAgSDAoEbmFtZRgGIAEoCRIYCgtlbnZpcm9ubWVudBgHIAEoCUgAiAEBQg4KDF9lbnZpcm9ubWVudCJMCgpTQVNMQ29uZmlnEjEKCmtyYl9jb25maWcYASABKAsyGy5ieXRlYmFzZS52MS5LZXJiZXJvc0NvbmZpZ0gAQgsKCW1lY2hhbmlzbSKWAQoOS2VyYmVyb3NDb25maWcSDwoHcHJpbWFyeRgBIAEoCRIQCghpbnN0YW5jZRgCIAEoCRINCgVyZWFsbRgDIAEoCRIOCgZrZXl0YWIYBCABKAwSEAoIa2RjX2hvc3QYBSABKAkSEAoIa2RjX3BvcnQYBiABKAkSHgoWa2RjX3RyYW5zcG9ydF9wcm90b2NvbBgHIAEoCSpHCg5EYXRhU291cmNlVHlwZRIbChdEQVRBX1NPVVJDRV9VTlNQRUNJRklFRBAAEgkKBUFETUlOEAESDQoJUkVBRF9PTkxZEAIy1BAKD0luc3RhbmNlU2VydmljZRKEAQoLR2V0SW5zdGFuY2USHy5ieXRlYmFzZS52MS5HZXRJbnN0YW5jZVJlcXVlc3QaFS5ieXRlYmFzZS52MS5JbnN0YW5jZSI92kEEbmFtZYrqMBBiYi5pbnN0YW5jZXMuZ2V0kOowAYLT5JMCGBIWL3YxL3tuYW1lPWluc3RhbmNlcy8qfRKJAQoNTGlzdEluc3RhbmNlcxIhLmJ5dGViYXNlLnYxLkxpc3RJbnN0YW5jZXNSZXF1ZXN0GiIuYnl0ZWJhc2UudjEuTGlzdEluc3RhbmNlc1Jlc3BvbnNlIjHaQQCK6jARYmIuaW5zdGFuY2VzLmxpc3SQ6jABgtPkkwIPEg0vdjEvaW5zdGFuY2VzEpYBCg5DcmVhdGVJbnN0YW5jZRIiLmJ5dGViYXNlLnYxLkNyZWF0ZUluc3RhbmNlUmVxdWVzdBoVLmJ5dGViYXNlLnYxLkluc3RhbmNlIknaQQhpbnN0YW5jZYrqMBNiYi5pbnN0YW5jZXMuY3JlYXRlkOowAZjqMAGC0+STAhk6CGluc3RhbmNlIg0vdjEvaW5zdGFuY2VzErQBCg5VcGRhdGVJbnN0YW5jZRIiLmJ5dGViYXNlLnYxLlVwZGF0ZUluc3RhbmNlUmVxdWVzdBoVLmJ5dGViYXNlLnYxLkluc3RhbmNlImfaQRRpbnN0YW5jZSx1cGRhdGVfbWFza4rqMBNiYi5pbnN0YW5jZXMudXBkYXRlkOowAZjqMAGC0+STAis6CGluc3RhbmNlMh8vdjEve2luc3RhbmNlLm5hbWU9aW5zdGFuY2VzLyp9EpIBCg5EZWxldGVJbnN0YW5jZRIiLmJ5dGViYXNlLnYxLkRlbGV0ZUluc3RhbmNlUmVxdWVzdBoWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eSJE2kEEbmFtZYrqMBNiYi5pbnN0YW5jZXMuZGVsZXRlkOowAZjqMAGC0+STAhgqFi92MS97bmFtZT1pbnN0YW5jZXMvKn0SnAEKEFVuZGVsZXRlSW5zdGFuY2USJC5ieXRlYmFzZS52MS5VbmRlbGV0ZUluc3RhbmNlUmVxdWVzdBoVLmJ5dGViYXNlLnYxLkluc3RhbmNlIkuK6jAVYmIuaW5zdGFuY2VzLnVuZGVsZXRlkOowAZjqMAGC0+STAiQ6ASoiHy92MS97bmFtZT1pbnN0YW5jZXMvKn06dW5kZWxldGUSlAEKDFN5bmNJbnN0YW5jZRIgLmJ5dGViYXNlLnYxLlN5bmNJbnN0YW5jZVJlcXVlc3QaIS5ieXRlYmFzZS52MS5TeW5jSW5zdGFuY2VSZXNwb25zZSI/iuowEWJiLmluc3RhbmNlcy5zeW5jkOowAYLT5JMCIDoBKiIbL3YxL3tuYW1lPWluc3RhbmNlcy8qfTpzeW5jErABChRMaXN0SW5zdGFuY2VEYXRhYmFzZRIoLmJ5dGViYXNlLnYxLkxpc3RJbnN0YW5jZURhdGFiYXNlUmVxdWVzdBopLmJ5dGViYXNlLnYxLkxpc3RJbnN0YW5jZURhdGFiYXNlUmVzcG9uc2UiQ4rqMBBiYi5pbnN0YW5jZXMuZ2V0kOowAYLT5JMCJToBKiIgL3YxL3tuYW1lPWluc3RhbmNlcy8qfTpkYXRhYmFzZXMSogEKEkJhdGNoU3luY0luc3RhbmNlcxImLmJ5dGViYXNlLnYxLkJhdGNoU3luY0luc3RhbmNlc1JlcXVlc3QaJy5ieXRlYmFzZS52MS5CYXRjaFN5bmNJbnN0YW5jZXNSZXNwb25zZSI7iuowEWJiLmluc3RhbmNlcy5zeW5jkOowAYLT5JMCHDoBKiIXL3YxL2luc3RhbmNlczpiYXRjaFN5bmMSsAEKFEJhdGNoVXBkYXRlSW5zdGFuY2VzEiguYnl0ZWJhc2UudjEuQmF0Y2hVcGRhdGVJbnN0YW5jZXNSZXF1ZXN0GikuYnl0ZWJhc2UudjEuQmF0Y2hVcGRhdGVJbnN0YW5jZXNSZXNwb25zZSJDiuowE2JiLmluc3RhbmNlcy51cGRhdGWQ6jABmOowAYLT5JMCHjoBKiIZL3YxL2luc3RhbmNlczpiYXRjaFVwZGF0ZRKZAQoNQWRkRGF0YVNvdXJjZRIhLmJ5dGViYXNlLnYxLkFkZERhdGFTb3VyY2VSZXF1ZXN0GhUuYnl0ZWJhc2UudjEuSW5zdGFuY2UiTorqMBNiYi5pbnN0YW5jZXMudXBkYXRlkOowAZjqMAGC0+STAik6ASoiJC92MS97bmFtZT1pbnN0YW5jZXMvKn06YWRkRGF0YVNvdXJjZRKiAQoQUmVtb3ZlRGF0YVNvdXJjZRIkLmJ5dGViYXNlLnYxLlJlbW92ZURhdGFTb3VyY2VSZXF1ZXN0GhUuYnl0ZWJhc2UudjEuSW5zdGFuY2UiUYrqMBNiYi5pbnN0YW5jZXMudXBkYXRlkOowAZjqMAGC0+STAiw6ASoiJy92MS97bmFtZT1pbnN0YW5jZXMvKn06cmVtb3ZlRGF0YVNvdXJjZRLGAQoQVXBkYXRlRGF0YVNvdXJjZRIkLmJ5dGViYXNlLnYxLlVwZGF0ZURhdGFTb3VyY2VSZXF1ZXN0GhUuYnl0ZWJhc2UudjEuSW5zdGFuY2UiddpBF2RhdGFfc291cmNlLHVwZGF0ZV9tYXNriuowE2JiLmluc3RhbmNlcy51cGRhdGWQ6jABmOowAYLT5JMCNjoLZGF0YV9zb3VyY2UyJy92MS97bmFtZT1pbnN0YW5jZXMvKn06dXBkYXRlRGF0YVNvdXJjZUKqAQoPY29tLmJ5dGViYXNlLnYxQhRJbnN0YW5jZVNlcnZpY2VQcm90b1ABWjRnaXRodWIuY29tL2J5dGViYXNlL2J5dGViYXNlL2JhY2tlbmQvZ2VuZXJhdGVkLWdvL3YxogIDQlhYqgILQnl0ZWJhc2UuVjHKAgtCeXRlYmFzZVxWMeICF0J5dGViYXNlXFYxXEdQQk1ldGFkYXRh6gIMQnl0ZWJhc2U6OlYxYgZwcm90bzM", [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+kEXChVieXRlYmFzZS5jb20vSW5zdGFuY2UiYwoUTGlzdEluc3RhbmNlc1JlcXVlc3QSEQoJcGFnZV9zaXplGAEgASgFEhIKCnBhZ2VfdG9rZW4YAiABKAkSFAoMc2hvd19kZWxldGVkGAMgASgIEg4KBmZpbHRlchgEIAEoCSJaChVMaXN0SW5zdGFuY2VzUmVzcG9uc2USKAoJaW5zdGFuY2VzGAEgAygLMhUuYnl0ZWJhc2UudjEuSW5zdGFuY2USFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJInEKFUNyZWF0ZUluc3RhbmNlUmVxdWVzdBIsCghpbnN0YW5jZRgBIAEoCzIVLmJ5dGViYXNlLnYxLkluc3RhbmNlQgPgQQISEwoLaW5zdGFuY2VfaWQYAiABKAkSFQoNdmFsaWRhdGVfb25seRgDIAEoCCKNAQoVVXBkYXRlSW5zdGFuY2VSZXF1ZXN0EiwKCGluc3RhbmNlGAEgASgLMhUuYnl0ZWJhc2UudjEuSW5zdGFuY2VCA+BBAhIvCgt1cGRhdGVfbWFzaxgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2sSFQoNYWxsb3dfbWlzc2luZxgDIAEoCCJiChVEZWxldGVJbnN0YW5jZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vSW5zdGFuY2USDQoFZm9yY2UYAiABKAgSDQoFcHVyZ2UYAyABKAgiRgoXVW5kZWxldGVJbnN0YW5jZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vSW5zdGFuY2UiXAoTU3luY0luc3RhbmNlUmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9JbnN0YW5jZRIYChBlbmFibGVfZnVsbF9zeW5jGAIgASgIIooBChtMaXN0SW5zdGFuY2VEYXRhYmFzZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vSW5zdGFuY2USMQoIaW5zdGFuY2UYAiABKAsyFS5ieXRlYmFzZS52MS5JbnN0YW5jZUID4EECSACIAQFCCwoJX2luc3RhbmNlIjEKHExpc3RJbnN0YW5jZURhdGFiYXNlUmVzcG9uc2USEQoJZGF0YWJhc2VzGAEgAygJIikKFFN5bmNJbnN0YW5jZVJlc3BvbnNlEhEKCWRhdGFiYXNlcxgBIAMoCSJUChlCYXRjaFN5bmNJbnN0YW5jZXNSZXF1ZXN0EjcKCHJlcXVlc3RzGAEgAygLMiAuYnl0ZWJhc2UudjEuU3luY0luc3RhbmNlUmVxdWVzdEID4EECIhwKGkJhdGNoU3luY0luc3RhbmNlc1Jlc3BvbnNlIlgKG0JhdGNoVXBkYXRlSW5zdGFuY2VzUmVxdWVzdBI5CghyZXF1ZXN0cxgBIAMoCzIiLmJ5dGViYXNlLnYxLlVwZGF0ZUluc3RhbmNlUmVxdWVzdEID4EECIkgKHEJhdGNoVXBkYXRlSW5zdGFuY2VzUmVzcG9uc2USKAoJaW5zdGFuY2VzGAEgAygLMhUuYnl0ZWJhc2UudjEuSW5zdGFuY2UijQEKFEFkZERhdGFTb3VyY2VSZXF1ZXN0EisKBG5hbWUYASABKAlCHeBBAvpBFwoVYnl0ZWJhc2UuY29tL0luc3RhbmNlEjEKC2RhdGFfc291cmNlGAIgASgLMhcuYnl0ZWJhc2UudjEuRGF0YVNvdXJjZUID4EECEhUKDXZhbGlkYXRlX29ubHkYAyABKAgieQoXUmVtb3ZlRGF0YVNvdXJjZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vSW5zdGFuY2USMQoLZGF0YV9zb3VyY2UYAiABKAsyFy5ieXRlYmFzZS52MS5EYXRhU291cmNlQgPgQQIi2AEKF1VwZGF0ZURhdGFTb3VyY2VSZXF1ZXN0EisKBG5hbWUYASABKAlCHeBBAvpBFwoVYnl0ZWJhc2UuY29tL0luc3RhbmNlEjEKC2RhdGFfc291cmNlGAIgASgLMhcuYnl0ZWJhc2UudjEuRGF0YVNvdXJjZUID4EECEi8KC3VwZGF0ZV9tYXNrGAMgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFzaxIVCg12YWxpZGF0ZV9vbmx5GAQgASgIEhUKDWFsbG93X21pc3NpbmcYBSABKAgiggUKCEluc3RhbmNlEgwKBG5hbWUYASABKAkSIQoFc3RhdGUYAyABKA4yEi5ieXRlYmFzZS52MS5TdGF0ZRIXCgV0aXRsZRgEIAEoCUIIukgFcgMYyAESIwoGZW5naW5lGAUgASgOMhMuYnl0ZWJhc2UudjEuRW5naW5lEhsKDmVuZ2luZV92ZXJzaW9uGAYgASgJQgPgQQMSFQoNZXh0ZXJuYWxfbGluaxgHIAEoCRItCgxkYXRhX3NvdXJjZXMYCCADKAsyFy5ieXRlYmFzZS52MS5EYXRhU291cmNlEh0KC2Vudmlyb25tZW50GAkgASgJQgPgQQFIAIgBARISCgphY3RpdmF0aW9uGAogASgIEi0KBXJvbGVzGAwgAygLMhkuYnl0ZWJhc2UudjEuSW5zdGFuY2VSb2xlQgPgQQMSMAoNc3luY19pbnRlcnZhbBgNIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbhIbChNtYXhpbXVtX2Nvbm5lY3Rpb25zGA4gASgFEhYKDnN5bmNfZGF0YWJhc2VzGA8gAygJEjcKDmxhc3Rfc3luY190aW1lGBAgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEjEKBmxhYmVscxgRIAMoCzIhLmJ5dGViYXNlLnYxLkluc3RhbmNlLkxhYmVsc0VudHJ5Gi0KC0xhYmVsc0VudHJ5EgsKA2tleRgBIAEoCRINCgV2YWx1ZRgCIAEoCToCOAE6MOpBLQoVYnl0ZWJhc2UuY29tL0luc3RhbmNlEhRpbnN0YW5jZXMve2luc3RhbmNlfUIOCgxfZW52aXJvbm1lbnQihQcKGERhdGFTb3VyY2VFeHRlcm5hbFNlY3JldBJFCgtzZWNyZXRfdHlwZRgBIAEoDjIwLmJ5dGViYXNlLnYxLkRhdGFTb3VyY2VFeHRlcm5hbFNlY3JldC5TZWNyZXRUeXBlEgsKA3VybBgCIAEoCRJBCglhdXRoX3R5cGUYAyABKA4yLi5ieXRlYmFzZS52MS5EYXRhU291cmNlRXh0ZXJuYWxTZWNyZXQuQXV0aFR5cGUSSwoIYXBwX3JvbGUYBCABKAsyNy5ieXRlYmFzZS52MS5EYXRhU291cmNlRXh0ZXJuYWxTZWNyZXQuQXBwUm9sZUF1dGhPcHRpb25IABIUCgV0b2tlbhgFIAEoCUID4EEESAASEwoLZW5naW5lX25hbWUYBiABKAkSEwoLc2VjcmV0X25hbWUYByABKAkSGQoRcGFzc3dvcmRfa2V5X25hbWUYCCABKAkSIwobc2tpcF92YXVsdF90bHNfdmVyaWZpY2F0aW9uGAkgASgIEhkKDHZhdWx0X3NzbF9jYRgKIAEoCUID4EEEEhsKDnZhdWx0X3NzbF9jZXJ0GAsgASgJQgPgQQQSGgoNdmF1bHRfc3NsX2tleRgMIAEoCUID4EEEGu4BChFBcHBSb2xlQXV0aE9wdGlvbhIUCgdyb2xlX2lkGAEgASgJQgPgQQQSFgoJc2VjcmV0X2lkGAIgASgJQgPgQQQSUAoEdHlwZRgDIAEoDjJCLmJ5dGViYXNlLnYxLkRhdGFTb3VyY2VFeHRlcm5hbFNlY3JldC5BcHBSb2xlQXV0aE9wdGlvbi5TZWNyZXRUeXBlEhIKCm1vdW50X3BhdGgYBCABKAkiRQoKU2VjcmV0VHlwZRIbChdTRUNSRVRfVFlQRV9VTlNQRUNJRklFRBAAEgkKBVBMQUlOEAESDwoLRU5WSVJPTk1FTlQQAiJrCgpTZWNyZXRUeXBlEhsKF1NFQ1JFVF9UWVBFX1VOU1BFQ0lGSUVEEAASDwoLVkFVTFRfS1ZfVjIQARIXChNBV1NfU0VDUkVUU19NQU5BR0VSEAISFgoSR0NQX1NFQ1JFVF9NQU5BR0VSEAMiRAoIQXV0aFR5cGUSGQoVQVVUSF9UWVBFX1VOU1BFQ0lGSUVEEAASCQoFVE9LRU4QARISCg5WQVVMVF9BUFBfUk9MRRACQg0KC2F1dGhfb3B0aW9uIpEPCgpEYXRhU291cmNlEgoKAmlkGAEgASgJEikKBHR5cGUYAiABKA4yGy5ieXRlYmFzZS52MS5EYXRhU291cmNlVHlwZRIQCgh1c2VybmFtZRgDIAEoCRIVCghwYXNzd29yZBgEIAEoCUID4EEEEg8KB3VzZV9zc2wYHiABKAgSEwoGc3NsX2NhGAUgASgJQgPgQQQSFQoIc3NsX2NlcnQYBiABKAlCA+BBBBIUCgdzc2xfa2V5GAcgASgJQgPgQQQSHgoWdmVyaWZ5X3Rsc19jZXJ0aWZpY2F0ZRgnIAEoCBIMCgRob3N0GAggASgJEgwKBHBvcnQYCSABKAkSEAoIZGF0YWJhc2UYCiABKAkSCwoDc3J2GAsgASgIEh8KF2F1dGhlbnRpY2F0aW9uX2RhdGFiYXNlGAwgASgJEhMKC3JlcGxpY2Ffc2V0GBkgASgJEgsKA3NpZBgNIAEoCRIUCgxzZXJ2aWNlX25hbWUYDiABKAkSEAoIc3NoX2hvc3QYDyABKAkSEAoIc3NoX3BvcnQYECABKAkSEAoIc3NoX3VzZXIYESABKAkSGQoMc3NoX3Bhc3N3b3JkGBIgASgJQgPgQQQSHAoPc3NoX3ByaXZhdGVfa2V5GBMgASgJQgPgQQQSJwoaYXV0aGVudGljYXRpb25fcHJpdmF0ZV9rZXkYFCABKAlCA+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]);
/**
* Describes the message bytebase.v1.GetInstanceRequest.
diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yaml
index 16f088be99..fc3f90b335 100644
--- a/proto/gen/grpc-doc/openapi.yaml
+++ b/proto/gen/grpc-doc/openapi.yaml
@@ -9257,6 +9257,11 @@ components:
Used for authentication when connecting to the data source.
obfuscatedAuthenticationPrivateKey:
type: string
+ authenticationPrivateKeyPassphrase:
+ type: string
+ description: Passphrase for the encrypted PKCS#8 private key. Only used when the private key is encrypted.
+ obfuscatedAuthenticationPrivateKeyPassphrase:
+ type: string
externalSecret:
$ref: '#/components/schemas/DataSourceExternalSecret'
authenticationType:
diff --git a/proto/gen/grpc-doc/store/README.md b/proto/gen/grpc-doc/store/README.md
index b2eac246e0..97162297d5 100644
--- a/proto/gen/grpc-doc/store/README.md
+++ b/proto/gen/grpc-doc/store/README.md
@@ -2313,6 +2313,8 @@ OIDCIdentityProviderConfig is the structure for OIDC identity provider config.
| obfuscated_ssh_private_key | [string](#string) | | |
| authentication_private_key | [string](#string) | | PKCS#8 private key in PEM format. If it&#39;s empty string, no private key is required. Used for authentication when connecting to the data source. |
| obfuscated_authentication_private_key | [string](#string) | | |
+| authentication_private_key_passphrase | [string](#string) | | Passphrase for the encrypted PKCS#8 private key. Only used when the private key is encrypted. |
+| obfuscated_authentication_private_key_passphrase | [string](#string) | | |
| external_secret | [DataSourceExternalSecret](#bytebase-store-DataSourceExternalSecret) | | |
| authentication_type | [DataSource.AuthenticationType](#bytebase-store-DataSource-AuthenticationType) | | |
| azure_credential | [DataSource.AzureCredential](#bytebase-store-DataSource-AzureCredential) | | |
diff --git a/proto/gen/grpc-doc/store/index.html b/proto/gen/grpc-doc/store/index.html
index 3cebceac73..3aff110109 100644
--- a/proto/gen/grpc-doc/store/index.html
+++ b/proto/gen/grpc-doc/store/index.html
@@ -6895,6 +6895,20 @@ Used for authentication when connecting to the data source. </p></td>
<td><p> </p></td>
</tr>
+ <tr>
+ <td>authentication_private_key_passphrase</td>
+ <td><a href="#string">string</a></td>
+ <td></td>
+ <td><p>Passphrase for the encrypted PKCS#8 private key. Only used when the private key is encrypted. </p></td>
+ </tr>
+
+ <tr>
+ <td>obfuscated_authentication_private_key_passphrase</td>
+ <td><a href="#string">string</a></td>
+ <td></td>
+ <td><p> </p></td>
+ </tr>
+
<tr>
<td>external_secret</td>
<td><a href="#bytebase.store.DataSourceExternalSecret">DataSourceExternalSecret</a></td>
diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.md
index 0c6d166142..87edc8648e 100644
--- a/proto/gen/grpc-doc/v1/README.md
+++ b/proto/gen/grpc-doc/v1/README.md
@@ -4378,6 +4378,7 @@ This value should be 4-63 characters, and valid characters are /[a-z][0-9]-/. |
| ssh_password | [string](#string) | | The password to login the server. If it&#39;s empty string, no password is required. |
| ssh_private_key | [string](#string) | | The private key to login the server. If it&#39;s empty string, we will use the system default private key from os.Getenv(&#34;SSH_AUTH_SOCK&#34;). |
| authentication_private_key | [string](#string) | | PKCS#8 private key in PEM format. If it&#39;s empty string, no private key is required. Used for authentication when connecting to the data source. |
+| 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) | | |
| azure_credential | [DataSource.AzureCredential](#bytebase-v1-DataSource-AzureCredential) | | |
diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.html
index 0842a12c75..b78e637ff2 100644
--- a/proto/gen/grpc-doc/v1/index.html
+++ b/proto/gen/grpc-doc/v1/index.html
@@ -12366,6 +12366,13 @@ Required. </p></td>
Used for authentication when connecting to the data source. </p></td>
</tr>
+ <tr>
+ <td>authentication_private_key_passphrase</td>
+ <td><a href="#string">string</a></td>
+ <td></td>
+ <td><p>Passphrase for the encrypted PKCS#8 private key. Only used when the private key is encrypted. </p></td>
+ </tr>
+
<tr>
<td>external_secret</td>
<td><a href="#bytebase.v1.DataSourceExternalSecret">DataSourceExternalSecret</a></td>
diff --git a/proto/store/store/instance.proto b/proto/store/store/instance.proto
index b065a82faf..25ac46b154 100644
--- a/proto/store/store/instance.proto
+++ b/proto/store/store/instance.proto
@@ -111,6 +111,9 @@ message DataSource {
// Used for authentication when connecting to the data source.
string authentication_private_key = 43;
string obfuscated_authentication_private_key = 20;
+ // Passphrase for the encrypted PKCS#8 private key. Only used when the private key is encrypted.
+ string authentication_private_key_passphrase = 48;
+ string obfuscated_authentication_private_key_passphrase = 49;
DataSourceExternalSecret external_secret = 21;
diff --git a/proto/v1/v1/instance_service.proto b/proto/v1/v1/instance_service.proto
index e1df843493..4843657c33 100644
--- a/proto/v1/v1/instance_service.proto
+++ b/proto/v1/v1/instance_service.proto
@@ -592,6 +592,8 @@ message DataSource {
// PKCS#8 private key in PEM format. If it's empty string, no private key is required.
// Used for authentication when connecting to the data source.
string authentication_private_key = 20 [(google.api.field_behavior) = INPUT_ONLY];
+ // Passphrase for the encrypted PKCS#8 private key. Only used when the private key is encrypted.
+ string authentication_private_key_passphrase = 40 [(google.api.field_behavior) = INPUT_ONLY];
DataSourceExternalSecret external_secret = 21;