Merge branch 'develop' into add-filter-for-not-occupied-beds-with-hl7…

…-monitor

.devcontainer/devcontainer.json

@@ -19,6 +19,6 @@
     }
   },
   "postCreateCommand": "echo 'eval \"$(direnv hook bash)\"' >> ~/.bashrc && cp .env.example .env",
-  "postAttachCommand": "make up",
+  "postStartCommand": "make up",
   "forwardPorts": [8000, 9000, 4000]
 }

.github/workflows/combine-dependencies.yml

@@ -0,0 +1,23 @@
+name: Combine Dependencies
+
+on: workflow_dispatch
+
+# The minimum permissions required to run this Action
+permissions:
+  contents: write
+  pull-requests: write
+  checks: read
+
+jobs:
+  combine-prs:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Combine dependencies
+        id: combine-dependencies
+        uses: github/combine-prs@v5.0.0
+        with:
+          pr_title: Combined dependencies # The title of the pull request to create
+          select_label: dependencies # The label which marks PRs that should be combined.
+          labels: combined-dependencies # Add a label to the combined PR
+          ci_required: "false" # Whether or not CI should be passing to combine the PR

.github/workflows/deployment.yaml

@@ -50,7 +50,7 @@ jobs:
             ghcr.io/${{ github.repository }}
             ${{ secrets.DOCKER_HUB_USERNAME }}/${{ github.event.repository.name }}
           tags: |
-            type=raw,value=production-latest,enable=${{ github.ref == 'refs/heads/v*' }}
+            type=raw,value=production-latest,enable=${{ startsWith(github.event.ref, 'refs/tags/v') }}
             type=raw,value=production-latest-${{ github.run_number }}-{{date 'YYYYMMDD'}}-{{sha}},enable=${{ startsWith(github.event.ref, 'refs/tags/v') }}
             type=raw,value=staging-latest,enable=${{ github.ref == 'refs/heads/staging' }}
             type=raw,value=staging-latest-${{ github.run_number }}-{{date 'YYYYMMDD'}}-{{sha}},enable=${{ github.ref == 'refs/heads/staging' }}
@@ -199,316 +199,9 @@ jobs:
       name: Staging-GCP
       url: https://care-staging-api.ohc.network/
     steps:
