@aws/lsp-codewhisperer 0.0.29 → 0.0.31
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 +42 -0
- package/CONTRIBUTING.md +28 -0
- package/README.md +1 -1
- package/out/client/streamingClient/codewhispererStreamingClient.js +1 -0
- package/out/client/streamingClient/codewhispererStreamingClient.js.map +1 -1
- package/out/index.d.ts +6 -5
- package/out/index.js +7 -5
- package/out/index.js.map +1 -1
- package/out/language-server/agenticChat/agenticChatController.d.ts +40 -0
- package/out/language-server/agenticChat/agenticChatController.js +414 -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 +96 -0
- package/out/language-server/agenticChat/qAgenticChatServer.js.map +1 -0
- package/out/language-server/agenticChat/tools/fsRead.d.ts +38 -0
- package/out/language-server/agenticChat/tools/fsRead.js +96 -0
- package/out/language-server/agenticChat/tools/fsRead.js.map +1 -0
- package/out/language-server/agenticChat/tools/fsWrite.d.ts +73 -0
- package/out/language-server/agenticChat/tools/fsWrite.js +128 -0
- package/out/language-server/agenticChat/tools/fsWrite.js.map +1 -0
- package/out/language-server/agenticChat/tools/toolServer.d.ts +2 -0
- package/out/language-server/agenticChat/tools/toolServer.js +14 -0
- package/out/language-server/agenticChat/tools/toolServer.js.map +1 -0
- package/out/language-server/agenticChat/tools/toolShared.d.ts +7 -0
- package/out/language-server/agenticChat/tools/toolShared.js +5 -0
- package/out/language-server/agenticChat/tools/toolShared.js.map +1 -0
- 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 +9 -6
- package/out/language-server/chat/chatController.js +74 -27
- package/out/language-server/chat/chatController.js.map +1 -1
- package/out/language-server/chat/chatEventParser.d.ts +2 -2
- package/out/language-server/chat/chatSessionManagementService.d.ts +1 -1
- package/out/language-server/chat/chatSessionService.d.ts +1 -1
- package/out/language-server/chat/chatSessionService.js +1 -3
- 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 +15 -2
- package/out/language-server/chat/contexts/documentContext.js.map +1 -1
- package/out/language-server/chat/contexts/triggerContext.d.ts +5 -5
- package/out/language-server/chat/contexts/triggerContext.js +3 -3
- package/out/language-server/chat/contexts/triggerContext.js.map +1 -1
- package/out/language-server/{qChatServer.js → chat/qChatServer.js} +15 -11
- package/out/language-server/chat/qChatServer.js.map +1 -0
- package/out/language-server/chat/telemetry/chatTelemetryController.d.ts +3 -3
- package/out/language-server/chat/telemetry/chatTelemetryController.js +3 -3
- package/out/language-server/chat/telemetry/chatTelemetryController.js.map +1 -1
- package/out/language-server/chat/telemetry/clientTelemetry.js +1 -1
- package/out/language-server/chat/telemetry/clientTelemetry.js.map +1 -1
- package/out/language-server/chat/utils.js +1 -1
- package/out/language-server/chat/utils.js.map +1 -1
- package/out/language-server/configuration/qConfigurationServer.d.ts +2 -2
- package/out/language-server/configuration/qConfigurationServer.js +2 -2
- package/out/language-server/configuration/qConfigurationServer.js.map +1 -1
- package/out/language-server/{auto-trigger → inline-completion/auto-trigger}/autoTrigger.d.ts +1 -1
- package/out/language-server/inline-completion/auto-trigger/autoTrigger.js.map +1 -0
- package/out/language-server/{telemetry → inline-completion}/codeDiffTracker.js +1 -1
- package/out/language-server/inline-completion/codeDiffTracker.js.map +1 -0
- package/out/language-server/{telemetry → inline-completion}/codePercentage.d.ts +1 -1
- package/out/language-server/inline-completion/codePercentage.js.map +1 -0
- package/out/language-server/inline-completion/codeWhispererServer.d.ts +7 -0
- package/out/language-server/{codeWhispererServer.js → inline-completion/codeWhispererServer.js} +37 -75
- package/out/language-server/inline-completion/codeWhispererServer.js.map +1 -0
- package/out/language-server/inline-completion/mergeRightUtils.js.map +1 -0
- package/out/language-server/{session → inline-completion/session}/sessionManager.d.ts +3 -3
- package/out/language-server/inline-completion/session/sessionManager.js.map +1 -0
- package/out/language-server/netTransform/artifactManager.d.ts +7 -7
- package/out/language-server/netTransform/artifactManager.js +86 -46
- package/out/language-server/netTransform/artifactManager.js.map +1 -1
- package/out/language-server/netTransform/metrics.js +1 -1
- package/out/language-server/netTransform/metrics.js.map +1 -1
- package/out/language-server/netTransform/models.d.ts +12 -0
- package/out/language-server/netTransform/models.js.map +1 -1
- package/out/language-server/{netTransformServer.d.ts → netTransform/netTransformServer.d.ts} +1 -1
- package/out/language-server/{netTransformServer.js → netTransform/netTransformServer.js} +5 -5
- package/out/language-server/netTransform/netTransformServer.js.map +1 -0
- package/out/language-server/netTransform/tests/mockData.d.ts +2 -21
- package/out/language-server/netTransform/tests/mockData.js +16 -13
- package/out/language-server/netTransform/tests/mockData.js.map +1 -1
- package/out/language-server/netTransform/transformHandler.d.ts +3 -1
- package/out/language-server/netTransform/transformHandler.js +49 -15
- package/out/language-server/netTransform/transformHandler.js.map +1 -1
- package/out/language-server/{codeWhispererSecurityScanServer.js → securityScan/codeWhispererSecurityScanServer.js} +5 -5
- package/out/language-server/securityScan/codeWhispererSecurityScanServer.js.map +1 -0
- package/out/language-server/securityScan/dependencyGraph/commonUtil.js.map +1 -0
- package/out/language-server/securityScan/dependencyGraph/constants.js.map +1 -0
- package/out/language-server/securityScan/dependencyGraph/csharpDependencyGraph.js.map +1 -0
- package/out/language-server/securityScan/dependencyGraph/dependencyGraph.js.map +1 -0
- package/out/language-server/securityScan/dependencyGraph/dependencyGraphFactory.js.map +1 -0
- package/out/language-server/securityScan/securityScanHandler.d.ts +1 -1
- package/out/language-server/securityScan/securityScanHandler.js +1 -1
- package/out/language-server/securityScan/securityScanHandler.js.map +1 -1
- package/out/{language-server → shared}/amazonQServiceManager/AmazonQTokenServiceManager.d.ts +6 -3
- package/out/{language-server → shared}/amazonQServiceManager/AmazonQTokenServiceManager.js +48 -84
- package/out/shared/amazonQServiceManager/AmazonQTokenServiceManager.js.map +1 -0
- package/out/shared/amazonQServiceManager/BaseAmazonQServiceManager.d.ts +7 -0
- package/out/shared/amazonQServiceManager/BaseAmazonQServiceManager.js.map +1 -0
- package/out/shared/amazonQServiceManager/configurationUtils.d.ts +45 -0
- package/out/shared/amazonQServiceManager/configurationUtils.js +130 -0
- package/out/shared/amazonQServiceManager/configurationUtils.js.map +1 -0
- package/out/shared/amazonQServiceManager/errors.js.map +1 -0
- package/out/shared/amazonQServiceManager/factories.d.ts +15 -0
- package/out/shared/amazonQServiceManager/factories.js +47 -0
- package/out/shared/amazonQServiceManager/factories.js.map +1 -0
- package/out/{language-server → shared}/amazonQServiceManager/qDeveloperProfiles.d.ts +1 -3
- package/out/{language-server → shared}/amazonQServiceManager/qDeveloperProfiles.js +2 -2
- package/out/shared/amazonQServiceManager/qDeveloperProfiles.js.map +1 -0
- package/out/shared/codeWhispererService.js.map +1 -0
- package/out/{language-server → shared}/constants.d.ts +5 -0
- package/out/shared/constants.js +16 -0
- package/out/shared/constants.js.map +1 -0
- package/out/shared/languageDetection.js.map +1 -0
- package/out/shared/models/constants.js.map +1 -0
- package/out/shared/models/model.js.map +1 -0
- package/out/{language-server → shared}/proxy-server.d.ts +1 -0
- package/out/shared/proxy-server.js +21 -0
- package/out/shared/proxy-server.js.map +1 -0
- package/out/shared/streamingClientService.d.ts +10 -0
- package/out/shared/streamingClientService.js +42 -0
- package/out/shared/streamingClientService.js.map +1 -0
- package/out/shared/supplementalContextUtil/codeParsingUtil.js.map +1 -0
- package/out/{language-server/utilities → shared}/supplementalContextUtil/crossFileContextUtil.d.ts +1 -1
- package/out/{language-server/utilities → shared}/supplementalContextUtil/crossFileContextUtil.js +1 -1
- package/out/shared/supplementalContextUtil/crossFileContextUtil.js.map +1 -0
- package/out/shared/supplementalContextUtil/rankBm25.js.map +1 -0
- package/out/{language-server/utilities → shared}/supplementalContextUtil/supplementalContextUtil.d.ts +1 -1
- package/out/shared/supplementalContextUtil/supplementalContextUtil.js.map +1 -0
- package/out/shared/telemetry/metric.js.map +1 -0
- package/out/{language-server → shared/telemetry}/telemetryService.d.ts +5 -5
- package/out/{language-server → shared/telemetry}/telemetryService.js +4 -4
- package/out/shared/telemetry/telemetryService.js.map +1 -0
- package/out/{language-server → shared}/telemetry/types.d.ts +2 -2
- package/out/shared/telemetry/types.js.map +1 -0
- package/out/{language-server/utilities → shared}/telemetryUtils.d.ts +1 -1
- package/out/shared/telemetryUtils.js.map +1 -0
- package/out/shared/testUtils.js.map +1 -0
- package/out/shared/utils.js.map +1 -0
- package/package.json +4 -4
- package/out/constants.d.ts +0 -8
- package/out/constants.js +0 -12
- package/out/constants.js.map +0 -1
- package/out/language-server/amazonQServiceManager/AmazonQTokenServiceManager.js.map +0 -1
- package/out/language-server/amazonQServiceManager/BaseAmazonQServiceManager.d.ts +0 -5
- package/out/language-server/amazonQServiceManager/BaseAmazonQServiceManager.js.map +0 -1
- package/out/language-server/amazonQServiceManager/errors.js.map +0 -1
- package/out/language-server/amazonQServiceManager/qDeveloperProfiles.js.map +0 -1
- package/out/language-server/auto-trigger/autoTrigger.js.map +0 -1
- package/out/language-server/codeWhispererSecurityScanServer.js.map +0 -1
- package/out/language-server/codeWhispererServer.d.ts +0 -6
- package/out/language-server/codeWhispererServer.js.map +0 -1
- package/out/language-server/codeWhispererService.js.map +0 -1
- package/out/language-server/constants.js +0 -8
- package/out/language-server/constants.js.map +0 -1
- package/out/language-server/dependencyGraph/commonUtil.js.map +0 -1
- package/out/language-server/dependencyGraph/constants.js.map +0 -1
- package/out/language-server/dependencyGraph/csharpDependencyGraph.js.map +0 -1
- package/out/language-server/dependencyGraph/dependencyGraph.js.map +0 -1
- package/out/language-server/dependencyGraph/dependencyGraphFactory.js.map +0 -1
- package/out/language-server/languageDetection.js.map +0 -1
- package/out/language-server/mergeRightUtils.js.map +0 -1
- package/out/language-server/models/constants.js.map +0 -1
- package/out/language-server/models/model.js.map +0 -1
- package/out/language-server/netTransformServer.js.map +0 -1
- package/out/language-server/proxy-server.js +0 -22
- package/out/language-server/proxy-server.js.map +0 -1
- package/out/language-server/qChatServer.js.map +0 -1
- package/out/language-server/session/sessionManager.js.map +0 -1
- package/out/language-server/telemetry/codeDiffTracker.js.map +0 -1
- package/out/language-server/telemetry/codePercentage.js.map +0 -1
- package/out/language-server/telemetry/metric.js.map +0 -1
- package/out/language-server/telemetry/types.js.map +0 -1
- package/out/language-server/telemetryService.js.map +0 -1
- package/out/language-server/testUtils.js.map +0 -1
- package/out/language-server/utilities/supplementalContextUtil/codeParsingUtil.js.map +0 -1
- package/out/language-server/utilities/supplementalContextUtil/crossFileContextUtil.js.map +0 -1
- package/out/language-server/utilities/supplementalContextUtil/rankBm25.js.map +0 -1
- package/out/language-server/utilities/supplementalContextUtil/supplementalContextUtil.js.map +0 -1
- package/out/language-server/utilities/telemetryUtils.js.map +0 -1
- package/out/language-server/utils.js.map +0 -1
- /package/out/language-server/{qChatServer.d.ts → chat/qChatServer.d.ts} +0 -0
- /package/out/language-server/{auto-trigger → inline-completion/auto-trigger}/autoTrigger.js +0 -0
- /package/out/language-server/{auto-trigger → inline-completion/auto-trigger}/coefficients.json +0 -0
- /package/out/language-server/{telemetry → inline-completion}/codeDiffTracker.d.ts +0 -0
- /package/out/language-server/{telemetry → inline-completion}/codePercentage.js +0 -0
- /package/out/language-server/{mergeRightUtils.d.ts → inline-completion/mergeRightUtils.d.ts} +0 -0
- /package/out/language-server/{mergeRightUtils.js → inline-completion/mergeRightUtils.js} +0 -0
- /package/out/language-server/{session → inline-completion/session}/sessionManager.js +0 -0
- /package/out/language-server/{codeWhispererSecurityScanServer.d.ts → securityScan/codeWhispererSecurityScanServer.d.ts} +0 -0
- /package/out/language-server/{dependencyGraph → securityScan/dependencyGraph}/commonUtil.d.ts +0 -0
- /package/out/language-server/{dependencyGraph → securityScan/dependencyGraph}/commonUtil.js +0 -0
- /package/out/language-server/{dependencyGraph → securityScan/dependencyGraph}/constants.d.ts +0 -0
- /package/out/language-server/{dependencyGraph → securityScan/dependencyGraph}/constants.js +0 -0
- /package/out/language-server/{dependencyGraph → securityScan/dependencyGraph}/csharpDependencyGraph.d.ts +0 -0
- /package/out/language-server/{dependencyGraph → securityScan/dependencyGraph}/csharpDependencyGraph.js +0 -0
- /package/out/language-server/{dependencyGraph → securityScan/dependencyGraph}/dependencyGraph.d.ts +0 -0
- /package/out/language-server/{dependencyGraph → securityScan/dependencyGraph}/dependencyGraph.js +0 -0
- /package/out/language-server/{dependencyGraph → securityScan/dependencyGraph}/dependencyGraphFactory.d.ts +0 -0
- /package/out/language-server/{dependencyGraph → securityScan/dependencyGraph}/dependencyGraphFactory.js +0 -0
- /package/out/{language-server → shared}/amazonQServiceManager/BaseAmazonQServiceManager.js +0 -0
- /package/out/{language-server → shared}/amazonQServiceManager/errors.d.ts +0 -0
- /package/out/{language-server → shared}/amazonQServiceManager/errors.js +0 -0
- /package/out/{language-server → shared}/codeWhispererService.d.ts +0 -0
- /package/out/{language-server → shared}/codeWhispererService.js +0 -0
- /package/out/{language-server → shared}/languageDetection.d.ts +0 -0
- /package/out/{language-server → shared}/languageDetection.js +0 -0
- /package/out/{language-server → shared}/models/constants.d.ts +0 -0
- /package/out/{language-server → shared}/models/constants.js +0 -0
- /package/out/{language-server → shared}/models/model.d.ts +0 -0
- /package/out/{language-server → shared}/models/model.js +0 -0
- /package/out/{language-server/utilities → shared}/supplementalContextUtil/codeParsingUtil.d.ts +0 -0
- /package/out/{language-server/utilities → shared}/supplementalContextUtil/codeParsingUtil.js +0 -0
- /package/out/{language-server/utilities → shared}/supplementalContextUtil/rankBm25.d.ts +0 -0
- /package/out/{language-server/utilities → shared}/supplementalContextUtil/rankBm25.js +0 -0
- /package/out/{language-server/utilities → shared}/supplementalContextUtil/supplementalContextUtil.js +0 -0
- /package/out/{language-server → shared}/telemetry/metric.d.ts +0 -0
- /package/out/{language-server → shared}/telemetry/metric.js +0 -0
- /package/out/{language-server → shared}/telemetry/types.js +0 -0
- /package/out/{language-server/utilities → shared}/telemetryUtils.js +0 -0
- /package/out/{language-server → shared}/testUtils.d.ts +0 -0
- /package/out/{language-server → shared}/testUtils.js +0 -0
- /package/out/{language-server → shared}/utils.d.ts +0 -0
- /package/out/{language-server → shared}/utils.js +0 -0
|
@@ -2,16 +2,14 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.AmazonQTokenServiceManager = void 0;
|
|
4
4
|
const server_interface_1 = require("@aws/language-server-runtimes/server-interface");
|
|
5
|
-
const constants_1 = require("../../constants");
|
|
6
5
|
const codeWhispererService_1 = require("../codeWhispererService");
|
|
7
6
|
const errors_1 = require("./errors");
|
|
8
|
-
const qConfigurationServer_1 = require("
|
|
9
|
-
const lsp_core_1 = require("@aws/lsp-core");
|
|
10
|
-
const codewhisperer_streaming_1 = require("@amzn/codewhisperer-streaming");
|
|
11
|
-
const util_retry_1 = require("@aws-sdk/util-retry");
|
|
7
|
+
const qConfigurationServer_1 = require("../../language-server/configuration/qConfigurationServer");
|
|
12
8
|
const qDeveloperProfiles_1 = require("./qDeveloperProfiles");
|
|
13
|
-
const
|
|
9
|
+
const configurationUtils_1 = require("./configurationUtils");
|
|
14
10
|
const utils_1 = require("../utils");
|
|
11
|
+
const telemetryUtils_1 = require("../telemetryUtils");
|
|
12
|
+
const streamingClientService_1 = require("../streamingClientService");
|
|
15
13
|
/**
|
|
16
14
|
* AmazonQTokenServiceManager manages state and provides centralized access to
|
|
17
15
|
* instance of CodeWhispererServiceToken SDK client to any consuming code.
|
|
@@ -43,8 +41,9 @@ class AmazonQTokenServiceManager {
|
|
|
43
41
|
features;
|
|
44
42
|
logging;
|
|
45
43
|
cachedCodewhispererService;
|
|
44
|
+
cachedStreamingClient;
|
|
46
45
|
enableDeveloperProfileSupport;
|
|
47
|
-
configurationCache = new
|
|
46
|
+
configurationCache = new configurationUtils_1.AmazonQConfigurationCache();
|
|
48
47
|
activeIdcProfile;
|
|
49
48
|
connectionType;
|
|
50
49
|
profileChangeTokenSource;
|
|
@@ -161,7 +160,7 @@ class AmazonQTokenServiceManager {
|
|
|
161
160
|
}
|
|
162
161
|
// Connection type hasn't change.
|
|
163
162
|
if (newConnectionType === this.connectionType) {
|
|
164
|
-
this.
|
|
163
|
+
this.logging.debug(`Connection type did not change: ${this.connectionType}`);
|
|
165
164
|
return;
|
|
166
165
|
}
|
|
167
166
|
// Connection type changed to 'builderId'
|
|
@@ -195,41 +194,26 @@ class AmazonQTokenServiceManager {
|
|
|
195
194
|
}
|
|
196
195
|
async handleDidChangeConfiguration() {
|
|
197
196
|
try {
|
|
198
|
-
const
|
|
199
|
-
if (
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
this.
|
|
203
|
-
|
|
204
|
-
// aws.q.optOutTelemetry - telemetry optout option
|
|
205
|
-
const optOutTelemetryPreference = qConfig['optOutTelemetry'] === true ? 'OPTOUT' : 'OPTIN';
|
|
206
|
-
this.log(`Read configuration optOutTelemetryPreference=${optOutTelemetryPreference}`);
|
|
207
|
-
this.configurationCache.set('optOutTelemetryPreference', optOutTelemetryPreference);
|
|
208
|
-
if (this.cachedCodewhispererService) {
|
|
209
|
-
this.log(`Using customization=${customizationArn}`);
|
|
210
|
-
this.cachedCodewhispererService.customizationArn = customizationArn;
|
|
211
|
-
}
|
|
212
|
-
}
|
|
213
|
-
const codeWhispererConfig = await this.features.lsp.workspace.getConfiguration('aws.codeWhisperer');
|
|
214
|
-
if (codeWhispererConfig) {
|
|
215
|
-
// aws.codeWhisperer.includeSuggestionsWithCodeReferences - return suggestions with code references
|
|
216
|
-
const includeSuggestionsWithCodeReferences = codeWhispererConfig['includeSuggestionsWithCodeReferences'] === true;
|
|
217
|
-
this.log(`Read сonfiguration includeSuggestionsWithCodeReferences=${includeSuggestionsWithCodeReferences}`);
|
|
218
|
-
this.configurationCache.set('includeSuggestionsWithCodeReferences', includeSuggestionsWithCodeReferences);
|
|
219
|
-
// aws.codeWhisperershareCodeWhispererContentWithAWS - share content with AWS
|
|
220
|
-
const shareCodeWhispererContentWithAWS = codeWhispererConfig['shareCodeWhispererContentWithAWS'] === true;
|
|
221
|
-
this.log(`Read configuration shareCodeWhispererContentWithAWS=${shareCodeWhispererContentWithAWS}`);
|
|
222
|
-
this.configurationCache.set('shareCodeWhispererContentWithAWS', shareCodeWhispererContentWithAWS);
|
|
223
|
-
if (this.cachedCodewhispererService) {
|
|
197
|
+
const amazonQConfig = await (0, configurationUtils_1.getAmazonQRelatedWorkspaceConfigs)(this.features.lsp, this.features.logging);
|
|
198
|
+
if (this.cachedCodewhispererService) {
|
|
199
|
+
const { customizationArn, shareCodeWhispererContentWithAWS } = amazonQConfig;
|
|
200
|
+
this.log(`Using customization=${customizationArn}`);
|
|
201
|
+
this.cachedCodewhispererService.customizationArn = customizationArn;
|
|
202
|
+
if (shareCodeWhispererContentWithAWS !== undefined) {
|
|
224
203
|
this.log('Update shareCodeWhispererContentWithAWS setting on cachedCodewhispererService to ' +
|
|
225
204
|
shareCodeWhispererContentWithAWS);
|
|
226
205
|
this.cachedCodewhispererService.shareCodeWhispererContentWithAWS = shareCodeWhispererContentWithAWS;
|
|
227
206
|
}
|
|
228
207
|
}
|
|
208
|
+
this.configurationCache.updateConfig(amazonQConfig);
|
|
229
209
|
}
|
|
230
210
|
catch (error) {
|
|
231
|
-
this.log(`
|
|
211
|
+
this.log(`Unexpected error in getAmazonQRelatedWorkspaceConfigs: ${error}`);
|
|
232
212
|
}
|
|
213
|
+
return this.configurationCache.getConfig();
|
|
214
|
+
}
|
|
215
|
+
getConfiguration() {
|
|
216
|
+
return this.configurationCache.getConfig();
|
|
233
217
|
}
|
|
234
218
|
cancelActiveProfileChangeToken() {
|
|
235
219
|
this.profileChangeTokenSource?.cancel();
|
|
@@ -254,7 +238,11 @@ class AmazonQTokenServiceManager {
|
|
|
254
238
|
// Test if connection type changed
|
|
255
239
|
this.handleSsoConnectionChange();
|
|
256
240
|
if (this.connectionType === 'none') {
|
|
257
|
-
|
|
241
|
+
if (newProfileArn !== null) {
|
|
242
|
+
throw new errors_1.AmazonQServicePendingSigninError();
|
|
243
|
+
}
|
|
244
|
+
this.logServiceState('Received null profile while not connected, ignoring request');
|
|
245
|
+
return;
|
|
258
246
|
}
|
|
259
247
|
if (this.connectionType !== 'identityCenter') {
|
|
260
248
|
this.logServiceState('Q Profile can not be set');
|
|
@@ -313,6 +301,9 @@ class AmazonQTokenServiceManager {
|
|
|
313
301
|
if (this.cachedCodewhispererService) {
|
|
314
302
|
this.cachedCodewhispererService.profileArn = newProfile.arn;
|
|
315
303
|
}
|
|
304
|
+
if (this.cachedStreamingClient) {
|
|
305
|
+
this.cachedStreamingClient.profileArn = newProfile.arn;
|
|
306
|
+
}
|
|
316
307
|
return;
|
|
317
308
|
}
|
|
318
309
|
this.log(`Switching service client region from ${oldRegion} to ${newRegion}`);
|
|
@@ -348,50 +339,32 @@ class AmazonQTokenServiceManager {
|
|
|
348
339
|
if (!tokenService || !this.region || !this.endpoint) {
|
|
349
340
|
throw new errors_1.AmazonQServiceNotInitializedError();
|
|
350
341
|
}
|
|
351
|
-
|
|
342
|
+
if (!this.cachedStreamingClient) {
|
|
343
|
+
this.cachedStreamingClient = this.streamingClientFactory(this.region, this.endpoint);
|
|
344
|
+
}
|
|
345
|
+
return this.cachedStreamingClient;
|
|
352
346
|
}
|
|
353
347
|
resetCodewhispererService() {
|
|
354
348
|
this.cachedCodewhispererService?.abortInflightRequests();
|
|
355
349
|
this.cachedCodewhispererService = undefined;
|
|
350
|
+
this.cachedStreamingClient?.abortInflightRequests();
|
|
351
|
+
this.cachedStreamingClient = undefined;
|
|
356
352
|
this.activeIdcProfile = undefined;
|
|
353
|
+
this.region = undefined;
|
|
354
|
+
this.endpoint = undefined;
|
|
357
355
|
}
|
|
358
|
-
createCodewhispererServiceInstances(connectionType,
|
|
356
|
+
createCodewhispererServiceInstances(connectionType, clientOrProfileRegion) {
|
|
359
357
|
this.logServiceState('Initializing CodewhispererService');
|
|
360
|
-
|
|
361
|
-
let awsQEndpoint;
|
|
362
|
-
if (region) {
|
|
363
|
-
this.log(`Selecting region (found: ${region}) provided by ${connectionType === 'builderId' ? 'client' : 'profile'}`);
|
|
364
|
-
awsQRegion = region;
|
|
365
|
-
// @ts-ignore
|
|
366
|
-
awsQEndpoint = constants_1.AWS_Q_ENDPOINTS[awsQRegion];
|
|
367
|
-
}
|
|
368
|
-
else {
|
|
369
|
-
const runtimeRegion = this.features.runtime.getConfiguration(constants_1.AWS_Q_REGION_ENV_VAR);
|
|
370
|
-
if (runtimeRegion) {
|
|
371
|
-
this.log(`Selecting region (found: ${runtimeRegion}) provided by runtime`);
|
|
372
|
-
awsQRegion = runtimeRegion;
|
|
373
|
-
// prettier-ignore
|
|
374
|
-
awsQEndpoint = // @ts-ignore
|
|
375
|
-
this.features.runtime.getConfiguration(constants_1.AWS_Q_ENDPOINT_URL_ENV_VAR) ?? constants_1.AWS_Q_ENDPOINTS[awsQRegion];
|
|
376
|
-
}
|
|
377
|
-
else {
|
|
378
|
-
this.log('Region not provided by caller or runtime, falling back to default region and endpoint');
|
|
379
|
-
awsQRegion = constants_1.DEFAULT_AWS_Q_REGION;
|
|
380
|
-
awsQEndpoint = constants_1.DEFAULT_AWS_Q_ENDPOINT_URL;
|
|
381
|
-
}
|
|
382
|
-
}
|
|
383
|
-
if (!awsQEndpoint) {
|
|
384
|
-
this.log(`Unable to determine endpoint (found: ${awsQEndpoint}) for region: ${awsQRegion}, falling back to default region and endpoint`);
|
|
385
|
-
awsQRegion = constants_1.DEFAULT_AWS_Q_REGION;
|
|
386
|
-
awsQEndpoint = constants_1.DEFAULT_AWS_Q_ENDPOINT_URL;
|
|
387
|
-
}
|
|
358
|
+
const { region, endpoint } = (0, configurationUtils_1.getAmazonQRegionAndEndpoint)(this.features.runtime, this.features.logging, clientOrProfileRegion);
|
|
388
359
|
// Cache active region and endpoint selection
|
|
389
360
|
this.connectionType = connectionType;
|
|
390
|
-
this.region =
|
|
391
|
-
this.endpoint =
|
|
392
|
-
this.cachedCodewhispererService = this.serviceFactory(
|
|
393
|
-
this.log(`CodeWhispererToken service for connection type ${connectionType} was initialized, region=${
|
|
394
|
-
this.
|
|
361
|
+
this.region = region;
|
|
362
|
+
this.endpoint = endpoint;
|
|
363
|
+
this.cachedCodewhispererService = this.serviceFactory(region, endpoint);
|
|
364
|
+
this.log(`CodeWhispererToken service for connection type ${connectionType} was initialized, region=${region}`);
|
|
365
|
+
this.cachedStreamingClient = this.streamingClientFactory(region, endpoint);
|
|
366
|
+
this.log(`StreamingClient service for connection type ${connectionType} was initialized, region=${region}`);
|
|
367
|
+
this.logServiceState('CodewhispererService and StreamingClient Initialization finished');
|
|
395
368
|
}
|
|
396
369
|
getCustomUserAgent() {
|
|
397
370
|
const initializeParams = this.features.lsp.getClientInitializeParams() || {};
|
|
@@ -403,25 +376,16 @@ class AmazonQTokenServiceManager {
|
|
|
403
376
|
service.updateClientConfig({
|
|
404
377
|
customUserAgent: customUserAgent,
|
|
405
378
|
});
|
|
406
|
-
service.customizationArn =
|
|
379
|
+
service.customizationArn = this.configurationCache.getProperty('customizationArn');
|
|
407
380
|
service.profileArn = this.activeIdcProfile?.arn;
|
|
408
|
-
service.shareCodeWhispererContentWithAWS =
|
|
409
|
-
this.configurationCache.get('shareCodeWhispererContentWithAWS') === true;
|
|
381
|
+
service.shareCodeWhispererContentWithAWS = this.configurationCache.getProperty('shareCodeWhispererContentWithAWS');
|
|
410
382
|
this.log('Configured CodeWhispererServiceToken instance settings:');
|
|
411
383
|
this.log(`customUserAgent=${customUserAgent}, customizationArn=${service.customizationArn}, shareCodeWhispererContentWithAWS=${service.shareCodeWhispererContentWithAWS}`);
|
|
412
384
|
return service;
|
|
413
385
|
}
|
|
414
386
|
streamingClientFactory(region, endpoint) {
|
|
415
|
-
const
|
|
416
|
-
|
|
417
|
-
// Without this, we need more complex mechanism for managing token change state when caching streaming client.
|
|
418
|
-
const streamingClient = this.features.sdkInitializator(codewhisperer_streaming_1.CodeWhispererStreaming, {
|
|
419
|
-
region,
|
|
420
|
-
endpoint,
|
|
421
|
-
token: { token: token },
|
|
422
|
-
retryStrategy: new util_retry_1.ConfiguredRetryStrategy(0, (attempt) => 500 + attempt ** 10),
|
|
423
|
-
customUserAgent: this.getCustomUserAgent(),
|
|
424
|
-
});
|
|
387
|
+
const streamingClient = new streamingClientService_1.StreamingClientService(this.features.credentialsProvider, this.features.sdkInitializator, region, endpoint, this.getCustomUserAgent());
|
|
388
|
+
streamingClient.profileArn = this.activeIdcProfile?.arn;
|
|
425
389
|
this.logging.debug(`Created streaming client instance region=${region}, endpoint=${endpoint}`);
|
|
426
390
|
return streamingClient;
|
|
427
391
|
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"AmazonQTokenServiceManager.js","sourceRoot":"","sources":["../../../src/shared/amazonQServiceManager/AmazonQTokenServiceManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { CodeWhispererServiceBase } from '../codeWhispererService';
|
|
2
|
+
import { AmazonQWorkspaceConfig } from './configurationUtils';
|
|
3
|
+
export interface BaseAmazonQServiceManager {
|
|
4
|
+
handleDidChangeConfiguration: () => Promise<Readonly<AmazonQWorkspaceConfig>>;
|
|
5
|
+
getCodewhispererService: () => CodeWhispererServiceBase;
|
|
6
|
+
getConfiguration: () => Readonly<AmazonQWorkspaceConfig>;
|
|
7
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"BaseAmazonQServiceManager.js","sourceRoot":"","sources":["../../../src/shared/amazonQServiceManager/BaseAmazonQServiceManager.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
import { Logging, Lsp, Runtime } from '@aws/language-server-runtimes/server-interface';
|
|
2
|
+
export interface AmazonQRegionAndEndpoint {
|
|
3
|
+
region: string;
|
|
4
|
+
endpoint: string;
|
|
5
|
+
}
|
|
6
|
+
/**
|
|
7
|
+
* Determines Q region according to the following discovery chain:
|
|
8
|
+
*
|
|
9
|
+
* provided region (e.g. by client or profile) -> region set in runtime -> default region
|
|
10
|
+
*
|
|
11
|
+
* @returns region and endpoint for Q connection
|
|
12
|
+
*/
|
|
13
|
+
export declare function getAmazonQRegionAndEndpoint(runtime: Runtime, logging: Logging, region?: string): AmazonQRegionAndEndpoint;
|
|
14
|
+
interface QInlineSuggestionsConfig {
|
|
15
|
+
extraContext: string | undefined;
|
|
16
|
+
}
|
|
17
|
+
interface QConfigSection {
|
|
18
|
+
customizationArn: string | undefined;
|
|
19
|
+
optOutTelemetryPreference: 'OPTOUT' | 'OPTIN';
|
|
20
|
+
inlineSuggestions: QInlineSuggestionsConfig;
|
|
21
|
+
}
|
|
22
|
+
interface CodeWhispererConfigSection {
|
|
23
|
+
includeSuggestionsWithCodeReferences: boolean;
|
|
24
|
+
shareCodeWhispererContentWithAWS: boolean;
|
|
25
|
+
}
|
|
26
|
+
export type AmazonQWorkspaceConfig = QConfigSection & CodeWhispererConfigSection;
|
|
27
|
+
export declare const CODE_WHISPERER_CONFIGURATION_SECTION = "aws.codeWhisperer";
|
|
28
|
+
/**
|
|
29
|
+
* Attempts to fetch the workspace configurations set in:
|
|
30
|
+
* - aws.q
|
|
31
|
+
* - aws.codeWhisperer
|
|
32
|
+
*
|
|
33
|
+
* and consolidates them into one configuration.
|
|
34
|
+
*/
|
|
35
|
+
export declare function getAmazonQRelatedWorkspaceConfigs(lsp: Lsp, logging: Logging): Promise<Readonly<Partial<AmazonQWorkspaceConfig>>>;
|
|
36
|
+
export declare const defaultAmazonQWorkspaceConfigFactory: () => AmazonQWorkspaceConfig;
|
|
37
|
+
export declare class AmazonQConfigurationCache {
|
|
38
|
+
private _cachedConfig;
|
|
39
|
+
constructor();
|
|
40
|
+
setProperty<K extends keyof AmazonQWorkspaceConfig>(key: K, newProperty: AmazonQWorkspaceConfig[K]): void;
|
|
41
|
+
getProperty<K extends keyof AmazonQWorkspaceConfig>(key: K): Readonly<AmazonQWorkspaceConfig[K]>;
|
|
42
|
+
updateConfig(newConfig: Readonly<Partial<AmazonQWorkspaceConfig>>): void;
|
|
43
|
+
getConfig(): Readonly<AmazonQWorkspaceConfig>;
|
|
44
|
+
}
|
|
45
|
+
export {};
|
|
@@ -0,0 +1,130 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.AmazonQConfigurationCache = exports.defaultAmazonQWorkspaceConfigFactory = exports.CODE_WHISPERER_CONFIGURATION_SECTION = void 0;
|
|
4
|
+
exports.getAmazonQRegionAndEndpoint = getAmazonQRegionAndEndpoint;
|
|
5
|
+
exports.getAmazonQRelatedWorkspaceConfigs = getAmazonQRelatedWorkspaceConfigs;
|
|
6
|
+
const qConfigurationServer_1 = require("../../language-server/configuration/qConfigurationServer");
|
|
7
|
+
const lsp_core_1 = require("@aws/lsp-core");
|
|
8
|
+
const constants_1 = require("../constants");
|
|
9
|
+
/**
|
|
10
|
+
* Determines Q region according to the following discovery chain:
|
|
11
|
+
*
|
|
12
|
+
* provided region (e.g. by client or profile) -> region set in runtime -> default region
|
|
13
|
+
*
|
|
14
|
+
* @returns region and endpoint for Q connection
|
|
15
|
+
*/
|
|
16
|
+
function getAmazonQRegionAndEndpoint(runtime, logging, region) {
|
|
17
|
+
let amazonQRegion;
|
|
18
|
+
let amazonQEndpoint;
|
|
19
|
+
if (region) {
|
|
20
|
+
logging.log(`Selecting region (found: ${region}) provided by caller`);
|
|
21
|
+
amazonQRegion = region;
|
|
22
|
+
amazonQEndpoint = constants_1.AWS_Q_ENDPOINTS.get(amazonQRegion);
|
|
23
|
+
}
|
|
24
|
+
else {
|
|
25
|
+
const runtimeRegion = runtime.getConfiguration(constants_1.AWS_Q_REGION_ENV_VAR);
|
|
26
|
+
if (runtimeRegion) {
|
|
27
|
+
logging.log(`Selecting region (found: ${runtimeRegion}) provided by runtime`);
|
|
28
|
+
amazonQRegion = runtimeRegion;
|
|
29
|
+
amazonQEndpoint = runtime.getConfiguration(constants_1.AWS_Q_ENDPOINT_URL_ENV_VAR) ?? constants_1.AWS_Q_ENDPOINTS.get(amazonQRegion);
|
|
30
|
+
}
|
|
31
|
+
else {
|
|
32
|
+
logging.log(`Region not provided by caller or runtime, falling back to default region (${constants_1.DEFAULT_AWS_Q_REGION}) and endpoint`);
|
|
33
|
+
amazonQRegion = constants_1.DEFAULT_AWS_Q_REGION;
|
|
34
|
+
amazonQEndpoint = constants_1.DEFAULT_AWS_Q_ENDPOINT_URL;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
if (!amazonQEndpoint) {
|
|
38
|
+
logging.log(`Unable to determine endpoint (found: ${amazonQEndpoint}) for region: ${amazonQRegion}, falling back to default region (${constants_1.DEFAULT_AWS_Q_REGION}) and endpoint`);
|
|
39
|
+
amazonQRegion = constants_1.DEFAULT_AWS_Q_REGION;
|
|
40
|
+
amazonQEndpoint = constants_1.DEFAULT_AWS_Q_ENDPOINT_URL;
|
|
41
|
+
}
|
|
42
|
+
return {
|
|
43
|
+
region: amazonQRegion,
|
|
44
|
+
endpoint: amazonQEndpoint,
|
|
45
|
+
};
|
|
46
|
+
}
|
|
47
|
+
exports.CODE_WHISPERER_CONFIGURATION_SECTION = 'aws.codeWhisperer';
|
|
48
|
+
/**
|
|
49
|
+
* Attempts to fetch the workspace configurations set in:
|
|
50
|
+
* - aws.q
|
|
51
|
+
* - aws.codeWhisperer
|
|
52
|
+
*
|
|
53
|
+
* and consolidates them into one configuration.
|
|
54
|
+
*/
|
|
55
|
+
async function getAmazonQRelatedWorkspaceConfigs(lsp, logging) {
|
|
56
|
+
let qConfig = undefined;
|
|
57
|
+
let codeWhispererConfig = undefined;
|
|
58
|
+
try {
|
|
59
|
+
logging.debug(`Calling getConfiguration(${qConfigurationServer_1.Q_CONFIGURATION_SECTION})`);
|
|
60
|
+
const newQConfig = await lsp.workspace.getConfiguration(qConfigurationServer_1.Q_CONFIGURATION_SECTION);
|
|
61
|
+
if (newQConfig) {
|
|
62
|
+
qConfig = {
|
|
63
|
+
customizationArn: lsp_core_1.textUtils.undefinedIfEmpty(newQConfig.customization),
|
|
64
|
+
optOutTelemetryPreference: newQConfig['optOutTelemetry'] === true ? 'OPTOUT' : 'OPTIN',
|
|
65
|
+
inlineSuggestions: {
|
|
66
|
+
extraContext: lsp_core_1.textUtils.undefinedIfEmpty(newQConfig.inlineSuggestions?.extraContext),
|
|
67
|
+
},
|
|
68
|
+
};
|
|
69
|
+
logging.log(`Read configuration customizationArn=${qConfig.customizationArn}`);
|
|
70
|
+
logging.log(`Read configuration optOutTelemetryPreference=${qConfig.optOutTelemetryPreference}`);
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
catch (error) {
|
|
74
|
+
logging.error(`Error in getConfiguration(${qConfigurationServer_1.Q_CONFIGURATION_SECTION}): ${error}`);
|
|
75
|
+
}
|
|
76
|
+
try {
|
|
77
|
+
logging.debug(`Calling getConfiguration(${exports.CODE_WHISPERER_CONFIGURATION_SECTION})`);
|
|
78
|
+
const newCodeWhispererConfig = await lsp.workspace.getConfiguration(exports.CODE_WHISPERER_CONFIGURATION_SECTION);
|
|
79
|
+
if (newCodeWhispererConfig) {
|
|
80
|
+
codeWhispererConfig = {
|
|
81
|
+
includeSuggestionsWithCodeReferences: newCodeWhispererConfig['includeSuggestionsWithCodeReferences'] === true,
|
|
82
|
+
shareCodeWhispererContentWithAWS: newCodeWhispererConfig['shareCodeWhispererContentWithAWS'] === true,
|
|
83
|
+
};
|
|
84
|
+
logging.log(`Read сonfiguration includeSuggestionsWithCodeReferences=${codeWhispererConfig.includeSuggestionsWithCodeReferences}`);
|
|
85
|
+
logging.log(`Read configuration shareCodeWhispererContentWithAWS=${codeWhispererConfig.shareCodeWhispererContentWithAWS}`);
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
catch (error) {
|
|
89
|
+
logging.error(`Error in getConfiguration(${exports.CODE_WHISPERER_CONFIGURATION_SECTION}): ${error}`);
|
|
90
|
+
}
|
|
91
|
+
return {
|
|
92
|
+
...qConfig,
|
|
93
|
+
...codeWhispererConfig,
|
|
94
|
+
};
|
|
95
|
+
}
|
|
96
|
+
const defaultAmazonQWorkspaceConfigFactory = () => {
|
|
97
|
+
return {
|
|
98
|
+
customizationArn: undefined,
|
|
99
|
+
optOutTelemetryPreference: 'OPTIN',
|
|
100
|
+
inlineSuggestions: {
|
|
101
|
+
extraContext: undefined,
|
|
102
|
+
},
|
|
103
|
+
includeSuggestionsWithCodeReferences: false,
|
|
104
|
+
shareCodeWhispererContentWithAWS: false,
|
|
105
|
+
};
|
|
106
|
+
};
|
|
107
|
+
exports.defaultAmazonQWorkspaceConfigFactory = defaultAmazonQWorkspaceConfigFactory;
|
|
108
|
+
class AmazonQConfigurationCache {
|
|
109
|
+
_cachedConfig;
|
|
110
|
+
constructor() {
|
|
111
|
+
this._cachedConfig = (0, exports.defaultAmazonQWorkspaceConfigFactory)();
|
|
112
|
+
}
|
|
113
|
+
setProperty(key, newProperty) {
|
|
114
|
+
this._cachedConfig[key] = typeof newProperty === 'object' ? { ...newProperty } : newProperty;
|
|
115
|
+
}
|
|
116
|
+
getProperty(key) {
|
|
117
|
+
const property = this._cachedConfig[key];
|
|
118
|
+
return typeof property === 'object' ? { ...property } : property;
|
|
119
|
+
}
|
|
120
|
+
updateConfig(newConfig) {
|
|
121
|
+
Object.entries(newConfig).forEach(([key, value]) => {
|
|
122
|
+
this.setProperty(key, value);
|
|
123
|
+
});
|
|
124
|
+
}
|
|
125
|
+
getConfig() {
|
|
126
|
+
return { ...this._cachedConfig };
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
exports.AmazonQConfigurationCache = AmazonQConfigurationCache;
|
|
130
|
+
//# sourceMappingURL=configurationUtils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"configurationUtils.js","sourceRoot":"","sources":["../../../src/shared/amazonQServiceManager/configurationUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../src/shared/amazonQServiceManager/errors.ts"],"names":[],"mappings":";;;AAAA,gCAAgC;AAChC,MAAa,YAAa,SAAQ,KAAK;IAC5B,IAAI,CAAQ;IACnB,YAAY,OAAe,EAAE,IAAY;QACrC,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,IAAI,GAAG,cAAc,CAAA;QAC1B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;IACpB,CAAC;CACJ;AAPD,oCAOC;AAED,MAAa,iCAAkC,SAAQ,YAAY;IAC/D,YAAY,UAAkB,8CAA8C;QACxE,KAAK,CAAC,OAAO,EAAE,iCAAiC,CAAC,CAAA;QACjD,IAAI,CAAC,IAAI,GAAG,mCAAmC,CAAA;IACnD,CAAC;CACJ;AALD,8EAKC;AAED,MAAa,iCAAkC,SAAQ,YAAY;IAC/D,YAAY,UAAkB,yCAAyC;QACnE,KAAK,CAAC,OAAO,EAAE,4BAA4B,CAAC,CAAA;QAC5C,IAAI,CAAC,IAAI,GAAG,mCAAmC,CAAA;IACnD,CAAC;CACJ;AALD,8EAKC;AAED,MAAa,gCAAiC,SAAQ,YAAY;IAC9D,YAAY,UAAkB,mCAAmC;QAC7D,KAAK,CAAC,OAAO,EAAE,+BAA+B,CAAC,CAAA;QAC/C,IAAI,CAAC,IAAI,GAAG,kCAAkC,CAAA;IAClD,CAAC;CACJ;AALD,4EAKC;AAED,MAAa,iCAAkC,SAAQ,YAAY;IAC/D,YAAY,UAAkB,0DAA0D;QACpF,KAAK,CAAC,OAAO,EAAE,4BAA4B,CAAC,CAAA;QAC5C,IAAI,CAAC,IAAI,GAAG,mCAAmC,CAAA;IACnD,CAAC;CACJ;AALD,8EAKC;AAED,MAAa,uCAAwC,SAAQ,YAAY;IACrE,YAAY,UAAkB,oCAAoC;QAC9D,KAAK,CAAC,OAAO,EAAE,mCAAmC,CAAC,CAAA;QACnD,IAAI,CAAC,IAAI,GAAG,yCAAyC,CAAA;IACzD,CAAC;CACJ;AALD,0FAKC;AAED,MAAa,oCAAqC,SAAQ,YAAY;IAClE,YAAY,UAAkB,4BAA4B;QACtD,KAAK,CAAC,OAAO,EAAE,qCAAqC,CAAC,CAAA;QACrD,IAAI,CAAC,IAAI,GAAG,sCAAsC,CAAA;IACtD,CAAC;CACJ;AALD,oFAKC;AAED,MAAa,iCAAkC,SAAQ,YAAY;IAC/D,YAAY,UAAkB,sCAAsC;QAChE,KAAK,CAAC,OAAO,EAAE,4BAA4B,CAAC,CAAA;QAC5C,IAAI,CAAC,IAAI,GAAG,mCAAmC,CAAA;IACnD,CAAC;CACJ;AALD,8EAKC;AAED,MAAa,mCAAoC,SAAQ,YAAY;IACjE,YAAY,UAAkB,4DAA4D;QACtF,KAAK,CAAC,OAAO,EAAE,0CAA0C,CAAC,CAAA;QAC1D,IAAI,CAAC,IAAI,GAAG,qCAAqC,CAAA;IACrD,CAAC;CACJ;AALD,kFAKC"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { Features } from './AmazonQTokenServiceManager';
|
|
2
|
+
import { BaseAmazonQServiceManager } from './BaseAmazonQServiceManager';
|
|
3
|
+
import { AmazonQWorkspaceConfig } from './configurationUtils';
|
|
4
|
+
import { CodeWhispererServiceBase } from '../codeWhispererService';
|
|
5
|
+
export declare const initFallbackServiceManager: (features: Features, serviceOverride?: CodeWhispererServiceBase) => {
|
|
6
|
+
handleDidChangeConfiguration: () => Promise<Readonly<AmazonQWorkspaceConfig>>;
|
|
7
|
+
getCodewhispererService: () => CodeWhispererServiceBase;
|
|
8
|
+
getConfiguration: () => Readonly<AmazonQWorkspaceConfig>;
|
|
9
|
+
};
|
|
10
|
+
export declare const initBaseTokenServiceManager: (features: Features) => BaseAmazonQServiceManager;
|
|
11
|
+
export declare const initBaseIAMServiceManager: (features: Features) => {
|
|
12
|
+
handleDidChangeConfiguration: () => Promise<Readonly<AmazonQWorkspaceConfig>>;
|
|
13
|
+
getCodewhispererService: () => CodeWhispererServiceBase;
|
|
14
|
+
getConfiguration: () => Readonly<AmazonQWorkspaceConfig>;
|
|
15
|
+
};
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.initBaseIAMServiceManager = exports.initBaseTokenServiceManager = exports.initFallbackServiceManager = void 0;
|
|
4
|
+
const AmazonQTokenServiceManager_1 = require("./AmazonQTokenServiceManager");
|
|
5
|
+
const configurationUtils_1 = require("./configurationUtils");
|
|
6
|
+
const codeWhispererService_1 = require("../codeWhispererService");
|
|
7
|
+
const initTokenServiceManager = (features) => {
|
|
8
|
+
return AmazonQTokenServiceManager_1.AmazonQTokenServiceManager.getInstance(features);
|
|
9
|
+
};
|
|
10
|
+
const initFallbackServiceManager = (features, serviceOverride) => {
|
|
11
|
+
const { region, endpoint } = (0, configurationUtils_1.getAmazonQRegionAndEndpoint)(features.runtime, features.logging);
|
|
12
|
+
const codeWhisperService = serviceOverride ??
|
|
13
|
+
new codeWhispererService_1.CodeWhispererServiceIAM(features.credentialsProvider, features.workspace, region, endpoint, features.sdkInitializator);
|
|
14
|
+
const configurationCache = new configurationUtils_1.AmazonQConfigurationCache();
|
|
15
|
+
return {
|
|
16
|
+
handleDidChangeConfiguration: async () => {
|
|
17
|
+
try {
|
|
18
|
+
const amazonQConfig = await (0, configurationUtils_1.getAmazonQRelatedWorkspaceConfigs)(features.lsp, features.logging);
|
|
19
|
+
codeWhisperService.customizationArn = amazonQConfig.customizationArn;
|
|
20
|
+
if (amazonQConfig.shareCodeWhispererContentWithAWS !== undefined) {
|
|
21
|
+
codeWhisperService.shareCodeWhispererContentWithAWS = amazonQConfig.shareCodeWhispererContentWithAWS;
|
|
22
|
+
}
|
|
23
|
+
configurationCache.updateConfig(amazonQConfig);
|
|
24
|
+
}
|
|
25
|
+
catch (error) {
|
|
26
|
+
features.logging.debug(`Unexpected error in getAWSQRelatedWorkspaceConfigs: ${error}`);
|
|
27
|
+
}
|
|
28
|
+
return configurationCache.getConfig();
|
|
29
|
+
},
|
|
30
|
+
getCodewhispererService: () => {
|
|
31
|
+
return codeWhisperService;
|
|
32
|
+
},
|
|
33
|
+
getConfiguration: () => {
|
|
34
|
+
return configurationCache.getConfig();
|
|
35
|
+
},
|
|
36
|
+
};
|
|
37
|
+
};
|
|
38
|
+
exports.initFallbackServiceManager = initFallbackServiceManager;
|
|
39
|
+
const initBaseTokenServiceManager = (features) => {
|
|
40
|
+
return initTokenServiceManager(features);
|
|
41
|
+
};
|
|
42
|
+
exports.initBaseTokenServiceManager = initBaseTokenServiceManager;
|
|
43
|
+
const initBaseIAMServiceManager = (features) => {
|
|
44
|
+
return (0, exports.initFallbackServiceManager)(features);
|
|
45
|
+
};
|
|
46
|
+
exports.initBaseIAMServiceManager = initBaseIAMServiceManager;
|
|
47
|
+
//# sourceMappingURL=factories.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"factories.js","sourceRoot":"","sources":["../../../src/shared/amazonQServiceManager/factories.ts"],"names":[],"mappings":";;;AAAA,6EAAmF;AAEnF,6DAK6B;AAC7B,kEAA2F;AAE3F,MAAM,uBAAuB,GAAG,CAAC,QAAkB,EAAE,EAAE;IACnD,OAAO,uDAA0B,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAA;AAC3D,CAAC,CAAA;AAEM,MAAM,0BAA0B,GAAG,CAAC,QAAkB,EAAE,eAA0C,EAAE,EAAE;IACzG,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,gDAA2B,EAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAA;IAC5F,MAAM,kBAAkB,GACpB,eAAe;QACf,IAAI,8CAAuB,CACvB,QAAQ,CAAC,mBAAmB,EAC5B,QAAQ,CAAC,SAAS,EAClB,MAAM,EACN,QAAQ,EACR,QAAQ,CAAC,gBAAgB,CAC5B,CAAA;IAEL,MAAM,kBAAkB,GAAG,IAAI,8CAAyB,EAAE,CAAA;IAE1D,OAAO;QACH,4BAA4B,EAAE,KAAK,IAA+C,EAAE;YAChF,IAAI,CAAC;gBACD,MAAM,aAAa,GAAG,MAAM,IAAA,sDAAiC,EAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAA;gBAE7F,kBAAkB,CAAC,gBAAgB,GAAG,aAAa,CAAC,gBAAgB,CAAA;gBAEpE,IAAI,aAAa,CAAC,gCAAgC,KAAK,SAAS,EAAE,CAAC;oBAC/D,kBAAkB,CAAC,gCAAgC,GAAG,aAAa,CAAC,gCAAgC,CAAA;gBACxG,CAAC;gBAED,kBAAkB,CAAC,YAAY,CAAC,aAAa,CAAC,CAAA;YAClD,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,uDAAuD,KAAK,EAAE,CAAC,CAAA;YAC1F,CAAC;YAED,OAAO,kBAAkB,CAAC,SAAS,EAAE,CAAA;QACzC,CAAC;QACD,uBAAuB,EAAE,GAAG,EAAE;YAC1B,OAAO,kBAAkB,CAAA;QAC7B,CAAC;QACD,gBAAgB,EAAE,GAAG,EAAE;YACnB,OAAO,kBAAkB,CAAC,SAAS,EAAE,CAAA;QACzC,CAAC;KACJ,CAAA;AACL,CAAC,CAAA;AAvCY,QAAA,0BAA0B,8BAuCtC;AAEM,MAAM,2BAA2B,GAAG,CAAC,QAAkB,EAA6B,EAAE;IACzF,OAAO,uBAAuB,CAAC,QAAQ,CAAC,CAAA;AAC5C,CAAC,CAAA;AAFY,QAAA,2BAA2B,+BAEvC;AACM,MAAM,yBAAyB,GAAG,CAAC,QAAkB,EAAE,EAAE;IAC5D,OAAO,IAAA,kCAA0B,EAAC,QAAQ,CAAC,CAAA;AAC/C,CAAC,CAAA;AAFY,QAAA,yBAAyB,6BAErC"}
|
|
@@ -12,9 +12,7 @@ interface IdentityDetails {
|
|
|
12
12
|
export interface ListAllAvailableProfilesHandlerParams {
|
|
13
13
|
connectionType: SsoConnectionType;
|
|
14
14
|
logging: Logging;
|
|
15
|
-
endpoints?:
|
|
16
|
-
[region: string]: string;
|
|
17
|
-
};
|
|
15
|
+
endpoints?: Map<string, string>;
|
|
18
16
|
}
|
|
19
17
|
export type ListAllAvailableProfilesHandler = (params: ListAllAvailableProfilesHandlerParams) => Promise<AmazonQDeveloperProfile[]>;
|
|
20
18
|
export declare const MAX_Q_DEVELOPER_PROFILE_PAGES = 10;
|
|
@@ -4,7 +4,7 @@ exports.getListAllAvailableProfilesHandler = exports.MAX_Q_DEVELOPER_PROFILE_PAG
|
|
|
4
4
|
exports.signalsAWSQDeveloperProfilesEnabled = signalsAWSQDeveloperProfilesEnabled;
|
|
5
5
|
const server_interface_1 = require("@aws/language-server-runtimes/server-interface");
|
|
6
6
|
const utils_1 = require("../utils");
|
|
7
|
-
const constants_1 = require("../../constants");
|
|
7
|
+
const constants_1 = require("../../shared/constants");
|
|
8
8
|
exports.MAX_Q_DEVELOPER_PROFILE_PAGES = 10;
|
|
9
9
|
const MAX_Q_DEVELOPER_PROFILES_PER_PAGE = 10;
|
|
10
10
|
const getListAllAvailableProfilesHandler = (service) => async ({ connectionType, logging, endpoints }) => {
|
|
@@ -14,7 +14,7 @@ const getListAllAvailableProfilesHandler = (service) => async ({ connectionType,
|
|
|
14
14
|
}
|
|
15
15
|
let allProfiles = [];
|
|
16
16
|
const qEndpoints = endpoints ?? constants_1.AWS_Q_ENDPOINTS;
|
|
17
|
-
const result = await Promise.allSettled(
|
|
17
|
+
const result = await Promise.allSettled(Array.from(qEndpoints.entries(), ([region, endpoint]) => {
|
|
18
18
|
const codeWhispererService = service(region, endpoint);
|
|
19
19
|
return fetchProfilesFromRegion(codeWhispererService, region, logging);
|
|
20
20
|
}));
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"qDeveloperProfiles.js","sourceRoot":"","sources":["../../../src/shared/amazonQServiceManager/qDeveloperProfiles.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"codeWhispererService.js","sourceRoot":"","sources":["../../src/shared/codeWhispererService.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,3 +2,8 @@ export declare const MISSING_BEARER_TOKEN_ERROR = "credentialsProvider does not
|
|
|
2
2
|
export declare const INVALID_TOKEN = "The bearer token included in the request is invalid.";
|
|
3
3
|
export declare const GENERIC_UNAUTHORIZED_ERROR = "User is not authorized to make this call";
|
|
4
4
|
export declare const BUILDER_ID_START_URL = "https://view.awsapps.com/start";
|
|
5
|
+
export declare const DEFAULT_AWS_Q_ENDPOINT_URL = "https://codewhisperer.us-east-1.amazonaws.com/";
|
|
6
|
+
export declare const DEFAULT_AWS_Q_REGION = "us-east-1";
|
|
7
|
+
export declare const AWS_Q_ENDPOINTS: Map<string, string>;
|
|
8
|
+
export declare const AWS_Q_REGION_ENV_VAR = "AWS_Q_REGION";
|
|
9
|
+
export declare const AWS_Q_ENDPOINT_URL_ENV_VAR = "AWS_Q_ENDPOINT_URL";
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.AWS_Q_ENDPOINT_URL_ENV_VAR = exports.AWS_Q_REGION_ENV_VAR = exports.AWS_Q_ENDPOINTS = exports.DEFAULT_AWS_Q_REGION = exports.DEFAULT_AWS_Q_ENDPOINT_URL = exports.BUILDER_ID_START_URL = exports.GENERIC_UNAUTHORIZED_ERROR = exports.INVALID_TOKEN = exports.MISSING_BEARER_TOKEN_ERROR = void 0;
|
|
4
|
+
exports.MISSING_BEARER_TOKEN_ERROR = 'credentialsProvider does not have bearer token credentials';
|
|
5
|
+
exports.INVALID_TOKEN = 'The bearer token included in the request is invalid.';
|
|
6
|
+
exports.GENERIC_UNAUTHORIZED_ERROR = 'User is not authorized to make this call';
|
|
7
|
+
exports.BUILDER_ID_START_URL = 'https://view.awsapps.com/start';
|
|
8
|
+
exports.DEFAULT_AWS_Q_ENDPOINT_URL = 'https://codewhisperer.us-east-1.amazonaws.com/';
|
|
9
|
+
exports.DEFAULT_AWS_Q_REGION = 'us-east-1';
|
|
10
|
+
exports.AWS_Q_ENDPOINTS = new Map([
|
|
11
|
+
[exports.DEFAULT_AWS_Q_REGION, exports.DEFAULT_AWS_Q_ENDPOINT_URL],
|
|
12
|
+
['eu-central-1', 'https://q.eu-central-1.amazonaws.com/'],
|
|
13
|
+
]);
|
|
14
|
+
exports.AWS_Q_REGION_ENV_VAR = 'AWS_Q_REGION';
|
|
15
|
+
exports.AWS_Q_ENDPOINT_URL_ENV_VAR = 'AWS_Q_ENDPOINT_URL';
|
|
16
|
+
//# sourceMappingURL=constants.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/shared/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,0BAA0B,GAAG,4DAA4D,CAAA;AACzF,QAAA,aAAa,GAAG,sDAAsD,CAAA;AACtE,QAAA,0BAA0B,GAAG,0CAA0C,CAAA;AACvE,QAAA,oBAAoB,GAAG,gCAAgC,CAAA;AACvD,QAAA,0BAA0B,GAAG,gDAAgD,CAAA;AAC7E,QAAA,oBAAoB,GAAG,WAAW,CAAA;AAElC,QAAA,eAAe,GAAG,IAAI,GAAG,CAAC;IACnC,CAAC,4BAAoB,EAAE,kCAA0B,CAAC;IAClD,CAAC,cAAc,EAAE,uCAAuC,CAAC;CAC5D,CAAC,CAAA;AAEW,QAAA,oBAAoB,GAAG,cAAc,CAAA;AACrC,QAAA,0BAA0B,GAAG,oBAAoB,CAAA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"languageDetection.js","sourceRoot":"","sources":["../../src/shared/languageDetection.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/shared/models/constants.ts"],"names":[],"mappings":";AAAA,mDAAmD;AACnD,8IAA8I;;;AAE9I,IAAY,SAKX;AALD,WAAY,SAAS;IACjB,sCAAyB,CAAA;IACzB,oCAAuB,CAAA;IACvB,gCAAmB,CAAA;IACnB,0CAA6B,CAAA;AACjC,CAAC,EALW,SAAS,yBAAT,SAAS,QAKpB;AAEY,QAAA,oCAAoC,GAAG,gDAAgD,CAAA;AAEvF,QAAA,sBAAsB,GAAG;IAClC,oBAAoB,EAAE,EAAE;IACxB,IAAI,EAAE,CAAC;IACP,sBAAsB,EAAE,EAAE;CAC7B,CAAA;AAEY,QAAA,SAAS,GAAG;IACrB,cAAc,EAAE,KAAK;CACxB,CAAA"}
|