Skip to content

Commit 1f05819

Browse files
kuhekuhe
authored
test: remove changesets calls from e2e tests (#7354)
* test: remove changesets calls from e2e tests * test: unused variable
1 parent a40013f commit 1f05819

File tree

11 files changed

+234
-95
lines changed

11 files changed

+234
-95
lines changed

‎clients/client-cognito-identity/test/e2e/CognitoIdentity.e2e.spec.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { beforeAll, describe, expect, test as it } from "vitest";
22

3-
import { getIntegTestResources } from "../../../../tests/e2e/get-integ-test-resources";
3+
import { getE2eTestResources } from "@aws-sdk/aws-util-test/src";
44
import { CognitoIdentity } from "../../src/index";
55

66
describe("@aws-sdk/client-cognito-identity", () => {
@@ -9,8 +9,8 @@ describe("@aws-sdk/client-cognito-identity", () => {
99
let IdentityPoolId: string;
1010

1111
beforeAll(async () => {
12-
const integTestResourcesEnv = await getIntegTestResources();
13-
Object.assign(process.env, integTestResourcesEnv);
12+
const e2eTestResourcesEnv = await getE2eTestResources();
13+
Object.assign(process.env, e2eTestResourcesEnv);
1414

1515
region = process?.env?.AWS_SMOKE_TEST_REGION as string;
1616
IdentityPoolId =
@@ -38,4 +38,4 @@ describe("@aws-sdk/client-cognito-identity", () => {
3838
expect(typeof getCredentialsResult.Credentials?.AccessKeyId).to.equal("string");
3939
expect(typeof getCredentialsResult.Credentials?.SecretKey).to.equal("string");
4040
});
41-
});
41+
}, 60_000);

‎clients/client-s3/test/e2e/S3.browser.e2e.spec.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import { FetchHttpHandler } from "@smithy/fetch-http-handler";
44
import { Browser } from "happy-dom";
55
import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, onTestFailed, test as it } from "vitest";
66

7-
import { getIntegTestResources } from "../../../../tests/e2e/get-integ-test-resources";
87
import { getRuntimeConfig } from "../../src/runtimeConfig.browser";
98
import { S3 as S3Impl, waitUntilObjectExists as waitUntilObjectExistsImpl } from "../browser-build/browser-s3-bundle";
109
import { createBuffer } from "./helpers";
10+
import { getE2eTestResources } from "@aws-sdk/aws-util-test/src";
1111

1212
describe("@aws-sdk/client-s3", () => {
1313
let client: S3;
@@ -25,8 +25,8 @@ describe("@aws-sdk/client-s3", () => {
2525
const browser = new Browser();
2626
browser.settings.fetch.disableSameOriginPolicy = true;
2727

28-
const integTestResourcesEnv = await getIntegTestResources();
29-
Object.assign(process.env, integTestResourcesEnv);
28+
const e2eTestResourcesEnv = await getE2eTestResources();
29+
Object.assign(process.env, e2eTestResourcesEnv);
3030

3131
region = process?.env?.AWS_SMOKE_TEST_REGION as string;
3232
Bucket = process?.env?.AWS_SMOKE_TEST_BUCKET as string;

‎clients/client-s3/test/e2e/S3.e2e.spec.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import "@aws-sdk/signature-v4-crt";
33
import { ChecksumAlgorithm, S3 } from "@aws-sdk/client-s3";
44
import { afterAll, afterEach, beforeAll, describe, expect, test as it } from "vitest";
55

6-
import { getIntegTestResources } from "../../../../tests/e2e/get-integ-test-resources";
76
import { createBuffer } from "./helpers";
7+
import { getE2eTestResources } from "@aws-sdk/aws-util-test/src";
88

99
let Key = `${Date.now()}`;
1010

@@ -15,8 +15,8 @@ describe("@aws-sdk/client-s3", () => {
1515
let mrapArn: string;
1616

1717
beforeAll(async () => {
18-
const integTestResourcesEnv = await getIntegTestResources();
19-
Object.assign(process.env, integTestResourcesEnv);
18+
const e2eTestResourcesEnv = await getE2eTestResources();
19+
Object.assign(process.env, e2eTestResourcesEnv);
2020

2121
region = process?.env?.AWS_SMOKE_TEST_REGION as string;
2222
Bucket = process?.env?.AWS_SMOKE_TEST_BUCKET as string;
@@ -247,4 +247,4 @@ describe("@aws-sdk/client-s3", () => {
247247
expect(result.Contents).toBeInstanceOf(Array);
248248
});
249249
});
250-
});
250+
}, 60_000);

‎clients/client-s3/test/e2e/s3-object-features.e2e.spec.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ import { GetObjectCommand, PutObjectCommand, S3 } from "@aws-sdk/client-s3";
55
import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
66
import { afterAll, beforeAll, describe, expect, test as it } from "vitest";
77

8-
import { getIntegTestResources } from "../../../../tests/e2e/get-integ-test-resources";
8+
import { getE2eTestResources } from "@aws-sdk/aws-util-test/src";
99

1010
describe("@aws-sdk/client-s3", () => {
1111
let client: S3;
1212
let Bucket: string;
1313
let region: string;
1414

1515
beforeAll(async () => {
16-
const integTestResourcesEnv = await getIntegTestResources();
17-
Object.assign(process.env, integTestResourcesEnv);
16+
const e2eTestResourcesEnv = await getE2eTestResources();
17+
Object.assign(process.env, e2eTestResourcesEnv);
1818

1919
region = process?.env?.AWS_SMOKE_TEST_REGION as string;
2020
Bucket = process?.env?.AWS_SMOKE_TEST_BUCKET as string;

‎lib/lib-storage/src/lib-storage.e2e.spec.ts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1+
import { getE2eTestResources } from "@aws-sdk/aws-util-test/src";
12
import { ChecksumAlgorithm, S3 } from "@aws-sdk/client-s3";
23
import { Upload } from "@aws-sdk/lib-storage";
34
import { randomBytes } from "crypto";
45
import { Readable } from "stream";
56
import { afterAll, beforeAll, describe, expect, test as it } from "vitest";
67

7-
import { getIntegTestResources } from "../../../tests/e2e/get-integ-test-resources";
8-
98
describe("@aws-sdk/lib-storage", () => {
109
describe.each([undefined, "WHEN_REQUIRED", "WHEN_SUPPORTED"])(
1110
"requestChecksumCalculation: %s",
@@ -23,12 +22,11 @@ describe("@aws-sdk/lib-storage", () => {
2322
let dataString: string;
2423
let Bucket: string;
2524
let region: string;
26-
let resourcesAvailable = false;
2725

2826
beforeAll(async () => {
2927
try {
30-
const integTestResourcesEnv = await getIntegTestResources();
31-
Object.assign(process.env, integTestResourcesEnv);
28+
const e2eTestResourcesEnv = await getE2eTestResources();
29+
Object.assign(process.env, e2eTestResourcesEnv);
3230

3331
region = process?.env?.AWS_SMOKE_TEST_REGION as string;
3432
Bucket = process?.env?.AWS_SMOKE_TEST_BUCKET as string;
@@ -43,7 +41,6 @@ describe("@aws-sdk/lib-storage", () => {
4341
requestChecksumCalculation,
4442
});
4543
Key = `multi-part-file-${requestChecksumCalculation}-${ChecksumAlgorithm}-${Date.now()}`;
46-
resourcesAvailable = true;
4744
} catch (error) {
4845
console.warn("Failed to set up test resources:", error);
4946
}

‎packages/middleware-flexible-checksums/src/middleware-flexible-checksums.e2e.spec.ts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { getE2eTestResources } from "@aws-sdk/aws-util-test/src";
12
import { S3, UploadPartCommandOutput } from "@aws-sdk/client-s3";
23
import { Upload } from "@aws-sdk/lib-storage";
34
import { FetchHttpHandler } from "@smithy/fetch-http-handler";
@@ -6,8 +7,6 @@ import { ChecksumStream, headStream } from "@smithy/util-stream";
67
import { Readable } from "node:stream";
78
import { beforeAll, describe, expect, test as it, vi } from "vitest";
89

9-
import { getIntegTestResources } from "../../../tests/e2e/get-integ-test-resources";
10-
1110
describe("S3 checksums", () => {
1211
let s3: S3;
1312
let s3_noChecksum: S3;
@@ -38,8 +37,8 @@ describe("S3 checksums", () => {
3837
}
3938

4039
beforeAll(async () => {
41-
const integTestResourcesEnv = await getIntegTestResources();
42-
Object.assign(process.env, integTestResourcesEnv);
40+
const e2eTestResourcesEnv = await getE2eTestResources();
41+
Object.assign(process.env, e2eTestResourcesEnv);
4342

4443
region = process?.env?.AWS_SMOKE_TEST_REGION as string;
4544
Bucket = process?.env?.AWS_SMOKE_TEST_BUCKET as string;
@@ -252,4 +251,4 @@ describe("S3 checksums", () => {
252251
await expect(checksumStream.getReader().closed).resolves.toBe(undefined);
253252
});
254253
});
255-
});
254+
}, 60_000);

‎packages/s3-presigned-post/src/createPresignedPost.e2e.spec.ts‎

Lines changed: 74 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -3,98 +3,102 @@ import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, test as i
33

44
const FormData = require("form-data");
55

6+
import { getE2eTestResources } from "@aws-sdk/aws-util-test/src";
67
import { createReadStream, existsSync, rmSync, writeFileSync } from "fs";
78
import { join } from "path";
89

9-
import { getIntegTestResources } from "../../../tests/e2e/get-integ-test-resources";
1010
import { createPresignedPost } from "./createPresignedPost";
1111

12-
describe(createPresignedPost.name, () => {
13-
let Bucket: string;
14-
let region: string;
15-
16-
beforeAll(async () => {
17-
const integTestResourcesEnv = await getIntegTestResources();
18-
Object.assign(process.env, integTestResourcesEnv);
19-
20-
region = process?.env?.AWS_SMOKE_TEST_REGION as string;
21-
Bucket = process?.env?.AWS_SMOKE_TEST_BUCKET as string;
22-
});
23-
24-
it("should allow custom endpoints to be modified by endpoint resolution options", async () => {
25-
const Key = "test-key";
26-
{
27-
const client = new S3({
28-
region,
29-
forcePathStyle: true,
30-
endpoint: `https://s3.dualstack.${region}.amazonaws.com`,
31-
});
32-
const { url } = await createPresignedPost(client, { Bucket, Key });
33-
expect(url).toBe(`https://s3.dualstack.${region}.amazonaws.com/${Bucket}`);
34-
}
35-
{
36-
const client = new S3({ region, endpoint: `https://s3.dualstack.${region}.amazonaws.com` });
37-
const { url } = await createPresignedPost(client, { Bucket, Key });
38-
expect(url).toBe(`https://${Bucket}.s3.dualstack.${region}.amazonaws.com/`);
39-
}
40-
});
41-
42-
describe("test with real bucket", () => {
43-
let Key: string;
44-
let client: S3;
45-
let contents: string;
46-
let fileLocation: string;
12+
describe(
13+
createPresignedPost.name,
14+
() => {
15+
let Bucket: string;
16+
let region: string;
4717

4818
beforeAll(async () => {
49-
Key = `aws-sdk-js-integration-test-s3-presigned-post-${Date.now()}.txt`;
50-
contents = "Hello, world!";
51-
fileLocation = join(__dirname, Key);
52-
client = new S3({ region, endpoint: `https://s3.dualstack.${region}.amazonaws.com` });
19+
const e2eTestResourcesEnv = await getE2eTestResources();
20+
Object.assign(process.env, e2eTestResourcesEnv);
5321

54-
await client.headBucket({ Bucket });
55-
writeFileSync(fileLocation, contents, "utf-8");
22+
region = process?.env?.AWS_SMOKE_TEST_REGION as string;
23+
Bucket = process?.env?.AWS_SMOKE_TEST_BUCKET as string;
5624
});
5725

58-
afterAll(async () => {
59-
if (existsSync(fileLocation)) {
60-
rmSync(fileLocation);
26+
it("should allow custom endpoints to be modified by endpoint resolution options", async () => {
27+
const Key = "test-key";
28+
{
29+
const client = new S3({
30+
region,
31+
forcePathStyle: true,
32+
endpoint: `https://s3.dualstack.${region}.amazonaws.com`,
33+
});
34+
const { url } = await createPresignedPost(client, { Bucket, Key });
35+
expect(url).toBe(`https://s3.dualstack.${region}.amazonaws.com/${Bucket}`);
36+
}
37+
{
38+
const client = new S3({ region, endpoint: `https://s3.dualstack.${region}.amazonaws.com` });
39+
const { url } = await createPresignedPost(client, { Bucket, Key });
40+
expect(url).toBe(`https://${Bucket}.s3.dualstack.${region}.amazonaws.com/`);
6141
}
6242
});
6343

64-
beforeEach(async () => {
65-
await client.deleteObject({ Bucket, Key });
66-
});
44+
describe("test with real bucket", () => {
45+
let Key: string;
46+
let client: S3;
47+
let contents: string;
48+
let fileLocation: string;
6749

68-
afterEach(async () => {
69-
await client.deleteObject({ Bucket, Key });
70-
});
50+
beforeAll(async () => {
51+
Key = `aws-sdk-js-integration-test-s3-presigned-post-${Date.now()}.txt`;
52+
contents = "Hello, world!";
53+
fileLocation = join(__dirname, Key);
54+
client = new S3({ region, endpoint: `https://s3.dualstack.${region}.amazonaws.com` });
7155

72-
it("should put an object using a presigned post w/ custom endpoint", async () => {
73-
const { url, fields } = await createPresignedPost(client, { Bucket, Key });
56+
await client.headBucket({ Bucket });
57+
writeFileSync(fileLocation, contents, "utf-8");
58+
});
7459

75-
expect(url).toBe(`https://${Bucket}.s3.dualstack.${region}.amazonaws.com/`);
60+
afterAll(async () => {
61+
if (existsSync(fileLocation)) {
62+
rmSync(fileLocation);
63+
}
64+
});
7665

77-
const form = new FormData();
78-
Object.entries(fields).forEach(([field, value]) => {
79-
form.append(field, value);
66+
beforeEach(async () => {
67+
await client.deleteObject({ Bucket, Key });
8068
});
81-
form.append("file", createReadStream(fileLocation));
8269

83-
const precheck = await client.getObject({ Bucket, Key }).catch((err) => err);
84-
expect(precheck).toBeInstanceOf(NoSuchKey);
70+
afterEach(async () => {
71+
await client.deleteObject({ Bucket, Key });
72+
});
8573

86-
const submit: { statusCode: number } = await new Promise((resolve, reject) => {
87-
form.submit(url, (err: any, res: any) => {
88-
if (err) reject(err);
89-
resolve(res);
74+
it("should put an object using a presigned post w/ custom endpoint", async () => {
75+
const { url, fields } = await createPresignedPost(client, { Bucket, Key });
76+
77+
expect(url).toBe(`https://${Bucket}.s3.dualstack.${region}.amazonaws.com/`);
78+
79+
const form = new FormData();
80+
Object.entries(fields).forEach(([field, value]) => {
81+
form.append(field, value);
9082
});
91-
});
83+
form.append("file", createReadStream(fileLocation));
9284

93-
expect(submit.statusCode).toBe(204);
85+
const precheck = await client.getObject({ Bucket, Key }).catch((err) => err);
86+
expect(precheck).toBeInstanceOf(NoSuchKey);
9487

95-
const check = await client.getObject({ Bucket, Key });
88+
const submit: { statusCode: number } = await new Promise((resolve, reject) => {
89+
form.submit(url, (err: any, res: any) => {
90+
if (err) reject(err);
91+
resolve(res);
92+
});
93+
});
9694

97-
expect(await check.Body?.transformToString()).toEqual(contents);
95+
expect(submit.statusCode).toBe(204);
96+
97+
const check = await client.getObject({ Bucket, Key });
98+
99+
expect(await check.Body?.transformToString()).toEqual(contents);
100+
});
98101
});
99-
});
100-
});
102+
},
103+
60_000
104+
);

‎private/aws-util-test/package.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@
2020
"sideEffects": false,
2121
"dependencies": {
2222
"@aws-sdk/aws-protocoltests-json": "*",
23+
"@aws-sdk/client-cognito-identity": "*",
24+
"@aws-sdk/client-s3": "*",
25+
"@aws-sdk/client-s3-control": "*",
26+
"@aws-sdk/client-sts": "*",
2327
"@smithy/protocol-http": "^5.2.1",
2428
"@smithy/shared-ini-file-loader": "^4.2.0",
2529
"@smithy/types": "^4.5.0",

0 commit comments

Comments
 (0)