Skip to content
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
9311322
Atx riv final (#2520)
Rajanna-Karthik Nov 22, 2025
fd301ce
fix: adding atxcredentials details
Nov 22, 2025
90f1003
fix: updating plan for completed status
Nov 23, 2025
767206f
fix: separating aws atx and q credentials storage
Nov 23, 2025
3537b6b
Merge branch 'karsraja-atx-final' of https://github.com/aws/language-…
gzmiao8 Nov 23, 2025
14fc0fc
fix: changed customer_output to customer_input
gzmiao8 Nov 23, 2025
d06b72a
fix: added new atx-fes-client models to allow CUSTOMER_INPUT types
gzmiao8 Nov 23, 2025
1a28cce
fix: multiple accounts token auth
Nov 23, 2025
c4c55b9
fix: auto-sync transform profiles using TransformConfigurationServer …
Rajanna-Karthik Nov 23, 2025
2406963
fix: set default fallback transform request from net 8 to net 10
gzmiao8 Nov 24, 2025
e79b4d8
fix: changed back q flow to net 8, added target framework to create j…
gzmiao8 Nov 24, 2025
a640848
Merge branch 'main' into karsraja-atx-final
gzmiao8 Nov 24, 2025
d5ca017
Merge branch 'main' into karsraja-atx-final
XiaoxuanLu Nov 24, 2025
23f19b6
fix: updates aws-server-runtimes to 0.3.8 and added Syd endpoint to c…
gzmiao8 Nov 24, 2025
ea4aa27
Merge branch 'karsraja-atx-final' of https://github.com/aws/language-…
gzmiao8 Nov 24, 2025
0ea885f
fix: maintaining backwards compatibility
Nov 24, 2025
6c18d5c
fix: fixing failing test
Nov 25, 2025
6fdc795
fix: fixing tests
Nov 25, 2025
2d39e9f
fix: get endpoints by stage
cslong Nov 24, 2025
fcf1f78
fix: regex for appUrl not handling gamma stage and return default region
cslong Nov 25, 2025
1e7b76f
fix: fix for initInstance and moved init of atx servers to be after b…
gzmiao8 Nov 25, 2025
c45dd1d
fix: fixing tests
Nov 25, 2025
60dec8d
fix: fixing tests
Nov 25, 2025
4488909
fix: fixing tests
Nov 25, 2025
7c21e0a
chore: bumping lsp version to 0.3.8
Nov 25, 2025
0300cb8
chore: revert naming from Q back to codewhisperer
Nov 25, 2025
4892fa5
chore: deleting stale function
Nov 25, 2025
5b5c31a
chore: updating folder
Nov 25, 2025
4758c21
fix: changed transformserver to log caught errors instead of throwing
gzmiao8 Nov 25, 2025
6353ef2
chore: reverting changes and adding todo
Nov 25, 2025
4054ee5
fix: tests with changes
Nov 25, 2025
ddc6b79
fix: tests with changes
Nov 25, 2025
e1fcaa8
chore: removing debug logs
Nov 25, 2025
483b4b7
Merge branch 'main' into karsraja-atx-final
pranav-firake Nov 25, 2025
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
2 changes: 1 addition & 1 deletion app/aws-lsp-antlr4-runtimes/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"webpack": "webpack"
},
"dependencies": {
"@aws/language-server-runtimes": "0.3.6",
"@aws/language-server-runtimes": "0.3.7",
"@aws/lsp-antlr4": "*",
"antlr4-c3": "^3.4.2",
"antlr4ng": "^3.0.14"
Expand Down
2 changes: 1 addition & 1 deletion app/aws-lsp-buildspec-runtimes/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"compile": "tsc --build"
},
"dependencies": {
"@aws/language-server-runtimes": "0.3.6",
"@aws/language-server-runtimes": "0.3.7",
"@aws/lsp-buildspec": "^0.0.1"
}
}
2 changes: 1 addition & 1 deletion app/aws-lsp-cloudformation-runtimes/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"compile": "tsc --build"
},
"dependencies": {
"@aws/language-server-runtimes": "0.3.6",
"@aws/language-server-runtimes": "0.3.7",
"@aws/lsp-cloudformation": "^0.0.1"
}
}
2 changes: 1 addition & 1 deletion app/aws-lsp-codewhisperer-runtimes/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"local-build": "node scripts/local-build.js"
},
"dependencies": {
"@aws/language-server-runtimes": "0.3.6",
"@aws/language-server-runtimes": "0.3.7",
"@aws/lsp-codewhisperer": "*",
"copyfiles": "^2.4.1",
"cross-env": "^7.0.3",
Expand Down
4 changes: 4 additions & 0 deletions app/aws-lsp-codewhisperer-runtimes/src/agent-standalone.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import {
CodeWhispererServer,
QAgenticChatServerProxy,
QConfigurationServerTokenProxy,
TransformConfigurationServerTokenProxy,
AtxNetTransformServerTokenProxy,
QLocalProjectContextServerProxy,
QNetTransformServerTokenProxy,
WorkspaceContextServerTokenProxy,
Expand All @@ -28,6 +30,8 @@ const props = {
CodeWhispererServer,
CodeWhispererSecurityScanServerTokenProxy,
QConfigurationServerTokenProxy,
TransformConfigurationServerTokenProxy,
AtxNetTransformServerTokenProxy,
QNetTransformServerTokenProxy,
QAgenticChatServerProxy,
IdentityServer.create,
Expand Down
2 changes: 1 addition & 1 deletion app/aws-lsp-codewhisperer-runtimes/src/iam-standalone.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ import { standalone } from '@aws/language-server-runtimes/runtimes'
import { CodeWhispererServerIAM, QChatServerIAMProxy } from '@aws/lsp-codewhisperer'
import { createIAMRuntimeProps } from './standalone-common'

const props = createIAMRuntimeProps('0.1.0', [CodeWhispererServerIAM, QChatServerIAMProxy])
const props = createIAMRuntimeProps('0.1.0', [CodeWhispererServerIAM as any, QChatServerIAMProxy as any])

standalone(props)
2 changes: 1 addition & 1 deletion app/aws-lsp-codewhisperer-runtimes/src/iam-webworker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { AmazonQServiceServerIAM } from '@aws/lsp-codewhisperer/out/shared/amazo
// to inject the AmazonQServiceServer does not work for webworker as it triggers missing polyfill errors
const props: RuntimeProps = {
version: '1.0.0',
servers: [AmazonQServiceServerIAM, CodeWhispererServerIAM, QChatServerIAM],
servers: [AmazonQServiceServerIAM as any, CodeWhispererServerIAM as any, QChatServerIAM as any],
name: 'AWS CodeWhisperer',
}

Expand Down
6 changes: 3 additions & 3 deletions app/aws-lsp-codewhisperer-runtimes/src/standalone-common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ const createRuntimePropsFactory =
(version: string, servers: Server[], name = 'AWS CodeWhisperer'): RuntimeProps => {
return {
version,
servers: [AmazonQServiceServer, ...servers],
servers: [AmazonQServiceServer as any, ...servers],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why change this to as any

name,
}
}

export const createIAMRuntimeProps = createRuntimePropsFactory(AmazonQServiceServerIAM)
export const createTokenRuntimeProps = createRuntimePropsFactory(AmazonQServiceServerToken)
export const createIAMRuntimeProps = createRuntimePropsFactory(AmazonQServiceServerIAM as any)
export const createTokenRuntimeProps = createRuntimePropsFactory(AmazonQServiceServerToken as any)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why are there all these casts to any?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reverted this change.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we still have these casts in 4 files

4 changes: 4 additions & 0 deletions app/aws-lsp-codewhisperer-runtimes/src/token-standalone.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import {
CodeWhispererServerTokenProxy,
QChatServerTokenProxy,
QConfigurationServerTokenProxy,
TransformConfigurationServerTokenProxy,
AtxNetTransformServerTokenProxy,
QNetTransformServerTokenProxy,
QLocalProjectContextServerProxy,
WorkspaceContextServerTokenProxy,
Expand All @@ -20,6 +22,8 @@ const props = createTokenRuntimeProps(VERSION, [
CodeWhispererServerTokenProxy,
CodeWhispererSecurityScanServerTokenProxy,
QConfigurationServerTokenProxy,
TransformConfigurationServerTokenProxy,
AtxNetTransformServerTokenProxy as any,
QNetTransformServerTokenProxy,
QChatServerTokenProxy,
IdentityServer.create,
Expand Down
2 changes: 1 addition & 1 deletion app/aws-lsp-identity-runtimes/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"compile": "tsc --build"
},
"dependencies": {
"@aws/language-server-runtimes": "0.3.6",
"@aws/language-server-runtimes": "0.3.7",
"@aws/lsp-identity": "^0.0.1"
}
}
2 changes: 1 addition & 1 deletion app/aws-lsp-json-runtimes/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"webpack": "webpack"
},
"dependencies": {
"@aws/language-server-runtimes": "0.3.6",
"@aws/language-server-runtimes": "0.3.7",
"@aws/lsp-json": "*"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion app/aws-lsp-notification-runtimes/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"compile": "tsc --build"
},
"dependencies": {
"@aws/language-server-runtimes": "0.3.6",
"@aws/language-server-runtimes": "0.3.7",
"@aws/lsp-notification": "^0.0.1"
}
}
2 changes: 1 addition & 1 deletion app/aws-lsp-partiql-runtimes/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"package": "npm run compile && npm run compile:webpack"
},
"dependencies": {
"@aws/language-server-runtimes": "0.3.6",
"@aws/language-server-runtimes": "0.3.7",
"@aws/lsp-partiql": "0.0.19"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion app/aws-lsp-s3-runtimes/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"compile": "tsc --build"
},
"dependencies": {
"@aws/language-server-runtimes": "0.3.6",
"@aws/language-server-runtimes": "0.3.7",
"@aws/lsp-s3": "^0.0.1"
}
}
2 changes: 1 addition & 1 deletion app/aws-lsp-yaml-json-webworker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"serve:webpack": "NODE_ENV=development webpack serve"
},
"dependencies": {
"@aws/language-server-runtimes": "0.3.6",
"@aws/language-server-runtimes": "0.3.7",
"@aws/lsp-json": "*",
"@aws/lsp-yaml": "*"
},
Expand Down
2 changes: 1 addition & 1 deletion app/aws-lsp-yaml-runtimes/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"webpack": "webpack"
},
"dependencies": {
"@aws/language-server-runtimes": "0.3.6",
"@aws/language-server-runtimes": "0.3.7",
"@aws/lsp-yaml": "*"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion app/hello-world-lsp-runtimes/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"dependencies": {
"@aws/hello-world-lsp": "^0.0.1",
"@aws/language-server-runtimes": "0.3.6"
"@aws/language-server-runtimes": "0.3.7"
},
"devDependencies": {
"@types/chai": "^4.3.5",
Expand Down
2 changes: 1 addition & 1 deletion chat-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
},
"dependencies": {
"@aws/chat-client-ui-types": "0.1.68",
"@aws/language-server-runtimes": "0.3.6",
"@aws/language-server-runtimes": "0.3.7",
"@aws/language-server-runtimes-types": "0.1.62",
"@aws/mynah-ui": "^4.38.0"
},
Expand Down
2 changes: 1 addition & 1 deletion client/vscode/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@
"@aws-sdk/credential-providers": "^3.731.1",
"@aws-sdk/types": "^3.734.0",
"@aws/chat-client-ui-types": "0.1.68",
"@aws/language-server-runtimes": "0.3.6",
"@aws/language-server-runtimes": "0.3.7",
"@types/uuid": "^9.0.8",
"@types/vscode": "^1.98.0",
"jose": "^5.2.4",
Expand Down
Binary file not shown.
2 changes: 1 addition & 1 deletion core/aws-lsp-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"prepack": "shx cp ../../LICENSE ../../NOTICE ../../SECURITY.md ."
},
"dependencies": {
"@aws/language-server-runtimes": "0.3.6",
"@aws/language-server-runtimes": "0.3.7",
"@gerhobbelt/gitignore-parser": "^0.2.0-9",
"cross-spawn": "7.0.6",
"jose": "^5.2.4",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ describe('IdeCredentialsProvider', function () {
warn: sinon.stub(),
error: sinon.stub(),
},
onRequest: sinon.stub(),
} as any
provider = new IdeCredentialsProvider(mockConnection as any)
})
Expand All @@ -45,4 +46,46 @@ describe('IdeCredentialsProvider', function () {
)
})
})

