Merge branch 'main' into mg/OPS-3127-2

Author: MarceloRGonc

.github/workflows/cd.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
       - name: Get token from Github App
         id: app_token
-        uses: actions/create-github-app-token@v2.1.4
+        uses: actions/create-github-app-token@v2.2.0
         with:
           app-id: ${{ vars.DEVOPS_GITHUB_APP_ID }}
           private-key: ${{ secrets.DEVOPS_GITHUB_APP_PEM }}

.github/workflows/chromatic.yml

@@ -11,7 +11,7 @@ jobs:
       CHROMATIC_PROJECT_TOKEN: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5.0.1
+        uses: actions/checkout@v6.0.0
         with:
           fetch-depth: 0
 
@@ -29,7 +29,7 @@ jobs:
 
       - name: Run Chromatic
         if: env.CHROMATIC_PROJECT_TOKEN
-        uses: chromaui/action@v13.3.3
+        uses: chromaui/action@v13.3.4
         with:
           projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
           onlyChanged: true # 👈 Required option to enable TurboSnap

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
     name: Install Dependencies
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5.0.1
+      - uses: actions/checkout@v6.0.0
       - name: Lookup node_modules cache
         id: node-modules-cache
         uses: actions/cache@v4.3.0
@@ -30,7 +30,7 @@ jobs:
     needs: install
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5.0.1
+      - uses: actions/checkout@v6.0.0
       - name: Restore node_modules cache
         id: node-modules-cache
         uses: actions/cache/restore@v4.3.0
@@ -45,7 +45,7 @@ jobs:
     needs: install
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5.0.1
+      - uses: actions/checkout@v6.0.0
       - name: Restore node_modules cache
         id: node-modules-cache
         uses: actions/cache/restore@v4.3.0
@@ -76,12 +76,12 @@ jobs:
     steps:
       - name: Checkout for Dependabot PR
         if: ${{ startsWith(github.head_ref || '', 'dependabot/') }}
-        uses: actions/checkout@v5.0.1
+        uses: actions/checkout@v6.0.0
         with:
           ref: ${{ github.head_ref }}
       - name: Checkout for others
         if: ${{ !startsWith(github.head_ref || '', 'dependabot/') }}
-        uses: actions/checkout@v5.0.1
+        uses: actions/checkout@v6.0.0
       - name: Restore node_modules cache
         id: node-modules-cache
         uses: actions/cache/restore@v4.3.0
@@ -124,7 +124,7 @@ jobs:
     needs: install
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5.0.1
+      - uses: actions/checkout@v6.0.0
       - name: Restore node_modules cache
         id: node-modules-cache
         uses: actions/cache/restore@v4.3.0
@@ -157,7 +157,7 @@ jobs:
     needs: install
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5.0.1
+      - uses: actions/checkout@v6.0.0
       - name: Restore node_modules cache
         id: node-modules-cache
         uses: actions/cache/restore@v4.3.0
@@ -198,7 +198,7 @@ jobs:
     needs: build
     runs-on: ${{ matrix.platform == 'amd64' && 'ubuntu-latest' || 'ubuntu-arm64' }}
     steps:
-      - uses: actions/checkout@v5.0.1
+      - uses: actions/checkout@v6.0.0
       - name: Restore build cache
         uses: actions/cache/restore@v4.3.0
         with:
@@ -209,7 +209,7 @@ jobs:
         uses: docker/setup-buildx-action@v3.11.1
       - name: Configure AWS credentials
         if: vars.ECR_REGION
-        uses: aws-actions/configure-aws-credentials@v5.1.0
+        uses: aws-actions/configure-aws-credentials@v5.1.1
         with:
           aws-access-key-id: ${{ secrets.ECR_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.ECR_SECRET_ACCESS_KEY }}
@@ -266,7 +266,7 @@ jobs:
     needs: build-images
     steps:
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v5.1.0
+        uses: aws-actions/configure-aws-credentials@v5.1.1
         with:
           aws-access-key-id: ${{ secrets.ECR_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.ECR_SECRET_ACCESS_KEY }}

.github/workflows/release.yml

@@ -46,7 +46,7 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3.11.1
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v5.1.0
+        uses: aws-actions/configure-aws-credentials@v5.1.1
         with:
           aws-access-key-id: ${{ secrets.ECR_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.ECR_SECRET_ACCESS_KEY }}
@@ -84,7 +84,7 @@ jobs:
       VERSION: ${{ needs.get-version.outputs.version }}
       RELEASE_DC_FILENAME: openops-dc-${{ needs.get-version.outputs.version }}.zip
     steps:
-      - uses: actions/checkout@v5.0.1
+      - uses: actions/checkout@v6.0.0
       - name: Create a release file
         run: |
           cp THIRD_PARTY_LICENSES.txt LICENSE NOTICE deploy/docker-compose
