Use Credentials and CredentialProvider from types package

Author: jeskew

packages/credential-provider/__mocks__/fs.ts

@@ -1,13 +1,13 @@
 interface FsModule {
-    __addMatcher(toMatch: RegExp, toReturn: string): void;
+    __addMatcher(toMatch: string, toReturn: string): void;
     __clearMatchers(): void;
     readFile: (path: string, encoding: string, cb: Function) => void
 }
 
 const fs: FsModule = <FsModule>jest.genMockFromModule('fs');
-const matchers = new Map<RegExp, string>();
+const matchers = new Map<string, string>();
 
-function __addMatcher(toMatch: RegExp, toReturn: string): void {
+function __addMatcher(toMatch: string, toReturn: string): void {
     matchers.set(toMatch, toReturn);
 }
 
@@ -21,7 +21,7 @@ function readFile(
     callback: (err: Error|null, data?: string) => void
 ): void {
     for (let [matcher, data] of matchers.entries()) {
-        if (matcher.test(path)) {
+        if (matcher === path) {
             callback(null, data);
             return;
         }

packages/credential-provider/__tests__/chain.ts

@@ -5,15 +5,15 @@ import {isCredentials} from "../lib/isCredentials";
 describe('chain', () => {
     it('should distill many credential providers into one', async () => {
         const provider = chain(
-            fromCredentials({accessKeyId: 'foo', secretKey: 'bar'}),
-            fromCredentials({accessKeyId: 'baz', secretKey: 'quux'}),
+            fromCredentials({accessKeyId: 'foo', secretAccessKey: 'bar'}),
+            fromCredentials({accessKeyId: 'baz', secretAccessKey: 'quux'}),
         );
 
         expect(isCredentials(await provider())).toBe(true);
     });
 
     it('should return the resolved value of the first successful promise', async () => {
-        const creds = {accessKeyId: 'foo', secretKey: 'bar'};
+        const creds = {accessKeyId: 'foo', secretAccessKey: 'bar'};
         const provider = chain(
             () => Promise.reject('Move along'),
             () => Promise.reject('Nothing to see here'),
@@ -24,7 +24,7 @@ describe('chain', () => {
     });
 
     it('should not invoke subsequent providers one resolves', async () => {
-        const creds = {accessKeyId: 'foo', secretKey: 'bar'};
+        const creds = {accessKeyId: 'foo', secretAccessKey: 'bar'};
         const providers = [
             jest.fn(() => Promise.reject('Move along')),
             jest.fn(() => Promise.resolve(creds)),

packages/credential-provider/__tests__/fromCredentials.ts

@@ -1,10 +1,12 @@
-import {CredentialProvider} from "../lib/CredentialProvider";
-import {Credentials} from "../lib/Credentials";
+import {CredentialProvider, Credentials} from "@aws/types";
 import {fromCredentials} from "../lib/fromCredentials";
 
 describe('fromCredentials', () => {
     it('should convert credentials into a credential provider', async () => {
-        const credentials: Credentials = {accessKeyId: 'foo', secretKey: 'bar'};
+        const credentials: Credentials = {
+            accessKeyId: 'foo',
+            secretAccessKey: 'bar'
+        };
         const provider: CredentialProvider = fromCredentials(credentials);
 
         expect(typeof provider).toBe('function');

packages/credential-provider/__tests__/fromEnv.ts

@@ -29,7 +29,7 @@ describe('fromEnv', () => {
 
         expect(await fromEnv()()).toEqual({
             accessKeyId: 'foo',
-            secretKey: 'bar',
+            secretAccessKey: 'bar',
             sessionToken: 'baz',
         });
     });
@@ -40,7 +40,7 @@ describe('fromEnv', () => {
 
         expect(await fromEnv()()).toEqual({
             accessKeyId: 'foo',
-            secretKey: 'bar',
+            secretAccessKey: 'bar',
             sessionToken: void 0,
         });
     });