describe('initialize', function () {
it('registers credential push handlers when IAM credentials are provided', function () {
const props = {
credentials: {
providesIam: true,
},
}

provider.initialize(props)

assert(mockConnection.onRequest.called)
})

it('does not register handlers when no credentials config provided', function () {
const props = {}

provider.initialize(props)

assert(!mockConnection.onRequest.called)
})
})

describe('hasCredentials', function () {
it('returns false when no credentials are set', function () {
// IdeCredentialsProvider doesn't expose hasCredentials directly
// Test through resolveIamCredentials instead
assert.strictEqual(provider['pushedCredentials'], undefined)
assert.strictEqual(provider['pushedToken'], undefined)
})
})

describe('getCredentials', function () {
it('throws NoCredentialsError when no credentials available', async function () {
try {
await provider.resolveIamCredentials({} as any)
throw new Error('Expected error was not thrown')
} catch (error) {
assert.strictEqual((error as Error).constructor.name, 'NoCredentialsError')
}
})
})
})
25 changes: 25 additions & 0 deletions core/aws-lsp-core/src/credentials/ideCredentialsProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ export class IdeCredentialsProvider implements CredentialsProvider {
private pushedCredentials: IamCredentials | undefined
private pushedToken: BearerToken | undefined

private pushedAtxCredentials: IamCredentials | undefined
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
private pushedAtxCredentials: IamCredentials | undefined

private pushedAtxToken: BearerToken | undefined

constructor(
private readonly connection: Connection,
key?: string,
Expand Down Expand Up @@ -165,6 +168,28 @@ export class IdeCredentialsProvider implements CredentialsProvider {
return this.pushedToken
}

/**
* Provides IAM based Atx credentials. Throws NoCredentialsError if no credentials are available
*/
public async resolveIamAtxCredentials(token: CancellationToken): Promise<IamCredentials> {
if (!this.pushedAtxCredentials) {
throw new NoCredentialsError()
}

return this.pushedAtxCredentials
}

/**
* Provides a atx bearer token. Throws NoCredentialsError if bearer token is not available
*/
public async resolveAtxBearerToken(token: CancellationToken): Promise<BearerToken> {
if (!this.pushedAtxToken) {
throw new NoCredentialsError()
}

return this.pushedAtxToken
}

private async decodeCredentialsRequestToken<T>(request: UpdateCredentialsRequest): Promise<T> {
if (!this.key) {
throw new Error('no encryption key')
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/q-agentic-chat-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"test-integ": "npm run compile && mocha --timeout 30000 \"./out/**/*.test.js\" --retries 2"
},
"dependencies": {
"@aws/language-server-runtimes": "0.3.6",
"@aws/language-server-runtimes": "0.3.7",
"@aws/lsp-core": "*"
},
"devDependencies": {
Expand Down
Loading
Loading