Merge pull request #29 from OpenHistoricalMap/202507-upstream-catchup

202507 upstream catchup

Author: erictheise

.circleci/config.yml

@@ -6,6 +6,6 @@ jobs:
   add_release:
     runs-on: ubuntu-latest
     steps:
-    - name: Add release version to db
-      run: |
-        curl -X POST "https://tasking-manager-tm4-production-api.hotosm.org/api/v2/system/release/"
+      - name: Add release version to db
+        run: |
+          curl -X POST "https://tasking-manager-production-api.hotosm.org/api/v2/system/release/"

.circleci/rdsid.sh

@@ -0,0 +1,80 @@
+name: Build and Deploy Backend to ECS
+
+on:
+  push:
+    branches:
+      - main
+      - staging
+      - develop
+    paths:
+      - "backend/**"
+  workflow_dispatch:
+
+env:
+  # NOTE: You can override these variables in the workflow file with GitHub Variables
+  # vars.TEAM is team name here in case you want to deploy for different team. Default is hotosm
+  # vars.INFRA_ENVIRONMENT is environment name here in case you have applied infrastructue with different environment name. Default is github.ref_name
+
+  AWS_REGION: ${{ vars.AWS_REGION || 'us-east-1' }}
+  OIDC_ROLE_ARN: ${{ secrets.AWS_OIDC_ROLE_ARN }}
+  ECS_CLUSTER: tasking-manager-${{ vars.INFRA_ENVIRONMENT || github.ref_name }}-cluster
+  TASK_DEFINITION_PREFIX: tasking-manager-${{ vars.TEAM || 'hotosm' }}-${{ vars.INFRA_ENVIRONMENT || github.ref_name }}
+  ECS_SERVICE_PREFIX: tasking-manager-${{ vars.TEAM || 'hotosm' }}-${{ vars.INFRA_ENVIRONMENT || github.ref_name }}
+  CONTAINER_NAME_PREFIX: tasking-manager-${{ vars.TEAM || 'hotosm' }}-${{ vars.INFRA_ENVIRONMENT || github.ref_name }}
+
+jobs:
+  image-build-and-push:
+    uses: hotosm/gh-workflows/.github/workflows/image_build.yml@1.5.1
+    with:
+      image_name: ghcr.io/${{ github.repository }}/backend
+      build_target: prod
+      dockerfile: scripts/docker/Dockerfile
+      image_tags: |
+        ghcr.io/${{ vars.IMAGE_NAME || 'hotosm/tasking-manager/backend' }}:${{ github.ref_name }}
+        ghcr.io/${{ vars.IMAGE_NAME || 'hotosm/tasking-manager/backend' }}:${{ github.sha }}
+
+  deploy-service:
+    name: Deploy ${{ matrix.service }} to ECS
+    runs-on: ubuntu-latest
+    environment: ${{ github.ref_name }}
+    needs: image-build-and-push
+    permissions:
+      contents: read
+      id-token: write
+
+    strategy:
+      matrix:
+        service: [fastapi, cron]
+      fail-fast: false
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-region: ${{ env.AWS_REGION }}
+          role-to-assume: ${{ env.OIDC_ROLE_ARN }}
+          role-session-name: gh-ci-ecs-deploy-${{ github.ref_name }}-${{ matrix.service }}
+
+      - name: Download task definition
+        run: |
+          aws ecs describe-task-definition --region ${{ env.AWS_REGION }} \
+            --task-definition ${{ env.TASK_DEFINITION_PREFIX }}-${{ matrix.service }} \
+            --query taskDefinition > task-definition.json
+
+      - name: Task definition rendition
+        id: task-def
+        uses: aws-actions/amazon-ecs-render-task-definition@v1
+        with:
+          task-definition: task-definition.json
+          container-name: ${{ env.CONTAINER_NAME_PREFIX }}-${{ matrix.service }}
+          image: ghcr.io/${{ vars.IMAGE_NAME || 'hotosm/tasking-manager/backend' }}:${{ github.sha }}
+
+      - name: Deploy task definition for ${{ matrix.service }}
+        uses: aws-actions/amazon-ecs-deploy-task-definition@v2
+        with:
+          task-definition: ${{ steps.task-def.outputs.task-definition }}
+          service: ${{ env.ECS_SERVICE_PREFIX }}-${{ matrix.service }}
+          cluster: ${{ env.ECS_CLUSTER }}
+          wait-for-service-stability: true

.flaskenv

@@ -0,0 +1,37 @@
+name: 🔧 Build CI Img
+
+on:
+  # Push includes PR merge
+  push:
+    branches:
+      - main
+      - staging
+      - development
+    paths:
+      # Workflow is triggered only if deps change
+      - "src/backend/pyproject.toml"
+      - "src/backend/Dockerfile"
+  # Allow manual trigger
+  workflow_dispatch:
+
+jobs:
+  backend-ci-build:
+    uses: hotosm/gh-workflows/.github/workflows/image_build.yml@3.2.0
+    with:
+      context: .
+      build_target: ci
+      image_tags: |
+        "ghcr.io/${{ github.repository }}/backend:ci-${{ github.ref_name }}"
+
+  invalidate-cache:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Delete CI Img Cache
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh extension install actions/gh-actions-cache
+          gh actions-cache delete image-cache-${{ runner.os }} \
+            -R ${{ github.repository }} \
+            -B ${{ github.ref_name }} \
+            --confirm || true

.github/workflows/add-version-to-db.yml

@@ -0,0 +1,36 @@
+name: 📖 Publish Docs
+
+on:
+  push:
+    paths:
+      - docs/**
+      - src/**
+      - mkdocs.yml
+    branches:
+      - develop
+  workflow_dispatch:
+
+jobs:
+  # TODO need to also publish osm-fieldwork docs somewhere...
+
+  build_doxygen:
+    uses: hotosm/gh-workflows/.github/workflows/doxygen_build.yml@3.2.0
+    with:
+      output_path: docs/apidocs
+
+  build_openapi_json:
+    uses: hotosm/gh-workflows/.github/workflows/openapi_build.yml@3.2.1
+    with:
+      image: ghcr.io/${{ github.repository }}/backend:ci-${{ github.ref_name }}
+      example_env_file_path: "example.env"
+      output_path: docs/openapi.json
+      py_backend_app_context: backend.main
+
+  publish_docs:
+    uses: hotosm/gh-workflows/.github/workflows/mkdocs_build.yml@3.2.0
+    needs:
+      - build_doxygen
+      - build_openapi_json
+    with:
+      doxygen: true
+      openapi: true