jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fixup gcs backup storage configuration

Browse Source
This commit is contained in:
Johannes Zellner
2025-05-05 12:18:56 +02:00
parent 98cc0b9dfc
commit d9f07c4de4
2 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dashboard/src/components/BackupDialog.vue
View File

@@ -121,16 +121,10 @@ async function onSubmit() {
data.noHardlinks = !providerConfig.value.useHardlinks;
data.preserveAttributes = true;
} else if (data.provider === 'gcs') {
// TODO we should probably allow to change the config without reuploading a new .json
if (providerConfig.value.gcsKeyContentJson) return;
data.bucket = providerConfig.value.bucket;
data.prefix = providerConfig.value.prefix;
data.projectId = providerConfig.value.gcsKeyContentJson.project_id;
data.credentials = {
client_email: providerConfig.value.gcsKeyContentJson.client_email,
private_key: providerConfig.value.gcsKeyContentJson.private_key
};
data.projectId = providerConfig.value.projectId;
data.credentials = providerConfig.value.credentials;
}
const limits = {

21
dashboard/src/components/BackupProviderForm.vue
View File

@@ -26,8 +26,6 @@ const storageProviders = STORAGE_PROVIDERS.concat([
const blockDevices = ref([]);
const disk = ref('');
const gcsKeyFileName = ref('');
const gcsProjectId = ref('');
const gcsKeyContentJson = ref(null);
const gcsFileParseError = ref('');
const advancedVisible = ref(false);
@@ -47,15 +45,20 @@ function onGcsKeyChange(event) {
if (!keyJson.client_email) throw new Error('client_email field missing in JSON key file');
if (!keyJson.private_key) throw new Error('private_key field missing in JSON key file');
gcsProjectId.value = keyJson.project_id;
gcsKeyContentJson.value = keyJson;
providerConfig.value.projectId = keyJson.project_id;
providerConfig.value.credentials = {
client_email: keyJson.client_email,
private_key: keyJson.private_key,
};
} catch (e) {
if (e.name === 'SyntaxError') gcsFileParseError.value = 'Invalid JSON';
else gcsFileParseError.value = e.message;
gcsKeyFileName.value = '';
gcsProjectId.value = '';
gcsKeyContentJson.value = null;
providerConfig.value.projectId = '';
providerConfig.value.credentials = {
client_email: '',
private_key: '',
};
}
};
fr.readAsText(event.target.files[0]);
@@ -263,8 +266,8 @@ onMounted(async () => {
</FormGroup>
<FormGroup v-if="provider === 'gcs'">
<input type="file" id="gcsKeyFileInput" style="display:none" @change="onGcsKeyChange"/>
<label for="gcsKeyInput">{{ $t('backups.configureBackupStorage.gcsServiceKey') }}{{ providerConfig.gcsProjectId ? ` - project: ${providerConfig.gcsProjectId}` : '' }}</label>
<input type="file" id="gcsKeyFileInput" style="display:none" accept="application/json, text/json" @change="onGcsKeyChange"/>
<label for="gcsKeyInput">{{ $t('backups.configureBackupStorage.gcsServiceKey') }}{{ providerConfig.projectId ? ` - project: ${providerConfig.projectId}` : '' }}</label>
<InputGroup>
<TextInput readonly required style="flex-grow: 1" v-model="gcsKeyFileName" placeholder="Service Account Key" onclick="document.getElementById('gcsKeyFileInput').click();"/>
<Button tool icon="fa fa-upload" onclick="document.getElementById('gcsKeyFileInput').click();"/>