fix: don't wait for archiver finalize

mshanemc · svc-cli-bot · web-flow · commit 81e32c2d8994 · 2022-11-04T09:32:07.000-05:00
* fix: don't wait for archiver finalize

* chore: auto-update metadata coverage in METADATA_SUPPORT.md

* test: record perf

* style: explain archiver types weirdness

* test: record perf

Co-authored-by: svc-cli-bot &lt;svc_cli_bot@salesforce.com&gt;
diff --git a/METADATA_SUPPORT.md b/METADATA_SUPPORT.md
@@ -532,6 +532,7 @@ v57 introduces the following new types.  Here's their current level of support
 |:---|:---|:---|
 |ActionableListDefinition|❌|Not supported, but support could be added|
 |AffinityScoreDefinition|❌|Not supported, but support could be added|
+|ClaimFinancialSettings|✅||
 |ClauseCatgConfiguration|✅||
 |CommerceRuleSettings|✅||
 |DisclosureDefinition|✅||
@@ -541,8 +542,9 @@ v57 introduces the following new types.  Here's their current level of support
 |ExternalClientAppSettings|✅||
 |ExternalClientApplication|✅||
 |ExternalDocStorageConfig|❌|Not supported, but support could be added|
+|ExtlClntAppMobilePolicies|❌|Not supported, but support could be added|
 |ExtlClntAppMobileSettings|✅||
-|ExtlClntAppOauthPlcyCnfg|❌|Not supported, but support could be added|
+|ExtlClntAppOauthConfigurablePolicies|✅||
 |ExtlClntAppOauthSettings|✅||
 |IdentityProviderSettings|✅||
 |IntegrationProviderDef|❌|Not supported, but support could be added|
@@ -580,7 +582,6 @@ v57 introduces the following new types.  Here's their current level of support
 - CustomFieldTranslation
 - MatchingRule
 - MarketingResourceType
-- ExtlClntAppOauthConfigurablePolicies
 - CustomExperience
 - ManagedTopic
 - DataPipeline
