Merge branch 'main' into thomas/parent-id

dust-tt · Dec 11, 2024 · 1c1b1e1 · 1c1b1e1
2 parents 58936b2 + 218fb87
commit 1c1b1e1
Show file tree

Hide file tree

Showing 33 changed files with 589 additions and 501 deletions.
diff --git a/.github/workflows/deploy-front-edge.yml b/.github/workflows/deploy-front-edge.yml
@@ -58,8 +58,8 @@ jobs:
 
       - name: Build the image on Cloud Build
         run: |
-          chmod +x ./k8s/cloud-build_tmp.sh
-          ./k8s/cloud-build_tmp.sh \
+          chmod +x ./k8s/cloud-build.sh
+          ./k8s/cloud-build.sh \
             --image-name=$IMAGE_NAME \
             --dockerfile-path=./front/Dockerfile \
             --working-dir=./ \

diff --git a/.github/workflows/revert-connectors-edge.yml b/.github/workflows/revert-connectors-edge.yml
diff --git a/.github/workflows/revert-connectors.yml b/.github/workflows/revert-connectors.yml
@@ -2,6 +2,11 @@ name: Revert Connectors
 
 on:
   workflow_dispatch:
+    inputs:
+      image_tag:
+        description: "The image tag/SHA to deploy"
+        type: string
+        required: true
 
 env:
   GCLOUD_PROJECT_ID: ${{ secrets.GCLOUD_PROJECT_ID }}
@@ -14,25 +19,57 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
 
+      - name: Notify Build And Deploy Start
+        id: build_message
+        uses: ./.github/actions/slack-notify
+        with:
+          step: "start"
+          component: "Revert connectors"
+          image_tag: ${{ inputs.image_tag }}
+          channel: ${{ secrets.SLACK_CHANNEL_ID }}
+          slack_token: ${{ secrets.SLACK_BOT_TOKEN }}
+
       - name: "Authenticate with Google Cloud"
         uses: "google-github-actions/auth@v1"
         with:
           credentials_json: "${{ secrets.GCLOUD_SA_KEY }}"
 
