Merge branch 'main' into cy/cancellation_grace

Author: calvin-codecov

api/public/v2/tests/test_test_results_view.py

@@ -53,10 +53,6 @@ def test_list(self):
                     "outcome": self.test_instances[0].outcome,
                     "branch": self.test_instances[0].branch,
                     "repoid": self.test_instances[0].repoid,
-                    "failure_rate": self.test_instances[0].test.failure_rate,
-                    "commits_where_fail": self.test_instances[
-                        0
-                    ].test.commits_where_fail,
                 },
                 {
                     "id": self.test_instances[1].id,
@@ -68,10 +64,6 @@ def test_list(self):
                     "outcome": self.test_instances[1].outcome,
                     "branch": self.test_instances[1].branch,
                     "repoid": self.test_instances[1].repoid,
-                    "failure_rate": self.test_instances[1].test.failure_rate,
-                    "commits_where_fail": self.test_instances[
-                        1
-                    ].test.commits_where_fail,
                 },
             ],
             "total_pages": 1,
@@ -103,10 +95,6 @@ def test_list_filters(self):
                     "outcome": self.test_instances[0].outcome,
                     "branch": self.test_instances[0].branch,
                     "repoid": self.test_instances[0].repoid,
-                    "failure_rate": self.test_instances[0].test.failure_rate,
-                    "commits_where_fail": self.test_instances[
-                        0
-                    ].test.commits_where_fail,
                 },
             ],
             "total_pages": 1,
@@ -137,8 +125,6 @@ def test_retrieve(self, get_repo_permissions):
             "outcome": self.test_instances[0].outcome,
             "branch": self.test_instances[0].branch,
             "repoid": self.test_instances[0].repoid,
-            "failure_rate": self.test_instances[0].test.failure_rate,
-            "commits_where_fail": self.test_instances[0].test.commits_where_fail,
         }
 
     @patch("api.shared.permissions.RepositoryArtifactPermissions.has_permission")
@@ -240,6 +226,4 @@ def test_result_with_valid_super_token(
             "outcome": self.test_instances[0].outcome,
             "branch": self.test_instances[0].branch,
             "repoid": self.test_instances[0].repoid,
-            "failure_rate": self.test_instances[0].test.failure_rate,
-            "commits_where_fail": self.test_instances[0].test.commits_where_fail,
         }

codecov/settings_base.py

@@ -356,6 +356,9 @@
     "setup", "upload_throttling_enabled", default=True
 )
 
+HIDE_ALL_CODECOV_TOKENS = get_config("setup", "hide_all_codecov_tokens", default=False)
+
+
 SENTRY_JWT_SHARED_SECRET = get_config(
     "sentry", "jwt_shared_secret", default=None
 ) or get_config("setup", "sentry", "jwt_shared_secret", default=None)

graphql_api/tests/test_owner.py

@@ -27,6 +27,7 @@
     UnauthorizedGuestAccess,
 )
 from codecov_auth.models import GithubAppInstallation, OwnerProfile
+from graphql_api.types.repository.repository import TOKEN_UNAVAILABLE
 from plan.constants import PlanName, TrialStatus
 from reports.tests.factories import CommitReportFactory, UploadFactory
 
@@ -426,6 +427,28 @@ def test_get_org_upload_token(self, mocker):
         data = self.gql_request(query, owner=self.owner)
         assert data["owner"]["orgUploadToken"] == "upload_token"
 
+    @override_settings(HIDE_ALL_CODECOV_TOKENS=True)
+    def test_get_org_upload_token_hide_tokens_setting_owner_not_admin(self):
+        random_owner = OwnerFactory()
+        query = """{
+            owner(username: "%s") {
+               orgUploadToken
+            }
+        }
+        """ % (self.owner.username)
+        random_owner.organizations = [self.owner.ownerid]
+        random_owner.save()
+        data = self.gql_request(query, owner=random_owner)
+        assert data["owner"]["orgUploadToken"] == TOKEN_UNAVAILABLE
+
+    @patch("codecov_auth.commands.owner.owner.OwnerCommands.get_org_upload_token")
+    @override_settings(HIDE_ALL_CODECOV_TOKENS=True)
+    def test_get_org_upload_token_hide_tokens_setting_owner_is_admin(self, mocker):
+        mocker.return_value = "upload_token"
+        query = query_repositories % (self.owner.username, "", "")
+        data = self.gql_request(query, owner=self.owner)
+        assert data["owner"]["orgUploadToken"] == "upload_token"
+
     # Applies for old users that didn't get their owner profiles created w/ their owner
     def test_when_owner_profile_doesnt_exist(self):
         owner = OwnerFactory(username="no-profile-user")

