Merge branch 'main' into spalmurray/amplitude-upload-event

Author: spalmurray-codecov

.github/workflows/ci.yml

@@ -36,16 +36,6 @@ jobs:
     uses: codecov/gha-workflows/.github/workflows/[email protected]
     secrets: inherit
 
-  # ats:
-  #   name: ATS
-  #   needs: [build]
-  #   if: ${{ !github.event.pull_request.head.repo.fork && github.repository_owner == 'codecov' }}
-  #   uses: codecov/gha-workflows/.github/workflows/[email protected]
-  #   secrets: inherit
-  #   with:
-  #     repo: ${{ vars.CODECOV_IMAGE_V2 || 'codecov/self-hosted-api' }}
-  #     codecov_cli_upload_args: '--plugin pycoverage --plugin compress-pycoverage --flag smart-labels'
-  #     app_container_name: api
   test:
     name: Test
     needs: [build]

Makefile

@@ -205,7 +205,7 @@ test_env.install_cli:
 
 test_env.container_prepare:
 	apt-get -y install git build-essential netcat-traditional
-	git config --global --add safe.directory /app
+	git config --global --add safe.directory /app || true
 
 test_env.container_check_db:
 	while ! nc -vz postgres 5432; do sleep 1; echo "waiting for postgres"; done
@@ -229,24 +229,6 @@ test_env.run_integration:
 test_env.check-for-migration-conflicts:
 	docker-compose exec api python manage.py check_for_migration_conflicts
 
-test_env.static_analysis:
-	docker-compose exec api make test_env.container_static_analysis CODECOV_STATIC_TOKEN=${CODECOV_STATIC_TOKEN}
-
-test_env.label_analysis:
-	docker-compose exec api make test_env.container_label_analysis CODECOV_STATIC_TOKEN=${CODECOV_STATIC_TOKEN}
-
-test_env.ats:
-	docker-compose exec api make test_env.container_ats CODECOV_UPLOAD_TOKEN=${CODECOV_UPLOAD_TOKEN}
-
-test_env.container_static_analysis:
-	codecovcli -u ${CODECOV_URL} static-analysis --token=${CODECOV_STATIC_TOKEN}
-
-test_env.container_label_analysis:
-	codecovcli -u ${CODECOV_URL} label-analysis --base-sha=${merge_sha} --token=${CODECOV_STATIC_TOKEN}
-
-test_env.container_ats:
-	codecovcli -u ${CODECOV_URL} --codecov-yml-path=codecov_cli.yml upload-process --plugin pycoverage --plugin compress-pycoverage --flag smart-labels --fail-on-error
-
 test_env:
 	make test_env.up
 	make test_env.prepare

codecov.yml

@@ -1,16 +1,5 @@
 ignore:
   - "**tests**/test_*.py"
-comment:
-  show_critical_paths: true
-
-beta_groups:
-  - "labels"
-
-flag_management:
-  individual_flags:
-    - name: "smart-labels"
-      carryforward: true
-      carryforward_mode: "labels"
 
 codecov:
   require_ci_to_pass: false

codecov_cli.yml

@@ -1,9 +1,10 @@
 import enum
+from base64 import b64decode
 from dataclasses import dataclass
 from functools import cached_property
 from typing import Any, Dict, List, Optional
 
-from cursor_pagination import CursorPage, CursorPaginator
+from cursor_pagination import CursorPage, CursorPaginator, InvalidCursor
 from django.db.models import QuerySet
 
 from codecov.commands.exceptions import ValidationError
@@ -181,6 +182,7 @@ def page_info(self) -> Dict[str, Any]:
 
 
 class DictCursorPaginator(CursorPaginator):
+    NULL_VALUE_REPR = "\x1f"
     """
     WARNING: DictCursorPaginator does not work for dict objects where a key contains the following string: "__"
     TODO: if instance is a dictionary and not an object, don't split the ordering
@@ -205,6 +207,17 @@ class DictCursorPaginator(CursorPaginator):
     if the dict access fails then it throws an exception, although it would be a different
     """
 
+    def decode_cursor(self, cursor):
+        try:
+            orderings = b64decode(cursor.encode("ascii")).decode("utf8")
+            orderings = orderings.split(self.delimiter)
+            return [
+                None if ordering == self.NULL_VALUE_REPR else ordering
+                for ordering in orderings
+            ]
+        except (TypeError, ValueError):
+            raise InvalidCursor(self.invalid_cursor_message)
+
     def position_from_instance(self, instance):
         position = []
         for order in self.ordering:
@@ -219,7 +232,7 @@ def position_from_instance(self, instance):
                     except (KeyError, TypeError):
                         raise attr_err from None
                 parts.pop(0)
-            position.append(str(attr))
+            position.append(self.NULL_VALUE_REPR if attr is None else str(attr))
         return position
 
 

graphql_api/helpers/connection.py

@@ -155,3 +155,21 @@ def test_invalid_cursors(self):
 
         with self.assertRaises(ValidationError):
             queryset_to_connection_sync(data, first=3, after="invalid")
+
+    def test_dict_cursor_paginator_null_encoding(self):
+        from graphql_api.helpers.connection import DictCursorPaginator, field_order
+
+        repo_1 = RepositoryFactory(name="a", active=None)
+        repo_2 = RepositoryFactory(name="b", active=True)
+        repo_3 = RepositoryFactory(name="c", active=False)
+        r = Repository.objects.all()
+
+        ordering = tuple(
+            field_order(field, OrderingDirection.ASC) for field in ("active",)
+        )
+
+        paginator = DictCursorPaginator(r, ordering=ordering)
+
+        assert paginator.position_from_instance(repo_1) == ["\x1f"]
+        assert paginator.position_from_instance(repo_2) == ["True"]
+        assert paginator.position_from_instance(repo_3) == ["False"]

graphql_api/helpers/tests/test_connection.py

@@ -468,7 +468,7 @@ def test_test_results_pagination_asc(
     def test_test_analytics_term_filter(self, repository, store_in_redis, mock_storage):
         test_results = generate_test_results(
             repoid=repository.repoid,
-            term=rows[0]["name"],
+            term=rows[0]["name"][2:],
             ordering=TestResultsOrderingParameter.UPDATED_AT,
             ordering_direction=OrderingDirection.DESC,
             measurement_interval=MeasurementInterval.INTERVAL_30_DAY,

graphql_api/tests/test_test_analytics.py

@@ -198,7 +198,7 @@ def generate_test_results(
         )
 
     if term:
-        table = table.filter(pl.col("name").str.starts_with(term))
+        table = table.filter(pl.col("name").str.contains(term))
 
     if testsuites:
         table = table.filter(