mcdev 6.0.2 → 7.0.0

package/test/mockRoot/deploy/testInstance/testBU/mobileMessage/new.mobileMessage-meta.json

@@ -4,10 +4,8 @@
     "type": "ExactTarget.Mobile.Sms.Core.Entities.SmsMessageEntity",
     "name": "testNew_mobileMessage",
     "origin": "SMS Send",
-    "code": {
-        "code": "4912312345678"
-    },
-    "c__campaignNames": ["testExisting_campaign"],
+    "r__mobileCode_key": "4912312345678",
+    "r__campaign_key": ["testExisting_campaign"],
     "mtSendDate": "2017-07-03T14:03:00Z",
     "template": {
         "id": "Mzo4MDow",

package/test/mockRoot/deploy/testInstance/testBU/query/testExisting_query.query-meta.json

@@ -2,7 +2,7 @@
     "name": "testExisting_query",
     "key": "testExisting_query",
     "description": "updated on deploy",
-    "targetKey": "testExisting_dataExtension",
+    "r__dataExtension_key": "testExisting_dataExtension",
     "createdDate": "2022-04-26T15:21:16.453",
     "modifiedDate": "2022-04-26T16:04:15.88",
     "targetUpdateTypeName": "Overwrite",

package/test/mockRoot/deploy/testInstance/testBU/query/testExisting_query_fixKeys.query-meta.json

@@ -2,7 +2,7 @@
     "name": "testExisting_query_fixedKeys",
     "key": "testExisting_query_fixKeys",
     "description": "updated on deploy",
-    "targetKey": "testExisting_dataExtension",
+    "r__dataExtension_key": "testExisting_dataExtension",
     "createdDate": "2022-04-26T15:21:16.453",
     "modifiedDate": "2022-04-26T16:04:15.88",
     "targetUpdateTypeName": "Overwrite",

package/test/mockRoot/deploy/testInstance/testBU/query/testNew_query.query-meta.json

@@ -2,7 +2,7 @@
     "name": "testNew_query",
     "key": "testNew_query",
     "description": "created on deploy",
-    "targetKey": "testExisting_dataExtension",
+    "r__dataExtension_key": "testExisting_dataExtension",
     "createdDate": "2022-04-26T15:21:16.453",
     "modifiedDate": "2022-04-26T16:04:15.88",
     "targetUpdateTypeName": "Overwrite",

package/test/mockRoot/deploy/testInstance/testBU/sendClassification/testExisting_sendClassification.sendClassification-meta.json

@@ -0,0 +1,8 @@
+{
+    "CustomerKey": "testExisting_sendClassification",
+    "Name": "testExisting_sendClassification",
+    "Description": "updated on deploy",
+    "c__classification": "Commercial",
+    "r__senderProfile_key": "testExisting_senderProfile",
+    "r__deliveryProfile_key": "Default"
+}

package/test/mockRoot/deploy/testInstance/testBU/sendClassification/testNew_sendClassification.sendClassification-meta.json

@@ -0,0 +1,8 @@
+{
+    "CustomerKey": "testNew_sendClassification",
+    "Name": "testNew_sendClassification",
+    "Description": "created on deploy",
+    "c__classification": "Commercial",
+    "r__senderProfile_key": "testExisting_senderProfile",
+    "r__deliveryProfile_key": "Default"
+}

package/test/mockRoot/deploy/testInstance/testBU/senderProfile/testExisting_senderProfile.senderProfile-meta.json

@@ -0,0 +1,14 @@
+{
+    "CustomerKey": "testExisting_senderProfile",
+    "Name": "testExisting_senderProfile",
+    "Description": "updated via deploy",
+    "FromName": "Jörn Berkefeld",
+    "FromAddress": "joern.berkefeld@accenture.com",
+    "UseDefaultRMMRules": false,
+    "AutoForwardToEmailAddress": "joern.berkefeld@accenture.com",
+    "AutoForwardToName": "Jörn Berkefeld",
+    "DirectForward": false,
+    "AutoReply": false,
+    "SenderHeaderEmailAddress": "",
+    "SenderHeaderName": ""
+}

package/test/mockRoot/deploy/testInstance/testBU/senderProfile/testNew_senderProfile.senderProfile-meta.json

@@ -0,0 +1,14 @@
+{
+    "CustomerKey": "testNew_senderProfile",
+    "Name": "testNew_senderProfile",
+    "Description": "created on deploy",
+    "FromName": "Jörn Berkefeld",
+    "FromAddress": "joern.berkefeld@accenture.com",
+    "UseDefaultRMMRules": false,
+    "AutoForwardToEmailAddress": "joern.berkefeld@accenture.com",
+    "AutoForwardToName": "Jörn Berkefeld",
+    "DirectForward": false,
+    "AutoReply": false,
+    "SenderHeaderEmailAddress": "",
+    "SenderHeaderName": ""
+}

package/test/mockRoot/deploy/testInstance/testBU/transactionalEmail/testExisting_temail.transactionalEmail-meta.json

@@ -16,5 +16,5 @@
         "trackLinks": true
     },
     "r__journey_key": "testExisting_interaction",
