Cleaning up logs and functions (#198)

Author: satyakigh

src/app/standalone.ts

@@ -22,9 +22,14 @@ async function onInitialize(params: ExtendedInitializeParams) {
     getLogger().info(
         {
             ClientInfo,
-            AwsMetadata,
             NodeEnv,
             AwsEnv,
+            aws: {
+                clientInfo: AwsMetadata?.clientInfo,
+                telemetryEnabled: AwsMetadata?.telemetryEnabled,
+                logLevel: AwsMetadata?.logLevel,
+                cloudformation: AwsMetadata?.cloudformation,
+            },
         },
         `${ExtensionName} initializing...`,
     );

src/auth/AwsCredentials.ts

@@ -31,6 +31,7 @@ export class AwsCredentials {
         encryptionKey?: string,
     ) {
         this.encryptionKey = encryptionKey ? Buffer.from(encryptionKey, 'base64') : undefined;
+        this.logger.info(`AWS credentials ${encryptionKey ? 'encrypted' : 'unencrypted'}`);
     }
 
     getIAM(): DeepReadonly<IamCredentials> {

src/featureFlag/FeatureFlagProvider.ts

@@ -1,10 +1,10 @@
 import { readFileSync, writeFileSync } from 'fs';
 import { join } from 'path';
-import { downloadJson } from '../schema/RemoteSchemaHelper';
 import { LoggerFactory } from '../telemetry/LoggerFactory';
 import { Measure } from '../telemetry/TelemetryDecorator';
 import { Closeable } from '../utils/Closeable';
 import { AwsEnv } from '../utils/Environment';
+import { downloadJson } from '../utils/RemoteDownload';
 import { FeatureFlag, TargetedFeatureFlag } from './FeatureFlagI';
 import { FeatureFlagSupplier, FeatureFlagConfigKey, TargetedFeatureFlagConfigKey } from './FeatureFlagSupplier';
 

src/schema/CombinedSchemas.ts

@@ -1,9 +1,11 @@
+import { LoggerFactory } from '../telemetry/LoggerFactory';
 import { PrivateSchemas, PrivateSchemasType } from './PrivateSchemas';
 import { RegionalSchemas, RegionalSchemasType } from './RegionalSchemas';
 import { ResourceSchema } from './ResourceSchema';
 import { SamSchemas, SamSchemasType } from './SamSchemas';
 
 export class CombinedSchemas {
+    private static readonly log = LoggerFactory.getLogger('CombinedSchemas');
     readonly numSchemas: number;
     readonly schemas: Map<string, ResourceSchema>;
 
@@ -16,13 +18,6 @@ export class CombinedSchemas {
         this.numSchemas = this.schemas.size;
     }
 
-    toLog() {
-        return {
-            schema: this.schemas.size,
-            names: [...this.schemas.keys()],
-        };
-    }
-
     static from(
         regionalSchemas?: RegionalSchemasType,
         privateSchemas?: PrivateSchemasType,
@@ -32,6 +27,9 @@ export class CombinedSchemas {
         const privateSchema = privateSchemas === undefined ? undefined : PrivateSchemas.from(privateSchemas);
         const samSchema = samSchemas === undefined ? undefined : SamSchemas.from(samSchemas);
 
+        CombinedSchemas.log.info(
+            `Schemas from ${regionalSchemas?.schemas.length} public schemas, ${privateSchema?.schemas.size} private schemas and ${samSchema?.schemas.size} sam schemas`,
+        );
         return new CombinedSchemas(regionalSchema, privateSchema, samSchema);
     }
 }

src/schema/GetSamSchemaTask.ts

@@ -1,8 +1,8 @@
 import { DataStore } from '../datastore/DataStore';
 import { LoggerFactory } from '../telemetry/LoggerFactory';
 import { Measure } from '../telemetry/TelemetryDecorator';
+import { downloadJson } from '../utils/RemoteDownload';
 import { GetSchemaTask } from './GetSchemaTask';
-import { downloadJson } from './RemoteSchemaHelper';
 import { SamSchemas, SamSchemasType, SamStoreKey } from './SamSchemas';
 import { SamSchemaTransformer, SamSchema } from './SamSchemaTransformer';
 
@@ -15,8 +15,6 @@ export class GetSamSchemaTask extends GetSchemaTask {
     @Measure({ name: 'getSchemas' })
     override async runImpl(dataStore: DataStore): Promise<void> {
         try {
-            logger.info('Downloading SAM schema');
-
             const samSchema = await downloadJson<Record<string, unknown>>(GetSamSchemaTask.SAM_SCHEMA_URL);
 
             const resourceSchemas = SamSchemaTransformer.transformSamSchema(samSchema as unknown as SamSchema);

src/schema/GetSchemaTask.ts

@@ -4,9 +4,10 @@ import { DataStore } from '../datastore/DataStore';
 import { CfnService } from '../services/CfnService';
 import { Measure } from '../telemetry/TelemetryDecorator';
 import { AwsRegion } from '../utils/Region';
+import { downloadFile } from '../utils/RemoteDownload';
 import { PrivateSchemas, PrivateSchemasType } from './PrivateSchemas';
 import { RegionalSchemas, RegionalSchemasType, SchemaFileType } from './RegionalSchemas';
-import { cfnResourceSchemaLink, downloadFile, unZipFile } from './RemoteSchemaHelper';
+import { cfnResourceSchemaLink, unZipFile } from './RemoteSchemaHelper';
 
 export abstract class GetSchemaTask {
     protected abstract runImpl(dataStore: DataStore, logger?: Logger): Promise<void>;

src/schema/RemoteSchemaHelper.ts

@@ -1,4 +1,3 @@
-import axios from 'axios';
 import { ZipFile, fromBuffer, Entry } from 'yauzl';
 import { AwsRegion } from '../utils/Region';
 import { SchemaFileType } from './RegionalSchemas';
@@ -11,16 +10,6 @@ export function cfnResourceSchemaLink(region: AwsRegion) {
     return `https://schema.cloudformation.${region}.amazonaws.com/CloudformationSchema.zip`;
 }
 
-export async function downloadFile(url: string): Promise<Buffer> {
-    const response = await axios({
-        method: 'get',
-        url: url,
-        responseType: 'arraybuffer',
-    });
-
-    return Buffer.from(response.data);
-}
-
 export async function unZipFile(buffer: Promise<Buffer>): Promise<SchemaFileType[]> {
     return await buffer.then((zipBuffer) => {
         return new Promise((resolve, reject) => {
@@ -82,12 +71,3 @@ export async function unZipFile(buffer: Promise<Buffer>): Promise<SchemaFileType
         });
     });
 }
-
-export async function downloadJson<T = unknown>(url: string): Promise<T> {
-    const response = await axios<T>({
-        method: 'get',
-        url: url,
-    });
-
-    return response.data;
-}

src/utils/RemoteDownload.ts

@@ -0,0 +1,20 @@
+import axios from 'axios';
+
+export async function downloadFile(url: string): Promise<Buffer> {
+    const response = await axios({
+        method: 'get',
+        url: url,
+        responseType: 'arraybuffer',
+    });
+
+    return Buffer.from(response.data);
+}
+
+export async function downloadJson<T = unknown>(url: string): Promise<T> {
+    const response = await axios<T>({
+        method: 'get',
+        url: url,
+    });
+
+    return response.data;
+}