Merge branch 'master' into removeFsExtra2

Author: Hweinstock

packages/core/src/amazonqFeatureDev/client/featureDev.ts

@@ -26,8 +26,17 @@ import { createCodeWhispererChatStreamingClient } from '../../shared/clients/cod
 import { getClientId, getOptOutPreference, getOperatingSystem } from '../../shared/telemetry/util'
 import { extensionVersion } from '../../shared/vscode/env'
 
+// Re-enable once BE is able to handle retries.
+const writeAPIRetryOptions = {
+    maxRetries: 0,
+    retryDelayOptions: {
+        // The default number of milliseconds to use in the exponential backoff
+        base: 500,
+    },
+}
+
 // Create a client for featureDev proxy client based off of aws sdk v2
-export async function createFeatureDevProxyClient(): Promise<FeatureDevProxyClient> {
+export async function createFeatureDevProxyClient(options?: Partial<ServiceOptions>): Promise<FeatureDevProxyClient> {
     const bearerToken = await AuthUtil.instance.getBearerToken()
     const cwsprConfig = getCodewhispererConfig()
     return (await globals.sdkClientBuilder.createAwsService(
@@ -37,27 +46,22 @@ export async function createFeatureDevProxyClient(): Promise<FeatureDevProxyClie
             region: cwsprConfig.region,
             endpoint: cwsprConfig.endpoint,
             token: new Token({ token: bearerToken }),
-            // SETTING TO 0 FOR BETA. RE-ENABLE FOR RE-INVENT
-            maxRetries: 0,
-            retryDelayOptions: {
-                // The default number of milliseconds to use in the exponential backoff
-                base: 500,
-            },
+            ...options,
         } as ServiceOptions,
         undefined
     )) as FeatureDevProxyClient
 }
 
 export class FeatureDevClient {
-    public async getClient() {
+    public async getClient(options?: Partial<ServiceOptions>) {
         // Should not be stored for the whole session.
         // Client has to be reinitialized for each request so we always have a fresh bearerToken
-        return await createFeatureDevProxyClient()
+        return await createFeatureDevProxyClient(options)
     }
 
     public async createConversation() {
         try {
-            const client = await this.getClient()
+            const client = await this.getClient(writeAPIRetryOptions)
             getLogger().debug(`Executing createTaskAssistConversation with {}`)
             const { conversationId, $response } = await client.createTaskAssistConversation().promise()
             getLogger().debug(`${featureName}: Created conversation: %O`, {
@@ -82,7 +86,7 @@ export class FeatureDevClient {
 
     public async createUploadUrl(conversationId: string, contentChecksumSha256: string, contentLength: number) {
         try {
-            const client = await this.getClient()
+            const client = await this.getClient(writeAPIRetryOptions)
             const params = {
                 uploadContext: {
                     taskAssistPlanningUploadContext: {
@@ -119,7 +123,7 @@ export class FeatureDevClient {
 
     public async startCodeGeneration(conversationId: string, uploadId: string, message: string) {
         try {
-            const client = await this.getClient()
+            const client = await this.getClient(writeAPIRetryOptions)
             const params = {
                 conversationState: {
                     conversationId,

packages/core/src/codewhisperer/tracker/codewhispererCodeCoverageTracker.ts

@@ -120,7 +120,7 @@ export class CodeWhispererCodeCoverageTracker {
                 }
             })
         }
-        const percentCount = ((unmodifiedAcceptedTokens / totalTokens) * 100).toFixed(2)
+        const percentCount = ((acceptedTokens / totalTokens) * 100).toFixed(2)
         const percentage = Math.round(parseInt(percentCount))
         const selectedCustomization = getSelectedCustomization()
         if (this._serviceInvocationCount <= 0) {

packages/core/src/test/awsService/accessanalyzer/iamPolicyChecks.test.ts

@@ -19,6 +19,7 @@ import * as iamPolicyChecks from '../../../awsService/accessanalyzer/vue/iamPoli
 import * as vscode from 'vscode'
 import { IamPolicyChecksConstants } from '../../../awsService/accessanalyzer/vue/constants'
 import { FileSystem } from '../../../shared/fs/fs'
+import path from 'path'
 
 const defaultTerraformConfigPath = 'resources/policychecks-tf-default.yaml'
 let sandbox: sinon.SinonSandbox
@@ -29,7 +30,10 @@ describe('iamPolicyChecks', function () {
     it('IamPolicyChecksWebview built .vue source file path exists', async function () {
         assert.ok(
             await vscodeFs.existsFile(
-                globals.context.asAbsolutePath(`src/awsService/accessanalyzer/vue/iamPolicyChecks.vue`)
+                path.join(
+                    path.dirname(globals.context.extensionPath),
+                    `core/src/awsService/accessanalyzer/vue/iamPolicyChecks.vue`
+                )
             )
         )
     })