mcdev 7.10.0 → 8.0.0

package/test/general.test.js

@@ -226,7 +226,7 @@ describe('GENERAL', () => {
 
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
-                    76,
+                    80,
                     'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
                 );
                 return;
@@ -286,7 +286,7 @@ describe('GENERAL', () => {
 
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
-                    76,
+                    80,
                     'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
                 );
                 return;
@@ -346,7 +346,7 @@ describe('GENERAL', () => {
 
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
-                    76,
+                    80,
                     'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
                 );
                 return;
@@ -378,7 +378,7 @@ describe('GENERAL', () => {
                 );
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
-                    6,
+                    9,
                     'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
                 );
             });
@@ -512,7 +512,7 @@ describe('GENERAL', () => {
                 assert.equal(deployedTypes[0], 'dataExtract', 'deploy should have returned 1 type');
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
-                    10,
+                    13,
                     'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
                 );
             });
@@ -777,7 +777,7 @@ describe('GENERAL', () => {
                 // download first before we test buildTemplate
                 await handler.retrieve('testInstance/testBU', ['automation', 'query']);
 
-                const expectedApiCallsRetrieve = 31;
+                const expectedApiCallsRetrieve = 35;
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
                     expectedApiCallsRetrieve,
@@ -882,7 +882,7 @@ describe('GENERAL', () => {
             });
 
             it('buildTemplate + buildDefinition for multiple types with keys and --retrieve', async () => {
-                const expectedApiCallsRetrieve = 31;
+                const expectedApiCallsRetrieve = 32;
 
                 // preparation
                 const argvMetadata = [
@@ -987,7 +987,7 @@ describe('GENERAL', () => {
                 // download first before we test buildTemplate
                 await handler.retrieve('testInstance/testBU');
 
-                const expectedApiCallsRetrieve = 93;
+                const expectedApiCallsRetrieve = 101;
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
                     expectedApiCallsRetrieve,
@@ -1025,15 +1025,16 @@ describe('GENERAL', () => {
                     Object.keys(templateResult),
                     [
                         'automation',
-                        'query',
+                        'dataExtension',
                         'dataExtract',
+                        'domainVerification',
                         'emailSend',
-                        'dataExtension',
-                        'sendClassification',
-                        'senderProfile',
                         'fileTransfer',
                         'importFile',
+                        'query',
                         'script',
+                        'sendClassification',
+                        'senderProfile',
                         'verification',
                     ],
                     'did not create deployment packages for all relevant types'
@@ -1145,15 +1146,16 @@ describe('GENERAL', () => {
                     Object.keys(templateResult),
                     [
                         'automation',
-                        'query',
+                        'dataExtension',
                         'dataExtract',
+                        'domainVerification',
                         'emailSend',
-                        'dataExtension',
-                        'sendClassification',
-                        'senderProfile',
                         'fileTransfer',
                         'importFile',
+                        'query',
                         'script',
+                        'sendClassification',
+                        'senderProfile',
                         'verification',
                     ],
                     'did not create deployment packages for all relevant types'
@@ -1227,7 +1229,7 @@ describe('GENERAL', () => {
                     await testUtils.getActualDeployFile('testTemplated_query', 'query', 'sql')
                 ).to.equal(await testUtils.getExpectedFile('9999999', 'query', 'build', 'sql'));
 
-                const expectedApiCallsRetrieve = 97;
+                const expectedApiCallsRetrieve = 105;
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
                     expectedApiCallsRetrieve,
@@ -1239,7 +1241,7 @@ describe('GENERAL', () => {
                 // download first before we test buildTemplate
                 await handler.retrieve('testInstance/testBU', ['automation', 'query']);
 
-                const expectedApiCallsRetrieve = 31;
+                const expectedApiCallsRetrieve = 35;
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
                     expectedApiCallsRetrieve,
@@ -1431,7 +1433,7 @@ describe('GENERAL', () => {
                 // download first before we test buildTemplate
                 await handler.retrieve('testInstance/testBU', ['automation', 'query']);
 
-                const expectedApiCallsRetrieve = 31;
+                const expectedApiCallsRetrieve = 35;
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
                     expectedApiCallsRetrieve,
@@ -1502,7 +1504,7 @@ describe('GENERAL', () => {
                 // download first before we test buildTemplate
                 await handler.retrieve('testInstance/testBU', ['automation', 'query']);
 
-                const expectedApiCallsRetrieve = 31;
+                const expectedApiCallsRetrieve = 35;
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
                     expectedApiCallsRetrieve,
@@ -1601,7 +1603,7 @@ describe('GENERAL', () => {
                 // download everything before we test buildTemplate
                 await handler.retrieve('testInstance/testBU');
 
-                const expectedApiCallsRetrieve = 93;
+                const expectedApiCallsRetrieve = 101;
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
                     expectedApiCallsRetrieve,
@@ -1660,15 +1662,16 @@ describe('GENERAL', () => {
                     Object.keys(definitionResult),
                     [
                         'automation',
-                        'query',
+                        'dataExtension',
                         'dataExtract',
+                        'domainVerification',
                         'emailSend',
-                        'dataExtension',
-                        'sendClassification',
-                        'senderProfile',
                         'fileTransfer',
                         'importFile',
+                        'query',
                         'script',
+                        'sendClassification',
+                        'senderProfile',
                         'verification',
                     ],
                     'did not create deployment packages for all relevant types'
@@ -1767,15 +1770,16 @@ describe('GENERAL', () => {
                     Object.keys(definitionResult),
                     [
                         'automation',
-                        'query',
+                        'dataExtension',
                         'dataExtract',
+                        'domainVerification',
                         'emailSend',
-                        'dataExtension',
-                        'sendClassification',
-                        'senderProfile',
                         'fileTransfer',
                         'importFile',
+                        'query',
                         'script',
+                        'sendClassification',
+                        'senderProfile',
                         'verification',
                     ],
                     'did not create deployment packages for all relevant types'
@@ -1810,7 +1814,7 @@ describe('GENERAL', () => {
                     await testUtils.getActualDeployFile('testTemplated_query', 'query', 'sql')
                 ).to.equal(await testUtils.getExpectedFile('9999999', 'query', 'build', 'sql'));
 
-                const expectedApiCallsRetrieve = 97;
+                const expectedApiCallsRetrieve = 105;
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
                     expectedApiCallsRetrieve,
@@ -1822,7 +1826,7 @@ describe('GENERAL', () => {
                 // download first before we test buildTemplate
                 await handler.retrieve('testInstance/testBU', ['automation', 'query']);
 
-                const expectedApiCallsRetrieve = 31;
+                const expectedApiCallsRetrieve = 35;
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
                     expectedApiCallsRetrieve,
@@ -2001,7 +2005,7 @@ describe('GENERAL', () => {
                 // download first before we test buildTemplate
                 await handler.retrieve('testInstance/testBU');
 
-                const expectedApiCallsRetrieve = 93;
+                const expectedApiCallsRetrieve = 101;
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
                     expectedApiCallsRetrieve,
@@ -2061,15 +2065,16 @@ describe('GENERAL', () => {
                     Object.keys(definitionResult),
                     [
                         'automation',
-                        'query',
+                        'dataExtension',
                         'dataExtract',
+                        'domainVerification',
                         'emailSend',
-                        'dataExtension',
-                        'sendClassification',
-                        'senderProfile',
                         'fileTransfer',
                         'importFile',
+                        'query',
                         'script',
+                        'sendClassification',
+                        'senderProfile',
                         'verification',
                     ],
                     'did not create deployment packages for all relevant types'
@@ -2503,7 +2508,7 @@ describe('GENERAL', () => {
                 );
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
-                    9,
+                    12,
                     'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
                 );
             });

package/test/mockRoot/.mcdev-validations.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-unused-vars */
 'use strict';
 /**
  * @typedef {Object.<string, any>} MetadataTypeItem generic metadata item
@@ -39,13 +40,11 @@ const buPrefixBlacklistMap = {
  * @returns {validationRuleList} MetadataItem
  */
 export function validation(definition, item, targetDir, codeExtractItemArr, Util) {
-    Util.logger.verbose('just here to not get a warning about the unused property Util');
-
     const bu =
         (targetDir.includes('/') ? targetDir.split('/').pop() : targetDir.split('\\').pop()) ||
         'not-found';
     const prefixBlacklist = buPrefixBlacklistMap[bu] || [];
-    // eslint-disable-next-line no-unused-vars -- codeExtractItemArr is not used in this example
+
     const temp = codeExtractItemArr;
 
     return {

package/test/mockRoot/.mcdevrc.json

@@ -175,5 +175,5 @@
             "verification"
         ]
     },
-    "version": "7.10.0"
+    "version": "8.0.0"
 }

package/test/mockRoot/deploy/testInstance/testBU/importFile/testExisting_importFile.importFile-meta.json

@@ -26,10 +26,11 @@
     "c__dataAction": "AddUpdate",
     "c__subscriberImportType": "DataExtension",
     "destination": {
-        "c__destinationType": "DataExtension",
+        "c__type": "DataExtension",
         "r__dataExtension_key": "testExisting_dataExtension"
     },
     "source": {
+        "c__type": "File Location",
         "r__fileLocation_name": "ExactTarget Enhanced FTP"
     }
 }

package/test/mockRoot/deploy/testInstance/testBU/importFile/testNew_importFile.importFile-meta.json

@@ -24,10 +24,11 @@
     "c__subscriberImportType": "DataExtension",
     "c__dataAction": "AddUpdate",
     "destination": {
-        "c__destinationType": "DataExtension",
+        "c__type": "DataExtension",
         "r__dataExtension_key": "testExisting_dataExtension"
     },
     "source": {
+        "c__type": "File Location",
         "r__fileLocation_name": "ExactTarget Enhanced FTP"
     }
 }

package/test/resourceFactory.js

@@ -270,7 +270,16 @@ export const handleRESTRequest = async (config) => {
         let filterBody;
         if (urlObj.searchParams.get('$filter')) {
             filterName = urlObj.searchParams.get('$filter').split(' eq ')[1];
+        } else if (urlObj.searchParams.get('action')) {
+            filterName = urlObj.searchParams.get('action');
+        } else if (urlObj.searchParams.get('mostRecentVersionOnly')) {
+            filterName = 'mostRecentVersionOnly';
+        } else if (urlObj.searchParams.get('versionNumber')) {
+            filterName = 'versionNumber';
+        } else if (urlObj.searchParams.get('id')) {
+            filterName = 'id';
         }
+
         const testPath = path
             .join(
                 'test',
@@ -283,7 +292,16 @@ export const handleRESTRequest = async (config) => {
         const testPathFilter = filterName
             ? testPath +
               '-' +
-              urlObj.searchParams.get('$filter').replaceAll(' eq ', '=').replaceAll(' ', '')
+              (urlObj.searchParams.get('$filter') || urlObj.searchParams.get('action') || '')
+                  .replaceAll(' eq ', '=')
+                  .replaceAll(' ', '') +
+              (urlObj.searchParams.get('id') ? 'id=' + urlObj.searchParams.get('id') : '') +
+              (urlObj.searchParams.get('versionNumber')
+                  ? 'versionNumber=' + urlObj.searchParams.get('versionNumber')
+                  : '') +
+              (urlObj.searchParams.get('mostRecentVersionOnly')
+                  ? 'mostRecentVersionOnly=' + urlObj.searchParams.get('mostRecentVersionOnly')
+                  : '')
             : null;
 
         if (!testPathFilter && config.method === 'post' && config.data) {
@@ -308,7 +326,6 @@ export const handleRESTRequest = async (config) => {
             }
         }
         const testPathFilterBody = filterBody ? testPath + '-' + filterBody : null;
-
         if (testPathFilter && (await fs.pathExists(testPathFilter + '.json'))) {
             // build filter logic to ensure templating works
             if (filterName) {
@@ -317,8 +334,14 @@ export const handleRESTRequest = async (config) => {
                         encoding: 'utf8',
                     })
                 );
-                response.items = response.items.filter((def) => def.name == filterName);
-                response.count = response.items.length;
+                if (
+                    response.items &&
+                    filterName !== 'mostRecentVersionOnly' &&
+                    filterName !== 'versionNumber' &&
+                    filterName !== 'id'
+                ) {
+                    response.items = response.items.filter((def) => def.name == filterName);
+                }
                 console.log(loadingFile + projectRoot + testPathFilter + '.json'); // eslint-disable-line no-console
                 return [200, JSON.stringify(response)];
             } else {
@@ -380,7 +403,12 @@ export const handleRESTRequest = async (config) => {
             }
 
             // build filter logic to ensure templating works
-            if (filterName) {
+            if (
+                filterName &&
+                filterName !== 'mostRecentVersionOnly' &&
+                filterName !== 'versionNumber' &&
+                filterName !== 'id'
+            ) {
                 const response = JSON.parse(
                     await fs.readFile(testPath + '.json', {
                         encoding: 'utf8',
@@ -445,7 +473,8 @@ export const handleRESTRequest = async (config) => {
                 }),
             ];
         }
-    } catch {
+    } catch (ex) {
+        console.log(ex); // eslint-disable-line no-console
         return [500, {}];
     }
 };

package/test/resources/1111111/dataExtension/update-expected.json

@@ -49,7 +49,7 @@
         }
     ],
     "c__dataRetentionPeriodUnitOfMeasure": "Months",
-    "c__retentionPolicy": "individialRecords",
+    "c__retentionPolicy": "allRecords",
     "r__folder_ContentType": "shared_dataextension",
     "r__folder_Path": "Shared Items/Shared Data Extensions"
 }

package/test/resources/9999999/asset/test_coderesource_js-retrieve-expected.js

@@ -0,0 +1 @@
+/* insert code here */

package/test/resources/9999999/asset/test_coderesource_js-retrieve-expected.json

@@ -0,0 +1,47 @@
+{
+    "assetType": {
+        "displayName": "Javascript Code Resource",
+        "name": "jscoderesource"
+    },
+    "availableViews": [],
+    "category": {
+        "name": "mcdev"
+    },
+    "contentType": "application/javascript",
+    "createdBy": {
+        "email": "joern.berkefeld@accenture.com",
+        "name": "Jörn Berkefeld"
+    },
+    "createdDate": "2025-03-24T05:20:40.82-06:00",
+    "customerKey": "test_coderesource_js",
+    "data": {
+        "site": {
+            "content": {
+                "url": "https://oss-test.accenture.com/test_coderesource"
+            }
+        }
+    },
+    "description": "",
+    "memberId": 9999999,
+    "meta": {
+        "cloudPages": {
+            "c__published": true,
+            "publishDate": "2025-03-24 06:05:23.203"
+        }
+    },
+    "modelVersion": 2,
+    "modifiedBy": {
+        "email": "joern.berkefeld@accenture.com",
+        "name": "Jörn Berkefeld"
+    },
+    "modifiedDate": "2025-03-25T03:03:20.603-06:00",
+    "name": "test_coderesource_js",
+    "owner": {
+        "email": "joern.berkefeld@accenture.com",
+        "name": "Jörn Berkefeld"
+    },
+    "status": {
+        "name": "Draft"
+    },
+    "version": 1
+}

package/test/resources/9999999/asset/test_coderesource_json-retrieve-expected.json

@@ -0,0 +1,47 @@
+{
+    "assetType": {
+        "displayName": "JSON Code Resource",
+        "name": "jsoncoderesource"
+    },
+    "availableViews": [],
+    "category": {
+        "name": "mcdev"
+    },
+    "contentType": "application/json",
+    "createdBy": {
+        "email": "joern.berkefeld@accenture.com",
+        "name": "Jörn Berkefeld"
+    },
+    "createdDate": "2025-03-25T03:15:22.72-06:00",
+    "customerKey": "test_coderesource_json",
+    "data": {
+        "site": {
+            "content": {
+                "url": "https://oss-test.accenture.com/test_coderesource_json"
+            }
+        }
+    },
+    "description": "",
+    "memberId": 9999999,
+    "meta": {
+        "cloudPages": {
+            "c__published": true,
+            "publishDate": "2025-03-25 03:16:40.913"
+        }
+    },
+    "modelVersion": 2,
+    "modifiedBy": {
+        "email": "joern.berkefeld@accenture.com",
+        "name": "Jörn Berkefeld"
+    },
+    "modifiedDate": "2025-03-25T03:16:40.913-06:00",
+    "name": "test_coderesource_json",
+    "owner": {
+        "email": "joern.berkefeld@accenture.com",
+        "name": "Jörn Berkefeld"
+    },
+    "status": {
+        "name": "Draft"
+    },
+    "version": 1
+}

package/test/resources/9999999/asset/test_coderesource_json-retrieve-expected.jsonc

@@ -0,0 +1 @@
+{ "test": true }

package/test/resources/9999999/asset/test_coderesource_xml-retrieve-expected.json

@@ -0,0 +1,46 @@
+{
+    "assetType": {
+        "displayName": "XML Code Resource",
+        "name": "xmlcoderesource"
+    },
+    "availableViews": [],
+    "category": {
+        "name": "mcdev"
+    },
+    "contentType": "application/xml",
+    "createdBy": {
+        "email": "joern.berkefeld@accenture.com",
+        "name": "Jörn Berkefeld"
+    },
+    "createdDate": "2025-03-25T03:03:45.713-06:00",
+    "customerKey": "test_coderesource_xml",
+    "data": {
+        "site": {
+            "content": {
+                "url": "https://oss-test.accenture.com/test_coderesource_xml"
+            }
+        }
+    },
+    "description": "",
+    "memberId": 9999999,
+    "meta": {
+        "cloudPages": {
+            "c__published": false
+        }
+    },
+    "modelVersion": 2,
+    "modifiedBy": {
+        "email": "joern.berkefeld@accenture.com",
+        "name": "Jörn Berkefeld"
+    },
+    "modifiedDate": "2025-03-25T03:04:06.48-06:00",
+    "name": "test_coderesource_xml",
+    "owner": {
+        "email": "joern.berkefeld@accenture.com",
+        "name": "Jörn Berkefeld"
+    },
+    "status": {
+        "name": "Draft"
+    },
+    "version": 1
+}

package/test/resources/9999999/asset/test_coderesource_xml-retrieve-expected.xml

@@ -0,0 +1 @@
+<xml>test</xml>

package/test/resources/9999999/asset/test_interactivecontent-retrieve-expected.json

@@ -0,0 +1,43 @@
+{
+    "assetType": {
+        "displayName": "Interactive Email Page",
+        "name": "interactivecontent"
+    },
+    "availableViews": [],
+    "category": {
+        "name": "mcdev"
+    },
+    "content": {
+        "url": "https://oss-test.accenture.com/test_interactivecontent"
+    },
+    "createdBy": {
+        "email": "joern.berkefeld@accenture.com",
+        "name": "Jörn Berkefeld"
+    },
+    "createdDate": "2025-03-25T03:02:46.823-06:00",
+    "customerKey": "test_interactivecontent",
+    "description": "",
+    "memberId": 9999999,
+    "meta": {
+        "cloudPages": {
+            "c__published": true,
+            "publishDate": "2025-03-25 03:02:55.307"
+        },
+        "r__asset_key": "test_interactivecontent_content"
+    },
+    "modelVersion": 2,
+    "modifiedBy": {
+        "email": "joern.berkefeld@accenture.com",
+        "name": "Jörn Berkefeld"
+    },
+    "modifiedDate": "2025-03-25T03:02:55.307-06:00",
+    "name": "test_interactivecontent",
+    "owner": {
+        "email": "joern.berkefeld@accenture.com",
+        "name": "Jörn Berkefeld"
+    },
+    "status": {
+        "name": "Draft"
+    },
+    "version": 1
+}

package/test/resources/9999999/asset/test_landingpage-retrieve-expected.json

@@ -0,0 +1,42 @@
+{
+    "assetType": {
+        "displayName": "Landing Page",
+        "name": "landingpage"
+    },
+    "availableViews": [],
+    "category": {
+        "name": "mcdev"
+    },
+    "content": {
+        "url": "https://oss-test.accenture.com/test_landingpage"
+    },
+    "createdBy": {
+        "email": "joern.berkefeld@accenture.com",
+        "name": "Jörn Berkefeld"
+    },
+    "createdDate": "2025-03-25T03:17:51.88-06:00",
+    "customerKey": "test_landingpage",
+    "description": "",
+    "memberId": 9999999,
+    "meta": {
+        "cloudPages": {
+            "c__published": false
+        },
+        "r__asset_key": "test_landingpage_content"
+    },
+    "modelVersion": 2,
+    "modifiedBy": {
+        "email": "joern.berkefeld@accenture.com",
+        "name": "Jörn Berkefeld"
+    },
+    "modifiedDate": "2025-03-25T03:17:52.187-06:00",
+    "name": "test_landingpage",
+    "owner": {
+        "email": "joern.berkefeld@accenture.com",
+        "name": "Jörn Berkefeld"
+    },
+    "status": {
+        "name": "Draft"
+    },
+    "version": 1
+}