Use getCredentialsforaccount instead of list and fix refresher (#2116)

Fixes OPS-3904

Author: bigfluffycookie

packages/blocks/aws-athena/src/lib/actions/query-athena-action.ts

@@ -3,7 +3,7 @@ import {
   amazonAuth,
   dryRunCheckBox,
   getAwsAccountsSingleSelectDropdown,
-  getCredentialsListFromAuth,
+  getCredentialsForAccount,
   getRegionsDropdownState,
   listAthenaDatabases,
   runAndWaitForQueryResult,
@@ -33,10 +33,9 @@ export const runAthenaQueryAction = createAction({
     database: Property.Dropdown<string>({
       displayName: 'Database',
       description: 'Database that contains the table to query on',
-
-      refreshers: ['auth', 'accounts', 'region'],
+      refreshers: ['auth', 'accounts', 'accounts.accounts', 'region'],
       required: true,
-      options: async ({ auth, accounts, region }) => {
+      options: async ({ auth, accounts, region }: any) => {
         if (!auth) {
           return {
             disabled: true,
@@ -46,24 +45,14 @@ export const runAthenaQueryAction = createAction({
         }
 
         try {
-          const authProp = auth as {
-            accessKeyId: string;
-            secretAccessKey: string;
-            defaultRegion: string;
-          };
-          const selectedAccounts = (
-            accounts as unknown as {
-              accounts?: string[];
-            }
-          )?.accounts;
-          const credentialsList = await getCredentialsListFromAuth(
-            authProp,
-            selectedAccounts,
+          const credentials = await getCredentialsForAccount(
+            auth,
+            accounts?.['accounts'],
           );
 
           const databases = await listAthenaDatabases(
-            credentialsList[0],
-            (region as string | undefined) ?? authProp.defaultRegion,
+            credentials,
+            (region as string | undefined) ?? auth.defaultRegion,
           );
 
           return {
@@ -119,14 +108,13 @@ export const runAthenaQueryAction = createAction({
     }
 
     try {
-      const selectedAccounts = context.propsValue.accounts?.['accounts'];
-      const credentialsList = await getCredentialsListFromAuth(
+      const credentials = await getCredentialsForAccount(
         context.auth,
-        selectedAccounts,
+        context.propsValue.accounts?.['accounts'],
       );
 
       return await runAndWaitForQueryResult(
-        credentialsList[0],
+        credentials,
         context.propsValue.region ?? context.auth.defaultRegion,
         query,
         database,

packages/blocks/aws-athena/test/athena-query-action.test.ts

@@ -1,6 +1,6 @@
 const openopsCommonMock = {
   ...jest.requireActual('@openops/common'),
-  getCredentialsListFromAuth: jest.fn(),
+  getCredentialsForAccount: jest.fn(),
   runAndWaitForQueryResult: jest.fn(),
 };
 
@@ -12,9 +12,9 @@ describe('runAthenaQueryAction tests', () => {
   beforeEach(() => {
     jest.clearAllMocks();
 
-    openopsCommonMock.getCredentialsListFromAuth.mockResolvedValue([
-      { someCreds: 'some creds' },
-    ]);
+    openopsCommonMock.getCredentialsForAccount.mockResolvedValue({
+      someCreds: 'some creds',
+    });
   });
 
   const auth = {
@@ -76,7 +76,7 @@ describe('runAthenaQueryAction tests', () => {
       ...jest.requireActual('@openops/blocks-framework'),
       auth: auth,
       propsValue: {
-        accounts: { accounts: ['some-account-id'] },
+        accounts: { accounts: 'some-account-id' },
         query: 'some query',
         database: 'some database',
         outputBucket: 'some outputBucket',
@@ -87,12 +87,10 @@ describe('runAthenaQueryAction tests', () => {
     const result = (await runAthenaQueryAction.run(context)) as any;
 
     expect(result).toEqual('mockResult');
-    expect(openopsCommonMock.getCredentialsListFromAuth).toHaveBeenCalledTimes(
-      1,
-    );
-    expect(openopsCommonMock.getCredentialsListFromAuth).toHaveBeenCalledWith(
+    expect(openopsCommonMock.getCredentialsForAccount).toHaveBeenCalledTimes(1);
+    expect(openopsCommonMock.getCredentialsForAccount).toHaveBeenCalledWith(
       auth,
-      ['some-account-id'],
+      'some-account-id',
     );
   });
 
@@ -138,7 +136,6 @@ describe('runAthenaQueryAction tests', () => {
       ...jest.requireActual('@openops/blocks-framework'),
       auth: auth,
       propsValue: {
-        accounts: { accounts: ['some-account-id'] },
         region: 'some region',
         query: 'some query',
         database: 'some database',
@@ -158,12 +155,10 @@ describe('runAthenaQueryAction tests', () => {
       'some database',
       'some outputBucket',
     );
-    expect(openopsCommonMock.getCredentialsListFromAuth).toHaveBeenCalledTimes(
-      1,
-    );
-    expect(openopsCommonMock.getCredentialsListFromAuth).toHaveBeenCalledWith(
+    expect(openopsCommonMock.getCredentialsForAccount).toHaveBeenCalledTimes(1);
+    expect(openopsCommonMock.getCredentialsForAccount).toHaveBeenCalledWith(
       auth,
-      ['some-account-id'],
+      undefined,
     );
   });