graphql_api/tests/test_repository.py

@@ -11,6 +11,7 @@
     RepositoryTokenFactory,
 )
 
+from graphql_api.types.repository.repository import TOKEN_UNAVAILABLE
 from services.profiling import CriticalFile
 
 from .helper import GraphQLTestHelper
@@ -73,6 +74,11 @@
 """
 
 
+def mock_get_config_global_upload_tokens(*args):
+    if args == ("setup", "hide_all_codecov_tokens"):
+        return True
+
+
 class TestFetchRepository(GraphQLTestHelper, TransactionTestCase):
     def fetch_repository(self, name, fields=None):
         data = self.gql_request(
@@ -683,6 +689,68 @@ def test_fetch_is_github_rate_limited_not_on_gh_service(self):
 
         assert data["me"]["owner"]["repository"]["isGithubRateLimited"] == False
 
+    @override_settings(HIDE_ALL_CODECOV_TOKENS=True)
+    def test_repo_upload_token_not_available_config_setting_owner_not_admin(self):
+        owner = OwnerFactory(service="gitlab")
+
+        repo = RepositoryFactory(
+            author=owner,
+            author__service="gitlab",
+            service_id=12345,
+            active=True,
+        )
+        new_owner = OwnerFactory(service="gitlab", organizations=[owner.ownerid])
+        new_owner.permission = [repo.repoid]
+        new_owner.save()
+        owner.admins = []
+
+        query = """
+            query {
+                owner(username: "%s") {
+                    repository(name: "%s") {
+                                    ... on Repository {
+                            uploadToken
+                            }
+                    }
+                }
+            }
+        """ % (
+            owner.username,
+            repo.name,
+        )
+
+        data = self.gql_request(
+            query,
+            owner=new_owner,
+            variables={"name": repo.name},
+            provider="gitlab",
+        )
+
+        assert data["owner"]["repository"]["uploadToken"] == TOKEN_UNAVAILABLE
+
+    @override_settings(HIDE_ALL_CODECOV_TOKENS=True)
+    def test_repo_upload_token_not_available_config_setting_owner_is_admin(self):
+        owner = OwnerFactory(service="gitlab")
+        repo = RepositoryFactory(
+            author=owner,
+            author__service="gitlab",
+            service_id=12345,
+            active=True,
+        )
+        owner.admins = [owner.ownerid]
+
+        data = self.gql_request(
+            query_repository
+            % """
+                uploadToken
+            """,
+            owner=owner,
+            variables={"name": repo.name},
+            provider="gitlab",
+        )
+
+        assert data["me"]["owner"]["repository"]["uploadToken"] != TOKEN_UNAVAILABLE
+
     @patch("shared.rate_limits.determine_entity_redis_key")
     @patch("shared.rate_limits.determine_if_entity_is_rate_limited")
     @patch("logging.Logger.warning")

graphql_api/types/bundle_analysis/base.py

@@ -3,7 +3,7 @@
 from typing import Dict, List, Mapping, Optional, Union
 
 import sentry_sdk
-from ariadne import ObjectType, convert_kwargs_to_snake_case
+from ariadne import ObjectType
 from graphql import GraphQLResolveInfo
 
 from codecov.commands.exceptions import ValidationError
@@ -139,7 +139,6 @@ def resolve_modules(
 
 @sentry_sdk.trace
 @bundle_asset_bindable.field("measurements")
-@convert_kwargs_to_snake_case
 @sync_to_async
 def resolve_asset_report_measurements(
     bundle_asset: AssetReport,
@@ -277,7 +276,6 @@ def resolve_bundle_report_filtered(
 
 @sentry_sdk.trace
 @bundle_report_bindable.field("measurements")
-@convert_kwargs_to_snake_case
 @sync_to_async
 def resolve_bundle_report_measurements(
     bundle_report: BundleReport,

graphql_api/types/commit/commit.py

@@ -4,7 +4,7 @@
 import sentry_sdk
 import shared.reports.api_report_service as report_service
 import yaml
-from ariadne import ObjectType, convert_kwargs_to_snake_case
+from ariadne import ObjectType
 from graphql import GraphQLResolveInfo
 from shared.reports.api_report_service import ReadOnlyReport
 from shared.reports.filtered import FilteredReportFile
@@ -84,7 +84,6 @@ async def resolve_yaml(commit: Commit, info) -> dict:
 
 
 @commit_bindable.field("yamlState")
-@convert_kwargs_to_snake_case
 async def resolve_yaml_state(commit: Commit, info) -> YamlStates:
     command = info.context["executor"].get_command("commit")
     final_yaml = await command.get_final_yaml(commit)
@@ -149,7 +148,6 @@ def resolve_critical_files(commit: Commit, info, **kwargs) -> List[CriticalFile]
 
 @sentry_sdk.trace
 @commit_bindable.field("pathContents")
-@convert_kwargs_to_snake_case
 @sync_to_async
 def resolve_path_contents(commit: Commit, info, path: str = None, filters=None):
     """

