Merge remote-tracking branch 'origin/main' into feat/rbac-refactor

Author: alexandrudanpop

THIRD_PARTY_LICENSES.txt

@@ -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,

package-lock.json

@@ -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,
     );
   });
 

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

@@ -3,6 +3,8 @@ import { Property, createAction } from '@openops/blocks-framework';
 import {
   amazonAuth,
   getAttributeValues,
+  getAwsAccountsSingleSelectDropdown,
+  getCredentialsForAccount,
   getCredentialsFromAuth,
   getPriceListWithCache,
   getServices,
@@ -17,12 +19,13 @@ export const getPriceAction = createAction({
   displayName: 'Get Price from Price Catalog',
   isWriteAction: false,
   props: {
+    account: getAwsAccountsSingleSelectDropdown().accounts,
     service: Property.Dropdown({
       displayName: 'Service Code',
       description: 'Service code for which to fetch the price',
-      refreshers: ['auth'],
+      refreshers: ['auth', 'account', 'account.accounts'],
       required: true,
-      options: async ({ auth }: any) => {
+      options: async ({ auth, account }: any) => {
         if (!auth) {
           return {
             disabled: true,
@@ -31,8 +34,11 @@ export const getPriceAction = createAction({
           };
         }
 
-        const credentials = await getCredentialsFromAuth(auth);
         try {
+          const credentials = await getCredentialsForAccount(
+            auth,
+            account?.['accounts'],
+          );
           const services = await getServices(credentials, PRICING_REGION);
 
           if (!services.length) {
@@ -66,8 +72,8 @@ export const getPriceAction = createAction({
       displayName: '',
       description: '',
       required: true,
-      refreshers: ['auth', 'service'],
-      props: async ({ auth, service }, { input }) => {
+      refreshers: ['auth', 'account', 'account.accounts', 'service'],
+      props: async ({ auth, account, service }, { input }) => {
         if (!auth || !service) {
           return {};
         }
@@ -101,7 +107,10 @@ export const getPriceAction = createAction({
                   };
                 }
 
-                const credentials = await getCredentialsFromAuth(auth);
+                const credentials = await getCredentialsForAccount(
+                  auth,
+                  account?.['accounts'],
+                );
                 try {
                   const attributeValues: AttributeValue[] =
                     await getAttributeValues(
@@ -139,17 +148,20 @@ export const getPriceAction = createAction({
   },
   async run(context) {
     try {
-      const { service, queryFilters } = context.propsValue;
+      const { account, service, queryFilters } = context.propsValue;
       const filters = queryFilters['queryFilters'].map((filter: any) => {
         return {
           Field: filter.attributeName,
           Type: FilterType.TERM_MATCH,
           Value: filter.attributeValue,
         };
       });
+      const credentials = account?.['accounts']
+        ? await getCredentialsForAccount(context.auth, account['accounts'])
+        : await getCredentialsFromAuth(context.auth);
 
       const priceList = getPriceListWithCache(
-        context.auth,
+        credentials,
         service.ServiceCode!,
         filters,
         PRICING_REGION,

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

@@ -1,6 +1,7 @@
 const openopsCommonMock = {
   ...jest.requireActual('@openops/common'),
   getCredentialsFromAuth: jest.fn(),
+  getCredentialsForAccount: jest.fn(),
   getAttributeValues: jest.fn(),
   getServices: jest.fn(),
   getPriceListWithCache: jest.fn(),
@@ -18,6 +19,9 @@ describe('getPriceAction', () => {
     openopsCommonMock.getCredentialsFromAuth.mockResolvedValue({
       someCreds: 'some value',
     });
+    openopsCommonMock.getCredentialsForAccount.mockResolvedValue({
+      someCreds: 'some value',
+    });
   });
 
   const auth = {
@@ -34,12 +38,16 @@ describe('getPriceAction', () => {
     },
     auth: auth,
     propsValue: {
-      accountId: 'some account id',
+      account: { accounts: 'some account id' },
     },
   };
 
   test('should create action with correct properties', () => {
     expect(getPriceAction.props).toMatchObject({
+      account: {
+        type: 'DYNAMIC',
+        required: true,
+      },
       service: {
         type: 'DROPDOWN',
         required: true,
@@ -80,22 +88,40 @@ describe('getPriceAction', () => {
 
       expect(openopsCommonMock.getPriceListWithCache).toHaveBeenCalledTimes(1);
       expect(openopsCommonMock.getPriceListWithCache).toHaveBeenCalledWith(
-        auth,
+        { someCreds: 'some value' },
         'some service',
         expectedFilters,
         'us-east-1',
       );
+      expect(openopsCommonMock.getCredentialsForAccount).toHaveBeenCalledWith(
+        auth,
+        'some account id',
+      );
     },
   );
 
+  test('should fallback to getCredentialsFromAuth when account is missing in run', async () => {
+    openopsCommonMock.getPriceListWithCache.mockResolvedValue('mockResult');
+    context.propsValue = {
+      service: { ServiceCode: 'some service' },
+      queryFilters: { queryFilters: [] },
+    };
+
+    const result = (await getPriceAction.run(context)) as any;
+
+    expect(result).toEqual('mockResult');
+    expect(openopsCommonMock.getCredentialsFromAuth).toHaveBeenCalledWith(auth);
+    expect(openopsCommonMock.getCredentialsForAccount).not.toHaveBeenCalled();
+  });
+
   test('should return the list of services in property service', async () => {
     openopsCommonMock.getServices.mockResolvedValue([
       { ServiceCode: 'service1' },
       { ServiceCode: 'service2' },
     ]);
 
     const result = await getPriceAction.props['service'].options(
-      { auth },
+      { auth, account: { accounts: 'some account id' } },
       context,
     );
 
@@ -118,6 +144,7 @@ describe('getPriceAction', () => {
       ServiceCode: 'some service',
       AttributeNames: ['some attibute'],
     };
+    context.propsValue.account = { accounts: 'some account id' };
     context.propsValue.auth = auth;
     context.input = { attributeName: 'some attibute' };
 

packages/blocks/aws/src/lib/actions/get-price-action.ts

@@ -44,7 +44,7 @@ You can generate your API token from:
     } catch (e) {
       return {
         valid: false,
-        error: ((e as HttpError).response.body as any).message,
+        error: (e as HttpError)?.message ?? 'Invalid credentials',
       };
     }
   },

packages/blocks/aws/test/get-price-action.test.ts

@@ -269,7 +269,8 @@ export function dynamicBlockKitProperties(): any {
         const result: any = {
           blocks: Property.Json({
             displayName: 'Block Kit blocks',
-            description: 'See https://api.slack.com/block-kit for specs',
+            description:
+              'See https://api.slack.com/block-kit for specs. Visual preview available at https://app.slack.com/block-kit-builder',
             required: true,
             defaultValue: [
               {

packages/blocks/jira-cloud/src/auth.ts

@@ -6,7 +6,7 @@ import {
   CollapsibleContent,
   CollapsibleTrigger,
 } from '@openops/components/ui';
-import { ChevronRight } from 'lucide-react';
+import { ChevronRight, SquareX } from 'lucide-react';
 import React, { useCallback, useMemo } from 'react';
 
 import { blocksHooks } from '@/app/features/blocks/lib/blocks-hook';
@@ -18,6 +18,7 @@ import { ActionType, FlagId, flowHelper } from '@openops/shared';
 import { flagsHooks } from '@/app/common/hooks/flags-hooks';
 import { useCenterWorkflowViewOntoStep } from '@/app/features/builder/hooks/center-workflow-view-onto-step';
 import { StepStatusIcon } from '@/app/features/flow-runs/components/step-status-icon';
+import { t } from 'i18next';
 import { RUN_DETAILS_STEP_CARD_ID_PREFIX } from './constants';
 import { LoopIterationInput } from './loop-iteration-input';
 
@@ -145,10 +146,24 @@ const FlowStepDetailsCardItem = ({
                 />
               </Button>
             )}
-            <img className="w-6 h-6" alt={'logo'} src={stepMetadata?.logoUrl} />
-            <div className="break-all truncate">{`${stepIndex + 1}. ${
-              step?.displayName
-            }`}</div>
+            {stepMetadata?.logoUrl ? (
+              <img
+                className="w-6 h-6"
+                alt={'logo'}
+                src={stepMetadata?.logoUrl}
+              />
+            ) : (
+              <SquareX className="w-6 h-6 text-muted-foreground" />
+            )}
+
+            <div
+              className={cn('break-all truncate', {
+                'text-muted-foreground italic': !step?.displayName,
+              })}
+            >
+              {(stepIndex !== -1 ? `${stepIndex + 1}. ` : '') +
+                (step?.displayName ?? t('Deleted Step'))}
+            </div>
             <div className="w-2"></div>
             <div className="flex gap-1 justify-end items-center flex-grow">
               {isLoopStep && (