fix: fixed customPermission child xml tag

forcedotcom · Jan 10, 2025 · 812668d · 812668d · svc-cli-bot · Jan 10, 2025
1 parent e8e31d9
commit 812668d
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 17 deletions.
diff --git a/src/registry/presets/decomposePermissionSetBeta2.json b/src/registry/presets/decomposePermissionSetBeta2.json
@@ -3,7 +3,7 @@
     "applicationvisibility": "permissionset",
     "classaccess": "permissionset",
     "custommetadatatypeaccess": "permissionset",
-    "custompermissions": "permissionset",
+    "custompermission": "permissionset",
     "customsettingaccess": "permissionset",
     "externalcredentialprincipalaccess": "permissionset",
     "externaldatasourceaccess": "permissionset",
@@ -28,7 +28,7 @@
           "applicationVisibilities": "applicationvisibility",
           "classAccesses": "classaccess",
           "customMetadataTypeAccesses": "custommetadatatypeaccess",
-          "customPermissions": "custompermissions",
+          "customPermissions": "custompermission",
           "customSettingAccesses": "customsettingaccess",
           "externalCredentialPrincipalAccesses": "externalcredentialprincipalaccess",
           "externalDataSourceAccesses": "externaldatasourceaccess",
@@ -44,7 +44,7 @@
           "applicationVisibility": "applicationvisibility",
           "classAccess": "classaccess",
           "customMetadataTypeAccess": "custommetadatatypeaccess",
-          "customPermission": "custompermissions",
+          "customPermission": "custompermission",
           "customSettingAccess": "customsettingaccess",
           "externalCredentialPrincipalAccess": "externalcredentialprincipalaccess",
           "externalDataSourceAccess": "externaldatasourceaccess",
@@ -82,9 +82,9 @@
             "suffix": "customMetadataTypeAccess",
             "uniqueIdElement": "name"
           },