graphql_api/types/comparison/comparison.py

@@ -2,7 +2,7 @@
 from typing import List, Optional
 
 import sentry_sdk
-from ariadne import ObjectType, UnionType, convert_kwargs_to_snake_case
+from ariadne import ObjectType, UnionType
 from graphql.type.definition import GraphQLResolveInfo
 
 import services.components as components_service
@@ -36,7 +36,6 @@ def resolve_state(comparison: ComparisonReport, info: GraphQLResolveInfo) -> str
 
 
 @comparison_bindable.field("impactedFiles")
-@convert_kwargs_to_snake_case
 @sync_to_async
 def resolve_impacted_files(
     comparison_report: ComparisonReport, info: GraphQLResolveInfo, filters=None

graphql_api/types/impacted_file/impacted_file.py

@@ -2,7 +2,7 @@
 from typing import List, Union
 
 import sentry_sdk
-from ariadne import ObjectType, UnionType, convert_kwargs_to_snake_case
+from ariadne import ObjectType, UnionType
 from shared.reports.types import ReportTotals
 from shared.torngit.exceptions import TorngitClientError
 
@@ -67,7 +67,6 @@ def resolve_hashed_path(impacted_file: ImpactedFile, info) -> str:
 @sentry_sdk.trace
 @impacted_file_bindable.field("segments")
 @sync_to_async
-@convert_kwargs_to_snake_case
 def resolve_segments(
     impacted_file: ImpactedFile, info, filters=None
 ) -> Union[UnknownPath, ProviderError, SegmentComparisons]:

graphql_api/types/line_comparison/line_comparison.py

@@ -1,7 +1,7 @@
 from functools import cached_property
 from typing import List, Optional
 
-from ariadne import ObjectType, convert_kwargs_to_snake_case
+from ariadne import ObjectType
 from shared.utils.merge import LineType
 
 from graphql_api.types.enums import CoverageLine
@@ -72,7 +72,6 @@ def resolve_content(line_comparison: LineComparison, info) -> str:
 
 
 @line_comparison_bindable.field("coverageInfo")
-@convert_kwargs_to_snake_case
 def resolve_coverage_info(
     line_comparison: LineComparison,
     info,

graphql_api/types/me/me.py

@@ -1,6 +1,6 @@
 from typing import Optional
 
-from ariadne import ObjectType, convert_kwargs_to_snake_case
+from ariadne import ObjectType
 from graphql import GraphQLResolveInfo
 
 from codecov.db import sync_to_async
@@ -41,7 +41,6 @@ def resolve_owner(user, _):
 
 
 @me_bindable.field("viewableRepositories")
-@convert_kwargs_to_snake_case
 def resolve_viewable_repositories(
     current_user,
     info: GraphQLResolveInfo,