Fix matching when using uids

Author: isaacroldan

packages/app/src/cli/models/app/identifiers.ts

@@ -71,7 +71,10 @@ export async function updateAppIdentifiers(
   })
 
   const contentIsEqual = deepCompare(dotenvFile.variables, updatedVariables)
-  const writeToFile = !contentIsEqual && (command === 'deploy' || command === 'release')
+  const writeToFile =
+    !contentIsEqual &&
+    (command === 'deploy' || command === 'release') &&
+    !developerPlatformClient.supportsAtomicDeployments
   dotenvFile.variables = updatedVariables
 
   if (writeToFile) {
@@ -108,9 +111,9 @@ export function getAppIdentifiers(
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       extensionsIdentifiers[extension.localIdentifier] = envVariables[extension.idEnvironmentVariableName]!
     }
-    if (developerPlatformClient.supportsAtomicDeployments) {
-      extensionsIdentifiers[extension.localIdentifier] = extension.uid
-    }
+    // if (developerPlatformClient.supportsAtomicDeployments) {
+    //   extensionsIdentifiers[extension.localIdentifier] = extension.uid
+    // }
   }
   app.allExtensions.forEach(processExtension)
 

packages/app/src/cli/services/context/breakdown-extensions.ts

@@ -368,20 +368,24 @@ function loadExtensionsIdentifiersBreakdown(
     (ext) => extensionTypeStrategy(specs, ext.specification?.identifier) === 'uuid',
   )
 
+  function moduleHasUUIDorUID(module: AppModuleVersion, identifier: string) {
+    return module.registrationUuid === identifier || module.registrationId === identifier
+  }
+
   const extensionsToUpdate = Object.entries(localRegistration)
-    .filter(([_identifier, uuid]) => extensionModules.map((module) => module.registrationUuid!).includes(uuid))
+    .filter(([_identifier, uuid]) => extensionModules.some((module) => moduleHasUUIDorUID(module, uuid)))
     .map(([identifier, _uuid]) => identifier)
 
   let extensionsToCreate = Object.entries(localRegistration)
-    .filter(([_identifier, uuid]) => !extensionModules.map((module) => module.registrationUuid!).includes(uuid))
+    .filter(([_identifier, uuid]) => !extensionModules.some((module) => moduleHasUUIDorUID(module, uuid)))
     .map(([identifier, _uuid]) => identifier)
   extensionsToCreate = Array.from(new Set(extensionsToCreate.concat(toCreate.map((source) => source.localIdentifier))))
 
   const extensionsOnlyRemote = extensionModules
     .filter(
       (module) =>
-        !Object.values(localRegistration).includes(module.registrationUuid!) &&
-        !toCreate.map((source) => source.localIdentifier).includes(module.registrationUuid!),
+        !Object.values(localRegistration).some((uuid) => moduleHasUUIDorUID(module, uuid)) &&
+        !toCreate.map((source) => source.localIdentifier).some((identifier) => moduleHasUUIDorUID(module, identifier)),
     )
     .map((module) => module.registrationTitle)
 

packages/app/src/cli/services/context/id-matching.ts

@@ -72,25 +72,37 @@ function matchByNameAndType(
 function matchByUUID(
   local: LocalSource[],
   remote: RemoteSource[],
+  ids: IdentifiersExtensions,
 ): {
   matched: IdentifiersExtensions
   toCreate: LocalSource[]
   toConfirm: {local: LocalSource; remote: RemoteSource}[]
   toManualMatch: {local: LocalSource[]; remote: RemoteSource[]}
 } {
-  const notMigratedRemoteExtensions = remote.filter((remoteSource) => !remoteSource.id)
-
-  const {matched, toCreate, toConfirm, toManualMatch} = matchByNameAndType(local, notMigratedRemoteExtensions)
+  const matched: IdentifiersExtensions = {}
+  const pendingLocal: LocalSource[] = []
 
+  // First, match by UID
   local.forEach((localSource) => {
-    const possibleMatch = remote.find((remoteSource) => remoteSource.uuid === localSource.uid)
+    const possibleMatch = remote.find((remoteSource) => remoteSource.id === localSource.uid)
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    if (possibleMatch) matched[localSource.localIdentifier] = possibleMatch.id!
+    else pendingLocal.push(localSource)
+  })
+
+  // Then, match by UUID
+  pendingLocal.forEach((localSource) => {
+    const possibleMatch = remote.find((remoteSource) => remoteSource.uuid === ids[localSource.localIdentifier])
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     if (possibleMatch) matched[localSource.localIdentifier] = possibleMatch.uuid!
   })
 
-  toCreate.concat(local.filter((elem) => !matched[elem.localIdentifier]))
+  // The rest, are either to be created or deleted.
+  // const {matched, toCreate, toConfirm, toManualMatch} = matchByNameAndType(local, notMigratedRemoteExtensions)
 
-  return {matched, toCreate, toConfirm, toManualMatch}
+  const toCreate = local.filter((elem) => !matched[elem.localIdentifier])
+
+  return {matched, toCreate, toConfirm: [], toManualMatch: {local: [], remote: []}}
 }
 
 function migrateLegacyFunctions(
@@ -229,7 +241,7 @@ export async function automaticMatchmaking(
   const {local, remote} = pendingAfterMigratingFunctions
 
   const {matched, toCreate, toConfirm, toManualMatch} = useUuidMatching
-    ? matchByUUID(local, remote)
+    ? matchByUUID(localSources, remoteSources, ids)
     : matchByNameAndType(local, remote)
 
   return {

packages/app/src/cli/services/context/identifiers.ts

@@ -70,13 +70,6 @@ export async function ensureDeploymentIdsPresence(options: EnsureDeploymentIdsPr
     extensionsToConfirm,
   )
 
-  // Update the matched local extensions with the remote UIDs
-  Object.keys(extensionsToConfirm.validMatches).forEach((handle) => {
-    const extension = options.app.allExtensions.find((ext) => ext.handle === handle)
-    if (!extension) return
-    extension.configuration.uid = extension.uid
-  })
-
   return {
     app: options.appId,
     extensions: result.extensions,

packages/app/src/cli/utilities/developer-platform-client/app-management-client.ts

@@ -1307,7 +1307,7 @@ function mapBusinessPlatformStoresToOrganizationStores(
 function appModuleVersion(mod: ReleasedAppModuleFragment): Required<AppModuleVersion> {
   return {
     registrationId: mod.userIdentifier,
-    registrationUuid: mod.userIdentifier,
+    registrationUuid: mod.uuid,
     registrationTitle: mod.handle,
     type: mod.specification.externalIdentifier,
     config: mod.config,