Skip to content

Commit 7d538cc

Browse files
committed
objectTagging related tests migration
Issue: CLDSRV-724
1 parent 42f0890 commit 7d538cc

File tree

2 files changed

+173
-53
lines changed

2 files changed

+173
-53
lines changed

tests/functional/aws-node-sdk/test/multipleBackend/objectTagging/taggingAwsVersioning-delete.js

Lines changed: 36 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ const {
1515
tagging,
1616
genUniqID,
1717
} = require('../utils');
18+
const { PutObjectCommand,
19+
DeleteObjectCommand,
20+
CreateBucketCommand,
21+
DeleteBucketCommand,
22+
} = require('@aws-sdk/client-s3');
1823
const { putTaggingAndAssert, delTaggingAndAssert, awsGetAssertTags } = tagging;
1924

2025
const bucket = `awsversioningtagdel${genUniqID()}`;
@@ -28,26 +33,28 @@ function testSuite() {
2833
withV4(sigCfg => {
2934
const bucketUtil = new BucketUtility('default', sigCfg);
3035
const s3 = bucketUtil.s3;
31-
beforeEach(done => s3.createBucket({
36+
beforeEach(done => s3.send(new CreateBucketCommand({
3237
Bucket: bucket,
3338
CreateBucketConfiguration: {
3439
LocationConstraint: awsLocation,
3540
},
36-
}, done));
41+
})).then(() => done()).catch(err => done(err)));
3742
afterEach(done => {
3843
removeAllVersions({ Bucket: bucket }, err => {
3944
if (err) {
4045
return done(err);
4146
}
42-
return s3.deleteBucket({ Bucket: bucket }, done);
47+
return s3.send(new DeleteBucketCommand({ Bucket: bucket }))
48+
.then(() => done()).catch(done);
4349
});
4450
});
4551

4652
it('versioning not configured: should delete a tag set on the ' +
4753
'latest version if no version is specified', done => {
4854
const key = `somekey-${genUniqID()}`;
4955
async.waterfall([
50-
next => s3.putObject({ Bucket: bucket, Key: key }, next),
56+
next => s3.send(new PutObjectCommand({ Bucket: bucket, Key: key })).then(data =>
57+
next(null, data)).catch(err => next(err)),
5158
(putData, next) => putTaggingAndAssert(s3, { bucket, key, tags,
5259
expectedVersionId: false }, next),
5360
(versionId, next) => delTaggingAndAssert(s3, { bucket, key,
@@ -60,7 +67,8 @@ function testSuite() {
6067
'version if specified (null)', done => {
6168
const key = `somekey-${genUniqID()}`;
6269
async.waterfall([
63-
next => s3.putObject({ Bucket: bucket, Key: key }, next),
70+
next => s3.send(new PutObjectCommand({ Bucket: bucket, Key: key })).then(data =>
71+
next(null, data)).catch(err => next(err)),
6472
(putData, next) => putTaggingAndAssert(s3, { bucket, key, tags,
6573
versionId: 'null', expectedVersionId: false }, next),
6674
(versionId, next) => delTaggingAndAssert(s3, { bucket, key,
@@ -103,7 +111,8 @@ function testSuite() {
103111
const key = `somekey-${genUniqID()}`;
104112
async.waterfall([
105113
next => enableVersioning(s3, bucket, next),
106-
next => s3.putObject({ Bucket: bucket, Key: key }, next),
114+
next => s3.send(new PutObjectCommand({ Bucket: bucket, Key: key })).then(data =>
115+
next(null, data)).catch(err => next(err)),
107116
(putData, next) => awsGetLatestVerId(key, '',
108117
(err, awsVid) => next(err, putData.VersionId, awsVid)),
109118
(s3Vid, awsVid, next) => putNullVersionsToAws(s3, bucket, key,
@@ -124,7 +133,8 @@ function testSuite() {
124133
const key = `somekey-${genUniqID()}`;
125134
async.waterfall([
126135
next => enableVersioning(s3, bucket, next),
127-
next => s3.putObject({ Bucket: bucket, Key: key }, next),
136+
next => s3.send(new PutObjectCommand({ Bucket: bucket, Key: key })).then(putData =>
137+
next(null, putData)).catch(err => next(err)),
128138
(putData, next) => putTaggingAndAssert(s3, { bucket, key, tags,
129139
expectedVersionId: putData.VersionId }, next),
130140
(versionId, next) => delTaggingAndAssert(s3, { bucket, key,
@@ -138,7 +148,8 @@ function testSuite() {
138148
const key = `somekey-${genUniqID()}`;
139149
async.waterfall([
140150
next => enableVersioning(s3, bucket, next),
141-
next => s3.putObject({ Bucket: bucket, Key: key }, next),
151+
next => s3.send(new PutObjectCommand({ Bucket: bucket, Key: key })).then(putData =>
152+
next(null, putData)).catch(err => next(err)),
142153
(putData, next) => putTaggingAndAssert(s3, { bucket, key, tags,
143154
versionId: putData.VersionId,
144155
expectedVersionId: putData.VersionId }, next),
@@ -153,13 +164,14 @@ function testSuite() {
153164
const key = `somekey-${genUniqID()}`;
154165
async.waterfall([
155166
next => enableVersioning(s3, bucket, next),
156-
next => s3.putObject({ Bucket: bucket, Key: key }, next),
167+
next => s3.send(new PutObjectCommand({ Bucket: bucket, Key: key })).then(putData =>
168+
next(null, putData)).catch(err => next(err)),
157169
(putData, next) => awsGetLatestVerId(key, '',
158170
(err, awsVid) => next(err, putData.VersionId, awsVid)),
159171
// put another version
160-
(s3Vid, awsVid, next) => s3.putObject({ Bucket: bucket,
161-
Key: key, Body: someBody },
162-
err => next(err, s3Vid, awsVid)),
172+
(s3Vid, awsVid, next) => s3.send(new PutObjectCommand({ Bucket: bucket,
173+
Key: key, Body: someBody })).then(() =>
174+
next(null, s3Vid, awsVid)).catch(err => next(err, s3Vid, awsVid)),
163175
(s3Vid, awsVid, next) => putTaggingAndAssert(s3, { bucket, key,
164176
tags, versionId: s3Vid, expectedVersionId: s3Vid }, err =>
165177
next(err, s3Vid, awsVid)),
@@ -196,10 +208,11 @@ function testSuite() {
196208
done => {
197209
const key = `somekey-${genUniqID()}`;
198210
async.waterfall([
199-
next => s3.putObject({ Bucket: bucket, Key: key }, next),
211+
next => s3.send(new PutObjectCommand({ Bucket: bucket, Key: key })).then(putData =>
212+
next(null, putData)).catch(err => next(err)),
200213
(putData, next) => awsGetLatestVerId(key, '', next),
201-
(awsVid, next) => awsS3.deleteObject({ Bucket: awsBucket,
202-
Key: key, VersionId: awsVid }, next),
214+
(awsVid, next) => awsS3.send(new DeleteObjectCommand({ Bucket: awsBucket,
215+
Key: key, VersionId: awsVid })).then(delData => next(null, delData)).catch(err => next(err)),
203216
(delData, next) => delTaggingAndAssert(s3, { bucket, key,
204217
expectedError: 'ServiceUnavailable' }, next),
205218
], done);
@@ -210,15 +223,15 @@ function testSuite() {
210223
done => {
211224
const key = `somekey-${genUniqID()}`;
212225
async.waterfall([
213-
next => s3.putObject({ Bucket: bucket, Key: key }, next),
214-
(putData, next) => awsGetLatestVerId(key, '',
215-
(err, awsVid) => next(err, putData.VersionId, awsVid)),
216-
(s3Vid, awsVid, next) => awsS3.deleteObject({ Bucket: awsBucket,
217-
Key: key, VersionId: awsVid }, err => next(err, s3Vid)),
218-
(s3Vid, next) => delTaggingAndAssert(s3, { bucket, key,
219-
versionId: s3Vid, expectedError: 'ServiceUnavailable' },
220-
next),
226+
next => s3.send(new PutObjectCommand({ Bucket: bucket, Key: key })).then(putData =>
227+
next(null, putData)).catch(err => next(err)),
228+
(putData, next) => awsGetLatestVerId(key, '', next),
229+
(awsVid, next) => awsS3.send(new DeleteObjectCommand({ Bucket: awsBucket,
230+
Key: key, VersionId: awsVid })).then(delData => next(null, delData)).catch(err => next(err)),
231+
(delData, next) => delTaggingAndAssert(s3, { bucket, key,
232+
expectedError: 'ServiceUnavailable' }, next),
221233
], done);
222234
});
235+
223236
});
224237
});

0 commit comments

Comments
 (0)