add comments and remove half-supported features

Author: Hweinstock

packages/core/src/shared/awsClientBuilderV3.ts

@@ -20,7 +20,7 @@ import {
 import { HttpResponse } from '@aws-sdk/protocol-http'
 import { telemetry } from './telemetry'
 import { getRequestId } from './errors'
-import { getLogger } from '.'
+import { extensionVersion, getLogger } from '.'
 
 export type AwsClient = IClient<any, any, any>
 interface AwsConfigOptions {
@@ -69,17 +69,9 @@ export class DefaultAWSClientBuilderV3 implements AWSClientBuilderV3 {
         }
 
         if (!opt.customUserAgent && userAgent) {
-            opt.customUserAgent = [[getUserAgent({ includePlatform: true, includeClientId: true })]]
-        }
-
-        const apiConfig = (opt as { apiConfig?: { metadata?: Record<string, string> } } | undefined)?.apiConfig
-        const serviceName =
-            apiConfig?.metadata?.serviceId?.toLowerCase() ??
-            (type as unknown as { serviceIdentifier?: string }).serviceIdentifier
-
-        if (serviceName) {
-            opt.endpoint = settings?.get('endpoints', {})[serviceName] ?? opt.endpoint
+            opt.customUserAgent = [[getUserAgent({ includePlatform: true, includeClientId: true }), extensionVersion]]
         }
+        // TODO: add tests for refresh logic.
         opt.credentials = async () => {
             const creds = await shim.get()
             if (creds.expiration && creds.expiration.getTime() < Date.now()) {
@@ -89,6 +81,7 @@ export class DefaultAWSClientBuilderV3 implements AWSClientBuilderV3 {
         }
 
         const service = new type(opt)
+        // TODO: add middleware for logging, telemetry, endpoints.
         service.middlewareStack.add(telemetryMiddleware, { step: 'deserialize' } as DeserializeHandlerOptions)
         return service
     }

packages/core/src/test/shared/defaultAwsClientBuilderV3.test.ts

@@ -5,14 +5,13 @@
 
 import assert from 'assert'
 import { version } from 'vscode'
-import { DevSettings } from '../../shared/settings'
 import { getClientId } from '../../shared/telemetry/util'
 import { FakeMemento } from '../fakeExtensionContext'
 import { FakeAwsContext } from '../utilities/fakeAwsContext'
-import { TestSettings } from '../utilities/testSettingsConfiguration'
 import { GlobalState } from '../../shared/globalState'
 import { AWSClientBuilderV3, DefaultAWSClientBuilderV3 } from '../../shared/awsClientBuilderV3'
 import { Client } from '@aws-sdk/smithy-client'
+import { extensionVersion } from '../../shared'
 
 describe('DefaultAwsClientBuilderV3', function () {
     let builder: AWSClientBuilderV3
@@ -31,6 +30,7 @@ describe('DefaultAwsClientBuilderV3', function () {
                 service.config.customUserAgent![0][0].replace('---Insiders', ''),
                 `AWS-Toolkit-For-VSCode/testPluginVersion Visual-Studio-Code/${version} ClientId/${clientId}`
             )
+            assert.strictEqual(service.config.customUserAgent![0][1], extensionVersion)
         })
 
         it('adds region to client', async function () {
@@ -54,41 +54,5 @@ describe('DefaultAwsClientBuilderV3', function () {
 
             assert.strictEqual(service.config.customUserAgent[0][0], 'CUSTOM USER AGENT')
         })
-
-        it('can use endpoint override', async function () {
-            const settings = new TestSettings()
-            await settings.update('aws.dev.endpoints', { foo: 'http://example.com' })
-
-            const service = await builder.createAwsService(
-                Client as any,
-                {
-                    customUserAgent: [['CUSTOM USER AGENT']],
-                    apiConfig: { metadata: { serviceId: 'foo' } },
-                } as any,
-                undefined,
-                undefined,
-                new DevSettings(settings)
-            )
-
-            assert.strictEqual(service.config.endpoint, 'http://example.com')
-        })
-
-        it('does not clobber endpoint setting if no override is present', async function () {
-            const settings = new TestSettings()
-
-            const service = await builder.createAwsService(
-                Client as any,
-                {
-                    customUserAgent: 'CUSTOM USER AGENT',
-                    apiConfig: { metadata: { serviceId: 'foo' } },
-                    endpoint: 'http://example.com',
-                } as any,
-                undefined,
-                undefined,
-                new DevSettings(settings)
-            )
-
-            assert.strictEqual(service.config.endpoint, 'http://example.com')
-        })
     })
 })