Skip to content

feat: support ids for juno orbiter config #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
peterpeterparker merged 1 commit into from
Apr 24, 2025
Merged

feat: support ids for juno orbiter config #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions plugins/plugin-tools/src/config.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,21 @@ describe('config', () => {
});

describe('no container', () => {
it('returns orbiter ID from orbiter.ids[mode] if set', async () => {
vi.spyOn(configLoader, 'junoConfigExist').mockResolvedValue(true);

vi.spyOn(configLoader, 'readJunoConfig').mockResolvedValue({
orbiter: {
ids: {
production: 'orb-prod-id'
}
}
} as unknown as JunoConfig);

const id = await orbiterId({params: {container: false}, mode: 'production'});
expect(id).toBe('orb-prod-id');
});

it('reads config and returns orbiter ID', async () => {
vi.spyOn(configLoader, 'junoConfigExist').mockResolvedValue(true);

Expand Down
6 changes: 3 additions & 3 deletions plugins/plugin-tools/src/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,12 +113,12 @@ const containerOrbiterId = async ({mode}: ConfigArgs): Promise<string | undefine
return ids?.[MODE_DEVELOPMENT];
};

const junoConfigOrbiterId = async (args: ConfigArgs): Promise<string | undefined> => {
const junoConfigOrbiterId = async ({mode}: ConfigArgs): Promise<string | undefined> => {
await assertJunoConfig();

const config = await readJunoConfig(args);
const config = await readJunoConfig({mode});

return config?.orbiter?.id ?? config?.orbiter?.orbiterId;
return config?.orbiter?.ids?.[mode] ?? config?.orbiter?.id ?? config?.orbiter?.orbiterId;
};

export const icpIds = (): IcpIds | undefined => ({
Expand Down