Merge pull request #2533 from Accenture/copilot/fix-asset-folder-creation

fix: prevent folder creation skip when same path exists in another BU

Author: JoernBerkefeld

.husky/commit-msg

@@ -2,7 +2,7 @@ INPUT_FILE=$1
 START_LINE=`head -n1 $INPUT_FILE`
 PATTERN="^(#[[:digit:]]|Merge|Revert)"
 
-if ! [[ "$START_LINE" =~ $PATTERN ]] ; then
+if ! echo "$START_LINE" | grep -qE "$PATTERN" ; then
   echo "Bad commit message, see example: \"#431 commit message\", you provided: \"$START_LINE\""
   exit 1
 fi

.husky/post-checkout

@@ -1,3 +1,4 @@
+#!/bin/sh
 # ### git commit message template ###
 git config commit.template .git/templatemessage
 TICKETID=`git rev-parse --abbrev-ref HEAD | LC_ALL=en_US.utf8 grep -oP '^((feature|bug|bugfix|fix|hotfix|task|chore)\/)?\K\d{1,7}' || true`
@@ -11,24 +12,21 @@ echo "[POST-CHECKOUT] Setting template commit to '$TEMPLATE'"
 echo "$TEMPLATE" > ".git/templatemessage"
 
 
-if [[ $SKIP_HOOKS>0 ]]; then
+if [ "${SKIP_HOOKS:-0}" -gt 0 ] 2>/dev/null; then
   echo "[POST-CHECKOUT] skipping hooks ($SKIP_HOOKS)"
   exit 0
 fi
 
 # ### run npm install ###
 echo "[POST-CHECKOUT] 📦 Checking for changes to dependencies"
-# define how to split strings into array elements
-IFS=$'\n'
 # $1 is the new HEAD pointer
 NEWHEAD=$1
 # $2 is the previous HEAD pointer
 OLDHEAD=$2
 # extract all paths to package-lock.json files
-PACKAGE_LOCK_REGEX="(^package-lock\.json)"
-PACKAGES=$(git diff --name-only $OLDHEAD $NEWHEAD | grep -E $PACKAGE_LOCK_REGEX || true)
+PACKAGES=$(git diff --name-only "$OLDHEAD" "$NEWHEAD" | grep -E "^package-lock\.json" || true)
 
-if [[ ${PACKAGES[@]} ]]; then
+if [ -n "$PACKAGES" ]; then
   for package in $PACKAGES; do
     echo "📦 $package was changed."
   done

@types/lib/metadataTypes/Folder.d.ts.map

@@ -224,9 +224,12 @@ class Folder extends MetadataType {
                             let existingId;
                             try {
                                 // perform a secondary check based on path
-
+                                // do not allow mapping folders from other BUs to avoid
+                                // treating a same-path folder from another BU as already existing
                                 const cachedVersion = cache.getFolderByPath(
-                                    deployableMetadata.Path
+                                    deployableMetadata.Path,
+                                    undefined,
+                                    false
                                 );
                                 existingId = cachedVersion?.ID;
                                 if (

lib/metadataTypes/Folder.js

@@ -0,0 +1,33 @@
+<?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>CreateResponse</wsa:Action>
+        <wsa:MessageID>urn:uuid:50c68314-30a5-45d4-93aa-6dd1191190e3</wsa:MessageID>
+        <wsa:RelatesTo>urn:uuid:00b40ac8-d7e8-4e55-8b88-fcf3569684a9</wsa:RelatesTo>
+        <wsa:To>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</wsa:To>
+        <wsse:Security>
+            <wsu:Timestamp wsu:Id="Timestamp-26435e8f-90d6-4552-aabb-d5eefa3a4bed">
+                <wsu:Created>2024-08-08T09:56:20Z</wsu:Created>
+                <wsu:Expires>2024-08-08T10:01:20Z</wsu:Expires>
+            </wsu:Timestamp>
+        </wsse:Security>
+    </soap:Header>
+    <soap:Body>
+        <CreateResponse xmlns="http://exacttarget.com/wsdl/partnerAPI">
+            <Results>
+                <StatusCode>OK</StatusCode>
+                <StatusMessage>Folder created successfully.</StatusMessage>
+                <OrdinalID>0</OrdinalID>
+                <NewID>88888</NewID>
+                <NewObjectID>a890243b-a4e1-4010-85e4-db6d6ae84502</NewObjectID>
+            </Results>
+            <RequestID>6b408e0b-ecbe-4b8e-9019-6376f6eeb0e2</RequestID>
+            <OverallStatus>OK</OverallStatus>
+        </CreateResponse>
+    </soap:Body>
+</soap:Envelope>