From f085683c3532528f5ad30cfc93107c2e7f782517 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20G=C3=B6bel?= <dgoebel@techfak.uni-bielefeld.de>
Date: Tue, 11 Jun 2024 10:15:19 +0000
Subject: [PATCH] Add move operation for S3 objects
#125
---
.gitlab-ci.yml | 2 +-
package-lock.json | 98 ++++++++++---------
.../object-storage/modals/CopyObjectModal.vue | 27 +++++
3 files changed, 78 insertions(+), 49 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4527b2d..bdb2f0c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,7 +37,7 @@ build:
.build-container-job:
stage: deploy
image:
- name: gcr.io/kaniko-project/executor:v1.23.0-debug
+ name: gcr.io/kaniko-project/executor:v1.23.1-debug
entrypoint: [ "" ]
dependencies: [ ]
cache: [ ]
diff --git a/package-lock.json b/package-lock.json
index 384ae72..110560b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1465,6 +1465,7 @@
"version": "0.11.14",
"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
"integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
+ "deprecated": "Use @eslint/config-array instead",
"dev": true,
"dependencies": {
"@humanwhocodes/object-schema": "^2.0.2",
@@ -1514,6 +1515,7 @@
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
"integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
+ "deprecated": "Use @eslint/object-schema instead",
"dev": true
},
"node_modules/@jridgewell/sourcemap-codec": {
@@ -2509,16 +2511,16 @@
"dev": true
},
"node_modules/@typescript-eslint/eslint-plugin": {
- "version": "7.12.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.12.0.tgz",
- "integrity": "sha512-7F91fcbuDf/d3S8o21+r3ZncGIke/+eWk0EpO21LXhDfLahriZF9CGj4fbAetEjlaBdjdSm9a6VeXbpbT6Z40Q==",
+ "version": "7.13.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.13.0.tgz",
+ "integrity": "sha512-FX1X6AF0w8MdVFLSdqwqN/me2hyhuQg4ykN6ZpVhh1ij/80pTvDKclX1sZB9iqex8SjQfVhwMKs3JtnnMLzG9w==",
"dev": true,
"dependencies": {
"@eslint-community/regexpp": "^4.10.0",
- "@typescript-eslint/scope-manager": "7.12.0",
- "@typescript-eslint/type-utils": "7.12.0",
- "@typescript-eslint/utils": "7.12.0",
- "@typescript-eslint/visitor-keys": "7.12.0",
+ "@typescript-eslint/scope-manager": "7.13.0",
+ "@typescript-eslint/type-utils": "7.13.0",
+ "@typescript-eslint/utils": "7.13.0",
+ "@typescript-eslint/visitor-keys": "7.13.0",
"graphemer": "^1.4.0",
"ignore": "^5.3.1",
"natural-compare": "^1.4.0",
@@ -2542,15 +2544,15 @@
}
},
"node_modules/@typescript-eslint/parser": {
- "version": "7.12.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.12.0.tgz",
- "integrity": "sha512-dm/J2UDY3oV3TKius2OUZIFHsomQmpHtsV0FTh1WO8EKgHLQ1QCADUqscPgTpU+ih1e21FQSRjXckHn3txn6kQ==",
+ "version": "7.13.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.13.0.tgz",
+ "integrity": "sha512-EjMfl69KOS9awXXe83iRN7oIEXy9yYdqWfqdrFAYAAr6syP8eLEFI7ZE4939antx2mNgPRW/o1ybm2SFYkbTVA==",
"dev": true,
"dependencies": {
- "@typescript-eslint/scope-manager": "7.12.0",
- "@typescript-eslint/types": "7.12.0",
- "@typescript-eslint/typescript-estree": "7.12.0",
- "@typescript-eslint/visitor-keys": "7.12.0",
+ "@typescript-eslint/scope-manager": "7.13.0",
+ "@typescript-eslint/types": "7.13.0",
+ "@typescript-eslint/typescript-estree": "7.13.0",
+ "@typescript-eslint/visitor-keys": "7.13.0",
"debug": "^4.3.4"
},
"engines": {
@@ -2570,13 +2572,13 @@
}
},
"node_modules/@typescript-eslint/scope-manager": {
- "version": "7.12.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.12.0.tgz",
- "integrity": "sha512-itF1pTnN6F3unPak+kutH9raIkL3lhH1YRPGgt7QQOh43DQKVJXmWkpb+vpc/TiDHs6RSd9CTbDsc/Y+Ygq7kg==",
+ "version": "7.13.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.13.0.tgz",
+ "integrity": "sha512-ZrMCe1R6a01T94ilV13egvcnvVJ1pxShkE0+NDjDzH4nvG1wXpwsVI5bZCvE7AEDH1mXEx5tJSVR68bLgG7Dng==",
"dev": true,
"dependencies": {
- "@typescript-eslint/types": "7.12.0",
- "@typescript-eslint/visitor-keys": "7.12.0"
+ "@typescript-eslint/types": "7.13.0",
+ "@typescript-eslint/visitor-keys": "7.13.0"
},
"engines": {
"node": "^18.18.0 || >=20.0.0"
@@ -2587,13 +2589,13 @@
}
},
"node_modules/@typescript-eslint/type-utils": {
- "version": "7.12.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.12.0.tgz",
- "integrity": "sha512-lib96tyRtMhLxwauDWUp/uW3FMhLA6D0rJ8T7HmH7x23Gk1Gwwu8UZ94NMXBvOELn6flSPiBrCKlehkiXyaqwA==",
+ "version": "7.13.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.13.0.tgz",
+ "integrity": "sha512-xMEtMzxq9eRkZy48XuxlBFzpVMDurUAfDu5Rz16GouAtXm0TaAoTFzqWUFPPuQYXI/CDaH/Bgx/fk/84t/Bc9A==",
"dev": true,
"dependencies": {
- "@typescript-eslint/typescript-estree": "7.12.0",
- "@typescript-eslint/utils": "7.12.0",
+ "@typescript-eslint/typescript-estree": "7.13.0",
+ "@typescript-eslint/utils": "7.13.0",
"debug": "^4.3.4",
"ts-api-utils": "^1.3.0"
},
@@ -2614,9 +2616,9 @@
}
},
"node_modules/@typescript-eslint/types": {
- "version": "7.12.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.12.0.tgz",
- "integrity": "sha512-o+0Te6eWp2ppKY3mLCU+YA9pVJxhUJE15FV7kxuD9jgwIAa+w/ycGJBMrYDTpVGUM/tgpa9SeMOugSabWFq7bg==",
+ "version": "7.13.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.13.0.tgz",
+ "integrity": "sha512-QWuwm9wcGMAuTsxP+qz6LBBd3Uq8I5Nv8xb0mk54jmNoCyDspnMvVsOxI6IsMmway5d1S9Su2+sCKv1st2l6eA==",
"dev": true,
"engines": {
"node": "^18.18.0 || >=20.0.0"
@@ -2627,13 +2629,13 @@
}
},
"node_modules/@typescript-eslint/typescript-estree": {
- "version": "7.12.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.12.0.tgz",
- "integrity": "sha512-5bwqLsWBULv1h6pn7cMW5dXX/Y2amRqLaKqsASVwbBHMZSnHqE/HN4vT4fE0aFsiwxYvr98kqOWh1a8ZKXalCQ==",
+ "version": "7.13.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.13.0.tgz",
+ "integrity": "sha512-cAvBvUoobaoIcoqox1YatXOnSl3gx92rCZoMRPzMNisDiM12siGilSM4+dJAekuuHTibI2hVC2fYK79iSFvWjw==",
"dev": true,
"dependencies": {
- "@typescript-eslint/types": "7.12.0",
- "@typescript-eslint/visitor-keys": "7.12.0",
+ "@typescript-eslint/types": "7.13.0",
+ "@typescript-eslint/visitor-keys": "7.13.0",
"debug": "^4.3.4",
"globby": "^11.1.0",
"is-glob": "^4.0.3",
@@ -2655,15 +2657,15 @@
}
},
"node_modules/@typescript-eslint/utils": {
- "version": "7.12.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.12.0.tgz",
- "integrity": "sha512-Y6hhwxwDx41HNpjuYswYp6gDbkiZ8Hin9Bf5aJQn1bpTs3afYY4GX+MPYxma8jtoIV2GRwTM/UJm/2uGCVv+DQ==",
+ "version": "7.13.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.13.0.tgz",
+ "integrity": "sha512-jceD8RgdKORVnB4Y6BqasfIkFhl4pajB1wVxrF4akxD2QPM8GNYjgGwEzYS+437ewlqqrg7Dw+6dhdpjMpeBFQ==",
"dev": true,
"dependencies": {
"@eslint-community/eslint-utils": "^4.4.0",
- "@typescript-eslint/scope-manager": "7.12.0",
- "@typescript-eslint/types": "7.12.0",
- "@typescript-eslint/typescript-estree": "7.12.0"
+ "@typescript-eslint/scope-manager": "7.13.0",
+ "@typescript-eslint/types": "7.13.0",
+ "@typescript-eslint/typescript-estree": "7.13.0"
},
"engines": {
"node": "^18.18.0 || >=20.0.0"
@@ -2677,12 +2679,12 @@
}
},
"node_modules/@typescript-eslint/visitor-keys": {
- "version": "7.12.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.12.0.tgz",
- "integrity": "sha512-uZk7DevrQLL3vSnfFl5bj4sL75qC9D6EdjemIdbtkuUmIheWpuiiylSY01JxJE7+zGrOWDZrp1WxOuDntvKrHQ==",
+ "version": "7.13.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.13.0.tgz",
+ "integrity": "sha512-nxn+dozQx+MK61nn/JP+M4eCkHDSxSLDpgE3WcQo0+fkjEolnaB5jswvIKC4K56By8MMgIho7f1PVxERHEo8rw==",
"dev": true,
"dependencies": {
- "@typescript-eslint/types": "7.12.0",
+ "@typescript-eslint/types": "7.13.0",
"eslint-visitor-keys": "^3.4.3"
},
"engines": {
@@ -5723,9 +5725,9 @@
}
},
"node_modules/prettier": {
- "version": "3.3.1",
- "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.1.tgz",
- "integrity": "sha512-7CAwy5dRsxs8PHXT3twixW9/OEll8MLE0VRPCJyl7CkS6VHGPSlsVaWTiASPTyGyYRyApxlaWTzwUxVNrhcwDg==",
+ "version": "3.3.2",
+ "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.2.tgz",
+ "integrity": "sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==",
"dev": true,
"bin": {
"prettier": "bin/prettier.cjs"
@@ -7161,9 +7163,9 @@
}
},
"node_modules/vue-router": {
- "version": "4.3.2",
- "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.3.2.tgz",
- "integrity": "sha512-hKQJ1vDAZ5LVkKEnHhmm1f9pMiWIBNGF5AwU67PdH7TyXCj/a4hTccuUuYCAMgJK6rO/NVYtQIEN3yL8CECa7Q==",
+ "version": "4.3.3",
+ "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.3.3.tgz",
+ "integrity": "sha512-8Q+u+WP4N2SXY38FDcF2H1dUEbYVHVPtPCPZj/GTZx8RCbiB8AtJP9+YIxn4Vs0svMTNQcLIzka4GH7Utkx9xQ==",
"dependencies": {
"@vue/devtools-api": "^6.5.1"
},
diff --git a/src/components/object-storage/modals/CopyObjectModal.vue b/src/components/object-storage/modals/CopyObjectModal.vue
index 69b6c92..856566f 100644
--- a/src/components/object-storage/modals/CopyObjectModal.vue
+++ b/src/components/object-storage/modals/CopyObjectModal.vue
@@ -22,12 +22,14 @@ const formState = reactive<{
uploading: boolean;
err: string;
abortController?: AbortController;
+ moveObject: boolean;
}>({
destKey: "",
destBucket: "",
uploading: false,
err: "",
abortController: undefined,
+ moveObject: false,
});
const bucketRepository = useBucketStore();
@@ -58,9 +60,18 @@ function copyObject() {
formState.destKey,
formState.abortController,
)
+ .then(() => {
+ if (formState.moveObject && props.srcObject.Key != undefined) {
+ return objectRepository.deleteObject(
+ props.srcBucket,
+ props.srcObject.Key,
+ );
+ }
+ })
.then(() => {
copyModal?.hide();
successToast?.show();
+ formState.moveObject = false;
formState.destBucket = "";
})
.catch((e) => {
@@ -157,6 +168,21 @@ onMounted(() => {
v-model="formState.destKey"
/>
</div>
+ <div class="mb-3 form-check">
+ <input
+ class="form-check-input"
+ type="checkbox"
+ v-model="formState.moveObject"
+ id="flexCheckDefault"
+ :disabled="formState.uploading"
+ />
+ <label class="form-check-label" for="flexCheckDefault">
+ Delete object after copy
+ </label>
+ </div>
+ <div class="text-danger" v-if="(srcObject.Size ?? 0) > 5000000000">
+ Only objects smaller than 5GB can be copied.
+ </div>
</form>
<div class="col-5">
You can copy objects. You have to create destination buckets prior
@@ -185,6 +211,7 @@ onMounted(() => {
type="submit"
:form="'copyObjectForm' + randomIDSuffix"
class="btn btn-primary"
+ :disabled="(srcObject.Size ?? 0) > 5000000000"
>
Copy
</button>
--
GitLab