diff --git a/src/convert/transformers/staticResourceMetadataTransformer.ts b/src/convert/transformers/staticResourceMetadataTransformer.ts
@@ -39,6 +39,11 @@ export class StaticResourceMetadataTransformer extends BaseMetadataTransformer {
   public async toMetadataFormat(component: SourceComponent): Promise<WriteInfo[]> {
     const { content, type, xml } = component;
 
+    // archiver/zip.finalize looks like it is async, because it extends streams, but it is not meant to be used that way
+    // the typings on it are misleading and unintended.  More info https://github.com/archiverjs/node-archiver/issues/476
+    // If you await it, bad things happen, like the convert process exiting silently.  https://github.com/forcedotcom/cli/issues/1791
+    // leave the void as it is
+    // eslint-disable-next-line @typescript-eslint/require-await
     const zipIt = async (): Promise<Archiver> => {
       // toolbelt was using level 9 for static resources, so we'll do the same.
       // Otherwise, you'll see errors like https://github.com/forcedotcom/cli/issues/1098
@@ -53,7 +58,7 @@ export class StaticResourceMetadataTransformer extends BaseMetadataTransformer {
           zip.append(replacementStream, { name: relative(content, path) });
         }
       }
-      await zip.finalize();
+      void zip.finalize();
       return zip;
     };
 
diff --git a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8171M-CPU-2-60GHz/eda.json b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8171M-CPU-2-60GHz/eda.json
@@ -1,18 +1,18 @@
 [
   {
     "name": "componentSetCreate",
-    "duration": 258.7272329999978
+    "duration": 240.1729839999898
   },
   {
     "name": "sourceToMdapi",
-    "duration": 7064.5000979999895
+    "duration": 5893.712117000003
   },
   {
     "name": "sourceToZip",
-    "duration": 5043.188347000003
+    "duration": 6712.079133000007
   },
   {
     "name": "mdapiToSource",
-    "duration": 4514.134340000019
+    "duration": 4511.380858000019
   }
 ]
diff --git a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8171M-CPU-2-60GHz/lotsOfClasses.json b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8171M-CPU-2-60GHz/lotsOfClasses.json
@@ -1,18 +1,18 @@
 [
   {
     "name": "componentSetCreate",
-    "duration": 479.82419299997855
+    "duration": 505.1115040000004
   },
   {
     "name": "sourceToMdapi",
-    "duration": 8941.918268000009
+    "duration": 10536.354740999988
   },
   {
     "name": "sourceToZip",
-    "duration": 10533.41592499998
+    "duration": 7629.889922000002
   },
   {
     "name": "mdapiToSource",
-    "duration": 5452.256045999995
+    "duration": 5711.929862999998
   }
 ]
diff --git a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8171M-CPU-2-60GHz/lotsOfClassesOneDir.json b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8171M-CPU-2-60GHz/lotsOfClassesOneDir.json
@@ -1,18 +1,18 @@
 [
   {
     "name": "componentSetCreate",
-    "duration": 830.0290470000182
+    "duration": 848.9497269999993
   },
   {
     "name": "sourceToMdapi",
-    "duration": 12821.065571999992
+    "duration": 14420.913567999989
   },
   {
     "name": "sourceToZip",
-    "duration": 11678.985925000015
+    "duration": 12225.230517000018
   },
   {
     "name": "mdapiToSource",
-    "duration": 13113.897208999988
+    "duration": 14027.158036999987
   }
 ]
diff --git a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/eda.json b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/eda.json
@@ -1,18 +1,18 @@
 [
   {
     "name": "componentSetCreate",
-    "duration": 212.75168799998937
+    "duration": 211.11101899998903
   },
   {
     "name": "sourceToMdapi",
-    "duration": 4968.247083999973
+    "duration": 5271.692285000012
   },
   {
     "name": "sourceToZip",
-    "duration": 4913.3930489999475
+    "duration": 4380.870213999995
   },
   {
     "name": "mdapiToSource",
-    "duration": 3678.5225419999915
+    "duration": 3751.995666999981
   }
 ]
diff --git a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClasses.json b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClasses.json
@@ -1,18 +1,18 @@
 [
   {
     "name": "componentSetCreate",
-    "duration": 427.1703989999951
+    "duration": 442.0649090000079
   },
   {
     "name": "sourceToMdapi",
-    "duration": 8699.61532500002
+    "duration": 7637.912526
   },
   {
     "name": "sourceToZip",
-    "duration": 7062.340872999979
+    "duration": 7133.890660000005
   },
   {
     "name": "mdapiToSource",
-    "duration": 4507.392125000013
+    "duration": 4296.643390000012
   }
 ]
diff --git a/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClassesOneDir.json b/test/nuts/perfResults/x64-linux-2xIntel-Xeon-Platinum-8272CL-CPU-2-60GHz/lotsOfClassesOneDir.json
@@ -1,18 +1,18 @@
 [
   {
     "name": "componentSetCreate",
-    "duration": 708.247853000008
+    "duration": 714.2424170000013
   },
   {
     "name": "sourceToMdapi",
-    "duration": 11350.272353000008
+    "duration": 10538.031634999992
   },
   {
     "name": "sourceToZip",
-    "duration": 10826.725208999997
+    "duration": 9512.72887000002
   },
   {
     "name": "mdapiToSource",
-    "duration": 9852.030005000008
+    "duration": 8187.150167999993
   }
 ]

Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,18 @@`
`1`	`1`	`[`
`2`	`2`	`{`
`3`	`3`	`"name": "componentSetCreate",`
`4`		`- "duration": 258.7272329999978`
	`4`	`+ "duration": 240.1729839999898`
`5`	`5`	`},`
`6`	`6`	`{`
`7`	`7`	`"name": "sourceToMdapi",`
`8`		`- "duration": 7064.5000979999895`
	`8`	`+ "duration": 5893.712117000003`
`9`	`9`	`},`
`10`	`10`	`{`
`11`	`11`	`"name": "sourceToZip",`
`12`		`- "duration": 5043.188347000003`
	`12`	`+ "duration": 6712.079133000007`
`13`	`13`	`},`
`14`	`14`	`{`
`15`	`15`	`"name": "mdapiToSource",`
`16`		`- "duration": 4514.134340000019`
	`16`	`+ "duration": 4511.380858000019`
`17`	`17`	`}`
`18`	`18`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,18 @@`
`1`	`1`	`[`
`2`	`2`	`{`
`3`	`3`	`"name": "componentSetCreate",`
`4`		`- "duration": 479.82419299997855`
	`4`	`+ "duration": 505.1115040000004`
`5`	`5`	`},`
`6`	`6`	`{`
`7`	`7`	`"name": "sourceToMdapi",`
`8`		`- "duration": 8941.918268000009`
	`8`	`+ "duration": 10536.354740999988`
`9`	`9`	`},`
`10`	`10`	`{`
`11`	`11`	`"name": "sourceToZip",`
`12`		`- "duration": 10533.41592499998`
	`12`	`+ "duration": 7629.889922000002`
`13`	`13`	`},`
`14`	`14`	`{`
`15`	`15`	`"name": "mdapiToSource",`
`16`		`- "duration": 5452.256045999995`
	`16`	`+ "duration": 5711.929862999998`
`17`	`17`	`}`
`18`	`18`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,18 @@`
`1`	`1`	`[`
`2`	`2`	`{`
`3`	`3`	`"name": "componentSetCreate",`
`4`		`- "duration": 830.0290470000182`
	`4`	`+ "duration": 848.9497269999993`
`5`	`5`	`},`
`6`	`6`	`{`
`7`	`7`	`"name": "sourceToMdapi",`
`8`		`- "duration": 12821.065571999992`
	`8`	`+ "duration": 14420.913567999989`
`9`	`9`	`},`
`10`	`10`	`{`
`11`	`11`	`"name": "sourceToZip",`
`12`		`- "duration": 11678.985925000015`
	`12`	`+ "duration": 12225.230517000018`
`13`	`13`	`},`
`14`	`14`	`{`
`15`	`15`	`"name": "mdapiToSource",`
`16`		`- "duration": 13113.897208999988`
	`16`	`+ "duration": 14027.158036999987`
`17`	`17`	`}`
`18`	`18`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,18 @@`
`1`	`1`	`[`
`2`	`2`	`{`
`3`	`3`	`"name": "componentSetCreate",`
`4`		`- "duration": 212.75168799998937`
	`4`	`+ "duration": 211.11101899998903`
`5`	`5`	`},`
`6`	`6`	`{`
`7`	`7`	`"name": "sourceToMdapi",`
`8`		`- "duration": 4968.247083999973`
	`8`	`+ "duration": 5271.692285000012`
`9`	`9`	`},`
`10`	`10`	`{`
`11`	`11`	`"name": "sourceToZip",`
`12`		`- "duration": 4913.3930489999475`
	`12`	`+ "duration": 4380.870213999995`
`13`	`13`	`},`
`14`	`14`	`{`
`15`	`15`	`"name": "mdapiToSource",`
`16`		`- "duration": 3678.5225419999915`
	`16`	`+ "duration": 3751.995666999981`
`17`	`17`	`}`
`18`	`18`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,18 @@`
`1`	`1`	`[`
`2`	`2`	`{`
`3`	`3`	`"name": "componentSetCreate",`
`4`		`- "duration": 427.1703989999951`
	`4`	`+ "duration": 442.0649090000079`
`5`	`5`	`},`
`6`	`6`	`{`
`7`	`7`	`"name": "sourceToMdapi",`
`8`		`- "duration": 8699.61532500002`
	`8`	`+ "duration": 7637.912526`
`9`	`9`	`},`
`10`	`10`	`{`
`11`	`11`	`"name": "sourceToZip",`
`12`		`- "duration": 7062.340872999979`
	`12`	`+ "duration": 7133.890660000005`
`13`	`13`	`},`
`14`	`14`	`{`
`15`	`15`	`"name": "mdapiToSource",`
`16`		`- "duration": 4507.392125000013`
	`16`	`+ "duration": 4296.643390000012`
`17`	`17`	`}`
`18`	`18`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,18 @@`
`1`	`1`	`[`
`2`	`2`	`{`
`3`	`3`	`"name": "componentSetCreate",`
`4`		`- "duration": 708.247853000008`
	`4`	`+ "duration": 714.2424170000013`
`5`	`5`	`},`
`6`	`6`	`{`
`7`	`7`	`"name": "sourceToMdapi",`
`8`		`- "duration": 11350.272353000008`
	`8`	`+ "duration": 10538.031634999992`
`9`	`9`	`},`
`10`	`10`	`{`
`11`	`11`	`"name": "sourceToZip",`
`12`		`- "duration": 10826.725208999997`
	`12`	`+ "duration": 9512.72887000002`
`13`	`13`	`},`
`14`	`14`	`{`
`15`	`15`	`"name": "mdapiToSource",`
`16`		`- "duration": 9852.030005000008`
	`16`	`+ "duration": 8187.150167999993`
`17`	`17`	`}`
`18`	`18`	`]`