Skip to content

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

chore: several fix for instance (#18081)

ecmadaoe0408c336de5
diff --git a/backend/api/v1/audit.go b/backend/api/v1/audit.go
index 95297e6eb9..3c663a4588 100644
--- a/backend/api/v1/audit.go
+++ b/backend/api/v1/audit.go
@@ -484,49 +484,59 @@ func redactInstance(i *v1pb.Instance) *v1pb.Instance {
if i == nil {
return nil
}
+ // Clone the instance to avoid modifying the original response
+ cloned, ok := proto.Clone(i).(*v1pb.Instance)
+ if !ok {
+ return i
+ }
var dataSources []*v1pb.DataSource
- for _, d := range i.DataSources {
+ for _, d := range cloned.DataSources {
dataSources = append(dataSources, redactDataSource(d))
}
- i.DataSources = dataSources
- return i
+ cloned.DataSources = dataSources
+ return cloned
}
func redactDataSource(d *v1pb.DataSource) *v1pb.DataSource {
- if d.Password != "" {
- d.Password = maskedString
+ // Clone the datasource to avoid modifying the original
+ cloned, ok := proto.Clone(d).(*v1pb.DataSource)
+ if !ok {
+ return d
+ }
+ if cloned.Password != "" {
+ cloned.Password = maskedString
}
- if d.SslCa != "" {
- d.SslCa = maskedString
+ if cloned.SslCa != "" {
+ cloned.SslCa = maskedString
}
- if d.SslCert != "" {
- d.SslCert = maskedString
+ if cloned.SslCert != "" {
+ cloned.SslCert = maskedString
}
- if d.SslKey != "" {
- d.SslKey = maskedString
+ if cloned.SslKey != "" {
+ cloned.SslKey = maskedString
}
- if d.SshPassword != "" {
- d.SshPassword = maskedString
+ if cloned.SshPassword != "" {
+ cloned.SshPassword = maskedString
}
- if d.SshPrivateKey != "" {
- d.SshPrivateKey = maskedString
+ if cloned.SshPrivateKey != "" {
+ cloned.SshPrivateKey = maskedString
}
- if d.AuthenticationPrivateKey != "" {
- d.AuthenticationPrivateKey = maskedString
+ if cloned.AuthenticationPrivateKey != "" {
+ cloned.AuthenticationPrivateKey = maskedString
}
- if d.ExternalSecret != nil {
- d.ExternalSecret = new(v1pb.DataSourceExternalSecret)
+ if cloned.ExternalSecret != nil {
+ cloned.ExternalSecret = new(v1pb.DataSourceExternalSecret)
}
- if d.SaslConfig != nil {
- if krbConf := d.SaslConfig.GetKrbConfig(); krbConf != nil {
+ if cloned.SaslConfig != nil {
+ if krbConf := cloned.SaslConfig.GetKrbConfig(); krbConf != nil {
krbConf.Keytab = []byte(maskedString)
- d.SaslConfig.Mechanism = &v1pb.SASLConfig_KrbConfig{KrbConfig: krbConf}
+ cloned.SaslConfig.Mechanism = &v1pb.SASLConfig_KrbConfig{KrbConfig: krbConf}
}
}
- if d.MasterPassword != "" {
- d.MasterPassword = maskedString
+ if cloned.MasterPassword != "" {
+ cloned.MasterPassword = maskedString
}
- return d
+ return cloned
}
func redactAdminExecuteResponse(r *v1pb.AdminExecuteResponse) *v1pb.AdminExecuteResponse {
diff --git a/backend/api/v1/instance_service_converter.go b/backend/api/v1/instance_service_converter.go
index ec0729a012..01051d7372 100644
--- a/backend/api/v1/instance_service_converter.go
+++ b/backend/api/v1/instance_service_converter.go
@@ -127,12 +127,17 @@ func convertDataSourceExternalSecret(externalSecret *storepb.DataSourceExternalS
}
resp := &v1pb.DataSourceExternalSecret{
- SecretType: v1pb.DataSourceExternalSecret_SecretType(externalSecret.SecretType),
- Url: externalSecret.Url,
- AuthType: v1pb.DataSourceExternalSecret_AuthType(externalSecret.AuthType),
- EngineName: externalSecret.EngineName,
- SecretName: externalSecret.SecretName,
- PasswordKeyName: externalSecret.PasswordKeyName,
+ SecretType: v1pb.DataSourceExternalSecret_SecretType(externalSecret.SecretType),
+ Url: externalSecret.Url,
+ AuthType: v1pb.DataSourceExternalSecret_AuthType(externalSecret.AuthType),
+ EngineName: externalSecret.EngineName,
+ SecretName: externalSecret.SecretName,
+ PasswordKeyName: externalSecret.PasswordKeyName,
+ SkipVaultTlsVerification: externalSecret.SkipVaultTlsVerification,
+ // Clear sensitive Vault SSL data (INPUT_ONLY fields, should not be returned)
+ VaultSslCa: "",
+ VaultSslCert: "",
+ VaultSslKey: "",
}
// clear sensitive data.
@@ -255,12 +260,16 @@ func convertV1DataSourceExternalSecret(externalSecret *v1pb.DataSourceExternalSe
}
secret := &storepb.DataSourceExternalSecret{
- SecretType: storepb.DataSourceExternalSecret_SecretType(externalSecret.SecretType),
- Url: externalSecret.Url,
- AuthType: storepb.DataSourceExternalSecret_AuthType(externalSecret.AuthType),
- EngineName: externalSecret.EngineName,
- SecretName: externalSecret.SecretName,
- PasswordKeyName: externalSecret.PasswordKeyName,
+ SecretType: storepb.DataSourceExternalSecret_SecretType(externalSecret.SecretType),
+ Url: externalSecret.Url,
+ AuthType: storepb.DataSourceExternalSecret_AuthType(externalSecret.AuthType),
+ EngineName: externalSecret.EngineName,
+ SecretName: externalSecret.SecretName,
+ PasswordKeyName: externalSecret.PasswordKeyName,
+ SkipVaultTlsVerification: externalSecret.SkipVaultTlsVerification,
+ VaultSslCa: externalSecret.VaultSslCa,
+ VaultSslCert: externalSecret.VaultSslCert,
+ VaultSslKey: externalSecret.VaultSslKey,
}
// Convert auth options
diff --git a/backend/generated-go/store/instance.pb.go b/backend/generated-go/store/instance.pb.go
index ebaeb3b5b2..50763ab004 100644
--- a/backend/generated-go/store/instance.pb.go
+++ b/backend/generated-go/store/instance.pb.go
@@ -1218,13 +1218,16 @@ type DataSourceExternalSecret struct {
// Only set to true for development or when certificates cannot be properly validated.
SkipVaultTlsVerification bool `protobuf:"varint,9,opt,name=skip_vault_tls_verification,json=skipVaultTlsVerification,proto3" json:"skip_vault_tls_verification,omitempty"`
// CA certificate for Vault server verification.
- VaultSslCa string `protobuf:"bytes,10,opt,name=vault_ssl_ca,json=vaultSslCa,proto3" json:"vault_ssl_ca,omitempty"`
+ VaultSslCa string `protobuf:"bytes,10,opt,name=vault_ssl_ca,json=vaultSslCa,proto3" json:"vault_ssl_ca,omitempty"`
+ ObfuscatedVaultSslCa string `protobuf:"bytes,11,opt,name=obfuscated_vault_ssl_ca,json=obfuscatedVaultSslCa,proto3" json:"obfuscated_vault_ssl_ca,omitempty"`
// Client certificate for mutual TLS authentication with Vault.
- VaultSslCert string `protobuf:"bytes,11,opt,name=vault_ssl_cert,json=vaultSslCert,proto3" json:"vault_ssl_cert,omitempty"`
+ VaultSslCert string `protobuf:"bytes,12,opt,name=vault_ssl_cert,json=vaultSslCert,proto3" json:"vault_ssl_cert,omitempty"`
+ ObfuscatedVaultSslCert string `protobuf:"bytes,13,opt,name=obfuscated_vault_ssl_cert,json=obfuscatedVaultSslCert,proto3" json:"obfuscated_vault_ssl_cert,omitempty"`
// Client private key for mutual TLS authentication with Vault.
- VaultSslKey string `protobuf:"bytes,12,opt,name=vault_ssl_key,json=vaultSslKey,proto3" json:"vault_ssl_key,omitempty"`
- unknownFields protoimpl.UnknownFields
- sizeCache protoimpl.SizeCache
+ VaultSslKey string `protobuf:"bytes,14,opt,name=vault_ssl_key,json=vaultSslKey,proto3" json:"vault_ssl_key,omitempty"`
+ ObfuscatedVaultSslKey string `protobuf:"bytes,15,opt,name=obfuscated_vault_ssl_key,json=obfuscatedVaultSslKey,proto3" json:"obfuscated_vault_ssl_key,omitempty"`
+ unknownFields protoimpl.UnknownFields
+ sizeCache protoimpl.SizeCache
}
func (x *DataSourceExternalSecret) Reset() {
@@ -1338,6 +1341,13 @@ func (x *DataSourceExternalSecret) GetVaultSslCa() string {
return ""
}
+func (x *DataSourceExternalSecret) GetObfuscatedVaultSslCa() string {
+ if x != nil {
+ return x.ObfuscatedVaultSslCa
+ }
+ return ""
+}
+
func (x *DataSourceExternalSecret) GetVaultSslCert() string {
if x != nil {
return x.VaultSslCert
@@ -1345,6 +1355,13 @@ func (x *DataSourceExternalSecret) GetVaultSslCert() string {
return ""
}
+func (x *DataSourceExternalSecret) GetObfuscatedVaultSslCert() string {
+ if x != nil {
+ return x.ObfuscatedVaultSslCert
+ }
+ return ""
+}
+
func (x *DataSourceExternalSecret) GetVaultSslKey() string {
if x != nil {
return x.VaultSslKey
@@ -1352,6 +1369,13 @@ func (x *DataSourceExternalSecret) GetVaultSslKey() string {
return ""
}
+func (x *DataSourceExternalSecret) GetObfuscatedVaultSslKey() string {
+ if x != nil {
+ return x.ObfuscatedVaultSslKey
+ }
+ return ""
+}
+
type isDataSourceExternalSecret_AuthOption interface {
isDataSourceExternalSecret_AuthOption()
}
@@ -1852,7 +1876,7 @@ const file_store_instance_proto_rawDesc = "" +
"\x06keytab\x18\x04 \x01(\fR\x06keytab\x12\x19\n" +
"\bkdc_host\x18\x05 \x01(\tR\akdcHost\x12\x19\n" +
"\bkdc_port\x18\x06 \x01(\tR\akdcPort\x124\n" +
- "\x16kdc_transport_protocol\x18\a \x01(\tR\x14kdcTransportProtocol\"\xab\b\n" +
+ "\x16kdc_transport_protocol\x18\a \x01(\tR\x14kdcTransportProtocol\"\xd6\t\n" +
"\x18DataSourceExternalSecret\x12T\n" +
"\vsecret_type\x18\x01 \x01(\x0e23.bytebase.store.DataSourceExternalSecret.SecretTypeR\n" +
"secretType\x12\x10\n" +
@@ -1868,9 +1892,12 @@ const file_store_instance_proto_rawDesc = "" +
"\x1bskip_vault_tls_verification\x18\t \x01(\bR\x18skipVaultTlsVerification\x12 \n" +
"\fvault_ssl_ca\x18\n" +
" \x01(\tR\n" +
- "vaultSslCa\x12$\n" +
- "\x0evault_ssl_cert\x18\v \x01(\tR\fvaultSslCert\x12\"\n" +
- "\rvault_ssl_key\x18\f \x01(\tR\vvaultSslKey\x1a\x8a\x02\n" +
+ "vaultSslCa\x125\n" +
+ "\x17obfuscated_vault_ssl_ca\x18\v \x01(\tR\x14obfuscatedVaultSslCa\x12$\n" +
+ "\x0evault_ssl_cert\x18\f \x01(\tR\fvaultSslCert\x129\n" +
+ "\x19obfuscated_vault_ssl_cert\x18\r \x01(\tR\x16obfuscatedVaultSslCert\x12\"\n" +
+ "\rvault_ssl_key\x18\x0e \x01(\tR\vvaultSslKey\x127\n" +
+ "\x18obfuscated_vault_ssl_key\x18\x0f \x01(\tR\x15obfuscatedVaultSslKey\x1a\x8a\x02\n" +
"\x11AppRoleAuthOption\x12\x17\n" +
"\arole_id\x18\x01 \x01(\tR\x06roleId\x12\x1b\n" +
"\tsecret_id\x18\x02 \x01(\tR\bsecretId\x12Y\n" +
diff --git a/backend/generated-go/store/instance_equal.pb.go b/backend/generated-go/store/instance_equal.pb.go
index e83930efbf..d0d2ccedc4 100644
--- a/backend/generated-go/store/instance_equal.pb.go
+++ b/backend/generated-go/store/instance_equal.pb.go
@@ -454,11 +454,20 @@ func (x *DataSourceExternalSecret) Equal(y *DataSourceExternalSecret) bool {
if x.VaultSslCa != y.VaultSslCa {
return false
}
+ if x.ObfuscatedVaultSslCa != y.ObfuscatedVaultSslCa {
+ return false
+ }
if x.VaultSslCert != y.VaultSslCert {
return false
}
+ if x.ObfuscatedVaultSslCert != y.ObfuscatedVaultSslCert {
+ return false
+ }
if x.VaultSslKey != y.VaultSslKey {
return false
}
+ if x.ObfuscatedVaultSslKey != y.ObfuscatedVaultSslKey {
+ return false
+ }
return true
}
diff --git a/backend/store/instance.go b/backend/store/instance.go
index 36608b1aca..d85b1f459e 100644
--- a/backend/store/instance.go
+++ b/backend/store/instance.go
@@ -404,6 +404,14 @@ func (s *Store) obfuscateInstance(ctx context.Context, instance *storepb.Instanc
gcpCredential.ObfuscatedContent = common.Obfuscate(gcpCredential.Content, secret)
gcpCredential.Content = ""
}
+ if externalSecret := ds.GetExternalSecret(); externalSecret != nil {
+ externalSecret.ObfuscatedVaultSslCa = common.Obfuscate(externalSecret.GetVaultSslCa(), secret)
+ externalSecret.VaultSslCa = ""
+ externalSecret.ObfuscatedVaultSslCert = common.Obfuscate(externalSecret.GetVaultSslCert(), secret)
+ externalSecret.VaultSslCert = ""
+ externalSecret.ObfuscatedVaultSslKey = common.Obfuscate(externalSecret.GetVaultSslKey(), secret)
+ externalSecret.VaultSslKey = ""
+ }
}
return redacted, nil
}
@@ -498,6 +506,26 @@ func (s *Store) unObfuscateInstance(ctx context.Context, instance *storepb.Insta
}
gcpCredential.Content = content
}
+
+ if externalSecret := ds.GetExternalSecret(); externalSecret != nil {
+ sslCa, err := common.Unobfuscate(externalSecret.GetObfuscatedVaultSslCa(), secret)
+ if err != nil {
+ return err
+ }
+ externalSecret.VaultSslCa = sslCa
+
+ sslCert, err := common.Unobfuscate(externalSecret.GetObfuscatedVaultSslCert(), secret)
+ if err != nil {
+ return err
+ }
+ externalSecret.VaultSslCert = sslCert
+
+ sslKey, err := common.Unobfuscate(externalSecret.GetObfuscatedVaultSslKey(), secret)
+ if err != nil {
+ return err
+ }
+ externalSecret.VaultSslKey = sslKey
+ }
}
return nil
}
diff --git a/frontend/src/components/InstanceForm/Buttons.vue b/frontend/src/components/InstanceForm/Buttons.vue
index 0c91d23e0a..f2b21b19e4 100644
--- a/frontend/src/components/InstanceForm/Buttons.vue
+++ b/frontend/src/components/InstanceForm/Buttons.vue
@@ -59,7 +59,6 @@ import { useRouter } from "vue-router";
import {
pushNotification,
useDatabaseV1Store,
- useGracefulRequest,
useInstanceV1Store,
useSubscriptionV1Store,
} from "@/store";
@@ -281,25 +280,22 @@ const doCreate = async () => {
state.value.isRequesting = true;
try {
- await useGracefulRequest(async () => {
- const createdInstance = await instanceV1Store.createInstance(
- pendingCreateInstance.value
- );
- if (props.onCreated) {
- props.onCreated(createdInstance);
- } else {
- router.push(`/${createdInstance.name}`);
- events.emit("dismiss");
- }
+ const createdInstance = await instanceV1Store.createInstance(
+ pendingCreateInstance.value
+ );
+ if (props.onCreated) {
+ props.onCreated(createdInstance);
+ } else {
+ router.push(`/${createdInstance.name}`);
+ events.emit("dismiss");
+ }
- pushNotification({
- module: "bytebase",
- style: "SUCCESS",
- title: t(
- "instance.successfully-created-instance-createdinstance-name",
- [createdInstance.title]
- ),
- });
+ pushNotification({
+ module: "bytebase",
+ style: "SUCCESS",
+ title: t("instance.successfully-created-instance-createdinstance-name", [
+ createdInstance.title,
+ ]),
});
} finally {
state.value.isRequesting = false;
diff --git a/frontend/src/components/InstanceForm/DataSourceSection/DataSourceForm.vue b/frontend/src/components/InstanceForm/DataSourceSection/DataSourceForm.vue
index 011a631505..8af654b392 100644
--- a/frontend/src/components/InstanceForm/DataSourceSection/DataSourceForm.vue
+++ b/frontend/src/components/InstanceForm/DataSourceSection/DataSourceForm.vue
@@ -369,7 +369,7 @@
}}
</label>
<NRadioGroup
- class="textlabel mb-2"
+ class="textlabel"
:value="dataSource.externalSecret.authType"
@update:value="changeExternalSecretAuthType"
>
@@ -562,6 +562,33 @@
/>
</div>
</div>
+ <div class="sm:col-span-2 sm:col-start-1">
+ <label class="textlabel block">
+ {{ $t("instance.external-secret-vault.vault-tls-config") }}
+ </label>
+ <SslCertificateFormV1
+ v-model:verify="verifyVaultTls"
+ v-model:ca="dataSource.externalSecret.vaultSslCa"
+ v-model:cert="dataSource.externalSecret.vaultSslCert"
+ v-model:private-key="dataSource.externalSecret.vaultSslKey"
+ :disabled="!allowEdit"
+ :show-tooltip="false"
+ :show-key-field="true"
+ :show-cert-field="true"
+ :verify-label="
+ $t(
+ 'instance.external-secret-vault.verify-vault-certificate'
+ )
+ "
+ :ca-label="$t('instance.external-secret-vault.vault-ca-cert')"
+ :cert-label="
+ $t('instance.external-secret-vault.vault-client-cert')
+ "
+ :key-label="
+ $t('instance.external-secret-vault.vault-client-key')
+ "
+ />
+ </div>
<div class="sm:col-span-2 sm:col-start-1">
<label class="textlabel block">
{{
@@ -590,33 +617,6 @@
"
/>
</div>
- <div class="sm:col-span-2 sm:col-start-1">
- <label class="textlabel block">
- {{ $t("instance.external-secret-vault.vault-tls-config") }}
- </label>
- <SslCertificateFormV1
- v-model:verify="verifyVaultTls"
- v-model:ca="dataSource.externalSecret.vaultSslCa"
- v-model:cert="dataSource.externalSecret.vaultSslCert"
- v-model:private-key="dataSource.externalSecret.vaultSslKey"
- :disabled="!allowEdit"
- :show-tooltip="false"
- :show-key-field="true"
- :show-cert-field="true"
- :verify-label="
- $t(
- 'instance.external-secret-vault.verify-vault-certificate'
- )
- "
- :ca-label="$t('instance.external-secret-vault.vault-ca-cert')"
- :cert-label="
- $t('instance.external-secret-vault.vault-client-cert')
- "
- :key-label="
- $t('instance.external-secret-vault.vault-client-key')
- "
- />
- </div>
</div>
<div class="sm:col-span-2 sm:col-start-1">
<label class="textlabel block">
diff --git a/frontend/src/components/ProvideInstanceContext.vue b/frontend/src/components/ProvideInstanceContext.vue
deleted file mode 100644
index de9bf9b18c..0000000000
--- a/frontend/src/components/ProvideInstanceContext.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-<template>
- <slot />
-</template>
-
-<script lang="ts" setup>
-import { watchEffect, computed } from "vue";
-import { useInstanceV1Store } from "@/store";
-import { instanceNamePrefix } from "@/store/modules/v1/common";
-import { isValidInstanceName } from "@/types";
-
-const props = defineProps<{
- instanceId: string;
-}>();
-
-const instanceStore = useInstanceV1Store();
-
-const instanceName = computed(() => `${instanceNamePrefix}${props.instanceId}`);
-const instance = computed(() =>
- instanceStore.getInstanceByName(instanceName.value)
-);
-
-const prepareInstanceContext = async function () {
- await prepareInstance();
-};
-
-const prepareInstance = async () => {
- if (isValidInstanceName(instance.value.name)) {
- return instance.value;
- }
-
- const ins = await useInstanceV1Store().getOrFetchInstanceByName(
- instanceName.value
- );
- return ins;
-};
-
-watchEffect(prepareInstanceContext);
-</script>
diff --git a/frontend/src/components/v2/Form/ResourceIdField.vue b/frontend/src/components/v2/Form/ResourceIdField.vue
index 71348582c2..84365ef3ab 100644
--- a/frontend/src/components/v2/Form/ResourceIdField.vue
+++ b/frontend/src/components/v2/Form/ResourceIdField.vue
@@ -212,7 +212,7 @@ const handleResourceIdChange = async (newValue: string) => {
}
}
- if (props.fetchResource && state.resourceId) {
+ if (props.fetchResource && state.resourceId && !props.readonly) {
try {
const resource = await props.fetchResource(state.resourceId);
if (resource) {
diff --git a/frontend/src/layouts/InstanceLayout.vue b/frontend/src/layouts/InstanceLayout.vue
index 9c9a50960c..0c7f67d117 100644
--- a/frontend/src/layouts/InstanceLayout.vue
+++ b/frontend/src/layouts/InstanceLayout.vue
@@ -1,19 +1,17 @@
<template>
<Suspense>
<template #default>
- <ProvideInstanceContext :instance-id="instanceId">
- <template v-if="hasPermission">
- <div
- v-if="!isValidInstanceName(instance.name)"
- class="flex items-center gap-x-2 m-4"
- >
- <BBSpin :size="20" />
- Loading instance...
- </div>
- <router-view v-else :instance-id="instanceId" />
- </template>
- <NoPermissionPlaceholder v-else class="py-6" />
- </ProvideInstanceContext>
+ <template v-if="hasPermission">
+ <div
+ v-if="!isValidInstanceName(instance.name)"
+ class="flex items-center gap-x-2 m-4"
+ >
+ <BBSpin :size="20" />
+ Loading instance...
+ </div>
+ <router-view v-else :instance-id="instanceId" />
+ </template>
+ <NoPermissionPlaceholder v-else class="py-6" />
</template>
<template #fallback>
<span>Loading instance...</span>
@@ -22,10 +20,9 @@
</template>
<script lang="ts" setup>
-import { computed, onMounted } from "vue";
+import { computed, watchEffect } from "vue";
import { useRouter } from "vue-router";
import { BBSpin } from "@/bbkit";
-import ProvideInstanceContext from "@/components/ProvideInstanceContext.vue";
import NoPermissionPlaceholder from "@/components/misc/NoPermissionPlaceholder.vue";
import { useInstanceV1Store } from "@/store";
import { instanceNamePrefix } from "@/store/modules/v1/common";
@@ -51,12 +48,12 @@ const hasPermission = computed(() => {
);
});
-onMounted(() => {
+watchEffect(async () => {
if (!hasPermission.value) {
return;
}
- instanceStore.getOrFetchInstanceByName(
+ await instanceStore.getOrFetchInstanceByName(
`${instanceNamePrefix}${props.instanceId}`
);
});
diff --git a/frontend/src/store/modules/v1/instance.ts b/frontend/src/store/modules/v1/instance.ts
index d421bf1957..d1d2a2ba79 100644
--- a/frontend/src/store/modules/v1/instance.ts
+++ b/frontend/src/store/modules/v1/instance.ts
@@ -97,7 +97,7 @@ export const useInstanceV1Store = defineStore("instance_v1", () => {
};
// Actions
- const upsertInstances = async (list: Instance[]): Promise<Instance[]> => {
+ const upsertInstances = (list: Instance[]): Instance[] => {
list.forEach((instance) => {
instanceMapByName.set(instance.name, instance);
});
@@ -109,7 +109,7 @@ export const useInstanceV1Store = defineStore("instance_v1", () => {
instanceId: extractInstanceResourceName(instance.name),
});
const response = await instanceServiceClientConnect.createInstance(request);
- const instances = await upsertInstances([response]);
+ const instances = upsertInstances([response]);
return instances[0];
};
@@ -119,7 +119,7 @@ export const useInstanceV1Store = defineStore("instance_v1", () => {
updateMask: { paths: updateMask },
});
const response = await instanceServiceClientConnect.updateInstance(request);
- const instances = await upsertInstances([response]);
+ const instances = upsertInstances([response]);
return instances[0];
};
const archiveInstance = async (instance: Instance, force = false) => {
@@ -129,7 +129,7 @@ export const useInstanceV1Store = defineStore("instance_v1", () => {
});
await instanceServiceClientConnect.deleteInstance(request);
instance.state = State.DELETED;
- const instances = await upsertInstances([instance]);
+ const instances = upsertInstances([instance]);
return instances[0];
};
const deleteInstance = async (instance: string) => {
@@ -146,7 +146,7 @@ export const useInstanceV1Store = defineStore("instance_v1", () => {
});
await instanceServiceClientConnect.undeleteInstance(request);
instance.state = State.ACTIVE;
- const instances = await upsertInstances([instance]);
+ const instances = upsertInstances([instance]);
return instances[0];
};
const syncInstance = async (instance: string, enableFullSync: boolean) => {
@@ -179,7 +179,7 @@ export const useInstanceV1Store = defineStore("instance_v1", () => {
});
const response =
await instanceServiceClientConnect.batchUpdateInstances(request);
- const instances = await upsertInstances(response.instances);
+ const instances = upsertInstances(response.instances);
return instances;
};
@@ -193,7 +193,7 @@ export const useInstanceV1Store = defineStore("instance_v1", () => {
const response = await instanceServiceClientConnect.getInstance(request, {
contextValues: createContextValues().set(silentContextKey, silent),
});
- const instances = await upsertInstances([response]);
+ const instances = upsertInstances([response]);
return instances[0];
};
const getInstanceByName = (name: string): Instance => {
@@ -229,7 +229,7 @@ export const useInstanceV1Store = defineStore("instance_v1", () => {
dataSource: dataSource,
});
const response = await instanceServiceClientConnect.addDataSource(request);
- const [updatedInstance] = await upsertInstances([response]);
+ const [updatedInstance] = upsertInstances([response]);
return updatedInstance;
};
const updateDataSource = async (
@@ -244,7 +244,7 @@ export const useInstanceV1Store = defineStore("instance_v1", () => {
});
const response =
await instanceServiceClientConnect.updateDataSource(request);
- const [updatedInstance] = await upsertInstances([response]);
+ const [updatedInstance] = upsertInstances([response]);
return updatedInstance;
};
const deleteDataSource = async (
@@ -257,7 +257,7 @@ export const useInstanceV1Store = defineStore("instance_v1", () => {
});
const response =
await instanceServiceClientConnect.removeDataSource(request);
- const [updatedInstance] = await upsertInstances([response]);
+ const [updatedInstance] = upsertInstances([response]);
return updatedInstance;
};
@@ -281,7 +281,7 @@ export const useInstanceV1Store = defineStore("instance_v1", () => {
const response = await instanceServiceClientConnect.listInstances(request);
const nextPageToken = response.nextPageToken;
- const instances = await upsertInstances(response.instances);
+ const instances = upsertInstances(response.instances);
return {
instances: instances,
nextPageToken,
@@ -290,7 +290,6 @@ export const useInstanceV1Store = defineStore("instance_v1", () => {
return {
reset,
- upsertInstances,
createInstance,
updateInstance,
archiveInstance,
diff --git a/frontend/src/utils/v1/common-conversions.ts b/frontend/src/utils/v1/common-conversions.ts
index c4b10d5fa9..f258649656 100644
--- a/frontend/src/utils/v1/common-conversions.ts
+++ b/frontend/src/utils/v1/common-conversions.ts
@@ -6,9 +6,7 @@
*/
import {
Engine as NewEngine,
- State as NewState,
ExportFormat as NewExportFormat,
- VCSType as NewVCSType,
} from "@/types/proto-es/v1/common_pb";
/**
@@ -18,13 +16,6 @@ export const engineToString = (engine: NewEngine): string => {
return NewEngine[engine] || "ENGINE_UNSPECIFIED";
};
-/**
- * Convert proto-es State to string for display/logging
- */
-export const stateToString = (state: NewState): string => {
- return NewState[state] || "STATE_UNSPECIFIED";
-};
-
/**
* Convert proto-es ExportFormat to string for display/logging
*/
@@ -32,13 +23,6 @@ export const exportFormatToString = (format: NewExportFormat): string => {
return NewExportFormat[format] || "FORMAT_UNSPECIFIED";
};
-/**
- * Convert proto-es VCSType to string for display/logging
- */
-export const vcsTypeToString = (vcsType: NewVCSType): string => {
- return NewVCSType[vcsType] || "VCS_TYPE_UNSPECIFIED";
-};
-
/**
* Convert scope value (string or number) to proto-es Engine
* Handles both string names and numeric enum values from scope.value
diff --git a/frontend/src/utils/v1/instance-conversions.ts b/frontend/src/utils/v1/instance-conversions.ts
deleted file mode 100644
index b26a34efb7..0000000000
--- a/frontend/src/utils/v1/instance-conversions.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import {
- DataSourceType as NewDataSourceType,
- DataSource_AuthenticationType as NewDataSource_AuthenticationType,
-} from "@/types/proto-es/v1/instance_service_pb";
-
-// ========== SCOPE VALUE CONVERSIONS (for AdvancedSearch components) ==========
-
-// Convert scope value (string or number) to proto-es DataSourceType
-export const convertScopeValueToDataSourceType = (
- value: string | number
-): NewDataSourceType => {
- switch (value) {
- case 0:
- case "DATA_SOURCE_UNSPECIFIED":
- return NewDataSourceType.DATA_SOURCE_UNSPECIFIED;
- case 1:
- case "ADMIN":
- return NewDataSourceType.ADMIN;
- case 2:
- case "READ_ONLY":
- return NewDataSourceType.READ_ONLY;
- case -1:
- case "UNRECOGNIZED":
- default:
- return NewDataSourceType.DATA_SOURCE_UNSPECIFIED;
- }
-};
-
-// Convert scope value (string or number) to proto-es DataSource_AuthenticationType
-export const convertScopeValueToDataSourceAuthenticationType = (
- value: string | number
-): NewDataSource_AuthenticationType => {
- switch (value) {
- case 0:
- case "AUTHENTICATION_UNSPECIFIED":
- return NewDataSource_AuthenticationType.AUTHENTICATION_UNSPECIFIED;
- case 1:
- case "PASSWORD":
- return NewDataSource_AuthenticationType.PASSWORD;
- case 2:
- case "GOOGLE_CLOUD_SQL_IAM":
- return NewDataSource_AuthenticationType.GOOGLE_CLOUD_SQL_IAM;
- case 3:
- case "AWS_RDS_IAM":
- return NewDataSource_AuthenticationType.AWS_RDS_IAM;
- case 4:
- case "AZURE_IAM":
- return NewDataSource_AuthenticationType.AZURE_IAM;
- case -1:
- case "UNRECOGNIZED":
- default:
- return NewDataSource_AuthenticationType.AUTHENTICATION_UNSPECIFIED;
- }
-};
diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yaml
index 36cfa285ba..5680786684 100644
--- a/proto/gen/grpc-doc/openapi.yaml
+++ b/proto/gen/grpc-doc/openapi.yaml
@@ -9621,12 +9621,18 @@ components:
vaultSslCa:
type: string
description: CA certificate for Vault server verification.
+ obfuscatedVaultSslCa:
+ type: string
vaultSslCert:
type: string
description: Client certificate for mutual TLS authentication with Vault.
+ obfuscatedVaultSslCert:
+ type: string
vaultSslKey:
type: string
description: Client private key for mutual TLS authentication with Vault.
+ obfuscatedVaultSslKey:
+ type: string
DataSourceExternalSecret_AppRoleAuthOption:
type: object
properties:
diff --git a/proto/gen/grpc-doc/store/README.md b/proto/gen/grpc-doc/store/README.md
index 9840f8fb3f..a19b4d3695 100644
--- a/proto/gen/grpc-doc/store/README.md
+++ b/proto/gen/grpc-doc/store/README.md
@@ -2426,8 +2426,11 @@ OIDCIdentityProviderConfig is the structure for OIDC identity provider config.
| password_key_name | [string](#string) | | the key name for the password. |
| skip_vault_tls_verification | [bool](#bool) | | TLS configuration for connecting to Vault server. These fields are separate from the database TLS configuration in DataSource. skip_vault_tls_verification disables TLS certificate verification for Vault connections. Default is false (verification enabled) for security. Only set to true for development or when certificates cannot be properly validated. |
| vault_ssl_ca | [string](#string) | | CA certificate for Vault server verification. |
+| obfuscated_vault_ssl_ca | [string](#string) | | |
| vault_ssl_cert | [string](#string) | | Client certificate for mutual TLS authentication with Vault. |
+| obfuscated_vault_ssl_cert | [string](#string) | | |
| vault_ssl_key | [string](#string) | | Client private key for mutual TLS authentication with Vault. |
+| obfuscated_vault_ssl_key | [string](#string) | | |
diff --git a/proto/gen/grpc-doc/store/index.html b/proto/gen/grpc-doc/store/index.html
index a4ef8b8f16..e81c8fb974 100644
--- a/proto/gen/grpc-doc/store/index.html
+++ b/proto/gen/grpc-doc/store/index.html
@@ -7301,6 +7301,13 @@ Only set to true for development or when certificates cannot be properly validat
<td><p>CA certificate for Vault server verification. </p></td>
</tr>
+ <tr>
+ <td>obfuscated_vault_ssl_ca</td>
+ <td><a href="#string">string</a></td>
+ <td></td>
+ <td><p> </p></td>
+ </tr>
+
<tr>
<td>vault_ssl_cert</td>
<td><a href="#string">string</a></td>
@@ -7308,6 +7315,13 @@ Only set to true for development or when certificates cannot be properly validat
<td><p>Client certificate for mutual TLS authentication with Vault. </p></td>
</tr>
+ <tr>
+ <td>obfuscated_vault_ssl_cert</td>
+ <td><a href="#string">string</a></td>
+ <td></td>
+ <td><p> </p></td>
+ </tr>
+
<tr>
<td>vault_ssl_key</td>
<td><a href="#string">string</a></td>
@@ -7315,6 +7329,13 @@ Only set to true for development or when certificates cannot be properly validat
<td><p>Client private key for mutual TLS authentication with Vault. </p></td>
</tr>
+ <tr>
+ <td>obfuscated_vault_ssl_key</td>
+ <td><a href="#string">string</a></td>
+ <td></td>
+ <td><p> </p></td>
+ </tr>
+
</tbody>
</table>
diff --git a/proto/store/store/instance.proto b/proto/store/store/instance.proto
index 926caf59f4..b065a82faf 100644
--- a/proto/store/store/instance.proto
+++ b/proto/store/store/instance.proto
@@ -275,8 +275,11 @@ message DataSourceExternalSecret {
bool skip_vault_tls_verification = 9;
// CA certificate for Vault server verification.
string vault_ssl_ca = 10;
+ string obfuscated_vault_ssl_ca = 11;
// Client certificate for mutual TLS authentication with Vault.
- string vault_ssl_cert = 11;
+ string vault_ssl_cert = 12;
+ string obfuscated_vault_ssl_cert = 13;
// Client private key for mutual TLS authentication with Vault.
- string vault_ssl_key = 12;
+ string vault_ssl_key = 14;
+ string obfuscated_vault_ssl_key = 15;
}