Merge branch 'main' into nestbot-calendar/setup-aws-kms

Author: ahmedxgouda

.github/workflows/run-ci-cd.yaml

@@ -35,7 +35,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
 
       - name: Install Poetry
         run: pipx install poetry
@@ -68,7 +68,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
 
       - name: Install pnpm
         uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda
@@ -101,7 +101,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
 
       - name: Run cspell
         run: |
@@ -116,7 +116,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
 
       - name: Run Trivy Repository Scan
         uses: aquasecurity/trivy-action@dc5a429b52fcf669ce959baa2c2dd26090d2a6c4
@@ -135,7 +135,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
 
       - name: Run Trivy Filesystem Scan
         uses: aquasecurity/trivy-action@dc5a429b52fcf669ce959baa2c2dd26090d2a6c4
@@ -153,7 +153,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
 
       - name: Set up Docker buildx
         uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435
@@ -184,7 +184,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
 
       - name: Set up Docker buildx
         uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435
@@ -215,7 +215,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
 
       - name: Set up Docker buildx
         uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435
@@ -267,7 +267,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392
@@ -359,7 +359,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
 
       - name: Scan backend image
         uses: aquasecurity/trivy-action@dc5a429b52fcf669ce959baa2c2dd26090d2a6c4
@@ -398,7 +398,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
 
       - name: Prepare SSH key
         run: |
@@ -471,7 +471,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
 
       - name: Prepare SSH key
         run: |
@@ -499,7 +499,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392
@@ -587,7 +587,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
 
       - name: Setup Trivy
         uses: aquasecurity/setup-trivy@9ea583eb67910444b1f64abf338bd2e105a0a93d
@@ -632,7 +632,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
 
       - name: Prepare SSH key
         run: |
@@ -711,7 +711,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
 
       - name: Prepare SSH key
         run: |

.github/workflows/run-code-ql.yaml

@@ -26,10 +26,10 @@ jobs:
           - python
     steps:
       - name: Check out repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@76621b61decf072c1cee8dd1ce2d2a82d33c17ed
+        uses: github/codeql-action/init@df559355d593797519d70b90fc8edd5db049e7a2
         with:
           languages: ${{ matrix.language }}
 
@@ -53,6 +53,6 @@ jobs:
         run: pnpm install --frozen-lockfile
 
       - name: Perform CodeQL analysis
-        uses: github/codeql-action/analyze@76621b61decf072c1cee8dd1ce2d2a82d33c17ed
+        uses: github/codeql-action/analyze@df559355d593797519d70b90fc8edd5db049e7a2
         with:
           category: /language:${{ matrix.language }}

.github/workflows/update-nest-test-images.yaml

@@ -17,7 +17,7 @@ jobs:
     if: ${{ github.repository == 'OWASP/Nest' }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
 
       - name: Set up Docker buildx
         uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435

.pre-commit-config.yaml

@@ -80,3 +80,8 @@ repos:
         files: backend/tests
       - id: trailing-whitespace
         exclude: pnpm-lock.yaml
+
+  - repo: https://github.com/tox-dev/pyproject-fmt
+    rev: v2.6.0
+    hooks:
+      - id: pyproject-fmt

backend/apps/core/api/internal/algolia.py

@@ -14,10 +14,10 @@
 
 from apps.common.index import IndexBase
 from apps.common.utils import get_user_ip_address
+from apps.core.constants import CACHE_PREFIX
 from apps.core.utils.index import deep_camelize, get_params_for_index
 from apps.core.validators import validate_search_params
 
-CACHE_PREFIX = "algolia_proxy"
 CACHE_TTL_IN_SECONDS = 3600  # 1 hour
 
 

backend/apps/core/constants.py

@@ -0,0 +1,3 @@
+"""Core app constants."""
+
+CACHE_PREFIX = "algolia_proxy"

backend/apps/core/utils/index.py

@@ -1,12 +1,17 @@
 """Index utils."""
 
 import contextlib
+import logging
 
 from algoliasearch_django import register, unregister
 from algoliasearch_django.registration import RegistrationError
 from django.apps import apps
+from django.core.cache import cache
 
 from apps.common.utils import convert_to_camel_case
+from apps.core.constants import CACHE_PREFIX
+
+logger = logging.getLogger(__name__)
 
 
 class DisableIndexing:
@@ -140,6 +145,18 @@ def get_params_for_index(index_name: str) -> dict:
             ]
             params["aroundLatLngViaIP"] = True
 
+        case "programs":
+            params["attributesToRetrieve"] = [
+                "idx_description",
+                "idx_ended_at",
+                "idx_experience_levels",
+                "idx_key",
+                "idx_modules",
+                "idx_name",
+                "idx_started_at",
+                "idx_status",
+            ]
+
         case "projects":
             params["attributesToRetrieve"] = [
                 "idx_contributors_count",
@@ -213,3 +230,32 @@ def get_params_for_index(index_name: str) -> dict:
             params["attributesToRetrieve"] = []
 
     return params
+
+
+def clear_index_cache(index_name: str) -> None:
+    """Clear Algolia proxy cache entries from the cache store that match a given index name.
+
+    Args:
+        index_name (str): The specific index to clear cache for.
+            If empty, the function does nothing.
+
+    Returns:
+        None
+
+    """
+    if not index_name:
+        logger.info("No index name provided, skipping cache clear.")
+        return
+
+    pattern = f"{CACHE_PREFIX}:{index_name}*"
+    keys_to_delete = list(cache.iter_keys(pattern))
+
+    if not keys_to_delete:
+        logger.info("No matching cache keys found for pattern: %s", pattern)
+        return
+
+    logger.info("Deleting %d cache keys for pattern: %s", len(keys_to_delete), pattern)
+
+    for key in keys_to_delete:
+        logger.info("Deleting key: %s", key)
+        cache.delete(key)

backend/apps/github/api/internal/nodes/issue.py

@@ -16,7 +16,7 @@
         "url",
     ],
 )
-class IssueNode:
+class IssueNode(strawberry.relay.Node):
     """GitHub issue node."""
 
     @strawberry.field

backend/apps/github/api/internal/nodes/milestone.py

@@ -19,7 +19,7 @@
         "url",
     ],
 )
-class MilestoneNode:
+class MilestoneNode(strawberry.relay.Node):
     """Github Milestone Node."""
 
     @strawberry.field

backend/apps/github/api/internal/nodes/organization.py

@@ -36,7 +36,7 @@ class OrganizationStatsNode:
         "updated_at",
     ],
 )
-class OrganizationNode:
+class OrganizationNode(strawberry.relay.Node):
     """GitHub organization node."""
 
     @strawberry.field