feat: redo custom domains after upgrade reset

package.json

@@ -27,7 +27,7 @@
     "@dfinity/candid": "^0.20.2",
     "@dfinity/identity": "^0.20.2",
     "@dfinity/principal": "^0.20.2",
-    "@junobuild/admin": "^0.0.38-next-2023-12-21",
+    "@junobuild/admin": "^0.0.38-next-2023-12-22",
     "@junobuild/core-peer": "^0.0.3-next-2023-12-21",
     "@junobuild/utils": "^0.0.16-next-2023-12-21",
     "conf": "^12.0.0",

src/commands/upgrade.ts

@@ -1,5 +1,6 @@
 import {
   checkUpgradeVersion,
+  listCustomDomains,
   missionControlVersion,
   orbiterVersion,
   satelliteVersion,
@@ -21,7 +22,7 @@ import {
   ORBITER_WASM_NAME,
   SATELLITE_WASM_NAME
 } from '../constants/constants';
-import {upgradeWasmCdn, upgradeWasmLocal} from '../services/upgrade.services';
+import {redoCustomDomains, upgradeWasmCdn, upgradeWasmLocal} from '../services/upgrade.services';
 import type {AssetKey} from '../types/asset-key';
 import {actorParameters} from '../utils/actor.utils';
 import {hasArgs, nextArg} from '../utils/args.utils';
@@ -154,24 +155,21 @@ const upgradeSatelliteRelease = async ({
   const displayHint = `satellite "${satelliteKey(satellite.satelliteId ?? '')}"`;
   const version = await selectVersion({currentVersion, assetKey: SATELLITE_WASM_NAME, displayHint});
 
-  if (version === undefined) {
+  if (isNullish(version)) {
     return;
   }
 
-  const reset = await confirmReset({args, assetKey: 'satellite'});
-
-  const upgradeSatelliteWasm = async ({wasm_module}: {wasm_module: Uint8Array}) => {
-    await upgradeSatelliteAdmin({
-      satellite,
-      wasm_module,
-      // TODO: option to be removed
-      deprecated: compare(currentVersion, '0.0.7') < 0,
-      deprecatedNoScope: compare(currentVersion, '0.0.9') < 0,
-      ...(reset && {reset})
-    });
-  };
+  const upgrade = async (params: {
+    upgrade: ({wasm_module}: {wasm_module: Uint8Array}) => Promise<void>;
+    reset?: boolean;
+  }) => upgradeWasmCdn({version, assetKey: 'satellite', ...params});
 
-  await upgradeWasmCdn({version, assetKey: 'satellite', upgrade: upgradeSatelliteWasm, reset});
+  await executeUpgradeSatellite({
+    satellite,
+    args,
+    currentVersion,
+    upgrade
+  });
 };
 
 const upgradeSatelliteCustom = async ({
@@ -193,8 +191,38 @@ const upgradeSatelliteCustom = async ({
     satellite
   });
 
+  const upgrade = async (params: {
+    upgrade: ({wasm_module}: {wasm_module: Uint8Array}) => Promise<void>;
+    reset?: boolean;
+  }) => upgradeWasmLocal({src, ...params});
+
+  await executeUpgradeSatellite({
+    satellite,
+    args,
+    currentVersion,
+    upgrade
+  });
+};
+
+const executeUpgradeSatellite = async ({
+  satellite,
+  args,
+  currentVersion,
+  upgrade
+}: {
+  satellite: SatelliteParameters;
+  args?: string[];
+  currentVersion: string;
+  upgrade: (params: {
+    upgrade: ({wasm_module}: {wasm_module: Uint8Array}) => Promise<void>;
+    reset?: boolean;
+  }) => Promise<void>;
+}) => {
   const reset = await confirmReset({args, assetKey: 'satellite'});
 
+  // Information we want to try to redo once the satellite has been updated and resetted
+  const customDomains = reset ? await listCustomDomains({satellite}) : [];
+
   const upgradeSatelliteWasm = async ({wasm_module}: {wasm_module: Uint8Array}) => {
     await upgradeSatelliteAdmin({
       satellite,
@@ -206,7 +234,14 @@ const upgradeSatelliteCustom = async ({
     });
   };
 
-  await upgradeWasmLocal({src, upgrade: upgradeSatelliteWasm, reset});
+  await upgrade({
+    upgrade: upgradeSatelliteWasm,
+    reset
+  });
+
+  if (reset && customDomains.length > 0) {
+    await redoCustomDomains({satellite, domains: customDomains});
+  }
 };
 
 const updateMissionControlRelease = async (missionControlParameters: MissionControlParameters) => {

src/services/upgrade.services.ts

@@ -6,6 +6,7 @@ import {JUNO_CDN_URL} from '../constants/constants';
 import type {AssetKey} from '../types/asset-key';
 import {downloadFromURL} from '../utils/download.utils';
 import {NEW_CMD_LINE, confirmAndExit} from '../utils/prompt.utils';
+import { CustomDomain, SatelliteParameters, setCustomDomains } from "@junobuild/admin";
 
 const executeUpgradeWasm = async ({
   upgrade,
@@ -106,3 +107,13 @@ export const upgradeWasmCdn = async ({
     throw err;
   }
 };
+
+export const redoCustomDomains = async (params: {satellite: SatelliteParameters; domains: CustomDomain[]}) => {
+  const spinner = ora('Setting back custom domains...').start();
+
+  try {
+    await setCustomDomains(params);
+  } finally {
+    spinner.stop();
+  }
+}