From 7a945af84a96c80d2f3897bc8f90d88ef5f1c556 Mon Sep 17 00:00:00 2001 From: fengmk2 Date: Mon, 21 Oct 2024 14:54:36 +0800 Subject: [PATCH 1/4] test: Node.js 23 --- .github/workflows/nodejs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 930d2f23..c44367f1 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - node-version: [16, 18, 20, 22] + node-version: [16, 18, 20, 22, 23] os: [ubuntu-latest] steps: From d9f49f2c3a687cb68379581580c331eb863444e6 Mon Sep 17 00:00:00 2001 From: fengmk2 Date: Sun, 27 Oct 2024 11:04:14 +0800 Subject: [PATCH 2/4] f --- test/OSSObject.test.ts | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/test/OSSObject.test.ts b/test/OSSObject.test.ts index 77bf1962..2114bda7 100644 --- a/test/OSSObject.test.ts +++ b/test/OSSObject.test.ts @@ -22,8 +22,7 @@ describe('test/OSSObject.test.ts', () => { const __filename = fileURLToPath(import.meta.url); const __dirname = path.dirname(__filename); - // OSSClientError: Access denied by bucket policy. - describe.skip('list()', () => { + describe('list()', () => { // oss.jpg // fun/test.jpg // fun/movie/001.avi @@ -42,9 +41,12 @@ describe('test/OSSObject.test.ts', () => { assert.equal(typeof obj.name, 'string'); assert.equal(typeof obj.lastModified, 'string'); assert.equal(typeof obj.etag, 'string'); - assert(obj.type === 'Normal' || obj.type === 'Multipart'); + assert(obj.type === 'Normal' || obj.type === 'Multipart' || obj.type === 'Appendable' || obj.type === 'Symlink', + `invalid obj.type ${obj.type}`); assert.equal(typeof obj.size, 'number'); - assert.equal(obj.storageClass, 'Standard'); + // assert.equal(obj.storageClass, 'Standard'); + assert(obj.storageClass === 'Standard' || obj.storageClass === 'IA', + `invalid obj.storageClass ${obj.storageClass}`); assert.equal(typeof obj.owner, 'object'); assert.equal(typeof obj.owner!.id, 'string'); assert.equal(typeof obj.owner!.displayName, 'string'); @@ -56,6 +58,7 @@ describe('test/OSSObject.test.ts', () => { // console.log(result.objects); result.objects.map(checkObjectProperties); assert.equal(typeof result.nextMarker, 'string'); + // console.log(result.isTruncated); assert(result.isTruncated); assert.deepEqual(result.prefixes, []); assert(result.res.headers.date); @@ -66,7 +69,7 @@ describe('test/OSSObject.test.ts', () => { assert(obj.size > 0); }); - it('should list timeout work', async () => { + it.skip('should list timeout work', async () => { await assert.rejects(async () => { await ossObject.list({}, { timeout: 1 }); }, (err: Error) => { @@ -168,8 +171,7 @@ describe('test/OSSObject.test.ts', () => { }); }); - // OSSClientError: Access denied by bucket policy. - describe.skip('listV2()', () => { + describe('listV2()', () => { const listPrefix = `${prefix}oss-client/listV2/`; before(async () => { await ossObject.put(`${listPrefix}oss.jpg`, Buffer.from('oss.jpg')); @@ -186,7 +188,8 @@ describe('test/OSSObject.test.ts', () => { assert.equal(typeof obj.etag, 'string'); assert(obj.type === 'Normal' || obj.type === 'Multipart'); assert.equal(typeof obj.size, 'number'); - assert.equal(obj.storageClass, 'Standard'); + // assert.equal(obj.storageClass, 'Standard'); + assert(obj.storageClass === 'Standard' || obj.storageClass === 'IA'); if (options?.owner) { assert(typeof obj.owner!.id === 'string' && typeof obj.owner!.displayName === 'string'); } else { @@ -924,12 +927,13 @@ describe('test/OSSObject.test.ts', () => { assert(r2.owner.displayName); assert(r2.owner.id); - const r3 = await ossObject.putACL(name, 'public-read'); + // public-read, Put public object acl is not allowed + const r3 = await ossObject.putACL(name, 'private'); assert.equal(r3.res.status, 200); const r4 = await ossObject.getACL(name); assert.equal(r4.res.status, 200); - assert.equal(r4.acl, 'public-read'); + assert.equal(r4.acl, 'private'); const r5 = await ossObject.get(name); assert.equal(r5.res.status, 200); From 12732be5aaffbdc36ea16c4606a3da86fc6077ff Mon Sep 17 00:00:00 2001 From: fengmk2 Date: Sun, 27 Oct 2024 11:08:25 +0800 Subject: [PATCH 3/4] f --- test/config.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/config.ts b/test/config.ts index 04abb800..caa2051c 100644 --- a/test/config.ts +++ b/test/config.ts @@ -1,11 +1,11 @@ export default { prefix: `${process.platform}-${process.version}-${new Date().getTime()}/`, oss: { - accessKeyId: process.env.OSS_CLIENT_ID! || process.env.ALI_SDK_OSS_ID!, - accessKeySecret: process.env.OSS_CLIENT_SECRET! || process.env.ALI_SDK_OSS_SECRET!, - region: process.env.OSS_CLIENT_REGION || process.env.ALI_SDK_OSS_REGION, - endpoint: process.env.OSS_CLIENT_ENDPOINT! || process.env.ALI_SDK_OSS_ENDPOINT!, - bucket: process.env.OSS_CLIENT_BUCKET! || process.env.ALI_SDK_OSS_BUCKET!, + accessKeyId: process.env.OSS_CLIENT_ID!, + accessKeySecret: process.env.OSS_CLIENT_SECRET!, + region: process.env.OSS_CLIENT_REGION!, + endpoint: process.env.OSS_CLIENT_ENDPOINT!, + bucket: process.env.OSS_CLIENT_BUCKET!, }, timeout: '120s', }; From f87f7bde91ee7d4d10882d356d3f2cd2668bc39a Mon Sep 17 00:00:00 2001 From: fengmk2 Date: Sun, 27 Oct 2024 11:10:06 +0800 Subject: [PATCH 4/4] f --- .github/workflows/nodejs.yml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index c44367f1..c83ef626 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -36,16 +36,11 @@ jobs: - name: Continuous Integration run: npm run ci env: - ALI_SDK_OSS_ID: ${{ secrets.ALI_SDK_OSS_ID }} - ALI_SDK_OSS_SECRET: ${{ secrets.ALI_SDK_OSS_SECRET }} - ALI_SDK_OSS_REGION: ${{ secrets.ALI_SDK_OSS_REGION }} - ALI_SDK_OSS_ENDPOINT: ${{ secrets.ALI_SDK_OSS_ENDPOINT }} - ALI_SDK_OSS_BUCKET: ${{ secrets.ALI_SDK_OSS_BUCKET }} - ALI_SDK_STS_ID: ${{ secrets.ALI_SDK_STS_ID }} - ALI_SDK_STS_SECRET: ${{ secrets.ALI_SDK_STS_SECRET }} - ALI_SDK_STS_ROLE: ${{ secrets.ALI_SDK_STS_ROLE }} - ALI_SDK_STS_BUCKET: ${{ secrets.ALI_SDK_STS_BUCKET }} - ALI_SDK_STS_ENDPOINT: ${{ secrets.ALI_SDK_STS_ENDPOINT }} + OSS_CLIENT_ID: ${{ secrets.OSS_CLIENT_ID }} + OSS_CLIENT_SECRET: ${{ secrets.OSS_CLIENT_SECRET }} + OSS_CLIENT_REGION: ${{ secrets.OSS_CLIENT_REGION }} + OSS_CLIENT_ENDPOINT: ${{ secrets.OSS_CLIENT_ENDPOINT }} + OSS_CLIENT_BUCKET: ${{ secrets.OSS_CLIENT_BUCKET }} - name: Code Coverage uses: codecov/codecov-action@v3