Move buildspecs to S3 bucket (#133)

* rm buildspecs
* style improvements

Author: Mark Kuhn

buildspecs/buildspec.canary.yml

@@ -1,18 +1,18 @@
-const { metricScope } = require("aws-embedded-metrics");
+const { metricScope } = require('aws-embedded-metrics');
 
 const aggregator = metricScope(metrics => async event => {
-  console.log("received message");
-  metrics.putDimensions({ Service: "Aggregator" });
-  metrics.putMetric("ProcessingLatency", 100, "Milliseconds");
-  metrics.setProperty("AccountId", "123456789012");
-  metrics.setProperty("RequestId", "422b1569-16f6-4a03-b8f0-fe3fd9b100f8");
-  metrics.setProperty("DeviceId", "61270781-c6ac-46f1-baf7-22c808af8162");
-  metrics.setProperty("Payload", {
+  console.log('received message');
+  metrics.putDimensions({ Service: 'Aggregator' });
+  metrics.putMetric('ProcessingLatency', 100, 'Milliseconds');
+  metrics.setProperty('AccountId', '123456789012');
+  metrics.setProperty('RequestId', '422b1569-16f6-4a03-b8f0-fe3fd9b100f8');
+  metrics.setProperty('DeviceId', '61270781-c6ac-46f1-baf7-22c808af8162');
+  metrics.setProperty('Payload', {
     sampleTime: 123456789,
     temperature: 273.0,
-    pressure: 101.3
+    pressure: 101.3,
   });
-  console.log("completed aggregation successfully.");
+  console.log('completed aggregation successfully.');
 });
 
 exports.handler = aggregator;

buildspecs/buildspec.release.yml

@@ -1,20 +1,19 @@
-const { metricScope, createMetricsLogger, Unit } = require("aws-embedded-metrics");
+const { metricScope, createMetricsLogger, Unit } = require('aws-embedded-metrics');
 
-const usingScope = metricScope(metrics => 
-    async (event, ctx) => {
-        metrics.putDimensions({ Service: "Aggregator" });
-        metrics.putMetric("EventCount", event.count, Unit.Count);
-        metrics.setProperty("AccountId", event.accountId);
-        metrics.setProperty("RequestId", ctx.requestId);
-    });
+const usingScope = metricScope(metrics => async (event, ctx) => {
+  metrics.putDimensions({ Service: 'Aggregator' });
+  metrics.putMetric('EventCount', event.count, Unit.Count);
+  metrics.setProperty('AccountId', event.accountId);
+  metrics.setProperty('RequestId', ctx.requestId);
+});
 
 const usingCreateLogger = async (event, ctx) => {
-    const metrics = createMetricsLogger();
-    metrics.putDimensions({ Service: "Aggregator" });
-    metrics.putMetric("EventCount", event.count, Unit.Count);
-    metrics.setProperty("AccountId", event.accountId);
-    metrics.setProperty("RequestId", ctx.requestId);
-    await metrics.flush();
+  const metrics = createMetricsLogger();
+  metrics.putDimensions({ Service: 'Aggregator' });
+  metrics.putMetric('EventCount', event.count, Unit.Count);
+  metrics.setProperty('AccountId', event.accountId);
+  metrics.setProperty('RequestId', ctx.requestId);
+  await metrics.flush();
 };
-    
+
 module.exports = { usingScope, usingCreateLogger };

buildspecs/buildspec.yml

@@ -6,7 +6,7 @@
 
 // set the environment override to Local which just logs to stdout
 // this needs to be done prior to importing any modules
-// because environment detection starts as soon as the 
+// because environment detection starts as soon as the
 // aws-embedded-metrics module is loaded
 process.env.AWS_EMF_ENVIRONMENT = 'Local';
 
@@ -24,4 +24,4 @@ test('usingScope test', async () => {
 
   // assert
   // I don't have anything I need to assert...
-});
+});

examples/lambda/src/index.js

@@ -49,9 +49,9 @@ export class EC2Environment implements IEnvironment {
       const options: RequestOptions = {
         host,
         path: tokenPath,
-        method: "PUT",
-        headers: {[tokenRequestHeaderKey]: tokenRequestHeaderValue}
-      }
+        method: 'PUT',
+        headers: { [tokenRequestHeaderKey]: tokenRequestHeaderValue },
+      };
       this.token = await fetchString(options);
     } catch (e) {
       LOG(e);
@@ -62,9 +62,9 @@ export class EC2Environment implements IEnvironment {
       const metadataOptions: RequestOptions = {
         host,
         path: metadataPath,
-        method: "GET",
-        headers: {[metadataRequestTokenHeaderKey]: this.token}
-      }
+        method: 'GET',
+        headers: { [metadataRequestTokenHeaderKey]: this.token },
+      };
       this.metadata = await fetchJSON<IEC2MetadataResponse>(metadataOptions);
       return !!this.metadata;
     } catch (e) {

examples/testing/src/module.js

@@ -19,8 +19,7 @@ import { MetricsContext } from './MetricsContext';
 
 const createMetricsLogger = (): MetricsLogger => {
   const context = MetricsContext.empty();
-  const logger = new MetricsLogger(resolveEnvironment, context);
-  return logger;
+  return new MetricsLogger(resolveEnvironment, context);
 };
 
 export { createMetricsLogger };

examples/testing/tests/module.local.test.js

@@ -32,7 +32,7 @@ export class TcpClient implements ISocketClient {
       .on('end', () => this.disconnect('end'))
       .on('data', data => LOG('TcpClient received data.', data));
 
-    // Used to create an initial connection on the socket right after creation to avoid socket failures.    
+    // Used to create an initial connection on the socket right after creation to avoid socket failures.
     this.initialConnect.apply(this);
   }
 

src/environment/EC2Environment.ts

@@ -25,33 +25,32 @@ const SOCKET_TIMEOUT = 1000;
 const fetch = (options: RequestOptions): Promise<Buffer> => {
   return new Promise<Buffer>((resolve, reject) => {
     const request = httpRequest(options, (response: IncomingMessage) => {
-        if (!response.statusCode) {
-          reject(`Received undefined response status code from '${options.host}${options.path}'`);
-          return;
-        }
+      if (!response.statusCode) {
+        reject(`Received undefined response status code from '${options.host}${options.path}'`);
+        return;
+      }
 
-        if (response.statusCode < 200 || response.statusCode > 299) {
-          reject(new Error('Failed to load page, status code: ' + response.statusCode));
-          return;
-        }
+      if (response.statusCode < 200 || response.statusCode > 299) {
+        reject(new Error('Failed to load page, status code: ' + response.statusCode));
+        return;
+      }
 
-        // using similar approach to node-fetch
-        // https://github.com/bitinn/node-fetch/blob/6a5d192034a0f438551dffb6d2d8df2c00921d16/src/body.js#L217
-        const body: Uint8Array[] = [];
-        let bodyBytes = 0;
-        response.on('data', (chunk: Uint8Array) => {
-          bodyBytes += chunk.length;
-          body.push(chunk);
-        });
+      // using similar approach to node-fetch
+      // https://github.com/bitinn/node-fetch/blob/6a5d192034a0f438551dffb6d2d8df2c00921d16/src/body.js#L217
+      const body: Uint8Array[] = [];
+      let bodyBytes = 0;
+      response.on('data', (chunk: Uint8Array) => {
+        bodyBytes += chunk.length;
+        body.push(chunk);
+      });
 
-        response.on('end', () => {
-          const buffer: Buffer = Buffer.concat(body, bodyBytes);
-          resolve(buffer)
-        });
-      })
-      .on('error', (err: unknown) => {
-        reject(err);
+      response.on('end', () => {
+        const buffer: Buffer = Buffer.concat(body, bodyBytes);
+        resolve(buffer);
       });
+    }).on('error', (err: unknown) => {
+      reject(err);
+    });
 
     request.on('socket', socket => {
       socket.on('timeout', () => {
@@ -62,8 +61,8 @@ const fetch = (options: RequestOptions): Promise<Buffer> => {
     });
 
     request.end();
-  })
-}
+  });
+};
 
 /**
  * Fetch a string from a remote HTTP endpoint with the provided headers.
@@ -73,7 +72,7 @@ const fetch = (options: RequestOptions): Promise<Buffer> => {
 const fetchString = async (options: RequestOptions): Promise<string> => {
   const buffer = await fetch(options);
   return buffer.toString();
-}
+};
 
 /**
  * Fetch JSON data from a remote HTTP endpoint with the provided headers and de-serialize to the provided type.
@@ -84,8 +83,8 @@ const fetchString = async (options: RequestOptions): Promise<string> => {
  * @param options - HTTP request options
  */
 const fetchJSON = async <T>(options: RequestOptions): Promise<T> => {
-  const responseString = await fetchString(options)
+  const responseString = await fetchString(options);
   return JSON.parse(responseString);
-}
+};
 
 export { fetch, fetchJSON, fetchString };