-    "r__asset_customerKey": "testExisting_asset_message"
+    "r__asset_key": "testExisting_asset_message"
 }

package/test/mockRoot/deploy/testInstance/testBU/transactionalEmail/testNew_temail.transactionalEmail-meta.json

@@ -15,5 +15,5 @@
     "options": {
         "trackLinks": true
     },
-    "r__asset_customerKey": "testExisting_asset_message"
+    "r__asset_key": "testExisting_asset_message"
 }

package/test/mockRoot/deploy/testInstance/testBU/transactionalPush/testExisting_tpush.transactionalPush-meta.json

@@ -4,9 +4,7 @@
     "status": "Active",
     "applicationId": "ffbab4c9-fbf6-4b87-9c9a-10c6ce86e81d",
     "description": "updated via deploy; note that applicationId can only be manually set up in Setup - Mobile Push",
-    "content": {
-        "customerKey": "mobileMessage_test"
-    },
+    "r__asset_key": "mobileMessage_test",
     "options": {
         "sound": "temp.wmv",
         "badge": "1",

package/test/mockRoot/deploy/testInstance/testBU/transactionalPush/testNew_tpush.transactionalPush-meta.json

@@ -4,9 +4,7 @@
     "status": "Active",
     "applicationId": "ffbab4c9-fbf6-4b87-9c9a-10c6ce86e81d",
     "description": "created on deploy; note that applicationId can only be manually set up in Setup - Mobile Push",
-    "content": {
-        "customerKey": "mobileMessage_test"
-    },
+    "r__asset_key": "mobileMessage_test",
     "options": {
         "sound": "temp.wmv",
         "badge": "1",

package/test/mockRoot/deploy/testInstance/testBU/transactionalSMS/testExisting_tsms.transactionalSMS-meta.json

@@ -6,10 +6,9 @@
     "createdDate": "2022-11-07T02:24:00",
     "modifiedDate": "2022-11-07T02:25:00",
     "subscriptions": {
-        "shortCode": "4912312345678",
         "countryCode": "",
         "autoAddSubscriber": true,
         "updateSubscriber": true,
-        "keyword": "TESTEXISTING_KEYWORD"
+        "r__mobileKeyword_key": "4912312345678.TESTEXISTING_KEYWORD"
     }
 }

package/test/mockRoot/deploy/testInstance/testBU/transactionalSMS/testNew_tsms.transactionalSMS-meta.json

@@ -6,10 +6,9 @@
     "createdDate": "2022-11-07T02:24:00",
     "modifiedDate": "2022-11-07T02:25:00",
     "subscriptions": {
-        "shortCode": "4912312345678",
         "countryCode": "",
         "autoAddSubscriber": true,
         "updateSubscriber": true,
-        "keyword": "TESTEXISTING_KEYWORD"
+        "r__mobileKeyword_key": "4912312345678.TESTEXISTING_KEYWORD"
     }
 }

package/test/mockRoot/deploy/testInstance/testBU/triggeredSend/testExisting_triggeredSend.triggeredSend-meta.json

@@ -18,12 +18,11 @@
     "Name": "testExisting_triggeredSend",
     "NewSlotTrigger": 0,
     "Priority": 4,
-    "SendClassification": {
-        "CustomerKey": "Default Transactional"
-    },
     "SuppressTracking": false,
     "TriggeredSendStatus": "New",
     "TriggeredSendType": "Continuous",
-    "r__email_Name": "Sporting Goods for September",
-    "r__folder_Path": "Triggered Sends"
+    "r__email_name": "Sporting Goods for September",
+    "r__folder_Path": "Triggered Sends",
+    "r__sendClassification_key": "testExisting_sendClassification",
+    "r__senderProfile_key": "testExisting_senderProfile"
 }

package/test/mockRoot/deploy/testInstance/testBU/triggeredSend/testNew_triggeredSend.triggeredSend-meta.json

