Skip to content

Commit

Permalink
Merge branch 'master' into csg/fix/master/52729765
Browse files Browse the repository at this point in the history
  • Loading branch information
csg01123119 committed Aug 12, 2024
2 parents cf0dbcb + 4c028d6 commit 4a92064
Show file tree
Hide file tree
Showing 65 changed files with 19,246 additions and 34,820 deletions.
7 changes: 6 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,9 @@ task/
browser-build.js
es
cjs
dist/
dist/

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

8 changes: 6 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 All @@ -34,6 +37,7 @@ module.exports = {
}
],
'no-buffer-constructor': [2],
'no-void': 'warn',
'comma-dangle': [0],
'import/prefer-default-export': [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 [email protected]
- 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 [email protected]
- 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 [email protected]
- 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
11 changes: 6 additions & 5 deletions .github/workflows/schedule.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Regularly clean test buckets at GMT 20:00 every day
# Regularly clean test buckets at GMT 01:00 every day.
name: 'Schdule Delete'

on:
schedule:
- cron: '0 20 1/1 * *'
- cron: '0 1 1/1 * *'

jobs:
cleanAllBucket:
Expand All @@ -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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,6 @@ package-lock.json

es
.eslintcache

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

lib/common/utils/createRequest.js
lib/common/utils/encodeString.js
lib/common/utils/getStandardRegion.js
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,18 @@

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.20.0](https://github.com/ali-sdk/ali-oss/compare/v6.19.0...v6.20.0) (2024-01-19)

### Features

* support v4 signature ([#1277](https://github.com/ali-sdk/ali-oss/issues/1277)) ([8bbe9b1](https://github.com/ali-sdk/ali-oss/commit/8bbe9b1ac8aa34c1564a1ad11549b67fc1db7f3a))

## [6.19.0](https://github.com/ali-sdk/ali-oss/compare/v6.18.1...v6.19.0) (2023-12-18)

### Features

* verify object names strictly when signing URLs and enabled by default ([#1265](https://github.com/ali-sdk/ali-oss/issues/1265)) ([830e36e](https://github.com/ali-sdk/ali-oss/commit/830e36ea143b57e09e42d0634bc0c4d07474a2a5))

### [6.18.1](https://github.com/ali-sdk/ali-oss/compare/v6.18.0...v6.18.1) (2023-09-08)

### Features
Expand Down
Loading

0 comments on commit 4a92064

Please sign in to comment.