Merge branch 'master' into scraps/loader

Author: natemoo-re

src/sentry/features/temporary.py

@@ -431,6 +431,9 @@ def register_temporary_features(manager: FeatureManager) -> None:
     # Use workflow engine exclusively for ProjectRuleDetailsEndpoint.get results.
     # See src/sentry/workflow_engine/docs/legacy_backport.md for context.
     manager.add("organizations:workflow-engine-projectruledetailsendpoint-get", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
+    # Use workflow engine exclusively for OrganizationCombinedRuleIndexEndpoint.get results.
+    # See src/sentry/workflow_engine/docs/legacy_backport.md for context.
+    manager.add("organizations:workflow-engine-combinedruleindex-get", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     # Enable metric detector limits by plan type
     manager.add("organizations:workflow-engine-metric-detector-limit", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable EventUniqueUserFrequencyConditionWithConditions special alert condition

src/sentry/incidents/endpoints/organization_alert_rule_index.py

@@ -607,7 +607,9 @@ def get(self, request: Request, organization: Organization) -> Response:
         # Common setup: type filter
         type_filter = request.GET.getlist("alertType", [])
 
-        if features.has("organizations:workflow-engine-rule-serializers", organization):
+        if features.has(
+            "organizations:workflow-engine-rule-serializers", organization
+        ) or features.has("organizations:workflow-engine-combinedruleindex-get", organization):
             return self._get_workflow_engine(
                 request=request,
                 organization=organization,

src/sentry/integrations/gitlab/client.py

@@ -690,6 +690,18 @@ def get_pr_diffs(self, repo: Repository, pr: PullRequest) -> list[dict[str, Any]
         path = GitLabApiClientPath.build_pr_diffs(project=project_id, pr_key=pr.key, unidiff=True)
         return self.get(path)
 
+    def get_repository_tree(
+        self, project_id: str, ref: str, recursive: bool = True
+    ) -> list[dict[str, Any]]:
+        """List repository tree at a given ref.
+
+        See https://docs.gitlab.com/ee/api/repositories.html#list-repository-tree
+        """
+        params: dict[str, str] = {"ref": ref, "per_page": "100"}
+        if recursive:
+            params["recursive"] = "true"
+        return self.get(GitLabApiClientPath.tree.format(project=project_id), params=params)
+
     def get_merge_request_diffs(self, project_id: str, pr_key: str) -> list[dict[str, Any]]:
         return self.get(GitLabApiClientPath.pr_diffs.format(project=project_id, pr_key=pr_key))
 

src/sentry/integrations/gitlab/utils.py

@@ -74,6 +74,7 @@ class GitLabApiClientPath:
     statuses = "/projects/{project}/statuses/{sha}"
     commit_statuses = "/projects/{project}/repository/commits/{sha}/statuses"
     archive = "/projects/{project}/repository/archive{format}"
+    tree = "/projects/{project}/repository/tree"
     branches = "/projects/{project_id}/repository/branches"
     branch = "/projects/{project_id}/repository/branches/{branch}"
     user = "/user"

src/sentry/pipeline/base.py

@@ -81,7 +81,10 @@ def unpack_state(cls, request: HttpRequest) -> PipelineRequestState[M, S] | None
         provider_model = None
         if state.provider_model_id:
             assert cls.provider_model_cls is not None
-            provider_model = cls.provider_model_cls.objects.get(id=state.provider_model_id)
+            try:
+                provider_model = cls.provider_model_cls.objects.get(id=state.provider_model_id)
+            except cls.provider_model_cls.DoesNotExist:
+                return None
 
         organization: RpcOrganization | None = None
         if state.org_id:

src/sentry/preprod/size_analysis/grouptype.py

@@ -193,7 +193,7 @@ def extract_value(self, data_packet: SizeAnalysisDataPacket) -> SizeAnalysisEval
                 return self._extract_head(data_packet) - self._extract_base(data_packet)
             case "relative_diff":
                 base = self._extract_base(data_packet)
-                return (self._extract_head(data_packet) - base) / base
+                return ((self._extract_head(data_packet) - base) / base) * 100
             case _:
                 raise ValueError(f"Unknown threshold_type: {threshold_type}")
 

src/sentry/scm/private/providers/gitlab.py

@@ -10,9 +10,7 @@
     * create_pull_request_draft
     * create_review
     * get_check_run
-    * get_git_commit
     * get_pull_request_diff
-    * get_tree
     * minimize_comment
     * request_review
     * resolve_review_thread
@@ -40,7 +38,10 @@
     Commit,
     CommitAuthor,
     FileContent,
+    GitCommitObject,
+    GitCommitTree,
     GitRef,
+    GitTree,
     PaginatedActionResult,
     PaginatedResponseMeta,
     PaginationParams,
@@ -56,6 +57,7 @@
     RequestOptions,
     ReviewComment,
     ReviewSide,
+    TreeEntry,
 )
 from sentry.shared_integrations.exceptions import ApiError
 
@@ -330,6 +332,47 @@ def create_branch(self, branch: BranchName, sha: SHA) -> ActionResult[GitRef]:
         raw = self.client.create_branch(self._repo_id, branch, sha)
         return make_result(map_git_ref, raw)
 
+    @catch_provider_exception
+    def get_tree(
+        self,
+        tree_sha: SHA,
+        recursive: bool = True,
+        pagination: PaginationParams | None = None,
+        request_options: RequestOptions | None = None,
+    ) -> ActionResult[GitTree]:
+        """List the repository tree at a given ref.
+
+        GitLab's tree API takes a ref (commit SHA, branch, tag) rather than a
+        tree-object SHA.  We treat ``tree_sha`` as a ref so callers can pass a
+        commit SHA obtained from ``get_git_commit``.
+        """
+        raw = self.client.get_repository_tree(self._repo_id, ref=tree_sha, recursive=recursive)
+        return ActionResult(
+            data=GitTree(
+                sha=tree_sha,
+                tree=[map_tree_entry(e) for e in raw],
+                truncated=False,
+            ),
+            type="gitlab",
+            raw=raw,
+            meta={},
+        )
+
+    @catch_provider_exception
+    def get_git_commit(
+        self,
+        sha: SHA,
+        request_options: RequestOptions | None = None,
+    ) -> ActionResult[GitCommitObject]:
+        """Get a commit as a git object.
+
+        GitLab's commit endpoint does not expose the tree-object SHA.  We set
+        ``tree.sha`` to the commit SHA so that downstream code can pass it to
+        ``get_tree`` (which accepts any ref).
+        """
+        raw = self.client.get_commit(self._repo_id, sha)
+        return make_result(map_git_commit_object, raw)
+
     @catch_provider_exception
     def get_archive_link(
         self,
@@ -667,6 +710,26 @@ def map_reaction_result(raw: dict[str, Any]) -> ReactionResult:
     )
 
 
+def map_git_commit_object(raw: dict[str, Any]) -> GitCommitObject:
+    return GitCommitObject(
+        sha=raw["id"],
+        # GitLab's commit API does not return a tree-object SHA.  We use the
+        # commit SHA so callers can pass it to get_tree (which accepts any ref).
+        tree=GitCommitTree(sha=raw["id"]),
+        message=raw["message"],
+    )
+
+
+def map_tree_entry(raw: dict[str, Any]) -> TreeEntry:
+    return TreeEntry(
+        path=raw["path"],
+        mode=raw["mode"],
+        type=raw["type"],
+        sha=raw["id"],
+        size=None,
+    )
+
+
 def map_review_comment(discussion_id: str) -> Callable[[dict[str, Any]], ReviewComment]:
     def _map_review_comment(raw: dict[str, Any]) -> ReviewComment:
         return ReviewComment(

static/app/components/commandPalette/useCommandPaletteActions.tsx

@@ -39,9 +39,10 @@ function addKeysToChildActions(
   actions: Array<CommandPaletteActionLink | CommandPaletteActionCallback>
 ): Array<CommandPaletteActionLinkWithKey | CommandPaletteActionCallbackWithKey> {
   return actions.map(action => {
-    const actionKey = `${id}:${action.type}:${action.display.label
-      .toLowerCase()
-      .replace(/ /g, '-')}`;
+    const label = action.display.label.toLowerCase().replace(/ /g, '-');
+    const disambiguator =
+      action.type === 'navigate' ? `:${JSON.stringify(action.to)}` : '';
+    const actionKey = `${id}:${action.type}:${label}${disambiguator}`;
     return {
       ...action,
       key: actionKey,

static/app/components/commandPalette/useGlobalCommandPaletteActions.tsx

@@ -1,3 +1,5 @@
+import {ProjectAvatar} from '@sentry/scraps/avatar';
+
 import {addLoadingMessage, addSuccessMessage} from 'sentry/actionCreators/indicator';
 import {openInviteMembersModal} from 'sentry/actionCreators/modal';
 import {
@@ -28,6 +30,7 @@ import {
 import {t} from 'sentry/locale';
 import {useMutateUserOptions} from 'sentry/utils/useMutateUserOptions';
 import {useOrganization} from 'sentry/utils/useOrganization';
+import {useProjects} from 'sentry/utils/useProjects';
 import {useGetStarredDashboards} from 'sentry/views/dashboards/hooks/useGetStarredDashboards';
 import {AGENTS_LANDING_SUB_PATH} from 'sentry/views/insights/pages/agents/settings';
 import {BACKEND_LANDING_SUB_PATH} from 'sentry/views/insights/pages/backend/settings';
@@ -49,6 +52,7 @@ function useNavigationActions(): CommandPaletteAction[] {
   const prefix = `/organizations/${slug}`;
   const {starredViews} = useStarredIssueViews();
   const {data: starredDashboards = []} = useGetStarredDashboards();
+  const {projects} = useProjects();
 
   const issuesChildren: CommandPaletteActionChild[] = [
     makeCommandPaletteLink({
@@ -218,6 +222,19 @@ function useNavigationActions(): CommandPaletteAction[] {
       )
     );
 
+  const projectSettingsChildren: CommandPaletteActionChild[] =
+    organization.features.includes('cmd-k-supercharged')
+      ? projects.map(project =>
+          makeCommandPaletteLink({
+            display: {
+              label: project.name,
+              icon: <ProjectAvatar project={project} size={16} />,
+            },
+            to: `/settings/${slug}/projects/${project.slug}/`,
+          })
+        )
+      : [];
+
   return [
     makeCommandPaletteGroup({
       groupingKey: 'navigate',
@@ -260,7 +277,17 @@ function useNavigationActions(): CommandPaletteAction[] {
       },
       actions: settingsChildren,
     }),
-  ];
+    organization.features.includes('cmd-k-supercharged')
+      ? makeCommandPaletteGroup({
+          groupingKey: 'navigate',
+          display: {
+            label: t('Project Settings'),
+            icon: <IconSettings />,
+          },
+          actions: projectSettingsChildren,
+        })
+      : null,
+  ].filter(x => x !== null);
 }
 
 function useNavigationToggleCollapsed(): CommandPaletteAction {

static/app/components/core/useScrollLock.tsx

@@ -41,6 +41,10 @@ class Lock {
         document.body.style.left = '0';
         document.body.style.right = '0';
         document.body.style.width = '100%';
+        document.documentElement.style.setProperty(
+          '--scrollbar-size',
+          `${scrollbarWidth}px`
+        );
         document.body.style.paddingRight = `${existingPaddingRight + scrollbarWidth}px`;
       } else {
         this.initialOverflow = this.container.style.overflow;
@@ -61,6 +65,7 @@ class Lock {
         document.body.style.right = this.initialBodyStyles.right;
         document.body.style.width = this.initialBodyStyles.width;
         document.body.style.paddingRight = this.initialBodyStyles.paddingRight;
+        document.documentElement.style.removeProperty('--scrollbar-size');
         const {x, y} = this.scroll;
         requestAnimationFrame(() => {
           if (this.acquiredBy.size === 0) {