@@ -18,12 +18,11 @@
     "Name": "testNew_triggeredSend",
     "NewSlotTrigger": 0,
     "Priority": 4,
-    "SendClassification": {
-        "CustomerKey": "Default Transactional"
-    },
     "SuppressTracking": false,
     "TriggeredSendStatus": "New",
     "TriggeredSendType": "Continuous",
-    "r__email_Name": "Sporting Goods for September",
-    "r__folder_Path": "Triggered Sends"
+    "r__email_name": "Sporting Goods for September",
+    "r__folder_Path": "Triggered Sends",
+    "r__sendClassification_key": "testExisting_sendClassification",
+    "r__senderProfile_key": "testExisting_senderProfile"
 }

package/test/mockRoot/deploy/testInstance/testBU/verification/testExisting_39f6a488-20eb-4ba0-b0b9.verification-meta.json

@@ -2,7 +2,7 @@
     "dataVerificationDefinitionId": "testExisting_39f6a488-20eb-4ba0-b0b9",
     "notificationEmailAddress": "test@accenture.com",
     "notificationEmailMessage": "",
-    "r__dataExtension_CustomerKey": "testExisting_dataExtension",
+    "r__dataExtension_key": "testExisting_dataExtension",
     "shouldEmailOnFailure": true,
     "shouldStopOnFailure": true,
     "value1": 1,

package/test/mockRoot/deploy/testInstance/testBU/verification/testNew_39f6a488-20eb-4ba0-b0b9.verification-meta.json

@@ -2,7 +2,7 @@
     "dataVerificationDefinitionId": "testNew_39f6a488-20eb-4ba0-b0b9",
     "notificationEmailAddress": "",
     "notificationEmailMessage": "",
-    "r__dataExtension_CustomerKey": "testExisting_dataExtension",
+    "r__dataExtension_key": "testExisting_dataExtension",
     "shouldEmailOnFailure": false,
     "shouldStopOnFailure": false,
     "value1": 2,

package/test/resourceFactory.js

@@ -4,14 +4,13 @@ import { XMLParser } from 'fast-xml-parser';
 import { Util } from '../lib/util/util.js';
 const parser = new XMLParser();
 const attributeParser = new XMLParser({ ignoreAttributes: false });
+/** @type {typeof Util.color} */
 let color;
 
 /* eslint-disable unicorn/prefer-ternary */