@@ -109,7 +109,7 @@ jobs:
           echo "The release was created as a draft." >> $GITHUB_STEP_SUMMARY
           echo "Please [review and publish it](${RELEASE_URL/\/tags\//\/edit\/})." >> $GITHUB_STEP_SUMMARY
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v5.1.0
+        uses: aws-actions/configure-aws-credentials@v5.1.1
         with:
           aws-access-key-id: ${{ secrets.RELEASE_S3_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.RELEASE_S3_SECRET_ACCESS_KEY }}
@@ -133,7 +133,7 @@ jobs:
     steps:
       - name: Get token from Github App
         id: app_token
-        uses: actions/create-github-app-token@v2.1.4
+        uses: actions/create-github-app-token@v2.2.0
         with:
           app-id: ${{ vars.DEVOPS_GITHUB_APP_ID }}
           private-key: ${{ secrets.DEVOPS_GITHUB_APP_PEM }}
@@ -154,7 +154,7 @@ jobs:
     steps:
       - name: Get GitHub App token
         id: app_token
-        uses: actions/create-github-app-token@v2.1.4
+        uses: actions/create-github-app-token@v2.2.0
         with:
           app-id: ${{ vars.DEVOPS_GITHUB_APP_ID }}
           private-key: ${{ secrets.DEVOPS_GITHUB_APP_PEM }}

.github/workflows/sync-internal.yml

@@ -11,7 +11,7 @@ jobs:
     steps:
       - name: Get token from Github App
         id: app_token
-        uses: actions/create-github-app-token@v2.1.4
+        uses: actions/create-github-app-token@v2.2.0
         with:
           app-id: ${{ vars.DEVOPS_GITHUB_APP_ID }}
           private-key: ${{ secrets.DEVOPS_GITHUB_APP_PEM }}

packages/blocks/aws/src/lib/actions/arn/build-arn-action.ts

@@ -15,7 +15,7 @@ export const buildArnAction = createAction({
     }),
     region: Property.ShortText({
       displayName: 'Region',
-      required: true,
+      required: false,
     }),
     accountId: Property.ShortText({
       displayName: 'Account ID',
@@ -33,7 +33,7 @@ export const buildArnAction = createAction({
       service,
       accountId,
       resource: resourceId,
-      region,
+      region: region ?? '',
     });
 
     return arn;

packages/blocks/aws/test/arn/build-arn-action.test.ts

@@ -17,7 +17,7 @@ describe('buildArnAction', () => {
       },
       region: {
         type: 'SHORT_TEXT',
-        required: true,
+        required: false,
       },
     });
   });
@@ -36,4 +36,21 @@ describe('buildArnAction', () => {
       'arn:aws:ec2:us-west-2:123456789012:i-1234567890abcdef0',
     );
   });
+
+  test.each([undefined, null, ''])(
+    'should build ARN without region when region=%p',
+    async (regionVal) => {
+      const result = await buildArnAction.run({
+        ...jest.requireActual('@openops/blocks-framework'),
+        propsValue: {
+          service: 'iam',
+          region: regionVal as any,
+          accountId: '123456789012',
+          resourceId: 'user/David',
+        },
+      });
+
+      expect(result).toEqual('arn:aws:iam::123456789012:user/David');
+    },
+  );
 });

packages/react-ui/src/app/app-bootstrap.tsx

@@ -0,0 +1,66 @@
+import { LoadingSpinner } from '@openops/components/ui';
+import { useEffect, useState } from 'react';
+import { QueryKeys } from './constants/query-keys';
+import { flagsApi, FlagsMap } from './lib/flags-api';
+import { initializeInternal } from './lib/initialize-internal';
+import { queryClient } from './lib/query-client';
+
+type AppBootstrapProps = {
+  children: React.ReactNode;
+};
+
+type BootstrapState =
+  | { status: 'loading' }
+  | { status: 'ready' }
+  | { status: 'error'; error: Error };
+
+export function AppBootstrap({ children }: Readonly<AppBootstrapProps>) {
+  const [state, setState] = useState<BootstrapState>({ status: 'loading' });
+
+  useEffect(() => {
+    let mounted = true;
+
+    async function bootstrap() {
+      try {
+        const flags = await flagsApi.getAll();
+        queryClient.setQueryData<FlagsMap>([QueryKeys.flags], flags);
+        await initializeInternal();
+
+        if (mounted) {
+          setState({ status: 'ready' });
+        }
+      } catch (error) {
+        console.error('Bootstrap failed:', error);
+        if (mounted) {
+          setState({
+            status: 'error',
+            error:
+              error instanceof Error
+                ? error
+                : new Error('Failed to initialize application'),
+          });
+        }
+      }
+    }
+
+    bootstrap();
+
+    return () => {
+      mounted = false;
+    };
+  }, []);
+
+  if (state.status === 'loading') {
+    return (
+      <div className="flex h-screen w-screen items-center justify-center">
+        <LoadingSpinner size={50} />
+      </div>
+    );
+  }
+
+  if (state.status === 'error') {
+    throw state.error;
+  }
+
+  return children;
+}