src/logger/MetricsLoggerFactory.ts

@@ -55,25 +55,24 @@ test(
 
     Configuration.agentEndpoint = 'tcp://0.0.0.0:25888';
 
-const doWork = metricScope(metrics => () => {
-  metrics.putDimensions(dimensions);
-  metrics.putMetric(metricName, 100, 'Milliseconds');
-  metrics.setProperty('RequestId', '422b1569-16f6-4a03-b8f0-fe3fd9b100f8');
-});
-
-// act
-doWork();
-doWork();
-await Sleep(idleTimeout);
-doWork();
+    const doWork = metricScope(metrics => () => {
+      metrics.putDimensions(dimensions);
+      metrics.putMetric(metricName, 100, 'Milliseconds');
+      metrics.setProperty('RequestId', '422b1569-16f6-4a03-b8f0-fe3fd9b100f8');
+    });
+
+    // act
+    doWork();
+    doWork();
+    await Sleep(idleTimeout);
+    doWork();
 
     // assert
     await waitForMetricExistence(metricName, expectedSamples);
   },
   timeoutMillis,
 );
 
-
 const metricExists = async (metricName: string, expectedSampleCount: number): Promise<boolean> => {
   const request = {
     Namespace: 'aws-embedded-metrics',

src/sinks/connections/TcpClient.ts

@@ -33,6 +33,6 @@ export class TestSink implements ISink {
 
   public accept(context: MetricsContext): Promise<void> {
     this.events.push(context);
-    return this.forceAcceptRejects ? Promise.reject(): Promise.resolve();
+    return this.forceAcceptRejects ? Promise.reject() : Promise.resolve();
   }
 }