-      - name: "Set up Cloud SDK"
-        uses: "google-github-actions/setup-gcloud@v1"
-
-      - name: Install gke-gcloud-auth-plugin
-        run: |
-          gcloud components install gke-gcloud-auth-plugin
-
-      - name: Setup kubectl
-        run: |
-          gcloud container clusters get-credentials dust-kube --region us-central1
+      - name: Generate a token
+        id: generate-token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.INFRA_DISPATCH_APP_ID }}
+          private-key: ${{ secrets.INFRA_DISPATCH_APP_PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+          repositories: |
+            dust-infra
 
-      - name: Rollback the deployment
-        run: |
-          kubectl rollout undo deployment/connectors-deployment
+      - name: Trigger dust-infra workflow
+        uses: actions/github-script@v6
+        with:
+          github-token: ${{ steps.generate-token.outputs.token }}
+          script: |
+            await github.rest.repos.createDispatchEvent({
+              owner: '${{ github.repository_owner }}',
+              repo: 'dust-infra',
+              event_type: 'trigger-component-deploy',
+              client_payload: {
+                regions: 'us-central1',
+                component: 'connectors',
+                image_tag: '${{ inputs.image_tag }}',
+                slack_thread_ts: "${{ steps.build_message.outputs.thread_ts }}",
+                slack_channel: '${{ secrets.SLACK_CHANNEL_ID }}'
+              }
+            });
 
-      - name: Wait for rollback to complete
-        run: kubectl rollout status deployment/connectors-deployment --timeout=10m
+      - name: Notify Failure
+        if: failure()
+        uses: ./.github/actions/slack-notify
+        with:
+          step: "failure"
+          blocked: ${{ steps.check_deployment_blocked.outputs.blocked }}
+          component: "Revert connectors"
+          image_tag: ${{ inputs.image_tag }}
+          channel: ${{ secrets.SLACK_CHANNEL_ID }}
+          slack_token: ${{ secrets.SLACK_BOT_TOKEN }}
+          thread_ts: "${{ steps.build_message.outputs.thread_ts }}"
diff --git a/.github/workflows/revert-core.yml b/.github/workflows/revert-core.yml
@@ -2,6 +2,11 @@ name: Revert Core
 
 on:
   workflow_dispatch:
+    inputs:
+      image_tag:
+        description: "The image tag/SHA to deploy"
+        type: string
+        required: true
 
 env:
   GCLOUD_PROJECT_ID: ${{ secrets.GCLOUD_PROJECT_ID }}
@@ -14,25 +19,57 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
 
+      - name: Notify Build And Deploy Start
+        id: build_message
+        uses: ./.github/actions/slack-notify
+        with:
+          step: "start"
+          component: "Revert core"
+          image_tag: ${{ inputs.image_tag  }}
+          channel: ${{ secrets.SLACK_CHANNEL_ID }}
+          slack_token: ${{ secrets.SLACK_BOT_TOKEN }}
+
       - name: "Authenticate with Google Cloud"
         uses: "google-github-actions/auth@v1"
         with:
           credentials_json: "${{ secrets.GCLOUD_SA_KEY }}"
 
-      - name: "Set up Cloud SDK"
-        uses: "google-github-actions/setup-gcloud@v1"
-
-      - name: Install gke-gcloud-auth-plugin
-        run: |
-          gcloud components install gke-gcloud-auth-plugin
-
-      - name: Setup kubectl
-        run: |
-          gcloud container clusters get-credentials dust-kube --region us-central1
+      - name: Generate a token
+        id: generate-token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.INFRA_DISPATCH_APP_ID }}
+          private-key: ${{ secrets.INFRA_DISPATCH_APP_PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+          repositories: |
+            dust-infra
 
-      - name: Rollback the deployment
-        run: |
-          kubectl rollout undo deployment/core-deployment
+      - name: Trigger dust-infra workflow
+        uses: actions/github-script@v6
+        with:
+          github-token: ${{ steps.generate-token.outputs.token }}
+          script: |
+            await github.rest.repos.createDispatchEvent({
+              owner: '${{ github.repository_owner }}',
+              repo: 'dust-infra',
+              event_type: 'trigger-component-deploy',
+              client_payload: {
+                regions: 'us-central1',
+                component: 'core',
+                image_tag: '${{ inputs.image_tag  }}',
+                slack_thread_ts: "${{ steps.build_message.outputs.thread_ts }}",
+                slack_channel: '${{ secrets.SLACK_CHANNEL_ID }}'
+              }
+            });
 
-      - name: Wait for rollback to complete
-        run: kubectl rollout status deployment/core-deployment --timeout=10m
+      - name: Notify Failure
+        if: failure()
+        uses: ./.github/actions/slack-notify
+        with:
+          step: "failure"
+          blocked: ${{ steps.check_deployment_blocked.outputs.blocked }}
+          component: "Revert core"
+          image_tag: ${{ inputs.image_tag  }}
+          channel: ${{ secrets.SLACK_CHANNEL_ID }}
+          slack_token: ${{ secrets.SLACK_BOT_TOKEN }}
+          thread_ts: "${{ steps.build_message.outputs.thread_ts }}"
diff --git a/.github/workflows/revert-front-edge.yml b/.github/workflows/revert-front-edge.yml
@@ -1,4 +1,4 @@
-name: Deploy Front Edge
+name: Revert Front Edge
 
 on:
   workflow_dispatch:
@@ -19,17 +19,13 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
 
-      - name: Get short sha
-        id: short_sha
-        run: echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
-
       - name: Notify Build And Deploy Start
         id: build_message
         uses: ./.github/actions/slack-notify
         with:
           step: "start"
           component: "Revert front-edge"
-          image_tag: ${{ steps.short_sha.outputs.short_sha }}
+          image_tag: ${{ inputs.image_tag }}
           channel: ${{ secrets.SLACK_CHANNEL_ID }}
           slack_token: ${{ secrets.SLACK_BOT_TOKEN }}
 
@@ -60,7 +56,7 @@ jobs:
               client_payload: {
                 regions: 'us-central1',
                 component: 'front-edge',
-                image_tag: '${{ steps.short_sha.outputs.short_sha }}',
+                image_tag: '${{ inputs.image_tag }}',
                 slack_thread_ts: "${{ steps.build_message.outputs.thread_ts }}",
                 slack_channel: '${{ secrets.SLACK_CHANNEL_ID }}'
               }
@@ -73,7 +69,7 @@ jobs:
           step: "failure"
           blocked: ${{ steps.check_deployment_blocked.outputs.blocked }}
           component: "Revert front-edge"
-          image_tag: ${{ steps.short_sha.outputs.short_sha }}
+          image_tag: ${{ inputs.image_tag }}
           channel: ${{ secrets.SLACK_CHANNEL_ID }}
           slack_token: ${{ secrets.SLACK_BOT_TOKEN }}
           thread_ts: "${{ steps.build_message.outputs.thread_ts }}"
diff --git a/.github/workflows/revert-front.yml b/.github/workflows/revert-front.yml
@@ -2,6 +2,11 @@ name: Revert Front
 
 on:
   workflow_dispatch:
+    inputs:
+      image_tag:
+        description: "The image tag/SHA to deploy"
+        type: string
+        required: true
 
 env:
   GCLOUD_PROJECT_ID: ${{ secrets.GCLOUD_PROJECT_ID }}
@@ -14,25 +19,57 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
 
+      - name: Notify Build And Deploy Start
+        id: build_message
+        uses: ./.github/actions/slack-notify
+        with:
+          step: "start"
+          component: "Revert front"
+          image_tag: ${{ inputs.image_tag }}
+          channel: ${{ secrets.SLACK_CHANNEL_ID }}
+          slack_token: ${{ secrets.SLACK_BOT_TOKEN }}
+
       - name: "Authenticate with Google Cloud"
         uses: "google-github-actions/auth@v1"
         with:
           credentials_json: "${{ secrets.GCLOUD_SA_KEY }}"
 
-      - name: "Set up Cloud SDK"
-        uses: "google-github-actions/setup-gcloud@v1"
-
-      - name: Install gke-gcloud-auth-plugin
-        run: |
-          gcloud components install gke-gcloud-auth-plugin
-
-      - name: Setup kubectl
-        run: |
-          gcloud container clusters get-credentials dust-kube --region us-central1
+      - name: Generate a token
+        id: generate-token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.INFRA_DISPATCH_APP_ID }}
+          private-key: ${{ secrets.INFRA_DISPATCH_APP_PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+          repositories: |
+            dust-infra
 
-      - name: Rollback the deployment
-        run: |
-          kubectl rollout undo deployment/front-deployment
+      - name: Trigger dust-infra workflow
+        uses: actions/github-script@v6
+        with:
+          github-token: ${{ steps.generate-token.outputs.token }}
+          script: |
+            await github.rest.repos.createDispatchEvent({
+              owner: '${{ github.repository_owner }}',
+              repo: 'dust-infra',
+              event_type: 'trigger-component-deploy',
+              client_payload: {
+                regions: 'us-central1',
+                component: 'front',
+                image_tag: '${{ inputs.image_tag }}',
+                slack_thread_ts: "${{ steps.build_message.outputs.thread_ts }}",
+                slack_channel: '${{ secrets.SLACK_CHANNEL_ID }}'
+              }
+            });
 
-      - name: Wait for rollback to complete
-        run: kubectl rollout status deployment/front-deployment --timeout=10m
+      - name: Notify Failure
+        if: failure()
+        uses: ./.github/actions/slack-notify
+        with:
+          step: "failure"
+          blocked: ${{ steps.check_deployment_blocked.outputs.blocked }}
+          component: "Revert front"
+          image_tag: ${{ inputs.image_tag }}
+          channel: ${{ secrets.SLACK_CHANNEL_ID }}
+          slack_token: ${{ secrets.SLACK_BOT_TOKEN }}
+          thread_ts: "${{ steps.build_message.outputs.thread_ts }}"
diff --git a/connectors/package-lock.json b/connectors/package-lock.json