Skip to content

Commit e7e1c18

Browse files
benzekrimahabenzekrimaha
committed
fixups
1 parent 9a107ce commit e7e1c18

File tree

3 files changed

+114
-10
lines changed

3 files changed

+114
-10
lines changed

‎package.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@
2222
"@aws-sdk/client-s3": "^3.705.0",
2323
"@aws-sdk/credential-providers": "^3.864.0",
2424
"@aws-sdk/middleware-retry": "^3.374.0",
25+
"@aws-sdk/protocol-http": "^3.374.0",
2526
"@aws-sdk/s3-request-presigner": "^3.901.0",
27+
"@aws-sdk/signature-v4": "^3.374.0",
2628
"@azure/storage-blob": "^12.28.0",
2729
"@hapi/joi": "^17.1.1",
2830
"@smithy/node-http-handler": "^3.0.0",

‎tests/functional/aws-node-sdk/test/bucket/putBucketNotification.js‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,9 @@ describe('aws-sdk test put notification configuration', () => {
128128
});
129129

130130
describe('event validation', () => {
131-
before(done => s3.createBucket({ Bucket: bucket }, done));
131+
before(() => s3.send(new CreateBucketCommand({ Bucket: bucket })));
132132

133-
after(done => s3.deleteBucket({ Bucket: bucket }, done));
133+
after(() => s3.send(new DeleteBucketCommand({ Bucket: bucket })));
134134

135135
const events = [
136136
{ supported: 'Transition', event: 's3:ObjectRestore:*' },
@@ -141,15 +141,25 @@ describe('aws-sdk test put notification configuration', () => {
141141
describe(`${event} event validation`, () => {
142142
it(`should handle ${event} events based on lifecycle rules configuration`, done => {
143143
const params = getNotificationParams([event]);
144-
s3.putBucketNotificationConfiguration(params, err => {
145-
if (config.supportedLifecycleRules.some(rule => rule.includes(supported))) {
146-
// Should succeed when lifecycle rule is supported
147-
assert.ifError(err);
144+
const shouldSucceed = config.supportedLifecycleRules.some(rule => rule.includes(supported));
145+
146+
s3.send(new PutBucketNotificationConfigurationCommand(params)).then(() => {
147+
if (shouldSucceed) {
148+
// Expected success when lifecycle rule is supported
149+
done();
148150
} else {
149-
// Should fail when lifecycle rule is not supported
151+
// Unexpected success - should have failed when lifecycle rule is not supported
152+
done(new Error('Expected MalformedXML error but operation succeeded'));
153+
}
154+
}).catch(err => {
155+
if (shouldSucceed) {
156+
// Unexpected error - should have succeeded when lifecycle rule is supported
157+
done(err);
158+
} else {
159+
// Expected error when lifecycle rule is not supported
150160
checkError(err, 'MalformedXML', 400);
161+
done();
151162
}
152-
done();
153163
});
154164
});
155165
});

‎yarn.lock‎

Lines changed: 94 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,15 @@
1010
"@jridgewell/gen-mapping" "^0.3.5"
1111
"@jridgewell/trace-mapping" "^0.3.24"
1212

13+
"@aws-crypto/[email protected]":
14+
version "3.0.0"
15+
resolved "https://registry.yarnpkg.com/@aws-crypto/crc32/-/crc32-3.0.0.tgz#07300eca214409c33e3ff769cd5697b57fdd38fa"
16+
integrity sha512-IzSgsrxUcsrejQbPVilIKy16kAT52EwB6zSaI+M3xxIhKh5+aldEyvI+z6erM7TCLB2BJsFrtHjp6/4/sr+3dA==
17+
dependencies:
18+
"@aws-crypto/util" "^3.0.0"
19+
"@aws-sdk/types" "^3.222.0"
20+
tslib "^1.11.1"
21+
1322
"@aws-crypto/[email protected]":
1423
version "5.2.0"
1524
resolved "https://registry.yarnpkg.com/@aws-crypto/crc32/-/crc32-5.2.0.tgz#cfcc22570949c98c6689cfcbd2d693d36cdae2e1"
@@ -88,6 +97,15 @@
8897
"@smithy/util-utf8" "^2.0.0"
8998
tslib "^2.6.2"
9099

100+
"@aws-crypto/util@^3.0.0":
101+
version "3.0.0"
102+
resolved "https://registry.yarnpkg.com/@aws-crypto/util/-/util-3.0.0.tgz#1c7ca90c29293f0883468ad48117937f0fe5bfb0"
103+
integrity sha512-2OJlpeJpCR48CC8r+uKVChzs9Iungj9wkZrl8Z041DWEWvyIHILYKCPNzJghKsivj+S3mLo6BVc7mBNzdxA46w==
104+
dependencies:
105+
"@aws-sdk/types" "^3.222.0"
106+
"@aws-sdk/util-utf8-browser" "^3.0.0"
107+
tslib "^1.11.1"
108+
91109
"@aws-sdk/[email protected]":
92110
version "3.895.0"
93111
resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.895.0.tgz#7d0a49eb8587ba8629a9c27dcb7dc931a9618636"
@@ -623,6 +641,14 @@
623641
"@smithy/util-utf8" "^4.1.0"
624642
tslib "^2.6.2"
625643

644+
"@aws-sdk/protocol-http@^3.374.0":
645+
version "3.374.0"
646+
resolved "https://registry.yarnpkg.com/@aws-sdk/protocol-http/-/protocol-http-3.374.0.tgz#e35e76096b995bbed803897a9f4587d11ca34088"
647+
integrity sha512-9WpRUbINdGroV3HiZZIBoJvL2ndoWk39OfwxWs2otxByppJZNN14bg/lvCx5e8ggHUti7IBk5rb0nqQZ4m05pg==
648+
dependencies:
649+
"@smithy/protocol-http" "^1.1.0"
650+
tslib "^2.5.0"
651+
626652
"@aws-sdk/[email protected]":
627653
version "3.893.0"
628654
resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.893.0.tgz#570dfd2314b3f71eb263557bb06fea36b5188cd6"
@@ -673,6 +699,14 @@
673699
"@smithy/types" "^4.6.0"
674700
tslib "^2.6.2"
675701

702+
"@aws-sdk/signature-v4@^3.374.0":
703+
version "3.374.0"
704+
resolved "https://registry.yarnpkg.com/@aws-sdk/signature-v4/-/signature-v4-3.374.0.tgz#bd727f4c392acb81bc667aa4cfceeba608250771"
705+
integrity sha512-2xLJvSdzcZZAg0lsDLUAuSQuihzK0dcxIK7WmfuJeF7DGKJFmp9czQmz5f3qiDz6IDQzvgK1M9vtJSVCslJbyQ==
706+
dependencies:
707+
"@smithy/signature-v4" "^1.0.1"
708+
tslib "^2.5.0"
709+
676710
"@aws-sdk/[email protected]":
677711
version "3.895.0"
678712
resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.895.0.tgz#6fc09c3aee81fb6c4430724ded1dda88d57775ac"
@@ -766,6 +800,13 @@
766800
"@smithy/types" "^4.5.0"
767801
tslib "^2.6.2"
768802

803+
"@aws-sdk/util-utf8-browser@^3.0.0":
804+
version "3.259.0"
805+
resolved "https://registry.yarnpkg.com/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.259.0.tgz#3275a6f5eb334f96ca76635b961d3c50259fd9ff"
806+
integrity sha512-UvFa/vR+e19XookZF8RzFZBrw2EUkQWxiBW0yYQAhvk3C+QVGl0H3ouca8LDBlBfQKXwmW3huo/59H8rwb1wJw==
807+
dependencies:
808+
tslib "^2.3.1"
809+
769810
"@aws-sdk/[email protected]":
770811
version "3.894.0"
771812
resolved "https://registry.yarnpkg.com/@aws-sdk/xml-builder/-/xml-builder-3.894.0.tgz#7110e86622345d3da220a2ed5259a30a91dec4bc"
@@ -1529,6 +1570,14 @@
15291570
resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.3.tgz#282046f03e886e352b2d5f5da5eb755e01457f3f"
15301571
integrity sha512-DE427ROAphMQzU4ENbliGYrBSYPXF+TtLg9S8vzeA+OF4ZKzoDdzfL8sxuMUGS/lgRhM6j1URSk9ghf7Xo1tyA==
15311572

1573+
"@smithy/abort-controller@^3.1.9":
1574+
version "3.1.9"
1575+
resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-3.1.9.tgz#47d323f754136a489e972d7fd465d534d72fcbff"
1576+
integrity sha512-yiW0WI30zj8ZKoSYNx90no7ugVn3khlyH/z5W8qtKBtVE6awRALbhSG+2SAHA1r6bO/6M9utxYKVZ3PCJ1rWxw==
1577+
dependencies:
1578+
"@smithy/types" "^3.7.2"
1579+
tslib "^2.6.2"
1580+
15321581
"@smithy/abort-controller@^4.1.1":
15331582
version "4.1.1"
15341583
resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-4.1.1.tgz#9b3872ab6b2c061486175c281dadc0a853260533"
@@ -1614,6 +1663,16 @@
16141663
"@smithy/url-parser" "^4.1.1"
16151664
tslib "^2.6.2"
16161665

1666+
"@smithy/eventstream-codec@^1.1.0":
1667+
version "1.1.0"
1668+
resolved "https://registry.yarnpkg.com/@smithy/eventstream-codec/-/eventstream-codec-1.1.0.tgz#bfe1308ba84ff3db3e79dc1ced8231c52ac0fc36"
1669+
integrity sha512-3tEbUb8t8an226jKB6V/Q2XU/J53lCwCzULuBPEaF4JjSh+FlCMp7TmogE/Aij5J9DwlsZ4VAD/IRDuQ/0ZtMw==
1670+
dependencies:
1671+
"@aws-crypto/crc32" "3.0.0"
1672+
"@smithy/types" "^1.2.0"
1673+
"@smithy/util-hex-encoding" "^1.1.0"
1674+
tslib "^2.5.0"
1675+
16171676
"@smithy/eventstream-codec@^4.1.1":
16181677
version "4.1.1"
16191678
resolved "https://registry.yarnpkg.com/@smithy/eventstream-codec/-/eventstream-codec-4.1.1.tgz#637eb4bceecc3ef588b86c28506439a9cdd7a41f"
@@ -1940,7 +1999,7 @@
19401999
"@smithy/types" "^4.6.0"
19412000
tslib "^2.6.2"
19422001

1943-
"@smithy/protocol-http@^1.2.0":
2002+
"@smithy/protocol-http@^1.1.0", "@smithy/protocol-http@^1.2.0":
19442003
version "1.2.0"
19452004
resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-1.2.0.tgz#a554e4dabb14508f0bc2cdef9c3710e2b294be04"
19462005
integrity sha512-GfGfruksi3nXdFok5RhgtOnWe5f6BndzYfmEXISD+5gAGdayFGpjWu5pIqIweTudMtse20bGbc+7MFZXT1Tb8Q==
@@ -2043,6 +2102,20 @@
20432102
"@smithy/types" "^4.6.0"
20442103
tslib "^2.6.2"
20452104

2105+
"@smithy/signature-v4@^1.0.1":
2106+
version "1.1.0"
2107+
resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-1.1.0.tgz#e85309995c2475d39598a4f56e68b7ed856bdfa6"
2108+
integrity sha512-fDo3m7YqXBs7neciOePPd/X9LPm5QLlDMdIC4m1H6dgNLnXfLMFNIxEfPyohGA8VW9Wn4X8lygnPSGxDZSmp0Q==
2109+
dependencies:
2110+
"@smithy/eventstream-codec" "^1.1.0"
2111+
"@smithy/is-array-buffer" "^1.1.0"
2112+
"@smithy/types" "^1.2.0"
2113+
"@smithy/util-hex-encoding" "^1.1.0"
2114+
"@smithy/util-middleware" "^1.1.0"
2115+
"@smithy/util-uri-escape" "^1.1.0"
2116+
"@smithy/util-utf8" "^1.1.0"
2117+
tslib "^2.5.0"
2118+
20462119
"@smithy/signature-v4@^2.1.1":
20472120
version "2.3.0"
20482121
resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-2.3.0.tgz#c30dd4028ae50c607db99459981cce8cdab7a3fd"
@@ -2310,6 +2383,13 @@
23102383
"@smithy/types" "^4.5.0"
23112384
tslib "^2.6.2"
23122385

2386+
"@smithy/util-hex-encoding@^1.1.0":
2387+
version "1.1.0"
2388+
resolved "https://registry.yarnpkg.com/@smithy/util-hex-encoding/-/util-hex-encoding-1.1.0.tgz#b5ba919aa076a3fd5e93e368e34ae2b732fa2090"
2389+
integrity sha512-7UtIE9eH0u41zpB60Jzr0oNCQ3hMJUabMcKRUVjmyHTXiWDE4vjSqN6qlih7rCNeKGbioS7f/y2Jgym4QZcKFg==
2390+
dependencies:
2391+
tslib "^2.5.0"
2392+
23132393
"@smithy/util-hex-encoding@^2.2.0":
23142394
version "2.2.0"
23152395
resolved "https://registry.yarnpkg.com/@smithy/util-hex-encoding/-/util-hex-encoding-2.2.0.tgz#87edb7c88c2f422cfca4bb21f1394ae9602c5085"
@@ -2422,6 +2502,13 @@
24222502
"@smithy/util-utf8" "^4.2.0"
24232503
tslib "^2.6.2"
24242504

2505+
"@smithy/util-uri-escape@^1.1.0":
2506+
version "1.1.0"
2507+
resolved "https://registry.yarnpkg.com/@smithy/util-uri-escape/-/util-uri-escape-1.1.0.tgz#a8c5edaf19c0efdb9b51661e840549cf600a1808"
2508+
integrity sha512-/jL/V1xdVRt5XppwiaEU8Etp5WHZj609n0xMTuehmCqdoOFbId1M+aEeDWZsQ+8JbEB/BJ6ynY2SlYmOaKtt8w==
2509+
dependencies:
2510+
tslib "^2.5.0"
2511+
24252512
"@smithy/util-uri-escape@^2.2.0":
24262513
version "2.2.0"
24272514
resolved "https://registry.yarnpkg.com/@smithy/util-uri-escape/-/util-uri-escape-2.2.0.tgz#56f5764051a33b67bc93fdd2a869f971b0635406"
@@ -8264,7 +8351,12 @@ tsconfig-paths@^3.15.0:
82648351
minimist "^1.2.6"
82658352
strip-bom "^3.0.0"
82668353

8267-
tslib@^2.2.0, tslib@^2.5.0, tslib@^2.6.2, tslib@^2.8.1:
8354+
tslib@^1.11.1:
8355+
version "1.14.1"
8356+
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
8357+
integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
8358+
8359+
tslib@^2.2.0, tslib@^2.3.1, tslib@^2.5.0, tslib@^2.6.2, tslib@^2.8.1:
82688360
version "2.8.1"
82698361
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
82708362
integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==

0 commit comments

Comments
 (0)