Skip to content

fix: derive IdC OIDC region from device registration, not profile ARN #126

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

Open
haxrob wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: derive IdC OIDC region from device registration, not profile ARN #126

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
7 changes: 5 additions & 2 deletions src/plugin/sync/kiro-cli.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Database from 'libsql'
import { existsSync } from 'node:fs'
import { extractRegionFromArn, normalizeRegion } from '../../constants'
import { extractRegionFromArn, isValidRegion, normalizeRegion } from '../../constants'
import { createDeterministicAccountId } from '../accounts'
import * as logger from '../logger'
import { kiroDb } from '../storage/sqlite'
Expand Down Expand Up @@ -57,7 +57,10 @@ export async function syncFromKiroCli() {
// serviceRegion wins over data.region: kiro-cli stores data.region as the
// OIDC region (often us-east-1) regardless of where the account actually lives.
const serviceRegion = extractRegionFromArn(profileArn) || normalizeRegion(data.region)
const oidcRegion = serviceRegion
const oidcRegion =
(isIdc && typeof deviceReg?.region === 'string' && isValidRegion(deviceReg.region)
? deviceReg.region
: undefined) || serviceRegion
const startUrl: string | undefined =
typeof data.start_url === 'string'
? data.start_url
Expand Down