Skip to content

Commit

Permalink
fix: error detail from header
Browse files Browse the repository at this point in the history
  • Loading branch information
csg01123119 committed Jul 26, 2024
2 parents d845779 + c29e15a commit 33bb2c5
Show file tree
Hide file tree
Showing 26 changed files with 275 additions and 218 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

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
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
4 changes: 2 additions & 2 deletions lib/common/multipart.js
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,8 @@ proto._uploadPart = async function _uploadPart(name, uploadId, partNo, data, opt
opt.headers = opt.headers || {};
opt.headers['Content-Length'] = data.size;

// Uploading shards does not require x-oss server side encryption
opt.headers = omit(opt.headers, ['x-oss-server-side-encryption']);
// Uploading shards does not require x-oss headers.
opt.headers = omit(opt.headers, ['x-oss-server-side-encryption', 'x-oss-storage-class']);
opt.subres = {
partNumber: partNo,
uploadId
Expand Down
Loading

0 comments on commit 33bb2c5

Please sign in to comment.