Drop compile target to es5, include tslib, and lower default retries to 0

Author: jeskew

packages/credential-provider-imds/__tests__/fromInstanceMetadata.ts

@@ -104,7 +104,7 @@ describe('fromInstanceMetadata', () => {
         mockHttpGet.mockReturnValueOnce(Promise.resolve(profile));
         mockHttpGet.mockReturnValueOnce(Promise.resolve(JSON.stringify(creds)));
 
-        await fromInstanceMetadata()();
+        await fromInstanceMetadata({maxRetries: 1})();
         expect(mockHttpGet.mock.calls.length).toEqual(3);
         expect(mockHttpGet.mock.calls[2][0]).toEqual({
             host: '169.254.169.254',

packages/credential-provider-imds/__tests__/remoteProvider/ImdsCredentials.ts

@@ -18,27 +18,20 @@ describe('isImdsCredentials', () => {
     });
 
     it('should reject credentials without an AccessKeyId', () => {
-        expect(
-            isImdsCredentials(Object.assign({}, creds, {AccessKeyId: void 0}))
-        ).toBe(false);
+        expect(isImdsCredentials({...creds, AccessKeyId: void 0})).toBe(false);
     });
 
     it('should reject credentials without a SecretAccessKey', () => {
-        expect(
-            isImdsCredentials(Object.assign({}, creds, {SecretAccessKey: void 0}))
-        ).toBe(false);
+        expect(isImdsCredentials({...creds, SecretAccessKey: void 0}))
+            .toBe(false);
     });
 
     it('should reject credentials without a Token', () => {
-        expect(
-            isImdsCredentials(Object.assign({}, creds, {Token: void 0}))
-        ).toBe(false);
+        expect(isImdsCredentials({...creds, Token: void 0})).toBe(false);
     });
 
     it('should reject credentials without an Expiration', () => {
-        expect(
-            isImdsCredentials(Object.assign({}, creds, {Expiration: void 0}))
-        ).toBe(false);
+        expect(isImdsCredentials({...creds, Expiration: void 0})).toBe(false);
     });
 
     it('should reject scalar values', () => {

packages/credential-provider-imds/__tests__/remoteProvider/httpGet.ts

@@ -2,14 +2,14 @@ import {createServer} from 'http';
 import {httpGet} from "../../lib/remoteProvider/httpGet";
 import {CredentialError} from '@aws/credential-provider-base';
 
-const matchers = new Map<string, string>();
+let matchers: {[url: string]: string} = {};
 
 function addMatcher(url: string, toReturn: string): void {
-    matchers.set(url, toReturn);
+    matchers[url] = toReturn;
 }
 
 function clearMatchers(): void {
-    matchers.clear();
+    matchers = {};
 }
 
 function getOpenPort(candidatePort: number = 4321): Promise<number> {
@@ -26,9 +26,9 @@ let port: number;
 
 const server = createServer((request, response) => {
     const {url = ''} = request;
-    if (matchers.has(url)) {
+    if (url in matchers) {
         response.statusCode = 200;
-        response.end(matchers.get(url));
+        response.end(matchers[url]);
     } else {
         response.statusCode = 404;
         response.end('Not found');

packages/credential-provider-imds/lib/fromContainerMetadata.ts

@@ -59,14 +59,14 @@ function requestFromEcsImds(
 }
 
 const CMDS_IP = '169.254.170.2';
-const GREENGRASS_HOSTS = new Set([
-    'localhost',
-    '127.0.0.1',
-]);
-const GREENGRASS_PROTOCOLS = new Set([
-    'http:',
-    'https:',
-]);
+const GREENGRASS_HOSTS = {
+    'localhost': true,
+    '127.0.0.1': true,
+};
+const GREENGRASS_PROTOCOLS = {
+    'http:': true,
+    'https:': true,
+};
 
 function getCmdsUri(): Promise<RequestOptions> {
     if (process.env[ENV_CMDS_RELATIVE_URI]) {
@@ -78,14 +78,14 @@ function getCmdsUri(): Promise<RequestOptions> {
 
     if (process.env[ENV_CMDS_FULL_URI]) {
         const parsed = parse(process.env[ENV_CMDS_FULL_URI]);
-        if (!parsed.hostname || !GREENGRASS_HOSTS.has(parsed.hostname)) {
+        if (!parsed.hostname || !(parsed.hostname in GREENGRASS_HOSTS)) {
             return Promise.reject(new CredentialError(
                 `${parsed.hostname} is not a valid container metadata service hostname`,
                 false
             ));
         }
 
-        if (!parsed.protocol || !GREENGRASS_PROTOCOLS.has(parsed.protocol)) {
+        if (!parsed.protocol || !(parsed.protocol in GREENGRASS_PROTOCOLS)) {
             return Promise.reject(new CredentialError(
                 `${parsed.protocol} is not a valid container metadata service protocol`,
                 false
@@ -94,7 +94,7 @@ function getCmdsUri(): Promise<RequestOptions> {
 
         return Promise.resolve({
             ...parsed,
-            port: parsed.port ? Number.parseInt(parsed.port, 10) : undefined
+            port: parsed.port ? parseInt(parsed.port, 10) : undefined
         });
     }
 

packages/credential-provider-imds/lib/remoteProvider/RemoteProviderInit.ts

@@ -1,6 +1,5 @@
 export const DEFAULT_TIMEOUT = 1000;
-// TODO I think this should be 0 (in line with other SDKs) and not 3 (in line with JS v2)
-export const DEFAULT_MAX_RETRIES = 3;
+export const DEFAULT_MAX_RETRIES = 0;
 
 export interface RemoteProviderConfig {
     /**

packages/credential-provider-imds/lib/remoteProvider/httpGet.ts

@@ -23,8 +23,8 @@ export function httpGet(options: RequestOptions): Promise<Buffer> {
             }
 
             const chunks: Array<Buffer> = [];
-            res.on('readable', () => {
-                chunks.push(res.read());
+            res.on('data', chunk => {
+                chunks.push(chunk as Buffer);
             });
             res.on('end', () => {
                 resolve(Buffer.concat(chunks));

packages/credential-provider-imds/package.json

@@ -17,7 +17,8 @@
   "license": "UNLICENSED",
   "dependencies": {
     "@aws/credential-provider-base": "^0.0.1",
-    "@aws/types": "^0.0.1"
+    "@aws/types": "^0.0.1",
+    "tslib": "^1.7.1"
   },
   "devDependencies": {
     "@types/jest": "^19.2.2",

packages/credential-provider-imds/tsconfig.json

@@ -1,9 +1,14 @@
 {
   "compilerOptions": {
     "module": "commonjs",
-    "target": "es6",
+    "target": "es5",
     "declaration": true,
     "strict": true,
-    "sourceMap": true
+    "sourceMap": true,
+    "importHelpers": true,
+    "lib": [
+      "es5",
+      "es2015.promise"
+    ]
   }
 }