diff --git a/src/commands/open.ts b/src/commands/open.ts index c7ca0c4a..b9aa174f 100644 --- a/src/commands/open.ts +++ b/src/commands/open.ts @@ -2,8 +2,8 @@ import {listCustomDomains, type CustomDomain} from '@junobuild/admin'; import {assertAnswerCtrlC, hasArgs, nextArg} from '@junobuild/cli-tools'; import prompts from 'prompts'; import {consoleUrl, defaultSatelliteDomain} from '../utils/domain.utils'; +import {assertConfigAndLoadSatelliteContext} from '../utils/juno.config.utils'; import {openUrl} from '../utils/open.utils'; -import {assertConfigAndLoadSatelliteContext} from '../utils/satellite.utils'; export const open = async (args?: string[]) => { const {satellite} = await assertConfigAndLoadSatelliteContext(); diff --git a/src/commands/status.ts b/src/commands/status.ts index 34dc1d5f..2dc87677 100644 --- a/src/commands/status.ts +++ b/src/commands/status.ts @@ -16,7 +16,7 @@ import {checkVersion, getSatelliteVersion} from '../services/version.services'; import type {AssetKey} from '../types/asset-key'; import {toAssetKeys} from '../utils/asset-key.utils'; import {orbiterKey, satelliteKey} from '../utils/cli.config.utils'; -import {assertConfigAndLoadSatelliteContext} from '../utils/satellite.utils'; +import {assertConfigAndLoadSatelliteContext} from '../utils/juno.config.utils'; import {lastRelease} from '../utils/upgrade.utils'; export const status = async () => { diff --git a/src/services/assert.services.ts b/src/services/assert.services.ts index eccada6e..5a2393f5 100644 --- a/src/services/assert.services.ts +++ b/src/services/assert.services.ts @@ -2,9 +2,9 @@ import {satelliteMemorySize, satelliteVersion} from '@junobuild/admin'; import {yellow} from 'kleur'; import {compare} from 'semver'; import {MEMORY_HEAP_WARNING, MEMORY_SIZE_ENDPOINT_VERSION} from '../constants/deploy.constants'; +import {assertConfigAndLoadSatelliteContext} from '../utils/juno.config.utils'; import {isHeadless} from '../utils/process.utils'; import {NEW_CMD_LINE, confirmAndExit} from '../utils/prompt.utils'; -import {assertConfigAndLoadSatelliteContext} from '../utils/satellite.utils'; export const assertSatelliteMemorySize = async () => { const {satellite, satelliteConfig} = await assertConfigAndLoadSatelliteContext(); diff --git a/src/services/assets/_deploy/deploy.execute.services.ts b/src/services/assets/_deploy/deploy.execute.services.ts index d0d81c62..d841567a 100644 --- a/src/services/assets/_deploy/deploy.execute.services.ts +++ b/src/services/assets/_deploy/deploy.execute.services.ts @@ -19,7 +19,7 @@ import { type UploadParams } from '../../../types/deploy'; import type {SatelliteParametersWithId} from '../../../types/satellite'; -import {assertConfigAndLoadSatelliteContext} from '../../../utils/satellite.utils'; +import {assertConfigAndLoadSatelliteContext} from '../../../utils/juno.config.utils'; import {assertSatelliteMemorySize} from '../../assert.services'; import {listAssets} from './deploy.list.services'; diff --git a/src/services/assets/clear.services.ts b/src/services/assets/clear.services.ts index 64ea9873..c5ee9dd8 100644 --- a/src/services/assets/clear.services.ts +++ b/src/services/assets/clear.services.ts @@ -5,8 +5,8 @@ import {deleteAsset} from '@junobuild/core'; import {green, yellow} from 'kleur'; import ora from 'ora'; import {noJunoConfig} from '../../configs/juno.config'; +import {assertConfigAndLoadSatelliteContext} from '../../utils/juno.config.utils'; import {consoleNoConfigFound} from '../../utils/msg.utils'; -import {assertConfigAndLoadSatelliteContext} from '../../utils/satellite.utils'; export const clear = async (args?: string[]) => { if (await noJunoConfig()) { diff --git a/src/services/auth/login.emulator.services.ts b/src/services/auth/login.emulator.services.ts index d6d85820..deb0df7c 100644 --- a/src/services/auth/login.emulator.services.ts +++ b/src/services/auth/login.emulator.services.ts @@ -6,7 +6,7 @@ import {saveCliConfig} from '../../configs/cli.config'; import {readEmulatorConfig} from '../../configs/emulator.config'; import {ENV} from '../../env'; import {generateToken} from '../../utils/auth.utils'; -import {assertConfigAndReadSatelliteId} from '../../utils/satellite.utils'; +import {assertConfigAndReadSatelliteId} from '../../utils/juno.config.utils'; import {dispatchRequest} from '../emulator/admin.services'; export const loginEmulatorOnly = async () => { diff --git a/src/services/changes/changes.apply.services.ts b/src/services/changes/changes.apply.services.ts index c439df94..0beb9aa4 100644 --- a/src/services/changes/changes.apply.services.ts +++ b/src/services/changes/changes.apply.services.ts @@ -9,7 +9,7 @@ import {hasArgs} from '@junobuild/cli-tools'; import ora from 'ora'; import type {SatelliteParametersWithId} from '../../types/satellite'; import {readChangesIdAndHash} from '../../utils/changes.utils'; -import {assertConfigAndLoadSatelliteContext} from '../../utils/satellite.utils'; +import {assertConfigAndLoadSatelliteContext} from '../../utils/juno.config.utils'; export const applyChanges = async (args?: string[]) => { const {satellite} = await assertConfigAndLoadSatelliteContext(); diff --git a/src/services/changes/changes.clear.services.ts b/src/services/changes/changes.clear.services.ts index 2e89cb67..34b339d0 100644 --- a/src/services/changes/changes.clear.services.ts +++ b/src/services/changes/changes.clear.services.ts @@ -2,7 +2,7 @@ import {deleteProposalAssets} from '@junobuild/cdn'; import {hasArgs} from '@junobuild/cli-tools'; import {green} from 'kleur'; import ora from 'ora'; -import {assertConfigAndLoadSatelliteContext} from '../../utils/satellite.utils'; +import {assertConfigAndLoadSatelliteContext} from '../../utils/juno.config.utils'; export const clearProposalStagedAssets = async ({ args, diff --git a/src/services/changes/changes.list.services.ts b/src/services/changes/changes.list.services.ts index d1a55125..4aaa3b97 100644 --- a/src/services/changes/changes.list.services.ts +++ b/src/services/changes/changes.list.services.ts @@ -3,7 +3,7 @@ import {listProposals as listProposalsLib, type Proposal, type ProposalKey} from import {hasArgs} from '@junobuild/cli-tools'; import {type SatelliteParametersWithId} from '../../types/satellite'; import {formatDate} from '../../utils/format.utils'; -import {assertConfigAndLoadSatelliteContext} from '../../utils/satellite.utils'; +import {assertConfigAndLoadSatelliteContext} from '../../utils/juno.config.utils'; export const listChanges = async (args?: string[]) => { const {satellite} = await assertConfigAndLoadSatelliteContext(); diff --git a/src/services/changes/changes.reject.services.ts b/src/services/changes/changes.reject.services.ts index 35b6e75b..3d12edab 100644 --- a/src/services/changes/changes.reject.services.ts +++ b/src/services/changes/changes.reject.services.ts @@ -9,7 +9,7 @@ import {hasArgs} from '@junobuild/cli-tools'; import ora from 'ora'; import type {SatelliteParametersWithId} from '../../types/satellite'; import {readChangesIdAndHash} from '../../utils/changes.utils'; -import {assertConfigAndLoadSatelliteContext} from '../../utils/satellite.utils'; +import {assertConfigAndLoadSatelliteContext} from '../../utils/juno.config.utils'; export const rejectChanges = async (args?: string[]) => { const {satellite} = await assertConfigAndLoadSatelliteContext(); diff --git a/src/services/config/apply.services.ts b/src/services/config/apply.services.ts index 86512fff..f7e38acb 100644 --- a/src/services/config/apply.services.ts +++ b/src/services/config/apply.services.ts @@ -41,10 +41,10 @@ import { type SettingsHash } from '../../types/cli.state'; import type {SatelliteParametersWithId} from '../../types/satellite'; +import {assertConfigAndLoadSatelliteContext} from '../../utils/juno.config.utils'; import {objHash} from '../../utils/obj.utils'; import {isHeadless} from '../../utils/process.utils'; import {confirmAndExit} from '../../utils/prompt.utils'; -import {assertConfigAndLoadSatelliteContext} from '../../utils/satellite.utils'; import {getSettings, setSettings} from './settings.services'; type SetConfigResults = [ diff --git a/src/services/functions/publish.services.ts b/src/services/functions/publish.services.ts index ee5e2958..8c857022 100644 --- a/src/services/functions/publish.services.ts +++ b/src/services/functions/publish.services.ts @@ -15,7 +15,7 @@ import {CDN_RELEASES_FULL_PATH} from '../../constants/functions.constants'; import {ENV} from '../../env'; import type {UploadFileFnParamsWithProposal} from '../../types/deploy'; import type {SatelliteParametersWithId} from '../../types/satellite'; -import {assertConfigAndLoadSatelliteContext} from '../../utils/satellite.utils'; +import {assertConfigAndLoadSatelliteContext} from '../../utils/juno.config.utils'; import {readWasmFileMetadata} from '../../utils/wasm.utils'; import {assertSatelliteMemorySize} from '../assert.services'; import {clearProposalStagedAssets} from '../changes/changes.clear.services'; diff --git a/src/services/functions/upgrade/upgrade.services.ts b/src/services/functions/upgrade/upgrade.services.ts index 81226555..b240920b 100644 --- a/src/services/functions/upgrade/upgrade.services.ts +++ b/src/services/functions/upgrade/upgrade.services.ts @@ -1,7 +1,7 @@ import {hasArgs, nextArg} from '@junobuild/cli-tools'; import {SATELLITE_OUTPUT} from '../../../constants/dev.constants'; import {type SatelliteParametersWithId} from '../../../types/satellite'; -import {assertConfigAndLoadSatelliteContext} from '../../../utils/satellite.utils'; +import {assertConfigAndLoadSatelliteContext} from '../../../utils/juno.config.utils'; import {upgradeSatelliteWithSrc} from '../../modules/upgrade/upgrade.satellite.services'; import {upgradeWithCdn} from './upgrade.cdn.services'; diff --git a/src/services/links.services.ts b/src/services/links.services.ts index af318205..e0d269f6 100644 --- a/src/services/links.services.ts +++ b/src/services/links.services.ts @@ -1,9 +1,9 @@ import {listCustomDomains} from '@junobuild/admin'; import {yellow} from 'kleur'; import {consoleUrl, defaultSatelliteDomain} from '../utils/domain.utils'; +import {assertConfigAndLoadSatelliteContext} from '../utils/juno.config.utils'; import {terminalLink} from '../utils/links.utils'; import {isHeadless} from '../utils/process.utils'; -import {assertConfigAndLoadSatelliteContext} from '../utils/satellite.utils'; export const links = async () => { const {satellite} = await assertConfigAndLoadSatelliteContext(); diff --git a/src/services/modules/snapshot/snapshot.satellite.services.ts b/src/services/modules/snapshot/snapshot.satellite.services.ts index 6896ec46..3f292f19 100644 --- a/src/services/modules/snapshot/snapshot.satellite.services.ts +++ b/src/services/modules/snapshot/snapshot.satellite.services.ts @@ -1,8 +1,8 @@ import {assertNonNullish} from '@dfinity/utils'; import {noJunoConfig} from '../../../configs/juno.config'; import type {AssetKey} from '../../../types/asset-key'; +import {assertConfigAndLoadSatelliteContext} from '../../../utils/juno.config.utils'; import {consoleNoConfigFound} from '../../../utils/msg.utils'; -import {assertConfigAndLoadSatelliteContext} from '../../../utils/satellite.utils'; import { createSnapshot, deleteSnapshot, diff --git a/src/services/modules/start-stop.services.ts b/src/services/modules/start-stop.services.ts index 41feedf6..ed3350b8 100644 --- a/src/services/modules/start-stop.services.ts +++ b/src/services/modules/start-stop.services.ts @@ -6,7 +6,7 @@ import {canisterStart, canisterStop} from '../../api/ic.api'; import {getCliMissionControl, getCliOrbiters} from '../../configs/cli.config'; import type {AssetKey} from '../../types/asset-key'; import type {StartStopAction} from '../../types/start-stop'; -import {assertConfigAndLoadSatelliteContext} from '../../utils/satellite.utils'; +import {assertConfigAndLoadSatelliteContext} from '../../utils/juno.config.utils'; export const startStopMissionControl = async ({ action diff --git a/src/services/modules/upgrade/upgrade.satellite.services.ts b/src/services/modules/upgrade/upgrade.satellite.services.ts index df0e02e2..d9713b28 100644 --- a/src/services/modules/upgrade/upgrade.satellite.services.ts +++ b/src/services/modules/upgrade/upgrade.satellite.services.ts @@ -16,8 +16,8 @@ import { type UpgradeWasmParams } from '../../../types/upgrade'; import {satelliteKey} from '../../../utils/cli.config.utils'; +import {assertConfigAndLoadSatelliteContext} from '../../../utils/juno.config.utils'; import {NEW_CMD_LINE} from '../../../utils/prompt.utils'; -import {assertConfigAndLoadSatelliteContext} from '../../../utils/satellite.utils'; import {logUpgradeResult, readUpgradeOptions} from '../../../utils/upgrade.utils'; import {assertSatelliteBuildType} from './upgrade-assert.services'; import { diff --git a/src/services/run.services.ts b/src/services/run.services.ts index 6d5400a0..cdf1da38 100644 --- a/src/services/run.services.ts +++ b/src/services/run.services.ts @@ -4,7 +4,7 @@ import {buildScript, nextArg} from '@junobuild/cli-tools'; import {OnRunSchema, type RunFnOrObject, RunFnOrObjectSchema} from '@junobuild/config'; import {red, yellow} from 'kleur'; import {ENV} from '../env'; -import {assertConfigAndLoadSatelliteContext} from '../utils/satellite.utils'; +import {assertConfigAndLoadSatelliteContext} from '../utils/juno.config.utils'; export const run = async (args?: string[]) => { const infile = nextArg({args, option: '-s'}) ?? nextArg({args, option: '--src'}); diff --git a/src/services/version.services.ts b/src/services/version.services.ts index fc025377..45b7a4db 100644 --- a/src/services/version.services.ts +++ b/src/services/version.services.ts @@ -9,7 +9,7 @@ import {cyan, green, red, yellow} from 'kleur'; import ora from 'ora'; import {compare} from 'semver'; import type {SatelliteParametersWithId} from '../types/satellite'; -import {assertConfigAndLoadSatelliteContext} from '../utils/satellite.utils'; +import {assertConfigAndLoadSatelliteContext} from '../utils/juno.config.utils'; export const getSatelliteVersion = async (): Promise< {result: 'success'; version: string} | {result: 'error'} diff --git a/src/utils/satellite.utils.ts b/src/utils/juno.config.utils.ts similarity index 100% rename from src/utils/satellite.utils.ts rename to src/utils/juno.config.utils.ts