-if (
-    process.env.VSCODE_AMD_ENTRYPOINT === 'vs/workbench/api/node/extensionHostProcess' ||
-    process.env.VSCODE_CRASH_REPORTER_PROCESS_TYPE === 'extensionHost'
-) {
+if (Util.isRunViaVSCodeExtension) {
     // when we execute the test in a VSCode extension host, we don't want CLI color codes.
+    // @ts-expect-error hacky way to get rid of colors - ts doesn't appreciate the hack
     color = new Proxy(
         {},
         {
@@ -38,7 +37,7 @@ if (
  * @param {string} type metadata Type
  * @param {string} mid of Business Unit
  * @param {object|string} filter likely for customer key
- * @returns {string} relevant metadata stringified
+ * @returns {Promise.<string>} relevant metadata stringified
  */
 async function loadSOAPRecords(mcdevAction, type, mid, filter) {
     type = type[0].toLowerCase() + type.slice(1);
@@ -240,6 +239,7 @@ export const handleRESTRequest = async (config) => {
             config.baseURL + (config.url.startsWith('/') ? config.url.slice(1) : config.url)
         );
         let filterName;
+        let filterBody;
         if (urlObj.searchParams.get('$filter')) {
             filterName = urlObj.searchParams.get('$filter').split(' eq ')[1];
         }
@@ -252,8 +252,92 @@ export const handleRESTRequest = async (config) => {
                 config.method + '-response'
             )
             .replace(':', '_'); // replace : with _ for Windows
+        const testPathFilter = filterName
+            ? testPath +
+              '-' +
+              urlObj.searchParams.get('$filter').replaceAll(' eq ', '=').replaceAll(' ', '')
+            : null;
+
+        if (!testPathFilter && config.method === 'post' && config.data) {
+            const simpleOperators = { equal: '=', in: 'IN' };
+            const data = JSON.parse(config.data);
+            const myObj = data.query?.rightOperand || data.query;
+            if (myObj) {
+                const op = simpleOperators[myObj.simpleOperator];
+                filterBody = `${myObj.property}${op}${op === 'IN' ? myObj.value.join(',') : myObj.value}`;
+            }
+        }
+        const testPathFilterBody = filterBody ? testPath + '-' + filterBody : null;
+
+        if (testPathFilter && (await fs.pathExists(testPathFilter + '.json'))) {
+            // build filter logic to ensure templating works
+            if (filterName) {
+                const response = JSON.parse(
+                    await fs.readFile(testPathFilter + '.json', {
+                        encoding: 'utf8',
+                    })
+                );
+                response.items = response.items.filter((def) => def.name == filterName);
+                response.count = response.items.length;
+                return [200, JSON.stringify(response)];
+            } else {
+                return [
+                    200,
+                    await fs.readFile(testPathFilter + '.json', {
+                        encoding: 'utf8',
+                    }),
+                ];
+            }
+        } else if (testPathFilter && (await fs.pathExists(testPathFilter + '.txt'))) {
+            return [
+                200,
+                await fs.readFile(testPathFilter + '.txt', {
+                    encoding: 'utf8',
+                }),
+            ];
+        } else if (testPathFilterBody && (await fs.pathExists(testPathFilterBody + '.json'))) {
+            return [
+                200,
+                await fs.readFile(testPathFilterBody + '.json', {
+                    encoding: 'utf8',
+                }),
+            ];
+        } else if (testPathFilterBody && (await fs.pathExists(testPathFilterBody + '.txt'))) {
+            return [
+                200,
+                await fs.readFile(testPathFilterBody + '.txt', {
+                    encoding: 'utf8',
+                }),
+            ];
+        } else if (await fs.pathExists(testPath + '.json')) {
+            if (testPathFilter) {
+                /* eslint-disable no-console */
+                console.log(
+                    `${color.bgYellow}${color.fgBlack}TEST-WARNING${
+                        color.reset
+                    }: You are loading your reponse from ${
+                        testPath + '.json'
+                    } instead of the more specific ${
+                        testPathFilter + '.json'
+                    }. Make sure this is intended`
+                );
+                /* eslint-enable no-console */
+            }
+
+            if (testPathFilterBody) {
+                /* eslint-disable no-console */
+                console.log(
+                    `${color.bgYellow}${color.fgBlack}TEST-WARNING${
+                        color.reset
+                    }: You are loading your reponse from ${
+                        testPath + '.json'
+                    } instead of the more specific ${
+                        testPathFilterBody + '.json'
+                    }. Make sure this is intended`
+                );
+                /* eslint-enable no-console */
+            }
 
-        if (await fs.pathExists(testPath + '.json')) {
             // build filter logic to ensure templating works
             if (filterName) {
                 const response = JSON.parse(
@@ -273,6 +357,33 @@ export const handleRESTRequest = async (config) => {
                 ];
             }
         } else if (await fs.pathExists(testPath + '.txt')) {
+            if (testPathFilter) {
+                /* eslint-disable no-console */
+                console.log(
+                    `${color.bgYellow}${color.fgBlack}TEST-WARNING${
+                        color.reset
+                    }: You are loading your reponse from ${
+                        testPath + '.txt'
+                    } instead of the more specific ${
+                        testPathFilter + '.txt'
+                    }. Make sure this is intended`
+                );
+                /* eslint-enable no-console */
+            }
+            if (testPathFilterBody) {
+                /* eslint-disable no-console */
+                console.log(
+                    `${color.bgYellow}${color.fgBlack}TEST-WARNING${
+                        color.reset
+                    }: You are loading your reponse from ${
+                        testPath + '.txt'
+                    } instead of the more specific ${
+                        testPathFilterBody + '.txt'
+                    }. Make sure this is intended`
+                );
+                /* eslint-enable no-console */
+            }
+
             return [
                 200,
                 await fs.readFile(testPath + '.txt', {
@@ -282,7 +393,7 @@ export const handleRESTRequest = async (config) => {
         } else {
             /* eslint-disable no-console */
             console.log(
-                `${color.bgRed}${color.fgBlack}TEST-ERROR${color.reset}: Please create file ${testPath}.json/.txt`
+                `${color.bgRed}${color.fgBlack}TEST-ERROR${color.reset}: Please create file ${testPath}.json/.txt${filterName ? ` or ${testPathFilter}.json/.txt` : testPathFilterBody ? ` or ${testPathFilterBody}.json/.txt` : ''}`
             );
             /* eslint-enable no-console */
             process.exitCode = 404;

package/test/resources/1111111/automation/v1/queries/get-response.json

@@ -0,0 +1,6 @@
+{
+    "count": 0,
+    "page": 1,
+    "pageSize": 50,
+    "items": []
+}

package/test/resources/1111111/automation/v1/queries/post-response.json

@@ -0,0 +1,18 @@
+{
+    "queryDefinitionId": "549f0568-607c-4940-afef-437965094d-keySuffix",
+    "name": "testNew_query",
+    "key": "testNew_query_DEV",
+    "description": "created on deploy",
+    "queryText": "SELECT\n    SubscriberKey as testField\nFROM\n    _Subscribers\n",
+    "targetName": "testExisting_dataExtensionShared",
+    "targetKey": "testExisting_dataExtensionShared",
+    "targetId": "21711373-72c1-ec11-b83b-shared",
+    "targetDescription": "",
+    "createdDate": "2022-04-26T15:21:16.453",
+    "modifiedDate": "2022-04-26T16:04:15.88",
+    "targetUpdateTypeId": 0,
+    "targetUpdateTypeName": "Overwrite",
+    "validatedQueryText": "SET NOCOUNT ON; SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;\r\n\r\nINSERT INTO C518001158.[testDataExtension] ([testField])\r\nSELECT querydef.[testField]\r\nFROM (SELECT SubscriberKey as testField FROM C518001158._Subscribers ) AS querydef \r\nSELECT @rcInsert = @@ROWCOUNT;;\r\n",
+    "categoryId": 9991,
+    "isFrozen": false
+}

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

@@ -1,7 +1,9 @@
 {
     "CustomerKey": "testNew_dataExtensionShared",
-    "DeleteAtEndOfRetentionPeriod": false,
+    "Name": "testNew_dataExtensionShared",
     "Description": "",
+    "IsSendable": false,
+    "IsTestable": false,
     "Fields": [
         {
             "DefaultValue": "",
@@ -12,12 +14,7 @@
             "Name": "testField"
         }
     ],
-    "IsSendable": false,
-    "IsTestable": false,
-    "Name": "testNew_dataExtensionShared",
-    "ResetRetentionPeriodOnImport": false,
-    "RetainUntil": "",
-    "RowBasedRetention": false,
+    "c__retentionPolicy": "none",
     "r__folder_ContentType": "shared_dataextension",
     "r__folder_Path": "Shared Items/Shared Data Extensions"
 }

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

@@ -1,8 +1,6 @@
 {
     "CustomerKey": "testExisting_dataExtensionShared",
     "DataRetentionPeriodLength": 6,
-    "DataRetentionPeriodUnitOfMeasure": 5,
-    "DeleteAtEndOfRetentionPeriod": false,
     "Description": "bla bla",
     "Fields": [
         {
@@ -42,14 +40,14 @@
     "IsTestable": true,
     "Name": "testExisting_dataExtensionShared",
     "ResetRetentionPeriodOnImport": false,
-    "RetainUntil": "",
-    "RowBasedRetention": true,
     "SendableDataExtensionField": {
         "Name": "ContactKey"
     },
     "SendableSubscriberField": {
         "Name": "Subscriber Key"
     },
+    "c__dataRetentionPeriodUnitOfMeasure": "Months",
+    "c__retentionPolicy": "individialRecords",
     "r__folder_ContentType": "shared_dataextension",
     "r__folder_Path": "Shared Items/Shared Data Extensions"
 }

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

@@ -1,7 +1,11 @@
 {
     "CustomerKey": "testExisting_dataExtensionShared",
-    "DeleteAtEndOfRetentionPeriod": false,
+    "Name": "testExisting_dataExtensionShared",
     "Description": "Container for my test emails",
+    "IsSendable": false,
+    "IsTestable": false,
+    "DataRetentionPeriodLength": 6,
+    "ResetRetentionPeriodOnImport": false,
     "Fields": [
         {
             "DefaultValue": "",
@@ -44,12 +48,8 @@
             "Name": "newField"
         }
     ],
-    "IsSendable": false,
-    "IsTestable": false,
-    "Name": "testExisting_dataExtensionShared",
-    "ResetRetentionPeriodOnImport": false,
-    "RetainUntil": "",
-    "RowBasedRetention": true,
+    "c__dataRetentionPeriodUnitOfMeasure": "Months",
+    "c__retentionPolicy": "individialRecords",
     "r__folder_ContentType": "shared_dataextension",
     "r__folder_Path": "Shared Items/Shared Data Extensions"
 }

package/test/resources/1111111/dataExtension/update-response.xml

@@ -31,9 +31,11 @@
                     <Description>Container for my test emails</Description>
                     <IsSendable>false</IsSendable>
                     <IsTestable>false</IsTestable>
+                    <DataRetentionPeriodLength>6</DataRetentionPeriodLength>
+                    <DataRetentionPeriodUnitOfMeasure>5</DataRetentionPeriodUnitOfMeasure>
                     <RowBasedRetention>false</RowBasedRetention>
                     <ResetRetentionPeriodOnImport>false</ResetRetentionPeriodOnImport>
-                    <DeleteAtEndOfRetentionPeriod>false</DeleteAtEndOfRetentionPeriod>
+                    <DeleteAtEndOfRetentionPeriod>true</DeleteAtEndOfRetentionPeriod>
                     <RetainUntil />
                     <Fields>
                         <Field>

package/test/resources/1111111/dataFolder/retrieve-ContentType=queryactivity-response.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing"
+    xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"
+    xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">
+    <soap:Header>
+        <wsa:Action>RetrieveResponse</wsa:Action>
+        <wsa:MessageID>urn:uuid:f36f3303-3b5a-4641-8109-b26447634d91</wsa:MessageID>
+        <wsa:RelatesTo>urn:uuid:33983968-28c4-4379-bb5f-f80ae32eb988</wsa:RelatesTo>
+        <wsa:To>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</wsa:To>
+        <wsse:Security>
+            <wsu:Timestamp wsu:Id="Timestamp-32ecc81b-6020-473c-9e99-4b5338921220">
+                <wsu:Created>2022-04-19T20:03:41Z</wsu:Created>
+                <wsu:Expires>2022-04-19T20:08:41Z</wsu:Expires>
+            </wsu:Timestamp>
+        </wsse:Security>
+    </soap:Header>
+    <soap:Body>
+        <RetrieveResponseMsg xmlns="http://exacttarget.com/wsdl/partnerAPI">
+            <OverallStatus>OK</OverallStatus>
+            <RequestID>02cd5ccb-8f84-4651-826f-71169eeecf05</RequestID>
+            <Results xsi:type="DataFolder">
+                <Client>
+                    <ID>1111111</ID>
+                </Client>
+                <PartnerKey xsi:nil="true" />
+                <CreatedDate>2016-07-22T11:52:20.407</CreatedDate>
+                <ModifiedDate>2016-07-22T11:52:20.407</ModifiedDate>
+                <ID>9991</ID>
+                <ObjectID xsi:nil="true" />
+                <CustomerKey>queryactivity_default</CustomerKey>
+                <ParentFolder>
+                    <PartnerKey xsi:nil="true" />
+                    <ID>0</ID>
+                    <ObjectID xsi:nil="true" />
+                </ParentFolder>
+                <Name>Query</Name>
+                <Description />
+                <ContentType>queryactivity</ContentType>
+                <IsActive>true</IsActive>
+                <IsEditable>false</IsEditable>
+                <AllowChildren>true</AllowChildren>
+            </Results>
+        </RetrieveResponseMsg>
+    </soap:Body>
+</soap:Envelope>

package/test/resources/1111111/query/patch_keySuffix-expected.json

@@ -0,0 +1,11 @@
+{
+    "name": "testNew_query",
+    "key": "testNew_query_DEV",
+    "description": "created on deploy",
+    "r__dataExtension_key": "testExisting_dataExtensionShared",
+    "createdDate": "2022-04-26T15:21:16.453",
+    "modifiedDate": "2022-04-26T16:04:15.88",
+    "targetUpdateTypeName": "Overwrite",
+    "isFrozen": false,
+    "r__folder_Path": "Query"
+}

package/test/resources/1111111/query/patch_keySuffix-expected.sql

@@ -0,0 +1,4 @@
+SELECT
+    SubscriberKey AS testField
+FROM
+    _Subscribers

package/test/resources/9999999/asset/block-1157-retrieve-expected.html

@@ -3,7 +3,7 @@
     cellspacing="0"
     width="100%"
     role="presentation"
-    style="min-width: 100%"
+    style="min-width: 100%; "
     class="stylingblock-content-wrapper"
 >
     <tr>
@@ -13,10 +13,11 @@
     /* my ampscript */
 ]%%
 <script runat="server">
-                // my ssjs
-            </script>
+    // my ssjs
+</script>
 
             <div>my 2nd html</div>
+            <div>%%=TreatAsContent(ContentBlockByFake("Content Builder\my very long path\Content Blocks Library\COMMON\some other folder\my code snippet"))=%%</div>
         </td>
     </tr>
 </table>