Compare commits

...

6 Commits

Author SHA1 Message Date
Alexandre Lavigne f98a847f66
increase global timeout, CI can be slow give it some time try 2021-10-20 10:31:29 +02:00
Alexandre Lavigne 1f3fa77bf2
test can timeout on 30s, increase it to 60s 2021-10-20 10:31:29 +02:00
Alexandre Lavigne 191b73e853
ZENKO-3646 - increase azure client timeout
Without this increase, the azure client triggers _connection reset_ error.
2021-10-19 12:04:52 +02:00
Alexandre Lavigne bb1935f6ee
ZENKO=3646 - Update latest arsenal version including fix for delete tagging 2021-10-18 14:05:58 +02:00
Alexandre Lavigne 76d5b1d8cd
ZENKO-3646 - update arsenal to new version 2021-10-18 14:05:58 +02:00
Alexandre Lavigne 67e4c108c1
ZENKO-36 - fix put object tagging
Arsenal library is now expecting the bucket name
as argument instead of the bucket object.
2021-10-18 14:05:58 +02:00
7 changed files with 12 additions and 8 deletions

View File

@ -2,7 +2,7 @@
version: 0.2 version: 0.2
branches: branches:
feature/*, documentation/*, improvement/*, bugfix/*, w/*, q/*, hotfix/*, dependabot/*: feature/*, documentation/*, improvement/*, bugfix/*, w/*, q/*, hotfix/*, dependabot/*, user/*:
stage: pre-merge stage: pre-merge
models: models:

View File

@ -86,7 +86,7 @@ function objectDeleteTagging(authInfo, request, log, callback) {
}, },
(bucket, objectMD, next) => (bucket, objectMD, next) =>
// if external backends handles tagging // if external backends handles tagging
data.objectTagging('Delete', objectKey, bucket, objectMD, data.objectTagging('Delete', objectKey, bucket.getName(), objectMD,
log, err => next(err, bucket, objectMD)), log, err => next(err, bucket, objectMD)),
], (err, bucket, objectMD) => { ], (err, bucket, objectMD) => {
const additionalResHeaders = collectCorsHeaders(request.headers.origin, const additionalResHeaders = collectCorsHeaders(request.headers.origin,

View File

@ -92,7 +92,7 @@ function objectPutTagging(authInfo, request, log, callback) {
}, },
(bucket, objectMD, next) => (bucket, objectMD, next) =>
// if external backend handles tagging // if external backend handles tagging
data.objectTagging('Put', objectKey, bucket, objectMD, data.objectTagging('Put', objectKey, bucket.getName(), objectMD,
log, err => next(err, bucket, objectMD)), log, err => next(err, bucket, objectMD)),
], (err, bucket, objectMD) => { ], (err, bucket, objectMD) => {
const additionalResHeaders = collectCorsHeaders(request.headers.origin, const additionalResHeaders = collectCorsHeaders(request.headers.origin,

View File

@ -20,7 +20,7 @@
"homepage": "https://github.com/scality/S3#readme", "homepage": "https://github.com/scality/S3#readme",
"dependencies": { "dependencies": {
"@hapi/joi": "^17.1.0", "@hapi/joi": "^17.1.0",
"arsenal": "github:scality/Arsenal#8.1.5", "arsenal": "github:scality/Arsenal#3205ecf",
"async": "~2.5.0", "async": "~2.5.0",
"aws-sdk": "2.905.0", "aws-sdk": "2.905.0",
"azure-storage": "^2.1.0", "azure-storage": "^2.1.0",
@ -109,7 +109,7 @@
"test_versionid_base62": "VERSION_ID_ENCODING_TYPE=base62 CI=true S3BACKEND=mem mocha --reporter mocha-multi-reporters --reporter-options configFile=$INIT_CWD/tests/reporter-config.json --recursive tests/unit/api", "test_versionid_base62": "VERSION_ID_ENCODING_TYPE=base62 CI=true S3BACKEND=mem mocha --reporter mocha-multi-reporters --reporter-options configFile=$INIT_CWD/tests/reporter-config.json --recursive tests/unit/api",
"test_legacy_location": "CI=true S3_LOCATION_FILE=tests/locationConfig/locationConfigLegacy.json S3BACKEND=mem mocha --reporter mocha-multi-reporters --reporter-options configFile=$INIT_CWD/tests/reporter-config.json --recursive tests/unit", "test_legacy_location": "CI=true S3_LOCATION_FILE=tests/locationConfig/locationConfigLegacy.json S3BACKEND=mem mocha --reporter mocha-multi-reporters --reporter-options configFile=$INIT_CWD/tests/reporter-config.json --recursive tests/unit",
"test_utapi_v2": "mocha --reporter mocha-multi-reporters --reporter-options configFile=$INIT_CWD/tests/reporter-config.json --recursive tests/utapi", "test_utapi_v2": "mocha --reporter mocha-multi-reporters --reporter-options configFile=$INIT_CWD/tests/reporter-config.json --recursive tests/utapi",
"multiple_backend_test": "CI=true S3BACKEND=mem S3DATA=multiple mocha --reporter mocha-multi-reporters --reporter-options configFile=$INIT_CWD/tests/reporter-config.json -t 20000 --recursive tests/multipleBackend", "multiple_backend_test": "CI=true S3BACKEND=mem S3DATA=multiple mocha --reporter mocha-multi-reporters --reporter-options configFile=$INIT_CWD/tests/reporter-config.json -t 40000 --recursive tests/multipleBackend",
"unit_coverage": "CI=true mkdir -p coverage/unit/ && S3BACKEND=mem istanbul cover --dir coverage/unit _mocha -- --reporter mocha-multi-reporters --reporter-options configFile=$INIT_CWD/tests/reporter-config.json --recursive tests/unit", "unit_coverage": "CI=true mkdir -p coverage/unit/ && S3BACKEND=mem istanbul cover --dir coverage/unit _mocha -- --reporter mocha-multi-reporters --reporter-options configFile=$INIT_CWD/tests/reporter-config.json --recursive tests/unit",
"unit_coverage_legacy_location": "CI=true mkdir -p coverage/unitlegacylocation/ && S3_LOCATION_FILE=tests/locationConfig/locationConfigLegacy.json S3BACKEND=mem istanbul cover --dir coverage/unitlegacylocation _mocha -- --reporter mocha-multi-reporters --reporter-options configFile=$INIT_CWD/tests/reporter-config.json --reporter mocha-junit-reporter --recursive tests/unit" "unit_coverage_legacy_location": "CI=true mkdir -p coverage/unitlegacylocation/ && S3_LOCATION_FILE=tests/locationConfig/locationConfigLegacy.json S3BACKEND=mem istanbul cover --dir coverage/unitlegacylocation _mocha -- --reporter mocha-multi-reporters --reporter-options configFile=$INIT_CWD/tests/reporter-config.json --reporter mocha-junit-reporter --recursive tests/unit"
} }

View File

@ -28,6 +28,8 @@ const smallBody = Buffer.from('I am a body', 'utf8');
const bigBody = Buffer.alloc(maxSubPartSize + 10); const bigBody = Buffer.alloc(maxSubPartSize + 10);
const s3MD5 = 'bd43a393937412d119abcdbbc9bd363a-2'; const s3MD5 = 'bd43a393937412d119abcdbbc9bd363a-2';
const expectedContentLength = '104857621'; const expectedContentLength = '104857621';
const millSec = 1000;
const minute = 60 * millSec;
let s3; let s3;
let bucketUtil; let bucketUtil;
@ -42,6 +44,8 @@ function getCheck(key, bucketMatch, cb) {
if (!bucketMatch) { if (!bucketMatch) {
azureKey = `${azureContainerName}/${key}`; azureKey = `${azureContainerName}/${key}`;
} }
azureClient.defaultClientRequestTimeoutInMs = 2 * minute;
azureClient.defaultTimeoutIntervalInMs = 2 * minute;
azureClient.getBlobProperties(azureContainerName, azureKey, azureClient.getBlobProperties(azureContainerName, azureKey,
(err, azureRes) => { (err, azureRes) => {
assert.equal(err, null, `Err getting object from Azure: ${err}`); assert.equal(err, null, `Err getting object from Azure: ${err}`);

View File

@ -10,7 +10,7 @@ const credentialOne = 'gcpbackend';
const bucketName = `somebucket-${genUniqID()}`; const bucketName = `somebucket-${genUniqID()}`;
describe('GCP: GET Object', function testSuite() { describe('GCP: GET Object', function testSuite() {
this.timeout(30000); this.timeout(60000);
const config = getRealAwsConfig(credentialOne); const config = getRealAwsConfig(credentialOne);
const gcpClient = new GCP(config); const gcpClient = new GCP(config);

View File

@ -675,9 +675,9 @@ arraybuffer.slice@~0.0.7:
resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675" resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog== integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==
"arsenal@github:scality/Arsenal#8.1.5": "arsenal@github:scality/Arsenal#3205ecf":
version "8.1.5" version "8.1.5"
resolved "https://codeload.github.com/scality/Arsenal/tar.gz/bfbda5d38b663fcbb5db23d54e12501c4ea2923c" resolved "https://codeload.github.com/scality/Arsenal/tar.gz/3205ecf8c72cc25e015dc6f2cd3d3f56917f6b23"
dependencies: dependencies:
"@hapi/joi" "^15.1.0" "@hapi/joi" "^15.1.0"
JSONStream "^1.0.0" JSONStream "^1.0.0"