Merge pull request #344 from hms-dbmi-cellenics/test-auth-rds

Fix auth rds not refreshing after expiration

src/sql/getConnectionParams.js

@@ -55,7 +55,6 @@ const getConnectionParams = async (environment, rdsSandboxId) => {
     username,
   });
 
-
   const token = await promisifiedGetAuthToken(signer);
 
   // Token expires in 15 minutes https://aws.amazon.com/premiumsupport/knowledge-center/users-connect-rds-iam/

src/sql/knexfile.js

@@ -18,16 +18,13 @@ const recursiveCamelcase = (result) => _.transform(result, (acc, value, key, tar
 });
 
 // This is one of the shapes the knexfile can take https://knexjs.org/#knexfile
-const fetchConfiguration = async (environment, rdsSandboxId) => {
-  const params = await getConnectionParams(environment, rdsSandboxId);
-  return {
-    [environment]: {
-      client: 'postgresql',
-      connection: params,
-      postProcessResponse: recursiveCamelcase,
-    },
-  };
-};
+const fetchConfiguration = async (environment, rdsSandboxId) => ({
+  [environment]: {
+    client: 'postgresql',
+    connection: async () => await getConnectionParams(environment, rdsSandboxId),
+    postProcessResponse: recursiveCamelcase,
+  },
+});
 
 module.exports = async () => {
   const configuration = await fetchConfiguration(config.clusterEnv, config.rdsSandboxId);

tests/sql/__snapshots__/knexfile.test.js.snap

@@ -4,9 +4,7 @@ exports[`knexfile Works correctly for staging 1`] = `
 Object {
   "staging": Object {
     "client": "postgresql",
-    "connection": Object {
-      "fake": true,
-    },
+    "connection": [Function],
     "postProcessResponse": [Function],
   },
 }

tests/sql/getConnectionParams.test.js

@@ -39,6 +39,11 @@ const testSandboxId = 'test';
 describe('getConnectionParams', () => {
   beforeEach(() => {
     jest.clearAllMocks();
+    jest.useFakeTimers('modern');
+  });
+
+  afterEach(() => {
+    jest.useRealTimers();
   });
 
   it('Creates correct params in development environment', async () => {
@@ -60,6 +65,9 @@ describe('getConnectionParams', () => {
       callback(null, 'passwordToken');
     });
 
+    const timeOfRun = new Date('2017-01-01');
+    jest.setSystemTime(timeOfRun);
+
     const params = await getConnectionParams('staging', testSandboxId);
 
     expect(mockDescribeDBClusterEndpoints.mock.calls[0]).toMatchSnapshot();
@@ -74,6 +82,17 @@ describe('getConnectionParams', () => {
     expect(mockGetAuthTokenSpy).toHaveBeenCalled();
 
     expect(params).toEqual(rdsParams);
+
+    // Connection not expired
+    expect(params.expirationChecker()).toEqual(false);
+
+    // Connection not expired after 14 minutes
+    jest.setSystemTime(new Date(timeOfRun.getTime() + 14 * 60000));
+    expect(params.expirationChecker()).toEqual(false);
+
+    // Connection expired after 15 minutes
+    jest.setSystemTime(new Date(timeOfRun.getTime() + 15 * 60000));
+    expect(params.expirationChecker()).toEqual(true);
   });
 
   it('Creates correct params in production environment', async () => {

tests/sql/knexfile.test.js

@@ -15,13 +15,14 @@ describe('knexfile', () => {
 
     const res = await knexfile();
 
-    expect(getConnectionParams).toHaveBeenCalled();
-
     expect(res.staging).toBeTruthy();
+    expect(res.staging.connection).toBeTruthy();
+    expect(res).toMatchSnapshot();
 
-    expect(res.staging.connection).toEqual(mockConnectionParams);
+    const connectionParams = await res.staging.connection();
+    expect(connectionParams).toEqual(mockConnectionParams);
 
-    expect(res).toMatchSnapshot();
+    expect(getConnectionParams).toHaveBeenCalled();
   });
 });