Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
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
41 changes: 36 additions & 5 deletions runtimes/protocol/identity-management.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,35 @@ export const AwsErrorCodes = {
E_SSO_TOKEN_EXPIRED: 'E_SSO_TOKEN_EXPIRED',
E_STS_CREDENTIAL_EXPIRED: 'E_STS_CREDENTIAL_EXPIRED',
E_SSO_TOKEN_SOURCE_NOT_SUPPORTED: 'E_SSO_TOKEN_SOURCE_NOT_SUPPORTED',
E_CALLER_IDENTITY_NOT_FOUND: 'E_CALLER_IDENTITY_NOT_FOUND',
E_MFA_REQUIRED: 'E_MFA_REQUIRED',
E_PERMISSION_DENIED: 'E_PERMISSION_DENIED',
E_TIMEOUT: 'E_TIMEOUT',
E_UNKNOWN: 'E_UNKNOWN',
E_CANCELLED: 'E_CANCELLED',
} as const

// Permissions
export const PermissionSets = {
Q: [
'q:StartConversation',
'q:SendMessage',
'q:GetConversation',
'q:ListConversations',
'q:UpdateConversation',
'q:DeleteConversation',
'q:PassRequest',
'q:StartTroubleshootingAnalysis',
'q:StartTroubleshootingResolutionExplanation',
'q:GetTroubleshootingResults',
'q:UpdateTroubleshootingCommandResult',
'q:GetIdentityMetaData',
'q:GenerateCodeFromCommands',
'q:UsePlugin',
'codewhisperer:GenerateRecommendations',
],
}

export interface AwsResponseErrorData {
awsErrorCode: string
}
Expand Down Expand Up @@ -253,22 +276,29 @@ export type IamCredentialId = string // Opaque identifier

export interface GetIamCredentialOptions {
callStsOnInvalidIamCredential?: boolean
validatePermissions?: boolean
permissionSet?: string[]
credentialOverride?: IamCredentials
}

export const getIamCredentialOptionsDefaults = {
callStsOnInvalidIamCredential: true,
validatePermissions: true,
permissionSet: PermissionSets.Q,
credentialOverride: undefined,
} satisfies GetIamCredentialOptions

export interface GetIamCredentialParams {
profileName: string
options?: GetIamCredentialOptions
}

export interface GetIamCredentialResult {
export interface IamCredential {
id: IamCredentialId
kinds: ProfileKind[]
credentials: IamCredentials
}

export interface GetIamCredentialResult {
credential: IamCredential
updateCredentialsParams: UpdateCredentialsParams
}

Expand All @@ -282,12 +312,13 @@ export const getIamCredentialRequestType = new ProtocolRequestType<

// getMfaCode
export interface GetMfaCodeParams {
mfaSerial: string
profileName: string
mfaSerial?: string
}

export interface GetMfaCodeResult {
code: string
mfaSerial: string
}

export const getMfaCodeRequestType = new ProtocolRequestType<
Expand Down Expand Up @@ -318,7 +349,7 @@ export const invalidateSsoTokenRequestType = new ProtocolRequestType<

// invalidateStsCredential
export interface InvalidateStsCredentialParams {
profileName: string
iamCredentialId: IamCredentialId
}

export interface InvalidateStsCredentialResult {
Expand Down
10 changes: 5 additions & 5 deletions runtimes/runtimes/auth/standalone/encryption.ts
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,11 @@ export async function encryptIamResultWithKey(
request: GetIamCredentialResult,
key: string
): Promise<GetIamCredentialResult> {
request.credentials = {
accessKeyId: await encryptObjectWithKey(request.credentials.accessKeyId, key),
secretAccessKey: await encryptObjectWithKey(request.credentials.secretAccessKey, key),
...(request.credentials.sessionToken
? { sessionToken: await encryptObjectWithKey(request.credentials.sessionToken, key) }
request.credential.credentials = {
accessKeyId: await encryptObjectWithKey(request.credential.credentials.accessKeyId, key),
secretAccessKey: await encryptObjectWithKey(request.credential.credentials.secretAccessKey, key),
...(request.credential.credentials.sessionToken
? { sessionToken: await encryptObjectWithKey(request.credential.credentials.sessionToken, key) }
: {}),
}
if (!request.updateCredentialsParams.encrypted) {
Expand Down