Skip to content

Commit

Permalink
Merge pull request #1327 from ali-sdk/master
Browse files Browse the repository at this point in the history
chore: 6.21.0
  • Loading branch information
YunZZY authored Aug 16, 2024
2 parents ccffa66 + 82a347a commit 23387bb
Show file tree
Hide file tree
Showing 48 changed files with 3,208 additions and 3,679 deletions.
10 changes: 9 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,12 @@ task/
browser-build.js
es
cjs
dist/
dist/

lib/common/utils/createRequest.js
lib/common/utils/encodeString.js
lib/common/utils/getStandardRegion.js
lib/common/utils/checkEnv.js
lib/common/utils/isDingTalk.js

lib/common/bucket/putBucketInventory.d.ts
7 changes: 5 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
/* eslint max-len: [0] */
// Ignore checking the js file generated by ts
const buckets = ['dataIndex.js'];
const ignorePatterns = ['lib/common/utils/*.js'].concat(buckets.map(item => `lib/common/bucket/${item}`));

module.exports = {
ignorePatterns,
extends: ['airbnb', 'eslint-config-ali/typescript', 'prettier'],
parserOptions: {
ecmaFeatures: {
Expand All @@ -16,7 +20,6 @@ module.exports = {
},
rules: {
indent: ['error', 2],
// override default options
'no-underscore-dangle': [0],
'no-plusplus': [0],
'no-return-await': [0],
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeCov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
ALI_SDK_STS_SECRET: ${{secrets.ALI_SDK_STS_SECRET}}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: test and report upload
run: |
npm install
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
17 changes: 10 additions & 7 deletions .github/workflows/dev_node_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
node-version: [14.x]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: browser build and test
run: |
curl cip.cc
Expand Down Expand Up @@ -61,11 +61,12 @@ jobs:
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
architecture: x64
- run: npm install
- run: npm run test

Expand All @@ -92,11 +93,12 @@ jobs:
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
architecture: x64
- run: npm install
- run: npm run test

Expand All @@ -123,12 +125,13 @@ jobs:
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
ref: develop
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
architecture: x64
- run: npm install
- run: npm run test
17 changes: 10 additions & 7 deletions .github/workflows/master_node_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
node-version: [14.x]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: browser build and test
run: |
curl cip.cc
Expand Down Expand Up @@ -61,11 +61,12 @@ jobs:
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
architecture: x64
- run: npm install -D npm@6.14.12
- run: npm install
- run: npm run test
Expand Down Expand Up @@ -93,11 +94,12 @@ jobs:
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
architecture: x64
- run: npm install -D npm@6.14.16
- run: npm install
- run: npm run test
Expand Down Expand Up @@ -125,11 +127,12 @@ jobs:
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
architecture: x64
- run: npm install -D npm@6.14.18
- run: npm install
- run: npm run test
5 changes: 3 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,12 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Setup Node
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: 18
architecture: x64
- name: Install Dependencies
run: npm install
- name: Snyk Protect
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/schedule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,11 @@ jobs:
matrix:
node-version: [14.x]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: clean all bucket
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
architecture: x64
- run: npm install
- run: node test/node/cleanAllBucket.js
- run: node test/node/fixtures/cleanAllBucket.js
2 changes: 1 addition & 1 deletion .github/workflows/snyk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- run: npm install
- name: Run Snyk to check for vulnerabilities
Expand Down
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ build
test/node/.tmp
test/browser/.tmp
test/demo.js
yarn.lock
package-lock.json
.nyc_output/
.env

Expand All @@ -44,3 +42,6 @@ package-lock.json

es
.eslintcache

/test/node/fixtures/nodejs-processed-w200-latest.png
/test/node/fixtures/nodejs-processed-w200.png
10 changes: 9 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,10 @@
node_modules/
dist/
dist/

lib/common/utils/createRequest.js
lib/common/utils/encodeString.js
lib/common/utils/getStandardRegion.js
lib/common/utils/checkEnv.js
lib/common/utils/isDingTalk.js

lib/common/bucket/putBucketInventory.d.ts
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,23 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

## [6.21.0](https://github.com/ali-sdk/ali-oss/compare/v6.20.0...v6.21.0) (2024-08-16)

### Features

* bucket options support setting headers ([#1306](https://github.com/ali-sdk/ali-oss/issues/1306)) ([b4fb361](https://github.com/ali-sdk/ali-oss/commit/b4fb361fa3b8bbc55e0d08b7a4103b44bc5e9c2a))
* callback supports callbackSNI ([#1291](https://github.com/ali-sdk/ali-oss/issues/1291)) ([fc6040b](https://github.com/ali-sdk/ali-oss/commit/fc6040bc2412c6fb1f5918754857cbbb127dc521))
* putBucketInventory supports new fields ([#1290](https://github.com/ali-sdk/ali-oss/issues/1290)) ([6bde1c2](https://github.com/ali-sdk/ali-oss/commit/6bde1c29bee6b0d5de5493ab494eb5ca736b584b))
* putBucketLifecycle supports ColdArchive and DeepColdArchive ([#1256](https://github.com/ali-sdk/ali-oss/issues/1256)) ([4c028d6](https://github.com/ali-sdk/ali-oss/commit/4c028d614d1911e4b8d9ab879f30d801b484df91))
* support EC Code and get error detail from header ([#1317](https://github.com/ali-sdk/ali-oss/issues/1317)) ([5a95778](https://github.com/ali-sdk/ali-oss/commit/5a95778ae51790e3bd2d9cbc47e40da54f4863e8))

### Bug Fixes

* multipartUpload supports setting storage-class header ([#1308](https://github.com/ali-sdk/ali-oss/issues/1308)) ([c29e15a](https://github.com/ali-sdk/ali-oss/commit/c29e15ab93164d1e246da2e488f26121d53302c4))
* add check to file of get ([#1228](https://github.com/ali-sdk/ali-oss/issues/1228)) ([c52bd5b](https://github.com/ali-sdk/ali-oss/commit/c52bd5b36d725365bf820ee3cea44b9ed0370ae4))
* fix the sorting of queries in signatureUrl ([#1310](https://github.com/ali-sdk/ali-oss/issues/1310)) ([b3cc7a0](https://github.com/ali-sdk/ali-oss/commit/b3cc7a0de2d949f87a4e91a6d4d76f2ab634a37c))
* upgrade urllib to 2.44.0 ([#1294](https://github.com/ali-sdk/ali-oss/issues/1294))

## [6.20.0](https://github.com/ali-sdk/ali-oss/compare/v6.19.0...v6.20.0) (2024-01-19)

### Features
Expand Down
Loading

0 comments on commit 23387bb

Please sign in to comment.