Merge remote-tracking branch 'origin/main' into sshin/fix/lint

Author: suejung-sentry

.github/workflows/ci.yml

@@ -15,23 +15,25 @@ concurrency:
 permissions:
   contents: "read"
   id-token: "write"
+  issues: "write"
+  pull-requests: "write"
 
 jobs:
   lint:
     name: Run Lint
-    uses: codecov/gha-workflows/.github/workflows/[email protected].24
+    uses: codecov/gha-workflows/.github/workflows/[email protected].26
 
   build:
     name: Build API
-    uses: codecov/gha-workflows/.github/workflows/[email protected].24
+    uses: codecov/gha-workflows/.github/workflows/[email protected].26
     secrets: inherit
     with:
       repo: ${{ vars.CODECOV_IMAGE_V2 || 'codecov/self-hosted-api' }}
 
   codecovstartup:
     name: Codecov Startup
     needs: build
-    uses: codecov/gha-workflows/.github/workflows/[email protected].24
+    uses: codecov/gha-workflows/.github/workflows/[email protected].26
     secrets: inherit
 
   # ats:
@@ -47,15 +49,15 @@ jobs:
   test:
     name: Test
     needs: [build]
-    uses: codecov/gha-workflows/.github/workflows/[email protected].24
+    uses: codecov/gha-workflows/.github/workflows/[email protected].26
     secrets: inherit
     with:
       repo: ${{ vars.CODECOV_IMAGE_V2 || 'codecov/self-hosted-api' }}
 
   build-self-hosted:
     name: Build Self Hosted API
     needs: [build, test]
-    uses: codecov/gha-workflows/.github/workflows/[email protected].24
+    uses: codecov/gha-workflows/.github/workflows/[email protected].26
     secrets: inherit
     with:
       repo: ${{ vars.CODECOV_IMAGE_V2 || 'codecov/self-hosted-api' }}
@@ -64,7 +66,7 @@ jobs:
     name: Push Staging Image
     needs: [build, test]
     if: ${{ github.event_name == 'push' && github.event.ref == 'refs/heads/staging' && github.repository_owner == 'codecov' }}
-    uses: codecov/gha-workflows/.github/workflows/[email protected].24
+    uses: codecov/gha-workflows/.github/workflows/[email protected].26
     secrets: inherit
     with:
       environment: staging
@@ -74,7 +76,7 @@ jobs:
     name: Push Production Image
     needs: [build, test]
     if: ${{ github.event_name == 'push' && github.event.ref == 'refs/heads/main' && github.repository_owner == 'codecov' }}
-    uses: codecov/gha-workflows/.github/workflows/[email protected].24
+    uses: codecov/gha-workflows/.github/workflows/[email protected].26
     secrets: inherit
     with:
       environment: production
@@ -85,7 +87,7 @@ jobs:
     needs: [build-self-hosted, test]
     secrets: inherit
     if: ${{ github.event_name == 'push' && github.event.ref == 'refs/heads/main' && github.repository_owner == 'codecov' }}
-    uses: codecov/gha-workflows/.github/workflows/[email protected].24
+    uses: codecov/gha-workflows/.github/workflows/[email protected].26
     with:
       push_rolling: true
       repo: ${{ vars.CODECOV_IMAGE_V2 || 'codecov/self-hosted-api' }}

codecov/settings_base.py

@@ -115,6 +115,10 @@
 
 DATABASE_ROUTERS = ["codecov.db.DatabaseRouter"]
 
+# GCS
+GCS_BUCKET_NAME = "codecov"
+
+
 # Password validation
 # https://docs.djangoproject.com/en/2.1/ref/settings/#auth-password-validators
 
@@ -170,6 +174,8 @@
     "'sha256-eKdXhLyOdPl2/gp1Ob116rCU2Ox54rseyz1MwCmzb6w='",
     "'sha256-a1pELtDJXf8fPX1YL2JiBM91RQBeIAswunzgwMEsvwA='",
     "'sha256-cNIcuS0BVLuBVP5rpfeFE42xHz7r5hMyf9YdfknWuCg='",
+    "'sha256-bmwAzHxhO1mBINfkKkKPopyKEv4ppCHx/z84wQJ9nOY='",
+    "'sha256-jQoC6QpIonlMBPFbUGlJFRJFFWbbijMl7Z8XqWrb46o='",
     "https://cdn.jsdelivr.net/npm/graphql-playground-react/build/static/js/middleware.js",
     "https://cdn.jsdelivr.net/npm/graphql-playground-react/build/favicon.png",
     "https://cdn.jsdelivr.net/npm/graphql-playground-react/build/static/css/index.css",

codecov/settings_staging.py

@@ -72,6 +72,8 @@
 COOKIE_SAME_SITE = "None"
 SESSION_COOKIE_SAMESITE = "None"
 
+GCS_BUCKET_NAME = "codecov-staging"
+
 CSRF_TRUSTED_ORIGINS = [
     get_config("setup", "trusted_origin", default="https://*.codecov.dev")
 ]

core/signals.py

@@ -18,7 +18,7 @@ def update_repository(
     log.info(f"Signal triggered for repository {instance.repoid}")
     created: bool = kwargs["created"]
     changes: Dict[str, Any] = instance.tracker.changed()
-    tracked_fields: List[str] = ["name", "upload_token"]
+    tracked_fields: List[str] = ["name", "upload_token", "activated", "active"]
 
     if created or any([field in changes for field in tracked_fields]):
         data = {

core/tests/test_signals.py

@@ -10,7 +10,9 @@ def test_shelter_repo_sync(mocker):
     publish = mocker.patch("google.cloud.pubsub_v1.PublisherClient.publish")
 
     # this triggers the publish via Django signals
-    repo = RepositoryFactory(repoid=91728376, author=OwnerFactory(ownerid=555))
+    repo = RepositoryFactory(
+        repoid=91728376, author=OwnerFactory(ownerid=555), active=False, activated=False
+    )
 
     # triggers publish on create
     publish.assert_has_calls(
@@ -38,13 +40,27 @@ def test_shelter_repo_sync(mocker):
         b'{"type": "repo", "sync": "one", "id": 91728376}',
     )
 
+    # Does not trigger another publish with untracked field
     repo.message = "foo"
     repo.save()
 
     publish_calls = publish.call_args_list
-    # does not trigger another publish
     assert len(publish_calls) == 3
 
+    # Triggers call when active is changed
+    repo.active = True
+    repo.save()
+
+    publish_calls = publish.call_args_list
+    assert len(publish_calls) == 4
+
+    # Triggers call when activated is changed
+    repo.activated = True
+    repo.save()
+
+    publish_calls = publish.call_args_list
+    assert len(publish_calls) == 5
+
 
 @pytest.mark.django_db
 def test_shelter_commit_sync(mocker):