@aws/lsp-codewhisperer 0.0.28 → 0.0.30
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +40 -0
- package/README.md +3 -0
- package/out/client/token/codewhisperer.d.ts +1 -1
- package/out/constants.d.ts +3 -0
- package/out/constants.js +4 -1
- package/out/constants.js.map +1 -1
- package/out/index.d.ts +1 -0
- package/out/index.js +2 -0
- package/out/index.js.map +1 -1
- package/out/language-server/agenticChat/agenticChatController.d.ts +37 -0
- package/out/language-server/agenticChat/agenticChatController.js +361 -0
- package/out/language-server/agenticChat/agenticChatController.js.map +1 -0
- package/out/language-server/agenticChat/qAgenticChatServer.d.ts +6 -0
- package/out/language-server/agenticChat/qAgenticChatServer.js +92 -0
- package/out/language-server/agenticChat/qAgenticChatServer.js.map +1 -0
- package/out/language-server/amazonQServiceManager/AmazonQTokenServiceManager.d.ts +90 -0
- package/out/language-server/amazonQServiceManager/AmazonQTokenServiceManager.js +466 -0
- package/out/language-server/amazonQServiceManager/AmazonQTokenServiceManager.js.map +1 -0
- package/out/language-server/amazonQServiceManager/BaseAmazonQServiceManager.d.ts +5 -0
- package/out/language-server/amazonQServiceManager/BaseAmazonQServiceManager.js +3 -0
- package/out/language-server/amazonQServiceManager/BaseAmazonQServiceManager.js.map +1 -0
- package/out/language-server/amazonQServiceManager/errors.d.ts +28 -0
- package/out/language-server/amazonQServiceManager/errors.js +70 -0
- package/out/language-server/amazonQServiceManager/errors.js.map +1 -0
- package/out/language-server/amazonQServiceManager/qDeveloperProfiles.js +7 -7
- package/out/language-server/amazonQServiceManager/qDeveloperProfiles.js.map +1 -1
- package/out/language-server/chat/agents/docGeneration/constants.d.ts +59 -0
- package/out/language-server/chat/agents/docGeneration/constants.js +147 -0
- package/out/language-server/chat/agents/docGeneration/constants.js.map +1 -0
- package/out/language-server/chat/agents/docGeneration/errors.d.ts +29 -0
- package/out/language-server/chat/agents/docGeneration/errors.js +67 -0
- package/out/language-server/chat/agents/docGeneration/errors.js.map +1 -0
- package/out/language-server/chat/agents/shared/i18n.d.ts +1 -0
- package/out/language-server/chat/agents/shared/i18n.js +7 -0
- package/out/language-server/chat/agents/shared/i18n.js.map +1 -0
- package/out/language-server/chat/agents/shared/types.d.ts +55 -0
- package/out/language-server/chat/agents/shared/types.js +46 -0
- package/out/language-server/chat/agents/shared/types.js.map +1 -0
- package/out/language-server/chat/chatController.d.ts +1 -1
- package/out/language-server/chat/chatController.js +17 -1
- package/out/language-server/chat/chatController.js.map +1 -1
- package/out/language-server/chat/chatSessionManagementService.d.ts +3 -8
- package/out/language-server/chat/chatSessionManagementService.js +5 -57
- package/out/language-server/chat/chatSessionManagementService.js.map +1 -1
- package/out/language-server/chat/chatSessionService.d.ts +2 -3
- package/out/language-server/chat/chatSessionService.js +7 -21
- package/out/language-server/chat/chatSessionService.js.map +1 -1
- package/out/language-server/chat/contexts/documentContext.d.ts +2 -0
- package/out/language-server/chat/contexts/documentContext.js +14 -1
- package/out/language-server/chat/contexts/documentContext.js.map +1 -1
- package/out/language-server/chat/contexts/triggerContext.d.ts +1 -1
- package/out/language-server/chat/contexts/triggerContext.js +3 -2
- package/out/language-server/chat/contexts/triggerContext.js.map +1 -1
- package/out/language-server/chat/telemetry/chatTelemetryController.js +88 -81
- package/out/language-server/chat/telemetry/chatTelemetryController.js.map +1 -1
- package/out/language-server/codeWhispererSecurityScanServer.d.ts +2 -4
- package/out/language-server/codeWhispererSecurityScanServer.js +24 -11
- package/out/language-server/codeWhispererSecurityScanServer.js.map +1 -1
- package/out/language-server/codeWhispererServer.d.ts +1 -1
- package/out/language-server/codeWhispererServer.js +92 -38
- package/out/language-server/codeWhispererServer.js.map +1 -1
- package/out/language-server/codeWhispererService.d.ts +8 -1
- package/out/language-server/codeWhispererService.js +39 -16
- package/out/language-server/codeWhispererService.js.map +1 -1
- package/out/language-server/configuration/qConfigurationServer.d.ts +5 -9
- package/out/language-server/configuration/qConfigurationServer.js +23 -35
- package/out/language-server/configuration/qConfigurationServer.js.map +1 -1
- package/out/language-server/netTransformServer.js +2 -2
- package/out/language-server/netTransformServer.js.map +1 -1
- package/out/language-server/proxy-server.d.ts +1 -0
- package/out/language-server/proxy-server.js +8 -17
- package/out/language-server/proxy-server.js.map +1 -1
- package/out/language-server/qChatServer.d.ts +2 -4
- package/out/language-server/qChatServer.js +30 -16
- package/out/language-server/qChatServer.js.map +1 -1
- package/out/language-server/securityScan/constants.d.ts +3 -0
- package/out/language-server/securityScan/constants.js +7 -0
- package/out/language-server/securityScan/constants.js.map +1 -0
- package/out/language-server/securityScan/securityScanHandler.d.ts +5 -5
- package/out/language-server/securityScan/securityScanHandler.js +22 -12
- package/out/language-server/securityScan/securityScanHandler.js.map +1 -1
- package/out/language-server/telemetry/codeDiffTracker.d.ts +1 -1
- package/out/language-server/telemetry/codeDiffTracker.js +1 -1
- package/out/language-server/telemetry/codeDiffTracker.js.map +1 -1
- package/out/language-server/telemetryService.d.ts +7 -5
- package/out/language-server/telemetryService.js +29 -20
- package/out/language-server/telemetryService.js.map +1 -1
- package/out/language-server/testUtils.d.ts +3 -0
- package/out/language-server/testUtils.js +12 -1
- package/out/language-server/testUtils.js.map +1 -1
- package/out/language-server/utils.d.ts +2 -0
- package/out/language-server/utils.js +11 -0
- package/out/language-server/utils.js.map +1 -1
- package/package.json +3 -3
|
@@ -12,7 +12,21 @@ class CodeWhispererServiceBase {
|
|
|
12
12
|
codeWhispererEndpoint;
|
|
13
13
|
shareCodeWhispererContentWithAWS = false;
|
|
14
14
|
customizationArn;
|
|
15
|
-
|
|
15
|
+
profileArn;
|
|
16
|
+
inflightRequests = new Set();
|
|
17
|
+
abortInflightRequests() {
|
|
18
|
+
this.inflightRequests.forEach(request => {
|
|
19
|
+
request.abort();
|
|
20
|
+
});
|
|
21
|
+
this.inflightRequests.clear();
|
|
22
|
+
}
|
|
23
|
+
trackRequest(request) {
|
|
24
|
+
this.inflightRequests.add(request);
|
|
25
|
+
}
|
|
26
|
+
completeRequest(request) {
|
|
27
|
+
this.inflightRequests.delete(request);
|
|
28
|
+
}
|
|
29
|
+
constructor(codeWhispererRegion, codeWhispererEndpoint) {
|
|
16
30
|
this.codeWhispererRegion = codeWhispererRegion;
|
|
17
31
|
this.codeWhispererEndpoint = codeWhispererEndpoint;
|
|
18
32
|
}
|
|
@@ -28,7 +42,7 @@ exports.CodeWhispererServiceBase = CodeWhispererServiceBase;
|
|
|
28
42
|
class CodeWhispererServiceIAM extends CodeWhispererServiceBase {
|
|
29
43
|
client;
|
|
30
44
|
constructor(credentialsProvider, workspace, codeWhispererRegion, codeWhispererEndpoint, sdkInitializator) {
|
|
31
|
-
super(
|
|
45
|
+
super(codeWhispererRegion, codeWhispererEndpoint);
|
|
32
46
|
const options = {
|
|
33
47
|
region: this.codeWhispererRegion,
|
|
34
48
|
endpoint: this.codeWhispererEndpoint,
|
|
@@ -73,12 +87,13 @@ exports.CodeWhispererServiceIAM = CodeWhispererServiceIAM;
|
|
|
73
87
|
class CodeWhispererServiceToken extends CodeWhispererServiceBase {
|
|
74
88
|
client;
|
|
75
89
|
constructor(credentialsProvider, workspace, codeWhispererRegion, codeWhispererEndpoint, sdkInitializator) {
|
|
76
|
-
super(
|
|
90
|
+
super(codeWhispererRegion, codeWhispererEndpoint);
|
|
77
91
|
const options = {
|
|
78
92
|
region: this.codeWhispererRegion,
|
|
79
93
|
endpoint: this.codeWhispererEndpoint,
|
|
80
94
|
onRequestSetup: [
|
|
81
95
|
req => {
|
|
96
|
+
this.trackRequest(req);
|
|
82
97
|
req.on('build', ({ httpRequest }) => {
|
|
83
98
|
const creds = credentialsProvider.getCredentials('bearer');
|
|
84
99
|
if (!creds?.token) {
|
|
@@ -87,6 +102,9 @@ class CodeWhispererServiceToken extends CodeWhispererServiceBase {
|
|
|
87
102
|
httpRequest.headers['Authorization'] = `Bearer ${creds.token}`;
|
|
88
103
|
httpRequest.headers['x-amzn-codewhisperer-optout'] = `${!this.shareCodeWhispererContentWithAWS}`;
|
|
89
104
|
});
|
|
105
|
+
req.on('complete', () => {
|
|
106
|
+
this.completeRequest(req);
|
|
107
|
+
});
|
|
90
108
|
},
|
|
91
109
|
],
|
|
92
110
|
};
|
|
@@ -95,12 +113,17 @@ class CodeWhispererServiceToken extends CodeWhispererServiceBase {
|
|
|
95
113
|
getCredentialsType() {
|
|
96
114
|
return 'bearer';
|
|
97
115
|
}
|
|
116
|
+
withProfileArn(request) {
|
|
117
|
+
if (!this.profileArn)
|
|
118
|
+
return request;
|
|
119
|
+
return { ...request, profileArn: this.profileArn };
|
|
120
|
+
}
|
|
98
121
|
async generateSuggestions(request) {
|
|
99
122
|
// add cancellation check
|
|
100
123
|
// add error check
|
|
101
124
|
if (this.customizationArn)
|
|
102
|
-
request =
|
|
103
|
-
const response = await this.client.generateCompletions(request).promise();
|
|
125
|
+
request.customizationArn = this.customizationArn;
|
|
126
|
+
const response = await this.client.generateCompletions(this.withProfileArn(request)).promise();
|
|
104
127
|
const responseContext = {
|
|
105
128
|
requestId: response?.$response?.requestId,
|
|
106
129
|
codewhispererSessionId: response?.$response?.httpResponse?.headers['x-amzn-sessionid'],
|
|
@@ -115,7 +138,7 @@ class CodeWhispererServiceToken extends CodeWhispererServiceBase {
|
|
|
115
138
|
};
|
|
116
139
|
}
|
|
117
140
|
async codeModernizerCreateUploadUrl(request) {
|
|
118
|
-
return this.client.createUploadUrl(request).promise();
|
|
141
|
+
return this.client.createUploadUrl(this.withProfileArn(request)).promise();
|
|
119
142
|
}
|
|
120
143
|
/**
|
|
121
144
|
* @description Use this function to start the transformation job.
|
|
@@ -123,7 +146,7 @@ class CodeWhispererServiceToken extends CodeWhispererServiceBase {
|
|
|
123
146
|
* @returns transformationJobId - String id for the Job
|
|
124
147
|
*/
|
|
125
148
|
async codeModernizerStartCodeTransformation(request) {
|
|
126
|
-
return await this.client.startTransformation(request).promise();
|
|
149
|
+
return await this.client.startTransformation(this.withProfileArn(request)).promise();
|
|
127
150
|
}
|
|
128
151
|
/**
|
|
129
152
|
* @description Use this function to stop the transformation job.
|
|
@@ -131,7 +154,7 @@ class CodeWhispererServiceToken extends CodeWhispererServiceBase {
|
|
|
131
154
|
* @returns transformationJobId - String id for the Job
|
|
132
155
|
*/
|
|
133
156
|
async codeModernizerStopCodeTransformation(request) {
|
|
134
|
-
return await this.client.stopTransformation(request).promise();
|
|
157
|
+
return await this.client.stopTransformation(this.withProfileArn(request)).promise();
|
|
135
158
|
}
|
|
136
159
|
/**
|
|
137
160
|
* @description Use this function to get the status of the code transformation. We should
|
|
@@ -139,7 +162,7 @@ class CodeWhispererServiceToken extends CodeWhispererServiceBase {
|
|
|
139
162
|
* returns COMPLETED we know the transformation is done.
|
|
140
163
|
*/
|
|
141
164
|
async codeModernizerGetCodeTransformation(request) {
|
|
142
|
-
return await this.client.getTransformation(request).promise();
|
|
165
|
+
return await this.client.getTransformation(this.withProfileArn(request)).promise();
|
|
143
166
|
}
|
|
144
167
|
/**
|
|
145
168
|
* @description After starting a transformation use this function to display the LLM
|
|
@@ -147,37 +170,37 @@ class CodeWhispererServiceToken extends CodeWhispererServiceBase {
|
|
|
147
170
|
* @params tranformationJobId - String id returned from StartCodeTransformationResponse
|
|
148
171
|
*/
|
|
149
172
|
async codeModernizerGetCodeTransformationPlan(request) {
|
|
150
|
-
return this.client.getTransformationPlan(request).promise();
|
|
173
|
+
return this.client.getTransformationPlan(this.withProfileArn(request)).promise();
|
|
151
174
|
}
|
|
152
175
|
/**
|
|
153
176
|
* @description get a pre-signed url to upload source code into S3 bucket
|
|
154
177
|
*/
|
|
155
178
|
async createUploadUrl(request) {
|
|
156
|
-
return this.client.createUploadUrl(request).promise();
|
|
179
|
+
return this.client.createUploadUrl(this.withProfileArn(request)).promise();
|
|
157
180
|
}
|
|
158
181
|
/**
|
|
159
182
|
* @description Once source code uploaded to S3, send a request to run security scan on uploaded source code.
|
|
160
183
|
*/
|
|
161
184
|
async startCodeAnalysis(request) {
|
|
162
|
-
return this.client.startCodeAnalysis(request).promise();
|
|
185
|
+
return this.client.startCodeAnalysis(this.withProfileArn(request)).promise();
|
|
163
186
|
}
|
|
164
187
|
/**
|
|
165
188
|
* @description Send a request to get the code scan status detail.
|
|
166
189
|
*/
|
|
167
190
|
async getCodeAnalysis(request) {
|
|
168
|
-
return this.client.getCodeAnalysis(request).promise();
|
|
191
|
+
return this.client.getCodeAnalysis(this.withProfileArn(request)).promise();
|
|
169
192
|
}
|
|
170
193
|
/**
|
|
171
194
|
* @description Once scan completed successfully, send a request to get list of all the findings for the given scan.
|
|
172
195
|
*/
|
|
173
196
|
async listCodeAnalysisFindings(request) {
|
|
174
|
-
return this.client.listCodeAnalysisFindings(request).promise();
|
|
197
|
+
return this.client.listCodeAnalysisFindings(this.withProfileArn(request)).promise();
|
|
175
198
|
}
|
|
176
199
|
/**
|
|
177
200
|
* @description Get list of available customizations
|
|
178
201
|
*/
|
|
179
202
|
async listAvailableCustomizations(request) {
|
|
180
|
-
return this.client.listAvailableCustomizations(request).promise();
|
|
203
|
+
return this.client.listAvailableCustomizations(this.withProfileArn(request)).promise();
|
|
181
204
|
}
|
|
182
205
|
/**
|
|
183
206
|
* @description Get list of available profiles
|
|
@@ -189,7 +212,7 @@ class CodeWhispererServiceToken extends CodeWhispererServiceBase {
|
|
|
189
212
|
* @description send telemetry event to code whisperer data warehouse
|
|
190
213
|
*/
|
|
191
214
|
async sendTelemetryEvent(request) {
|
|
192
|
-
return this.client.sendTelemetryEvent(request).promise();
|
|
215
|
+
return this.client.sendTelemetryEvent(this.withProfileArn(request)).promise();
|
|
193
216
|
}
|
|
194
217
|
}
|
|
195
218
|
exports.CodeWhispererServiceToken = CodeWhispererServiceToken;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codeWhispererService.js","sourceRoot":"","sources":["../../src/language-server/codeWhispererService.ts"],"names":[],"mappings":";;;AAOA,qCAA8F;AAG9F,+BAAmC;AACnC,iEAGsC;AACtC,
|
|
1
|
+
{"version":3,"file":"codeWhispererService.js","sourceRoot":"","sources":["../../src/language-server/codeWhispererService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,21 +1,17 @@
|
|
|
1
|
-
import { CredentialsProvider, Logging, Server
|
|
2
|
-
import { CodeWhispererServiceToken } from '../codeWhispererService';
|
|
3
|
-
import { SDKInitializator } from '@aws/language-server-runtimes/server-interface';
|
|
1
|
+
import { CredentialsProvider, Logging, Server } from '@aws/language-server-runtimes/server-interface';
|
|
4
2
|
import { AmazonQDeveloperProfile } from '../amazonQServiceManager/qDeveloperProfiles';
|
|
5
3
|
import { Customizations } from '../../client/token/codewhispererbearertokenclient';
|
|
4
|
+
import { AmazonQTokenServiceManager } from '../amazonQServiceManager/AmazonQTokenServiceManager';
|
|
6
5
|
export declare const Q_CONFIGURATION_SECTION = "aws.q";
|
|
7
6
|
export declare const Q_CUSTOMIZATIONS_CONFIGURATION_SECTION = "aws.q.customizations";
|
|
8
7
|
export declare const Q_DEVELOPER_PROFILES_CONFIGURATION_SECTION = "aws.q.developerProfiles";
|
|
9
|
-
export declare const QConfigurationServerToken: (
|
|
8
|
+
export declare const QConfigurationServerToken: () => Server;
|
|
10
9
|
export declare class ServerConfigurationProvider {
|
|
11
|
-
private
|
|
10
|
+
private serviceManager;
|
|
12
11
|
private credentialsProvider;
|
|
13
12
|
private logging;
|
|
14
|
-
private _qDeveloperProfilesEnabled;
|
|
15
13
|
private listAllAvailableProfilesHandler;
|
|
16
|
-
constructor(
|
|
17
|
-
get qDeveloperProfilesEnabled(): boolean;
|
|
18
|
-
set qDeveloperProfilesEnabled(value: boolean);
|
|
14
|
+
constructor(serviceManager: AmazonQTokenServiceManager, credentialsProvider: CredentialsProvider, logging: Logging);
|
|
19
15
|
listAvailableProfiles(): Promise<AmazonQDeveloperProfile[]>;
|
|
20
16
|
listAvailableCustomizations(): Promise<Customizations>;
|
|
21
17
|
private getResponseError;
|
|
@@ -2,33 +2,18 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ServerConfigurationProvider = exports.QConfigurationServerToken = exports.Q_DEVELOPER_PROFILES_CONFIGURATION_SECTION = exports.Q_CUSTOMIZATIONS_CONFIGURATION_SECTION = exports.Q_CONFIGURATION_SECTION = void 0;
|
|
4
4
|
const server_interface_1 = require("@aws/language-server-runtimes/server-interface");
|
|
5
|
-
const telemetryUtils_1 = require("../utilities/telemetryUtils");
|
|
6
|
-
const constants_1 = require("../../constants");
|
|
7
5
|
const qDeveloperProfiles_1 = require("../amazonQServiceManager/qDeveloperProfiles");
|
|
6
|
+
const AmazonQTokenServiceManager_1 = require("../amazonQServiceManager/AmazonQTokenServiceManager");
|
|
8
7
|
// The configuration section that the server will register and listen to
|
|
9
8
|
exports.Q_CONFIGURATION_SECTION = 'aws.q';
|
|
10
9
|
const Q_CUSTOMIZATIONS = 'customizations';
|
|
11
10
|
const Q_DEVELOPER_PROFILES = 'developerProfiles';
|
|
12
11
|
exports.Q_CUSTOMIZATIONS_CONFIGURATION_SECTION = `${exports.Q_CONFIGURATION_SECTION}.${Q_CUSTOMIZATIONS}`;
|
|
13
12
|
exports.Q_DEVELOPER_PROFILES_CONFIGURATION_SECTION = `${exports.Q_CONFIGURATION_SECTION}.${Q_DEVELOPER_PROFILES}`;
|
|
14
|
-
const QConfigurationServerToken = (
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
const client = service(credentialsProvider, workspace, region, endpoint, sdkInitializator);
|
|
18
|
-
if (codeWhispererService.client.config.customUserAgent)
|
|
19
|
-
client.updateClientConfig({
|
|
20
|
-
customUserAgent: codeWhispererService.client.config.customUserAgent,
|
|
21
|
-
});
|
|
22
|
-
return client;
|
|
23
|
-
});
|
|
13
|
+
const QConfigurationServerToken = () => ({ credentialsProvider, lsp, logging, runtime, workspace, sdkInitializator }) => {
|
|
14
|
+
let amazonQServiceManager;
|
|
15
|
+
let serverConfigurationProvider;
|
|
24
16
|
lsp.addInitializer((params) => {
|
|
25
|
-
codeWhispererService.updateClientConfig({
|
|
26
|
-
customUserAgent: (0, telemetryUtils_1.getUserAgent)(params, runtime.serverInfo),
|
|
27
|
-
});
|
|
28
|
-
if (params.initializationOptions?.aws) {
|
|
29
|
-
const isDeveloperProfilesEnabled = (0, qDeveloperProfiles_1.signalsAWSQDeveloperProfilesEnabled)(params.initializationOptions.aws);
|
|
30
|
-
serverConfigurationProvider.qDeveloperProfilesEnabled = isDeveloperProfilesEnabled;
|
|
31
|
-
}
|
|
32
17
|
return {
|
|
33
18
|
capabilities: {},
|
|
34
19
|
awsServerCapabilities: {
|
|
@@ -42,6 +27,17 @@ const QConfigurationServerToken = (service) => ({ credentialsProvider, lsp, logg
|
|
|
42
27
|
},
|
|
43
28
|
};
|
|
44
29
|
});
|
|
30
|
+
lsp.onInitialized(() => {
|
|
31
|
+
amazonQServiceManager = AmazonQTokenServiceManager_1.AmazonQTokenServiceManager.getInstance({
|
|
32
|
+
credentialsProvider,
|
|
33
|
+
lsp,
|
|
34
|
+
logging,
|
|
35
|
+
runtime,
|
|
36
|
+
workspace,
|
|
37
|
+
sdkInitializator,
|
|
38
|
+
});
|
|
39
|
+
serverConfigurationProvider = new ServerConfigurationProvider(amazonQServiceManager, credentialsProvider, logging);
|
|
40
|
+
});
|
|
45
41
|
lsp.extensions.onGetConfigurationFromServer(async (params, token) => {
|
|
46
42
|
const section = params.section;
|
|
47
43
|
let customizations;
|
|
@@ -54,7 +50,7 @@ const QConfigurationServerToken = (service) => ({ credentialsProvider, lsp, logg
|
|
|
54
50
|
serverConfigurationProvider.listAvailableCustomizations(),
|
|
55
51
|
serverConfigurationProvider.listAvailableProfiles(),
|
|
56
52
|
]);
|
|
57
|
-
return
|
|
53
|
+
return amazonQServiceManager.getEnableDeveloperProfileSupport()
|
|
58
54
|
? { customizations, developerProfiles }
|
|
59
55
|
: { customizations };
|
|
60
56
|
case exports.Q_CUSTOMIZATIONS_CONFIGURATION_SECTION:
|
|
@@ -75,32 +71,24 @@ const QConfigurationServerToken = (service) => ({ credentialsProvider, lsp, logg
|
|
|
75
71
|
throw new server_interface_1.ResponseError(server_interface_1.LSPErrorCodes.RequestFailed, `An unexpected error occured while fetching resource(s) for section: ${section}`);
|
|
76
72
|
}
|
|
77
73
|
});
|
|
78
|
-
logging.log('Amazon Q
|
|
74
|
+
logging.log('Amazon Q Configuration server has been initialised');
|
|
79
75
|
return () => { };
|
|
80
76
|
};
|
|
81
77
|
exports.QConfigurationServerToken = QConfigurationServerToken;
|
|
82
78
|
const ON_GET_CONFIGURATION_FROM_SERVER_ERROR_PREFIX = 'Failed to fetch: ';
|
|
83
79
|
class ServerConfigurationProvider {
|
|
84
|
-
|
|
80
|
+
serviceManager;
|
|
85
81
|
credentialsProvider;
|
|
86
82
|
logging;
|
|
87
|
-
_qDeveloperProfilesEnabled = false;
|
|
88
83
|
listAllAvailableProfilesHandler;
|
|
89
|
-
constructor(
|
|
90
|
-
this.
|
|
84
|
+
constructor(serviceManager, credentialsProvider, logging) {
|
|
85
|
+
this.serviceManager = serviceManager;
|
|
91
86
|
this.credentialsProvider = credentialsProvider;
|
|
92
87
|
this.logging = logging;
|
|
93
|
-
this.listAllAvailableProfilesHandler = (0, qDeveloperProfiles_1.getListAllAvailableProfilesHandler)(
|
|
94
|
-
}
|
|
95
|
-
get qDeveloperProfilesEnabled() {
|
|
96
|
-
return this._qDeveloperProfilesEnabled;
|
|
97
|
-
}
|
|
98
|
-
set qDeveloperProfilesEnabled(value) {
|
|
99
|
-
this.logging.debug(`Setting qDeveloperProfilesEnabled to: ${value}`);
|
|
100
|
-
this._qDeveloperProfilesEnabled = value;
|
|
88
|
+
this.listAllAvailableProfilesHandler = (0, qDeveloperProfiles_1.getListAllAvailableProfilesHandler)(this.serviceManager.getServiceFactory());
|
|
101
89
|
}
|
|
102
90
|
async listAvailableProfiles() {
|
|
103
|
-
if (!this.
|
|
91
|
+
if (!this.serviceManager.getEnableDeveloperProfileSupport()) {
|
|
104
92
|
this.logging.debug('Q developer profiles disabled - returning empty list');
|
|
105
93
|
return [];
|
|
106
94
|
}
|
|
@@ -117,7 +105,7 @@ class ServerConfigurationProvider {
|
|
|
117
105
|
}
|
|
118
106
|
async listAvailableCustomizations() {
|
|
119
107
|
try {
|
|
120
|
-
const customizations = (await this.
|
|
108
|
+
const customizations = (await this.serviceManager.getCodewhispererService().listAvailableCustomizations({ maxResults: 100 })).customizations;
|
|
121
109
|
return customizations;
|
|
122
110
|
}
|
|
123
111
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"qConfigurationServer.js","sourceRoot":"","sources":["../../../src/language-server/configuration/qConfigurationServer.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"qConfigurationServer.js","sourceRoot":"","sources":["../../../src/language-server/configuration/qConfigurationServer.ts"],"names":[],"mappings":";;;AAAA,qFASuD;AACvD,oFAIoD;AAEpD,oGAAgG;AAEhG,wEAAwE;AAC3D,QAAA,uBAAuB,GAAG,OAAO,CAAA;AAC9C,MAAM,gBAAgB,GAAG,gBAAgB,CAAA;AACzC,MAAM,oBAAoB,GAAG,mBAAmB,CAAA;AAEnC,QAAA,sCAAsC,GAAG,GAAG,+BAAuB,IAAI,gBAAgB,EAAE,CAAA;AACzF,QAAA,0CAA0C,GAAG,GAAG,+BAAuB,IAAI,oBAAoB,EAAE,CAAA;AAEvG,MAAM,yBAAyB,GAClC,GAAW,EAAE,CACb,CAAC,EAAE,mBAAmB,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,EAAE,EAAE;IAC5E,IAAI,qBAAiD,CAAA;IACrD,IAAI,2BAAwD,CAAA;IAE5D,GAAG,CAAC,cAAc,CAAC,CAAC,MAAwB,EAAE,EAAE;QAC5C,OAAO;YACH,YAAY,EAAE,EAAE;YAChB,qBAAqB,EAAE;gBACnB,qBAAqB,EAAE;oBACnB,QAAQ,EAAE;wBACN,+BAAuB;wBACvB,8CAAsC;wBACtC,kDAA0C;qBAC7C;iBACJ;aACJ;SACJ,CAAA;IACL,CAAC,CAAC,CAAA;IAEF,GAAG,CAAC,aAAa,CAAC,GAAG,EAAE;QACnB,qBAAqB,GAAG,uDAA0B,CAAC,WAAW,CAAC;YAC3D,mBAAmB;YACnB,GAAG;YACH,OAAO;YACP,OAAO;YACP,SAAS;YACT,gBAAgB;SACnB,CAAC,CAAA;QAEF,2BAA2B,GAAG,IAAI,2BAA2B,CACzD,qBAAqB,EACrB,mBAAmB,EACnB,OAAO,CACV,CAAA;IACL,CAAC,CAAC,CAAA;IAEF,GAAG,CAAC,UAAU,CAAC,4BAA4B,CACvC,KAAK,EAAE,MAAwC,EAAE,KAAwB,EAAE,EAAE;QACzE,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAA;QAE9B,IAAI,cAA8B,CAAA;QAClC,IAAI,iBAA4C,CAAA;QAEhD,IAAI,CAAC;YACD,QAAQ,OAAO,EAAE,CAAC;gBACd,KAAK,+BAAuB;oBACxB,CAAC;oBAAA,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;wBACrD,2BAA2B,CAAC,2BAA2B,EAAE;wBACzD,2BAA2B,CAAC,qBAAqB,EAAE;qBACtD,CAAC,CAAA;oBAEF,OAAO,qBAAqB,CAAC,gCAAgC,EAAE;wBAC3D,CAAC,CAAC,EAAE,cAAc,EAAE,iBAAiB,EAAE;wBACvC,CAAC,CAAC,EAAE,cAAc,EAAE,CAAA;gBAC5B,KAAK,8CAAsC;oBACvC,cAAc,GAAG,MAAM,2BAA2B,CAAC,2BAA2B,EAAE,CAAA;oBAEhF,OAAO,cAAc,CAAA;gBACzB,KAAK,kDAA0C;oBAC3C,iBAAiB,GAAG,MAAM,2BAA2B,CAAC,qBAAqB,EAAE,CAAA;oBAE7E,OAAO,iBAAiB,CAAA;gBAC5B;oBACI,MAAK;YACb,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,IAAI,KAAK,YAAY,gCAAa,EAAE,CAAC;gBACjC,MAAM,KAAK,CAAA;YACf,CAAC;YAED,OAAO,CAAC,KAAK,CAAC,yCAAyC,OAAO,KAAK,KAAK,EAAE,CAAC,CAAA;YAC3E,MAAM,IAAI,gCAAa,CACnB,gCAAa,CAAC,aAAa,EAC3B,uEAAuE,OAAO,EAAE,CACnF,CAAA;QACL,CAAC;IACL,CAAC,CACJ,CAAA;IAED,OAAO,CAAC,GAAG,CAAC,oDAAoD,CAAC,CAAA;IACjE,OAAO,GAAG,EAAE,GAAE,CAAC,CAAA;AACnB,CAAC,CAAA;AAnFQ,QAAA,yBAAyB,6BAmFjC;AAEL,MAAM,6CAA6C,GAAG,mBAAmB,CAAA;AAEzE,MAAa,2BAA2B;IAIxB;IACA;IACA;IALJ,+BAA+B,CAAiC;IAExE,YACY,cAA0C,EAC1C,mBAAwC,EACxC,OAAgB;QAFhB,mBAAc,GAAd,cAAc,CAA4B;QAC1C,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,YAAO,GAAP,OAAO,CAAS;QAExB,IAAI,CAAC,+BAA+B,GAAG,IAAA,uDAAkC,EACrE,IAAI,CAAC,cAAc,CAAC,iBAAiB,EAAE,CAC1C,CAAA;IACL,CAAC;IAED,KAAK,CAAC,qBAAqB;QACvB,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,gCAAgC,EAAE,EAAE,CAAC;YAC1D,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,sDAAsD,CAAC,CAAA;YAC1E,OAAO,EAAE,CAAA;QACb,CAAC;QAED,IAAI,CAAC;YACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,+BAA+B,CAAC;gBACxD,cAAc,EAAE,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,EAAE;gBAC5D,OAAO,EAAE,IAAI,CAAC,OAAO;aACxB,CAAC,CAAA;YAEF,OAAO,QAAQ,CAAA;QACnB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,MAAM,IAAI,CAAC,gBAAgB,CACvB,GAAG,6CAA6C,GAAG,oBAAoB,EAAE,EACzE,KAAK,CACR,CAAA;QACL,CAAC;IACL,CAAC;IAED,KAAK,CAAC,2BAA2B;QAC7B,IAAI,CAAC;YACD,MAAM,cAAc,GAAG,CACnB,MAAM,IAAI,CAAC,cAAc,CAAC,uBAAuB,EAAE,CAAC,2BAA2B,CAAC,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,CACvG,CAAC,cAAc,CAAA;YAEhB,OAAO,cAAc,CAAA;QACzB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,6CAA6C,GAAG,gBAAgB,EAAE,EAAE,KAAK,CAAC,CAAA;QAC7G,CAAC;IACL,CAAC;IAEO,gBAAgB,CAAC,OAAe,EAAE,KAAU;QAChD,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,OAAO,KAAK,KAAK,EAAE,CAAC,CAAA;QAC1C,OAAO,IAAI,gCAAa,CAAC,gCAAa,CAAC,aAAa,EAAE,OAAO,CAAC,CAAA;IAClE,CAAC;CACJ;AAlDD,kEAkDC"}
|
|
@@ -22,7 +22,7 @@ const constants_1 = require("../constants");
|
|
|
22
22
|
* @returns NetTransform server
|
|
23
23
|
*/
|
|
24
24
|
const QNetTransformServerToken = (service) => ({ credentialsProvider, workspace, logging, lsp, telemetry, runtime, sdkInitializator }) => {
|
|
25
|
-
const codewhispererclient = service(credentialsProvider, workspace, runtime.getConfiguration(
|
|
25
|
+
const codewhispererclient = service(credentialsProvider, workspace, runtime.getConfiguration(constants_1.AWS_Q_REGION_ENV_VAR) ?? constants_1.DEFAULT_AWS_Q_REGION, runtime.getConfiguration(constants_1.AWS_Q_ENDPOINT_URL_ENV_VAR) ?? constants_1.DEFAULT_AWS_Q_ENDPOINT_URL, sdkInitializator);
|
|
26
26
|
const transformHandler = new transformHandler_1.TransformHandler(codewhispererclient, workspace, logging, runtime);
|
|
27
27
|
const runTransformCommand = async (params, _token) => {
|
|
28
28
|
try {
|
|
@@ -68,7 +68,7 @@ const QNetTransformServerToken = (service) => ({ credentialsProvider, workspace,
|
|
|
68
68
|
case DownloadArtifactsCommand: {
|
|
69
69
|
const request = params;
|
|
70
70
|
const cwStreamingClientInstance = new codewhispererStreamingClient_1.StreamingClient();
|
|
71
|
-
const cwStreamingClient = await cwStreamingClientInstance.getStreamingClient(credentialsProvider, runtime.getConfiguration(
|
|
71
|
+
const cwStreamingClient = await cwStreamingClientInstance.getStreamingClient(credentialsProvider, runtime.getConfiguration(constants_1.AWS_Q_REGION_ENV_VAR) ?? constants_1.DEFAULT_AWS_Q_REGION, runtime.getConfiguration(constants_1.AWS_Q_ENDPOINT_URL_ENV_VAR) ?? constants_1.DEFAULT_AWS_Q_ENDPOINT_URL, sdkInitializator, customCWClientConfig);
|
|
72
72
|
const response = await transformHandler.downloadExportResultArchive(cwStreamingClient, request.TransformationJobId, request.SolutionRootPath);
|
|
73
73
|
(0, metrics_1.emitTransformationJobArtifactsDownloadedTelemetry)(telemetry, response, request.TransformationJobId);
|
|
74
74
|
return response;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"netTransformServer.js","sourceRoot":"","sources":["../../src/language-server/netTransformServer.ts"],"names":[],"mappings":";;;AAQA,yGAAwF;AAExF,oDAe+B;AAQ/B,sEAAkE;AAElE,+DAAyD;AAE5C,QAAA,yBAAyB,GAAG,CAAC,WAAW,EAAE,qBAAqB,EAAE,SAAS,EAAE,cAAc,EAAE,aAAa,CAAC,CAAA;AAC1G,QAAA,sBAAsB,GAAG,CAAC,WAAW,CAAC,CAAA;AACtC,QAAA,aAAa,GAAG,CAAC,QAAQ,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,CAAC,CAAA;AAC1E,MAAM,qBAAqB,GAAG,kCAAkC,CAAA;AAChE,MAAM,mBAAmB,GAAG,gCAAgC,CAAA;AAC5D,MAAM,oBAAoB,GAAG,iCAAiC,CAAA;AAC9D,MAAM,2BAA2B,GAAG,wCAAwC,CAAA;AAC5E,MAAM,uBAAuB,GAAG,oCAAoC,CAAA;AACpE,MAAM,sBAAsB,GAAG,mCAAmC,CAAA;AAClE,MAAM,wBAAwB,GAAG,qCAAqC,CAAA;AACtE,
|
|
1
|
+
{"version":3,"file":"netTransformServer.js","sourceRoot":"","sources":["../../src/language-server/netTransformServer.ts"],"names":[],"mappings":";;;AAQA,yGAAwF;AAExF,oDAe+B;AAQ/B,sEAAkE;AAElE,+DAAyD;AAE5C,QAAA,yBAAyB,GAAG,CAAC,WAAW,EAAE,qBAAqB,EAAE,SAAS,EAAE,cAAc,EAAE,aAAa,CAAC,CAAA;AAC1G,QAAA,sBAAsB,GAAG,CAAC,WAAW,CAAC,CAAA;AACtC,QAAA,aAAa,GAAG,CAAC,QAAQ,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,CAAC,CAAA;AAC1E,MAAM,qBAAqB,GAAG,kCAAkC,CAAA;AAChE,MAAM,mBAAmB,GAAG,gCAAgC,CAAA;AAC5D,MAAM,oBAAoB,GAAG,iCAAiC,CAAA;AAC9D,MAAM,2BAA2B,GAAG,wCAAwC,CAAA;AAC5E,MAAM,uBAAuB,GAAG,oCAAoC,CAAA;AACpE,MAAM,sBAAsB,GAAG,mCAAmC,CAAA;AAClE,MAAM,wBAAwB,GAAG,qCAAqC,CAAA;AACtE,4CAKqB;AAGrB;;;;GAIG;AACI,MAAM,wBAAwB,GACjC,CACI,OAM8B,EACxB,EAAE,CACZ,CAAC,EAAE,mBAAmB,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,gBAAgB,EAAE,EAAE,EAAE;IACvF,MAAM,mBAAmB,GAAG,OAAO,CAC/B,mBAAmB,EACnB,SAAS,EACT,OAAO,CAAC,gBAAgB,CAAC,gCAAoB,CAAC,IAAI,gCAAoB,EACtE,OAAO,CAAC,gBAAgB,CAAC,sCAA0B,CAAC,IAAI,sCAA0B,EAClF,gBAAgB,CACnB,CAAA;IACD,MAAM,gBAAgB,GAAG,IAAI,mCAAgB,CAAC,mBAAmB,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;IAC/F,MAAM,mBAAmB,GAAG,KAAK,EAAE,MAA4B,EAAE,MAAyB,EAAE,EAAE;QAC1F,IAAI,CAAC;YACD,QAAQ,MAAM,CAAC,OAAO,EAAE,CAAC;gBACrB,KAAK,qBAAqB,CAAC,CAAC,CAAC;oBACzB,MAAM,OAAO,GAAG,MAA+B,CAAA;oBAC/C,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAA;oBACpE,IAAA,+CAAqC,EAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;oBAC1D,OAAO,QAAQ,CAAA;gBACnB,CAAC;gBACD,KAAK,mBAAmB,CAAC,CAAC,CAAC;oBACvB,MAAM,OAAO,GAAG,MAA6B,CAAA;oBAC7C,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAA;oBAClE,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;wBACnB,IAAA,gDAAsC,EAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;oBAC/D,CAAC;oBACD,OAAO,QAAQ,CAAA;gBACnB,CAAC;gBACD,KAAK,oBAAoB,CAAC,CAAC,CAAC;oBACxB,MAAM,OAAO,GAAG,MAA6B,CAAA;oBAC7C,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,kBAAkB,CACtD,OAAO,EACP,8BAAsB,EACtB,qBAAa,CAChB,CAAA;oBACD,IAAA,8CAAoC,EAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;oBACzD,OAAO,QAAQ,CAAA;gBACnB,CAAC;gBACD,KAAK,2BAA2B,CAAC,CAAC,CAAC;oBAC/B,MAAM,OAAO,GAAG,MAA6B,CAAA;oBAC7C,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,kBAAkB,CACtD,OAAO,EACP,iCAAyB,EACzB,qBAAa,CAChB,CAAA;oBACD,IAAA,qDAA2C,EAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;oBAChE,OAAO,QAAQ,CAAA;gBACnB,CAAC;gBACD,KAAK,uBAAuB,CAAC,CAAC,CAAC;oBAC3B,MAAM,OAAO,GAAG,MAAiC,CAAA;oBACjD,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAA;oBACtE,IAAA,iDAAuC,EAAC,SAAS,EAAE,QAAQ,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAA;oBACzF,OAAO,QAAQ,CAAA;gBACnB,CAAC;gBACD,KAAK,sBAAsB,CAAC,CAAC,CAAC;oBAC1B,MAAM,OAAO,GAAG,MAAgC,CAAA;oBAChD,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAA;oBACrE,IAAA,iDAAuC,EAAC,SAAS,EAAE,QAAQ,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAA;oBACzF,OAAO,QAAQ,CAAA;gBACnB,CAAC;gBACD,KAAK,wBAAwB,CAAC,CAAC,CAAC;oBAC5B,MAAM,OAAO,GAAG,MAAkC,CAAA;oBAClD,MAAM,yBAAyB,GAAG,IAAI,8CAAe,EAAE,CAAA;oBACvD,MAAM,iBAAiB,GAAG,MAAM,yBAAyB,CAAC,kBAAkB,CACxE,mBAAmB,EACnB,OAAO,CAAC,gBAAgB,CAAC,gCAAoB,CAAC,IAAI,gCAAoB,EACtE,OAAO,CAAC,gBAAgB,CAAC,sCAA0B,CAAC,IAAI,sCAA0B,EAClF,gBAAgB,EAChB,oBAAoB,CACvB,CAAA;oBAED,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,2BAA2B,CAC/D,iBAAiB,EACjB,OAAO,CAAC,mBAAmB,EAC3B,OAAO,CAAC,gBAAgB,CAC3B,CAAA;oBACD,IAAA,2DAAiD,EAC7C,SAAS,EACT,QAAQ,EACR,OAAO,CAAC,mBAAmB,CAC9B,CAAA;oBACD,OAAO,QAAQ,CAAA;gBACnB,CAAC;YACL,CAAC;YACD,OAAM;QACV,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YACd,OAAO,CAAC,GAAG,CAAC,wDAAwD,GAAG,CAAC,CAAC,CAAA;YAEzE,QAAQ,MAAM,CAAC,OAAO,EAAE,CAAC;gBACrB,KAAK,qBAAqB,CAAC,CAAC,CAAC;oBACzB,MAAM,OAAO,GAAG,MAA+B,CAAA;oBAC/C,IAAA,6CAAmC,EAAC,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;oBAC1D,MAAK;gBACT,CAAC;gBACD,KAAK,mBAAmB,CAAC,CAAC,CAAC;oBACvB,MAAM,OAAO,GAAG,MAA6B,CAAA;oBAC7C,IAAA,8CAAoC,EAAC,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;oBAC3D,MAAK;gBACT,CAAC;gBACD,KAAK,oBAAoB,CAAC,CAAC,CAAC;oBACxB,MAAM,OAAO,GAAG,MAA6B,CAAA;oBAC7C,IAAA,4CAAkC,EAAC,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;oBACzD,MAAK;gBACT,CAAC;gBACD,KAAK,2BAA2B,CAAC,CAAC,CAAC;oBAC/B,MAAM,OAAO,GAAG,MAA6B,CAAA;oBAC7C,IAAA,mDAAyC,EAAC,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;oBAChE,MAAK;gBACT,CAAC;gBACD,KAAK,uBAAuB,CAAC,CAAC,CAAC;oBAC3B,MAAM,OAAO,GAAG,MAAiC,CAAA;oBACjD,IAAA,+CAAqC,EAAC,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;oBAC5D,MAAK;gBACT,CAAC;gBACD,KAAK,sBAAsB,CAAC,CAAC,CAAC;oBAC1B,MAAM,OAAO,GAAG,MAAgC,CAAA;oBAChD,IAAA,+CAAqC,EAAC,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;oBAC5D,MAAK;gBACT,CAAC;gBACD,KAAK,wBAAwB,CAAC,CAAC,CAAC;oBAC5B,MAAM,OAAO,GAAG,MAAkC,CAAA;oBAClD,IAAA,yDAA+C,EAAC,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;oBACtE,MAAK;gBACT,CAAC;YACL,CAAC;QACL,CAAC;IACL,CAAC,CAAA;IAED,MAAM,uBAAuB,GAAG,KAAK,EACjC,MAA4B,EAC5B,MAAyB,EACb,EAAE;QACd,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;QAC3B,OAAO,mBAAmB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC9C,CAAC,CAAA;IAED,MAAM,oBAAoB,GAAuC,EAAE,CAAA;IACnE,MAAM,mBAAmB,GAAG,CAAC,MAAwB,EAAE,EAAE;QACrD,mDAAmD;QACnD,oBAAoB,CAAC,eAAe,GAAG,IAAA,6BAAY,EAAC,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,CAAA;QAE/E,mBAAmB,CAAC,kBAAkB,CAAC;YACnC,eAAe,EAAE,oBAAoB,CAAC,eAAe;SACxD,CAAC,CAAA;QAEF,OAAO;YACH,YAAY,EAAE;gBACV,sBAAsB,EAAE;oBACpB,QAAQ,EAAE;wBACN,qBAAqB;wBACrB,mBAAmB;wBACnB,oBAAoB;wBACpB,2BAA2B;wBAC3B,uBAAuB;wBACvB,sBAAsB;wBACtB,wBAAwB;qBAC3B;iBACJ;aACJ;SACJ,CAAA;IACL,CAAC,CAAA;IACD,GAAG,CAAC,cAAc,CAAC,mBAAmB,CAAC,CAAA;IACvC,GAAG,CAAC,gBAAgB,CAAC,uBAAuB,CAAC,CAAA;IAE7C,OAAO,GAAG,EAAE,GAAE,CAAC,CAAA;AACnB,CAAC,CAAA;AA7KQ,QAAA,wBAAwB,4BA6KhC"}
|
|
@@ -3,4 +3,5 @@ export declare const CodeWhispererServerIAMProxy: import("@aws/language-server-r
|
|
|
3
3
|
export declare const CodeWhispererSecurityScanServerTokenProxy: import("@aws/language-server-runtimes/server-interface").Server;
|
|
4
4
|
export declare const QNetTransformServerTokenProxy: import("@aws/language-server-runtimes/server-interface").Server;
|
|
5
5
|
export declare const QChatServerProxy: import("@aws/language-server-runtimes/server-interface").Server;
|
|
6
|
+
export declare const QAgenticChatServerProxy: import("@aws/language-server-runtimes/server-interface").Server;
|
|
6
7
|
export declare const QConfigurationServerTokenProxy: import("@aws/language-server-runtimes/server-interface").Server;
|
|
@@ -1,33 +1,24 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.QConfigurationServerTokenProxy = exports.QChatServerProxy = exports.QNetTransformServerTokenProxy = exports.CodeWhispererSecurityScanServerTokenProxy = exports.CodeWhispererServerIAMProxy = exports.CodeWhispererServerTokenProxy = void 0;
|
|
4
|
-
const chatSessionManagementService_1 = require("./chat/chatSessionManagementService");
|
|
3
|
+
exports.QConfigurationServerTokenProxy = exports.QAgenticChatServerProxy = exports.QChatServerProxy = exports.QNetTransformServerTokenProxy = exports.CodeWhispererSecurityScanServerTokenProxy = exports.CodeWhispererServerIAMProxy = exports.CodeWhispererServerTokenProxy = void 0;
|
|
5
4
|
const codeWhispererSecurityScanServer_1 = require("./codeWhispererSecurityScanServer");
|
|
6
5
|
const codeWhispererServer_1 = require("./codeWhispererServer");
|
|
7
6
|
const codeWhispererService_1 = require("./codeWhispererService");
|
|
8
7
|
const netTransformServer_1 = require("./netTransformServer");
|
|
9
8
|
const qChatServer_1 = require("./qChatServer");
|
|
9
|
+
const qAgenticChatServer_1 = require("./agenticChat/qAgenticChatServer");
|
|
10
10
|
const qConfigurationServer_1 = require("./configuration/qConfigurationServer");
|
|
11
11
|
exports.CodeWhispererServerTokenProxy = (0, codeWhispererServer_1.CodewhispererServerFactory)((credentialsProvider, workspace, awsQRegion, awsQEndpointUrl, sdkInitializator) => {
|
|
12
12
|
return new codeWhispererService_1.CodeWhispererServiceToken(credentialsProvider, workspace, awsQRegion, awsQEndpointUrl, sdkInitializator);
|
|
13
|
-
});
|
|
13
|
+
}, 'token');
|
|
14
14
|
exports.CodeWhispererServerIAMProxy = (0, codeWhispererServer_1.CodewhispererServerFactory)((credentialsProvider, workspace, awsQRegion, awsQEndpointUrl, sdkInitializator) => {
|
|
15
15
|
return new codeWhispererService_1.CodeWhispererServiceIAM(credentialsProvider, workspace, awsQRegion, awsQEndpointUrl, sdkInitializator);
|
|
16
|
-
});
|
|
17
|
-
exports.CodeWhispererSecurityScanServerTokenProxy = (0, codeWhispererSecurityScanServer_1.SecurityScanServerToken)(
|
|
18
|
-
return new codeWhispererService_1.CodeWhispererServiceToken(credentialsProvider, workspace, awsQRegion, awsQEndpointUrl, sdkInitializator);
|
|
19
|
-
});
|
|
16
|
+
}, 'iam');
|
|
17
|
+
exports.CodeWhispererSecurityScanServerTokenProxy = (0, codeWhispererSecurityScanServer_1.SecurityScanServerToken)();
|
|
20
18
|
exports.QNetTransformServerTokenProxy = (0, netTransformServer_1.QNetTransformServerToken)((credentialsProvider, workspace, awsQRegion, awsQEndpointUrl, sdkInitializator) => {
|
|
21
19
|
return new codeWhispererService_1.CodeWhispererServiceToken(credentialsProvider, workspace, awsQRegion, awsQEndpointUrl, sdkInitializator);
|
|
22
20
|
});
|
|
23
|
-
exports.QChatServerProxy = (0, qChatServer_1.QChatServer)(
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
.withCodeWhispererEndpoint(awsQEndpointUrl)
|
|
27
|
-
.withCodeWhispererRegion(awsQRegion)
|
|
28
|
-
.withSdkRuntimeConfigurator(sdkInitializator);
|
|
29
|
-
});
|
|
30
|
-
exports.QConfigurationServerTokenProxy = (0, qConfigurationServer_1.QConfigurationServerToken)((credentialsProvider, workspace, awsQRegion, awsQEndpointUrl, sdkInitializator) => {
|
|
31
|
-
return new codeWhispererService_1.CodeWhispererServiceToken(credentialsProvider, workspace, awsQRegion, awsQEndpointUrl, sdkInitializator);
|
|
32
|
-
});
|
|
21
|
+
exports.QChatServerProxy = (0, qChatServer_1.QChatServer)();
|
|
22
|
+
exports.QAgenticChatServerProxy = (0, qAgenticChatServer_1.QAgenticChatServer)();
|
|
23
|
+
exports.QConfigurationServerTokenProxy = (0, qConfigurationServer_1.QConfigurationServerToken)();
|
|
33
24
|
//# sourceMappingURL=proxy-server.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy-server.js","sourceRoot":"","sources":["../../src/language-server/proxy-server.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"proxy-server.js","sourceRoot":"","sources":["../../src/language-server/proxy-server.ts"],"names":[],"mappings":";;;AAAA,uFAA2E;AAC3E,+DAAkE;AAClE,iEAA2F;AAC3F,6DAA+D;AAC/D,+CAA2C;AAC3C,yEAAqE;AACrE,+EAAgF;AAEnE,QAAA,6BAA6B,GAAG,IAAA,gDAA0B,EACnE,CAAC,mBAAmB,EAAE,SAAS,EAAE,UAAU,EAAE,eAAe,EAAE,gBAAgB,EAAE,EAAE;IAC9E,OAAO,IAAI,gDAAyB,CAChC,mBAAmB,EACnB,SAAS,EACT,UAAU,EACV,eAAe,EACf,gBAAgB,CACnB,CAAA;AACL,CAAC,EACD,OAAO,CACV,CAAA;AAEY,QAAA,2BAA2B,GAAG,IAAA,gDAA0B,EACjE,CAAC,mBAAmB,EAAE,SAAS,EAAE,UAAU,EAAE,eAAe,EAAE,gBAAgB,EAAE,EAAE;IAC9E,OAAO,IAAI,8CAAuB,CAC9B,mBAAmB,EACnB,SAAS,EACT,UAAU,EACV,eAAe,EACf,gBAAgB,CACnB,CAAA;AACL,CAAC,EACD,KAAK,CACR,CAAA;AAEY,QAAA,yCAAyC,GAAG,IAAA,yDAAuB,GAAE,CAAA;AAErE,QAAA,6BAA6B,GAAG,IAAA,6CAAwB,EACjE,CAAC,mBAAmB,EAAE,SAAS,EAAE,UAAU,EAAE,eAAe,EAAE,gBAAgB,EAAE,EAAE;IAC9E,OAAO,IAAI,gDAAyB,CAChC,mBAAmB,EACnB,SAAS,EACT,UAAU,EACV,eAAe,EACf,gBAAgB,CACnB,CAAA;AACL,CAAC,CACJ,CAAA;AAEY,QAAA,gBAAgB,GAAG,IAAA,yBAAW,GAAE,CAAA;AAEhC,QAAA,uBAAuB,GAAG,IAAA,uCAAkB,GAAE,CAAA;AAE9C,QAAA,8BAA8B,GAAG,IAAA,gDAAyB,GAAE,CAAA"}
|
|
@@ -1,4 +1,2 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
import { SDKInitializator } from '@aws/language-server-runtimes/server-interface';
|
|
4
|
-
export declare const QChatServer: (service: (credentialsProvider: CredentialsProvider, awsQRegion: string, awsQEndpointUrl: string, sdkInitializator: SDKInitializator) => ChatSessionManagementService) => Server;
|
|
1
|
+
import { Server } from '@aws/language-server-runtimes/server-interface';
|
|
2
|
+
export declare const QChatServer: () => Server;
|
|
@@ -2,23 +2,22 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.QChatServer = void 0;
|
|
4
4
|
const chatController_1 = require("./chat/chatController");
|
|
5
|
+
const chatSessionManagementService_1 = require("./chat/chatSessionManagementService");
|
|
5
6
|
const quickActions_1 = require("./chat/quickActions");
|
|
6
7
|
const telemetryService_1 = require("./telemetryService");
|
|
7
8
|
const telemetryUtils_1 = require("./utilities/telemetryUtils");
|
|
8
|
-
const
|
|
9
|
-
const
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
const
|
|
15
|
-
|
|
9
|
+
const AmazonQTokenServiceManager_1 = require("./amazonQServiceManager/AmazonQTokenServiceManager");
|
|
10
|
+
const errors_1 = require("./amazonQServiceManager/errors");
|
|
11
|
+
const utils_1 = require("./utils");
|
|
12
|
+
const QChatServer =
|
|
13
|
+
// prettier-ignore
|
|
14
|
+
() => features => {
|
|
15
|
+
const { chat, credentialsProvider, telemetry, logging, lsp, runtime } = features;
|
|
16
|
+
let amazonQServiceManager;
|
|
17
|
+
let chatController;
|
|
18
|
+
let chatSessionManagementService;
|
|
19
|
+
let telemetryService;
|
|
16
20
|
lsp.addInitializer((params) => {
|
|
17
|
-
chatSessionManagementService.setCustomUserAgent((0, telemetryUtils_1.getUserAgent)(params, runtime.serverInfo));
|
|
18
|
-
telemetryService.updateClientConfig({
|
|
19
|
-
customUserAgent: (0, telemetryUtils_1.getUserAgent)(params, runtime.serverInfo),
|
|
20
|
-
});
|
|
21
|
-
telemetryService.updateUserContext((0, telemetryUtils_1.makeUserContextObject)(params, runtime.platform, 'CHAT'));
|
|
22
21
|
return {
|
|
23
22
|
capabilities: {},
|
|
24
23
|
awsServerCapabilities: {
|
|
@@ -34,6 +33,23 @@ const QChatServer = (service) => features => {
|
|
|
34
33
|
},
|
|
35
34
|
};
|
|
36
35
|
});
|
|
36
|
+
const updateConfigurationHandler = async () => {
|
|
37
|
+
await amazonQServiceManager.handleDidChangeConfiguration();
|
|
38
|
+
await chatController.updateConfiguration();
|
|
39
|
+
};
|
|
40
|
+
lsp.onInitialized(async () => {
|
|
41
|
+
// Initialize service manager and inject it to chatSessionManagementService to pass it down
|
|
42
|
+
amazonQServiceManager = AmazonQTokenServiceManager_1.AmazonQTokenServiceManager.getInstance(features);
|
|
43
|
+
chatSessionManagementService = chatSessionManagementService_1.ChatSessionManagementService
|
|
44
|
+
.getInstance()
|
|
45
|
+
.withAmazonQServiceManager(amazonQServiceManager);
|
|
46
|
+
telemetryService = new telemetryService_1.TelemetryService(amazonQServiceManager, credentialsProvider, telemetry, logging);
|
|
47
|
+
const clientParams = (0, utils_1.safeGet)(lsp.getClientInitializeParams(), new errors_1.AmazonQServiceInitializationError('TelemetryService initialized before LSP connection was initialized.'));
|
|
48
|
+
telemetryService.updateUserContext((0, telemetryUtils_1.makeUserContextObject)(clientParams, runtime.platform, 'CHAT'));
|
|
49
|
+
chatController = new chatController_1.ChatController(chatSessionManagementService, features, telemetryService);
|
|
50
|
+
await updateConfigurationHandler();
|
|
51
|
+
});
|
|
52
|
+
lsp.didChangeConfiguration(updateConfigurationHandler);
|
|
37
53
|
chat.onTabAdd(params => {
|
|
38
54
|
logging.log(`Adding tab: ${params.tabId}`);
|
|
39
55
|
return chatController.onTabAdd(params);
|
|
@@ -63,11 +79,9 @@ const QChatServer = (service) => features => {
|
|
|
63
79
|
chat.onCodeInsertToCursorPosition(params => {
|
|
64
80
|
return chatController.onCodeInsertToCursorPosition(params);
|
|
65
81
|
});
|
|
66
|
-
lsp.onInitialized(chatController.updateConfiguration);
|
|
67
|
-
lsp.didChangeConfiguration(chatController.updateConfiguration);
|
|
68
82
|
logging.log('Q Chat server has been initialized');
|
|
69
83
|
return () => {
|
|
70
|
-
chatController
|
|
84
|
+
chatController?.dispose();
|
|
71
85
|
};
|
|
72
86
|
};
|
|
73
87
|
exports.QChatServer = QChatServer;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"qChatServer.js","sourceRoot":"","sources":["../../src/language-server/qChatServer.ts"],"names":[],"mappings":";;;AACA,0DAAsD;
|
|
1
|
+
{"version":3,"file":"qChatServer.js","sourceRoot":"","sources":["../../src/language-server/qChatServer.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.projectCodeAnalysisScope = exports.standardScanTimeoutMs = exports.projectScanUploadIntent = void 0;
|
|
4
|
+
exports.projectScanUploadIntent = 'FULL_PROJECT_SECURITY_SCAN';
|
|
5
|
+
exports.standardScanTimeoutMs = 900_000; // 15 minutes
|
|
6
|
+
exports.projectCodeAnalysisScope = 'PROJECT';
|
|
7
|
+
//# sourceMappingURL=constants.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/language-server/securityScan/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,uBAAuB,GAAG,4BAA4B,CAAA;AAEtD,QAAA,qBAAqB,GAAG,OAAO,CAAA,CAAC,aAAa;AAE7C,QAAA,wBAAwB,GAAG,SAAS,CAAA"}
|
|
@@ -1,19 +1,19 @@
|
|
|
1
1
|
import { Logging, Workspace, CancellationToken, CancellationTokenSource } from '@aws/language-server-runtimes/server-interface';
|
|
2
2
|
import { ArtifactMap, CreateUploadUrlResponse } from '../../client/token/codewhispererbearertokenclient';
|
|
3
|
-
import { CodeWhispererServiceToken } from '../codeWhispererService';
|
|
4
3
|
import { AggregatedCodeScanIssue } from './types';
|
|
4
|
+
import { AmazonQTokenServiceManager } from '../amazonQServiceManager/AmazonQTokenServiceManager';
|
|
5
5
|
export declare class SecurityScanHandler {
|
|
6
|
-
private
|
|
6
|
+
private serviceManager;
|
|
7
7
|
private workspace;
|
|
8
8
|
private logging;
|
|
9
9
|
tokenSource: CancellationTokenSource;
|
|
10
|
-
constructor(
|
|
10
|
+
constructor(serviceManager: AmazonQTokenServiceManager, workspace: Workspace, logging: Logging);
|
|
11
11
|
getMd5(content: Buffer): string;
|
|
12
12
|
throwIfCancelled(token: CancellationToken): void;
|
|
13
13
|
cancelSecurityScan(): void;
|
|
14
|
-
createCodeResourcePresignedUrlHandler(zipContent: Buffer): Promise<ArtifactMap>;
|
|
14
|
+
createCodeResourcePresignedUrlHandler(zipContent: Buffer, scanName: string): Promise<ArtifactMap>;
|
|
15
15
|
uploadArtifactToS3(zipBuffer: Buffer, resp: CreateUploadUrlResponse): Promise<void>;
|
|
16
|
-
createScanJob(artifactMap: ArtifactMap, languageName: string): Promise<import("aws-sdk/lib/request").PromiseResult<import("../../client/token/codewhispererbearertokenclient").StartCodeAnalysisResponse, import("aws-sdk").AWSError>>;
|
|
16
|
+
createScanJob(artifactMap: ArtifactMap, languageName: string, scanName: string): Promise<import("aws-sdk/lib/request").PromiseResult<import("../../client/token/codewhispererbearertokenclient").StartCodeAnalysisResponse, import("aws-sdk").AWSError>>;
|
|
17
17
|
pollScanJobStatus(jobId: string): Promise<string>;
|
|
18
18
|
listScanResults(jobId: string, projectPath: string): Promise<AggregatedCodeScanIssue[]>;
|
|
19
19
|
mapToAggregatedList(json: string, projectPath: string): Promise<AggregatedCodeScanIssue[]>;
|