-          "custompermissions": {
+          "custompermission": {
             "directoryName": "",
-            "id": "custompermissions",
+            "id": "custompermission",
             "isAddressable": false,
             "name": "CustomPermission",
             "suffix": "customPermission",

diff --git a/...ot/sampleProjects/preset-decomposedPS2/__snapshots__/verify-md-files.expected/package.xml b/...ot/sampleProjects/preset-decomposedPS2/__snapshots__/verify-md-files.expected/package.xml
@@ -4,6 +4,7 @@
         <members>dreamhouse</members>
         <members>ebikes</members>
         <members>noObjectSettings</members>
+        <members>withCustomPermission</members>
         <name>PermissionSet</name>
     </types>
     <version>60.0</version>

diff --git a/.../__snapshots__/verify-md-files.expected/permissionsets/withCustomPermission.permissionset b/.../__snapshots__/verify-md-files.expected/permissionsets/withCustomPermission.permissionset
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PermissionSet xmlns="http://soap.sforce.com/2006/04/metadata">
+    <applicationVisibilities>
+        <application>withCustomPermission</application>
+        <visible>true</visible>
+    </applicationVisibilities>
+    <classAccesses>
+        <apexClass>PagedResult</apexClass>
+        <enabled>true</enabled>
+    </classAccesses>
+    <classAccesses>
+        <apexClass>PropertyController</apexClass>
+        <enabled>true</enabled>
+    </classAccesses>
+    <classAccesses>
+        <apexClass>SampleDataController</apexClass>
+        <enabled>true</enabled>
+    </classAccesses>
+    <customPermissions>
+        <enabled>true</enabled>
+        <name>myCustomPerm</name>
+    </customPermissions>
+    <customPermissions>
+        <enabled>true</enabled>
+        <name>myCustomPerm1</name>
+    </customPermissions>
+    <hasActivationRequired>false</hasActivationRequired>
+    <label>withCustomPermission</label>
+</PermissionSet>
diff --git a/...efault/permissionsets/withCustomPermission/withCustomPermission.customPermission-meta.xml b/...efault/permissionsets/withCustomPermission/withCustomPermission.customPermission-meta.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <PermissionSet>
-    <>
+    <customPermissions>
         <enabled>true</enabled>
         <name>myCustomPerm</name>
-    </>
-    <>
+    </customPermissions>
+    <customPermissions>
         <enabled>true</enabled>
         <name>myCustomPerm1</name>
-    </>
+    </customPermissions>
 </PermissionSet>
diff --git a/...efault/permissionsets/withCustomPermission/withCustomPermission.customPermission-meta.xml b/...efault/permissionsets/withCustomPermission/withCustomPermission.customPermission-meta.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <PermissionSet>
-    <>
+    <customPermissions>
         <enabled>true</enabled>
         <name>myCustomPerm</name>
-    </>
-    <>
+    </customPermissions>
+    <customPermissions>
         <enabled>true</enabled>
         <name>myCustomPerm1</name>
-    </>
+    </customPermissions>
 </PermissionSet>
diff --git a/...ojects/preset-decomposedPS2/mdapiOutput/permissionsets/withCustomPermission.permissionset b/...ojects/preset-decomposedPS2/mdapiOutput/permissionsets/withCustomPermission.permissionset
@@ -16,14 +16,14 @@
         <apexClass>SampleDataController</apexClass>
         <enabled>true</enabled>
     </classAccesses>
-    <>
+    <customPermissions>
         <enabled>true</enabled>
         <name>myCustomPerm</name>
-    </>
-    <>
+    </customPermissions>
+    <customPermissions>
         <enabled>true</enabled>
         <name>myCustomPerm1</name>
-    </>
+    </customPermissions>
     <hasActivationRequired>false</hasActivationRequired>
     <label>withCustomPermission</label>
 </PermissionSet>
Benchmark suite	Current: `812668d`	Previous: `40aca73`	Ratio
`eda-componentSetCreate-linux`	`229` ms	`226` ms	`1.01`
`eda-sourceToMdapi-linux`	`2072` ms	`2052` ms	`1.01`
`eda-sourceToZip-linux`	`1916` ms	`1825` ms	`1.05`
`eda-mdapiToSource-linux`	`2826` ms	`2656` ms	`1.06`
`lotsOfClasses-componentSetCreate-linux`	`436` ms	`511` ms	`0.85`
`lotsOfClasses-sourceToMdapi-linux`	`3758` ms	`3568` ms	`1.05`
`lotsOfClasses-sourceToZip-linux`	`3214` ms	`2926` ms	`1.10`
`lotsOfClasses-mdapiToSource-linux`	`3608` ms	`3464` ms	`1.04`
`lotsOfClassesOneDir-componentSetCreate-linux`	`784` ms	`817` ms	`0.96`
`lotsOfClassesOneDir-sourceToMdapi-linux`	`6610` ms	`6308` ms	`1.05`
`lotsOfClassesOneDir-sourceToZip-linux`	`5876` ms	`4995` ms	`1.18`
`lotsOfClassesOneDir-mdapiToSource-linux`	`6653` ms	`6199` ms	`1.07`
Benchmark suite	Current: `812668d`	Previous: `40aca73`	Ratio
`eda-componentSetCreate-win32`	`655` ms	`693` ms	`0.95`
`eda-sourceToMdapi-win32`	`3899` ms	`4125` ms	`0.95`
`eda-sourceToZip-win32`	`2990` ms	`3223` ms	`0.93`
`eda-mdapiToSource-win32`	`5828` ms	`5889` ms	`0.99`
`lotsOfClasses-componentSetCreate-win32`	`1295` ms	`1408` ms	`0.92`
`lotsOfClasses-sourceToMdapi-win32`	`7857` ms	`8162` ms	`0.96`
`lotsOfClasses-sourceToZip-win32`	`4647` ms	`5115` ms	`0.91`
`lotsOfClasses-mdapiToSource-win32`	`7454` ms	`8274` ms	`0.90`
`lotsOfClassesOneDir-componentSetCreate-win32`	`2113` ms	`2468` ms	`0.86`
`lotsOfClassesOneDir-sourceToMdapi-win32`	`13369` ms	`14571` ms	`0.92`
`lotsOfClassesOneDir-sourceToZip-win32`	`8442` ms	`9210` ms	`0.92`
`lotsOfClassesOneDir-mdapiToSource-win32`	`13504` ms	`13982` ms	`0.97`