From a1f32c2b35a59cf2d27f9491638ee90aa3d9189f Mon Sep 17 00:00:00 2001
From: Cristian Dominguez <cdominguez@salesforce.com>
Date: Thu, 22 Sep 2022 16:46:36 -0300
Subject: [PATCH] fix(scratch): respect `apiVersion` config value

---
 src/org/scratchOrgCreate.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/org/scratchOrgCreate.ts b/src/org/scratchOrgCreate.ts
index f1498c030a..34dcee6226 100644
--- a/src/org/scratchOrgCreate.ts
+++ b/src/org/scratchOrgCreate.ts
@@ -9,6 +9,7 @@ import { ensureString } from '@salesforce/ts-types';
 import { Messages } from '../messages';
 import { Logger } from '../logger';
 import { ConfigAggregator } from '../config/configAggregator';
+import { OrgConfigProperties } from '../org/orgConfigProperties';
 import { SfProject } from '../sfProject';
 import { StateAggregator } from '../stateAggregator';
 import { Org } from './org';
@@ -152,6 +153,8 @@ export const scratchOrgResume = async (jobId: string): Promise<ScratchOrgCreateR
 
   const scratchOrg = await Org.create({ aliasOrUsername: username });
 
+  const configAggregator = await ConfigAggregator.create();
+
   await emit({ stage: 'deploy settings', scratchOrgInfo: soi });
   const settingsGenerator = new SettingsGenerator();
   settingsGenerator.extract({ ...soi, ...definitionjson });
@@ -161,7 +164,7 @@ export const scratchOrgResume = async (jobId: string): Promise<ScratchOrgCreateR
       scratchOrg,
       settingsGenerator,
       apiVersion ??
-        (new ConfigAggregator().getPropertyValue('apiVersion') as string) ??
+        configAggregator.getPropertyValue(OrgConfigProperties.ORG_API_VERSION) ??
         (await scratchOrg.retrieveMaxApiVersion())
     ),
   ]);
@@ -283,13 +286,15 @@ export const scratchOrgCreate = async (options: ScratchOrgCreateOptions): Promis
 
   await emit({ stage: 'deploy settings', scratchOrgInfo: soi });
 
+  const configAggregator = await ConfigAggregator.create();
+
   const [authInfo] = await Promise.all([
     resolveUrl(scratchOrgAuthInfo),
     deploySettings(
       scratchOrg,
       settingsGenerator,
       apiversion ??
-        (new ConfigAggregator().getPropertyValue('org-api-version') as string) ??
+        configAggregator.getPropertyValue(OrgConfigProperties.ORG_API_VERSION) ??
         (await scratchOrg.retrieveMaxApiVersion())
     ),
   ]);