CLDSRV-898: rm old test config setup & remove unused string concats

Author: leif-scality

lib/api/apiUtils/integrity/validateChecksums.js

@@ -29,8 +29,7 @@ const errTrailerNotSupported = errorInstances.InvalidRequest.customizeDescriptio
 );
 const errMPUAlgoNotSupported = errorInstances.InvalidRequest.customizeDescription(
     'Checksum algorithm provided is unsupported. ' +
-        'Please try again with any of the valid types: ' +
-        '[CRC32, CRC32C, CRC64NVME, SHA1, SHA256]',
+        'Please try again with any of the valid types: [CRC32, CRC32C, CRC64NVME, SHA1, SHA256]',
 );
 const errMPUTypeInvalid = errorInstances.InvalidRequest.customizeDescription(
     'Value for x-amz-checksum-type header is invalid.',

lib/api/completeMultipartUpload.js

@@ -353,16 +353,14 @@ function completeMultipartUpload(authInfo, request, log, callback) {
                                 // Legacy MPU created before checksumType was tracked.
                                 const typeErr = errorInstances.InvalidRequest.customizeDescription(
                                     'The upload was not created with a checksum mode. ' +
-                                        'The complete request must not include a ' +
-                                        'x-amz-checksum-type header.',
+                                        'The complete request must not include a x-amz-checksum-type header.',
                                 );
                                 return next(typeErr, destBucket);
                             }
                             if (headerTypeUpper !== mpuType.toUpperCase()) {
                                 const typeErr = errorInstances.InvalidRequest.customizeDescription(
-                                    `The upload was created using the ${mpuType} ` +
-                                        'checksum mode. The complete request must ' +
-                                        'use the same checksum mode.',
+                                    `The upload was created using the ${mpuType} checksum mode. ` +
+                                        'The complete request must use the same checksum mode.',
                                 );
                                 return next(typeErr, destBucket);
                             }

tests/functional/raw-node/test/xAmzChecksum.js

@@ -186,7 +186,7 @@ describe('Test x-amz-checksums', () => {
     for (const algo of algos) {
         for (const method of methods) {
             itSkipIfAWS(
-                `${method.Name} should respond BadDigest ` + `with invalid x-amz-checksum-${algo.name.toLowerCase()}`,
+                `${method.Name} should respond BadDigest with invalid x-amz-checksum-${algo.name.toLowerCase()}`,
                 done => {
                     const headers = {
                         [`x-amz-checksum-${algo.name.toLowerCase()}`]: algo.validWrong,
@@ -274,8 +274,7 @@ describe('Test x-amz-checksums', () => {
     for (const algo of algos) {
         for (const method of methods) {
             itSkipIfAWS(
-                `${method.Name} should not respond BadDigest if ` +
-                    `x-amz-checksum-${algo.name.toLowerCase()} is correct`,
+                `${method.Name} should not respond BadDigest if x-amz-checksum-${algo.name.toLowerCase()} is correct`,
                 done => {
                     const url = `http://localhost:8000/${bucket}/${method.Key}?${method.Query}`;
                     const req = new HttpRequestAuthV4(

tests/unit/api/apiUtils/integrity/validateChecksums.js

@@ -338,8 +338,6 @@ describe('validateMethodChecksumNoChunking', () => {
     describe('when checksum mismatches', () => {
         Object.keys(checksumedMethods).forEach(method => {
             it(`should return BadDigest error for ${method} when checksum mismatch`, async () => {
-                config.integrityChecks[method] = true;
-
                 const body = 'Hello, World!';
                 const wrongMd5 = '1B2M2Y8AsgTpgAmY7PhCfg==';
                 const request = {
@@ -360,8 +358,6 @@ describe('validateMethodChecksumNoChunking', () => {
     describe('when checksum mismatches', () => {
         Object.keys(checksumedMethods).forEach(method => {
             it(`should return InvalidDigest error for ${method} when checksum mismatch`, async () => {
-                config.integrityChecks[method] = true;
-
                 const body = 'Hello, World!';
                 const wrongMd5 = 'wrongchecksum123=';
                 const request = {
@@ -382,8 +378,6 @@ describe('validateMethodChecksumNoChunking', () => {
     describe('when no checksum is provided', () => {
         Object.keys(checksumedMethods).forEach(method => {
             it(`should return null for ${method} when no checksum is provided`, async () => {
-                config.integrityChecks[method] = true;
-
                 const body = 'Hello, World!';
                 const request = {
                     apiMethod: method,
@@ -401,8 +395,6 @@ describe('validateMethodChecksumNoChunking', () => {
     describe('when checksum matches', () => {
         Object.keys(checksumedMethods).forEach(method => {
             it(`should return null for ${method} when checksum matches`, async () => {
-                config.integrityChecks[method] = true;
-
                 const body = 'Hello, World!';
                 const correctMd5 = crypto.createHash('md5').update(body, 'utf8').digest('base64');
                 const request = {
@@ -443,9 +435,8 @@ describe('validateMethodChecksumNoChunking', () => {
     });
 
     describe('when method is not in validation function mapping', () => {
-        it('should return null for unsupported method even when enabled in config', async () => {
+        it('should return null for unsupported method', async () => {
             const unsupportedMethod = 'someUnsupportedMethod';
-            config.integrityChecks[unsupportedMethod] = true;
 
             const body = 'Hello, World!';
             const wrongMd5 = 'wrongchecksum123=';
@@ -502,7 +493,6 @@ describe('validateMethodChecksumNoChunking', () => {
         const correctMd5 = crypto.createHash('md5').update(body, 'utf8').digest('base64');
 
         it('should return null when Content-MD5 matches the body', async () => {
-            config.integrityChecks.completeMultipartUpload = true;
             const request = {
                 apiMethod: 'completeMultipartUpload',
                 headers: { 'content-md5': correctMd5 },
@@ -513,7 +503,6 @@ describe('validateMethodChecksumNoChunking', () => {
         });
 
         it('should return BadDigest when Content-MD5 does not match the body', async () => {
-            config.integrityChecks.completeMultipartUpload = true;
             const request = {
                 apiMethod: 'completeMultipartUpload',
                 headers: { 'content-md5': '1B2M2Y8AsgTpgAmY7PhCfg==' },
@@ -524,7 +513,6 @@ describe('validateMethodChecksumNoChunking', () => {
         });
 
         it('should return InvalidDigest when Content-MD5 is malformed', async () => {
-            config.integrityChecks.completeMultipartUpload = true;
             const request = {
                 apiMethod: 'completeMultipartUpload',
                 headers: { 'content-md5': 'wrongchecksum123=' },
@@ -535,7 +523,6 @@ describe('validateMethodChecksumNoChunking', () => {
         });
 
         it('should return null when no Content-MD5 header is present', async () => {
-            config.integrityChecks.completeMultipartUpload = true;
             const request = {
                 apiMethod: 'completeMultipartUpload',
                 headers: {},
@@ -550,7 +537,6 @@ describe('validateMethodChecksumNoChunking', () => {
             // the other methods, this wrong x-amz-checksum-sha256 (treated
             // as a body digest) would return BadDigest. The md5-only path
             // must ignore it — the final-object validator handles it later.
-            config.integrityChecks.completeMultipartUpload = true;
             const request = {
                 apiMethod: 'completeMultipartUpload',
                 headers: { 'x-amz-checksum-sha256': 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=' },