-      - name: Checkout Kube Config
-        uses: actions/checkout@v3
-        with:
-          repository: coronasafe/care-staging-gcp
-          token: ${{ secrets.GIT_ACCESS_TOKEN }}
-          path: kube
-          ref: main
-
-      # Setup gcloud CLI
-      - uses: google-github-actions/setup-gcloud@94337306dda8180d967a56932ceb4ddcf01edae7
-        with:
-          service_account_key: ${{ secrets.GKE_SA_KEY }}
-          project_id: ${{ secrets.GKE_PROJECT }}
-
-      # Get the GKE credentials so we can deploy to the cluster
-      - uses: google-github-actions/get-gke-credentials@fb08709ba27618c31c09e014e1d8364b02e5042e
-        with:
-          cluster_name: ${{ secrets.GKE_CLUSTER }}
-          location: ${{ secrets.GKE_ZONE }}
-          credentials: ${{ secrets.GKE_SA_KEY }}
-
-      - name: install kubectl
-        uses: azure/setup-kubectl@v3.0
-        with:
-          version: "v1.23.6"
-        id: install
-
-      - name: Deploy Care Production Manipur
-        run: |
-          mkdir -p $HOME/.kube/
-          cd kube/deployments/
-          sed -i -e "s/_BUILD_NUMBER_/${GITHUB_RUN_NUMBER}/g" care-backend.yaml
-          sed -i -e "s/_BUILD_NUMBER_/${GITHUB_RUN_NUMBER}/g" care-celery-beat.yaml
-          sed -i -e "s/_BUILD_NUMBER_/${GITHUB_RUN_NUMBER}/g" care-celery-worker.yaml
-          kubectl apply -f care-backend.yaml
-          kubectl apply -f care-celery-beat.yaml
-          kubectl apply -f care-celery-worker.yaml
-
-  deploy-production-manipur:
-    needs: notify-release
-    name: Deploy to GKE Manipur
-    runs-on: ubuntu-latest
-    environment:
-      name: Production-Manipur
-      url: https://careapi.mn.gov.in
-    steps:
-      - name: Checkout Kube Config
-        uses: actions/checkout@v3
-        with:
-          repository: coronasafe/mn-care-infra
-          token: ${{ secrets.GIT_ACCESS_TOKEN }}
-          path: kube
-          ref: main
-
-      # Setup gcloud CLI
-      - uses: google-github-actions/setup-gcloud@94337306dda8180d967a56932ceb4ddcf01edae7
-        with:
-          service_account_key: ${{ secrets.GKE_SA_KEY }}
-          project_id: ${{ secrets.GKE_PROJECT }}
-
-      # Get the GKE credentials so we can deploy to the cluster
-      - uses: google-github-actions/get-gke-credentials@fb08709ba27618c31c09e014e1d8364b02e5042e
-        with:
-          cluster_name: ${{ secrets.GKE_CLUSTER }}
-          location: ${{ secrets.GKE_ZONE }}
-          credentials: ${{ secrets.GKE_SA_KEY }}
-
-      - name: install kubectl
-        uses: azure/setup-kubectl@v3.0
-        with:
-          version: "v1.23.6"
-        id: install
-
-      - name: Deploy Care Production Manipur
-        run: |
-          mkdir -p $HOME/.kube/
-          cd kube/deployments/
-          sed -i -e "s/_BUILD_NUMBER_/${GITHUB_RUN_NUMBER}/g" care-backend.yaml
-          sed -i -e "s/_BUILD_NUMBER_/${GITHUB_RUN_NUMBER}/g" care-celery-beat.yaml
-          sed -i -e "s/_BUILD_NUMBER_/${GITHUB_RUN_NUMBER}/g" care-celery-worker.yaml
-          kubectl apply -f care-backend.yaml
-          kubectl apply -f care-celery-beat.yaml
-          kubectl apply -f care-celery-worker.yaml
-
-  deploy-production-karnataka:
-    needs: notify-release
-    name: Deploy to GKE Karnataka
-    runs-on: ubuntu-latest
-    environment:
-      name: Production-Karnataka
-      url: https://careapi.karnataka.care
-    steps:
-      - name: Checkout Kube Config
-        uses: actions/checkout@v3
-        with:
-          repository: coronasafe/ka-care-infra
-          token: ${{ secrets.GIT_ACCESS_TOKEN }}
-          path: kube
-          ref: main
-
-      # Setup gcloud CLI
-      - uses: google-github-actions/setup-gcloud@94337306dda8180d967a56932ceb4ddcf01edae7
-        with:
-          service_account_key: ${{ secrets.GKE_SA_KEY }}
-          project_id: ${{ secrets.GKE_PROJECT }}
-
-      # Get the GKE credentials so we can deploy to the cluster
-      - uses: google-github-actions/get-gke-credentials@fb08709ba27618c31c09e014e1d8364b02e5042e
-        with:
-          cluster_name: ${{ secrets.GKE_CLUSTER }}
-          location: ${{ secrets.GKE_ZONE }}
-          credentials: ${{ secrets.GKE_SA_KEY }}
-
-      - name: install kubectl
-        uses: azure/setup-kubectl@v3.0
-        with:
-          version: "v1.23.6"
-        id: install
-
-      - name: Deploy Care Production Karnataka
-        run: |
-          mkdir -p $HOME/.kube/
-          cd kube/deployments/
-          sed -i -e "s/_BUILD_NUMBER_/${GITHUB_RUN_NUMBER}/g" care-backend.yaml
-          sed -i -e "s/_BUILD_NUMBER_/${GITHUB_RUN_NUMBER}/g" care-celery-beat.yaml
-          sed -i -e "s/_BUILD_NUMBER_/${GITHUB_RUN_NUMBER}/g" care-celery-worker.yaml
-          kubectl apply -f care-backend.yaml
-          kubectl apply -f care-celery-beat.yaml
-          kubectl apply -f care-celery-worker.yaml
-
-  deploy-production-assam:
-    needs: notify-release
-    name: Deploy to GKE Assam
-    runs-on: ubuntu-latest
-    environment:
-      name: Production-Assam
-      url: https://careapi.assam.gov.in
-    steps:
-      - name: Checkout Kube Config
-        uses: actions/checkout@v3
-        with:
-          repository: coronasafe/as-care-infra
-          token: ${{ secrets.GIT_ACCESS_TOKEN }}
-          path: kube
-          ref: main
-
-      # Setup gcloud CLI
-      - uses: google-github-actions/setup-gcloud@94337306dda8180d967a56932ceb4ddcf01edae7
-        with:
-          service_account_key: ${{ secrets.GKE_SA_KEY }}
-          project_id: ${{ secrets.GKE_PROJECT }}
-
-      # Get the GKE credentials so we can deploy to the cluster
-      - uses: google-github-actions/get-gke-credentials@fb08709ba27618c31c09e014e1d8364b02e5042e
-        with:
-          cluster_name: ${{ secrets.GKE_CLUSTER }}
-          location: ${{ secrets.GKE_ZONE }}
-          credentials: ${{ secrets.GKE_SA_KEY }}
-
-      - name: install kubectl
-        uses: azure/setup-kubectl@v3.0
-        with:
-          version: "v1.23.6"
-        id: install
-
-      - name: Deploy Care Production Assam
-        run: |
-          mkdir -p $HOME/.kube/
-          cd kube/deployments/
-          sed -i -e "s/_BUILD_NUMBER_/${GITHUB_RUN_NUMBER}/g" care-backend.yaml
-          sed -i -e "s/_BUILD_NUMBER_/${GITHUB_RUN_NUMBER}/g" care-celery-beat.yaml
-          sed -i -e "s/_BUILD_NUMBER_/${GITHUB_RUN_NUMBER}/g" care-celery-worker.yaml
-          kubectl apply -f care-backend.yaml
-          kubectl apply -f care-celery-beat.yaml
-          kubectl apply -f care-celery-worker.yaml
-
-  deploy-production-sikkim:
-    needs: notify-release
-    name: Deploy to GKE Sikkim
-    runs-on: ubuntu-latest
-    environment:
-      name: Production-Sikkim
-      url: https://careapi.sikkim.gov.in
-    steps:
-      - name: Checkout Kube Config
-        uses: actions/checkout@v3
-        with:
-          repository: coronasafe/sk-care-infra
-          token: ${{ secrets.GIT_ACCESS_TOKEN }}
-          path: kube
-          ref: main
-
-      # Setup gcloud CLI
-      - uses: google-github-actions/setup-gcloud@94337306dda8180d967a56932ceb4ddcf01edae7
-        with:
-          service_account_key: ${{ secrets.GKE_SA_KEY }}
-          project_id: ${{ secrets.GKE_PROJECT }}
-
-      # Get the GKE credentials so we can deploy to the cluster
-      - uses: google-github-actions/get-gke-credentials@fb08709ba27618c31c09e014e1d8364b02e5042e
-        with:
-          cluster_name: ${{ secrets.GKE_CLUSTER }}
-          location: ${{ secrets.GKE_ZONE }}
-          credentials: ${{ secrets.GKE_SA_KEY }}
-
-      - name: install kubectl
-        uses: azure/setup-kubectl@v3.0
-        with:
-          version: "v1.23.6"
-        id: install
-
-      - name: Deploy Care Production Sikkim
-        run: |
-          mkdir -p $HOME/.kube/
-          cd kube/deployments/
-          sed -i -e "s/_BUILD_NUMBER_/${GITHUB_RUN_NUMBER}/g" care-backend.yaml
-          sed -i -e "s/_BUILD_NUMBER_/${GITHUB_RUN_NUMBER}/g" care-celery-beat.yaml
-          sed -i -e "s/_BUILD_NUMBER_/${GITHUB_RUN_NUMBER}/g" care-celery-worker.yaml
-          kubectl apply -f care-backend.yaml
-          kubectl apply -f care-celery-beat.yaml
-          kubectl apply -f care-celery-worker.yaml
-
-  deploy-production-nagaland:
-    needs: notify-release
-    name: Deploy to GKE Nagaland
-    runs-on: ubuntu-latest
-    environment:
-      name: Production - Nagaland
-      url: https://careapi.nagaland.gov.in
-    steps:
-      - name: Checkout Kube Config
-        uses: actions/checkout@v3
-        with:
-          repository: coronasafe/nl-care-infra
-          token: ${{ secrets.GIT_ACCESS_TOKEN }}
-          path: kube
-          ref: main
-
-      # Setup gcloud CLI
-      - uses: google-github-actions/setup-gcloud@94337306dda8180d967a56932ceb4ddcf01edae7
-        with:
-          service_account_key: ${{ secrets.GKE_SA_KEY }}
-          project_id: ${{ secrets.GKE_PROJECT }}
-
-      # Get the GKE credentials, so we can deploy to the cluster
-      - uses: google-github-actions/get-gke-credentials@fb08709ba27618c31c09e014e1d8364b02e5042e
-        with:
-          cluster_name: ${{ secrets.GKE_CLUSTER }}
-          location: ${{ secrets.GKE_ZONE }}
-          credentials: ${{ secrets.GKE_SA_KEY }}
-
-      - name: install kubectl
-        uses: azure/setup-kubectl@v3.0
-        with:
-          version: "v1.23.6"
-        id: install
-
-      - name: Deploy Care Production Nagaland
-        run: |
-          mkdir -p $HOME/.kube/
-          cd kube/deployments/
-          sed -i -e "s/_BUILD_NUMBER_/${GITHUB_RUN_NUMBER}/g" care-backend.yaml
-          sed -i -e "s/_BUILD_NUMBER_/${GITHUB_RUN_NUMBER}/g" care-celery-beat.yaml
-          sed -i -e "s/_BUILD_NUMBER_/${GITHUB_RUN_NUMBER}/g" care-celery-worker.yaml
-          kubectl apply -f care-backend.yaml
-          kubectl apply -f care-celery-beat.yaml
-          kubectl apply -f care-celery-worker.yaml
-
-  deploy-production-meghalaya:
-    needs: notify-release
-    name: Deploy to GKE Meghalaya
-    runs-on: ubuntu-latest
-    environment:
-      name: Production-Meghalaya
-      url: https://careapi.meghealth.gov.in
-    steps:
-      - name: Checkout Kube Config
-        uses: actions/checkout@v3
-        with:
-          repository: coronasafe/ml-care-infra
-          token: ${{ secrets.GIT_ACCESS_TOKEN }}
-          path: kube
-          ref: main
-
-      # Setup gcloud CLI
-      - uses: google-github-actions/setup-gcloud@94337306dda8180d967a56932ceb4ddcf01edae7
-        with:
-          service_account_key: ${{ secrets.GKE_SA_KEY }}
-          project_id: ${{ secrets.GKE_PROJECT }}
-
-      # Get the GKE credentials, so we can deploy to the cluster
-      - uses: google-github-actions/get-gke-credentials@fb08709ba27618c31c09e014e1d8364b02e5042e
-        with:
-          cluster_name: ${{ secrets.GKE_CLUSTER }}
-          location: ${{ secrets.GKE_ZONE }}
-          credentials: ${{ secrets.GKE_SA_KEY }}
-
-      - name: install kubectl
-        uses: azure/setup-kubectl@v3.0
-        with:
-          version: "v1.23.6"
-        id: install
-
-      - name: Deploy Care Production Nagaland
+      - name: Trigger deploy
         run: |
-          mkdir -p $HOME/.kube/
-          cd kube/deployments/
-          sed -i -e "s/_BUILD_NUMBER_/${GITHUB_RUN_NUMBER}/g" care-backend.yaml
-          sed -i -e "s/_BUILD_NUMBER_/${GITHUB_RUN_NUMBER}/g" care-celery-beat.yaml
-          sed -i -e "s/_BUILD_NUMBER_/${GITHUB_RUN_NUMBER}/g" care-celery-worker.yaml
-          kubectl apply -f care-backend.yaml
-          kubectl apply -f care-celery-beat.yaml
-          kubectl apply -f care-celery-worker.yaml
+          COMMIT_SHA=${{ github.sha }}
+          JSON='{ "substitutions": { "care_be_tag":"'"$COMMIT_SHA"'", "care_fe_tag": "", "metabase_tag": "" } }'
+          curl --location "${{ secrets.STAGING_GCP_DEPLOY_URL }}" \
+            --header 'Content-Type: application/json' --data "$JSON"

.gitignore

@@ -356,3 +356,7 @@ secrets.sh
 /.idea/modules.xml
 /.idea/vcs.xml
 /.idea/ruff.xml
+
+
+# Redis
+*.rdb