Merge branch 'master' into mifu67/aci/subscription-processor-tests

Author: mifu67

.craft.yml

@@ -12,13 +12,4 @@ statusProvider:
 artifactProvider:
   name: none
 targets:
-  - id: release
-    name: docker
-    source: ghcr.io/getsentry/sentry
-    target: getsentry/sentry
-  - id: latest
-    name: docker
-    source: ghcr.io/getsentry/sentry
-    target: getsentry/sentry
-    targetFormat: '{{{target}}}:latest'
   - name: github

.cursor/rules/tsx_tests.mdc renamed to .cursor/rules/typescript_tests.mdc

@@ -30,6 +30,7 @@ import {
 
 - **User-centric testing**: Write tests that resemble how users interact with the app.
 - **Avoid implementation details**: Focus on behavior, not internal component structure.
+- **Do not share state between tests**: Behavior should not be influenced by other tests in the test suite.
 
 ## Query Priority (in order of preference)
 
@@ -99,6 +100,23 @@ PageFiltersStore.onInitializeUrlState(
 )
 ```
 
+### Use fixtures
+
+Sentry fixtures are located in tests/js/fixtures/ while GetSentry fixtures are located in tests/js/getsentry-test/fixtures/.
+
+```tsx
+
+// ❌ Don't import type and initialize it
+import type {Project} from 'sentry/types/project';
+const project: Project = {...}
+
+// ✅ Import a fixture instead
+import {ProjectFixture} from 'sentry-fixture/project';
+
+const project = ProjectFixture(partialProject)
+
+```
+
 ### Use `screen` instead of destructuring
 ```tsx
 // ❌ Don't do this

.git-blame-ignore-revs

@@ -96,3 +96,13 @@ eb55184602940adb1fc09a9c0e33515cac92c7d8
 c8a00d1cf64a349276060458ca51dab9e2538f3e
 # ref: perform non-typing --py311-plus pyupgrades (#64164)
 b5e15e8611ff64f8d4e2cde8365f92f7769c9c20
+# feat(dx): Move dashboard endpoints to dashboard module #97394
+fe2eb237aee31a1fca51774660a91d13d1b3ecc5
+# ref(dx): Move avatar endpoint into core module (#97437)
+b4914e559b6e70675452d8ed750fbf70ec703f27
+# ref(dx): Move core team endpoints to core module (#97433)
+4a825dfd62b6d61e48982d014f7d7383f61982f2
+# ref(dx): Move project core endpoints to core module (#97419)
+7dcda5dd9a861130d657ccc2468eb61f55be76b9
+# feat(dx): Move various organization endpoints to "core" (#97407)
+8592e74bbd014d1d44b7cd973379e5278ceb5b41

.github/CODEOWNERS

@@ -117,6 +117,7 @@ vercel.json                                              @getsentry/owners-js-bu
 babel.config.*                                           @getsentry/owners-js-build
 build-utils/                                             @getsentry/owners-js-build
 eslint.config.mjs                                        @getsentry/owners-js-build
+jest-balance.json                                        @getsentry/owners-js-build
 jest.config.ts                                           @getsentry/owners-js-build
 tsconfig.*                                               @getsentry/owners-js-build
 .node-version                                            @getsentry/owners-js-deps
@@ -232,8 +233,8 @@ pnpm-lock.yaml                                           @getsentry/owners-js-de
 /src/sentry/search/events/                                                  @getsentry/visibility
 /src/sentry/search/eap/                                                     @getsentry/visibility
 
-/src/sentry/performance_issues/                                             @getsentry/performance @getsentry/issue-detection-backend
-/tests/sentry/performance_issues/                                           @getsentry/performance @getsentry/issue-detection-backend
+/src/sentry/performance_issues/                                             @getsentry/issue-detection-backend
+/tests/sentry/performance_issues/                                           @getsentry/issue-detection-backend
 
 /static/app/components/events/eventStatisticalDetector/                     @getsentry/visibility @getsentry/profiling
 
@@ -245,13 +246,8 @@ pnpm-lock.yaml                                           @getsentry/owners-js-de
 
 /src/sentry/api/bases/organization_events.py                                @getsentry/visibility
 
-/src/sentry/api/endpoints/organization_dashboards.py                         @getsentry/dashboards
-/src/sentry/api/endpoints/organization_dashboard_details.py                  @getsentry/dashboards
-/src/sentry/api/endpoints/organization_dashboard_widget_details.py           @getsentry/dashboards
-
-tests/sentry/api/endpoints/test_organization_dashboards.py                   @getsentry/dashboards
-tests/sentry/api/endpoints/test_organization_dashboard_details.py            @getsentry/dashboards
-tests/sentry/api/endpoints/test_organization_dashboard_widget_details.py     @getsentry/dashboards
+/src/sentry/dashboards/                                                     @getsentry/dashboards
+/tests/sentry/dashboards/                                                   @getsentry/dashboards
 
 /src/sentry/api/serializers/models/dashboard.py                      @getsentry/dashboards
 /src/sentry/api/serializers/models/discoversavedquery.py             @getsentry/visibility
@@ -680,4 +676,6 @@ tests/sentry/api/endpoints/test_organization_dashboard_widget_details.py     @ge
 /static/app/components/core/                          @getsentry/design-engineering
 /static/app/icons/                                    @getsentry/design-engineering
 /static/app/stories/                                  @getsentry/design-engineering
+/static/.cursor/BUGBOT.md                             @getsentry/design-engineering
+/static/CLAUDE.md                                     @getsentry/design-engineering
 ## End of Frontend Platform

.github/dependency-review-config.yml

@@ -0,0 +1,5 @@
+fail-on-severity: high
+
+allow-ghsas:
+  # doesn't apply; we don't use the pure python wheel
+  - GHSA-8qvm-5x2c-j2w7

.github/workflows/self-hosted.yml

@@ -74,32 +74,18 @@ jobs:
           python3 -m tools.fast_editable --path .
           python3 -m sentry.build.main
 
-      - run: docker login --username '${{ github.actor }}' --password '${{ github.token }}' ghcr.io
-        if: github.ref_name == 'master' && github.event_name != 'pull_request'
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
-
-      - name: Build
-        uses: docker/build-push-action@32945a339266b759abcbdc89316275140b0fc960 # v6.8.10
+      - uses: getsentry/action-build-and-push-images@6a8b87ba640ef1a79854ce57a7ba4411deb84762
         with:
-          context: .
-          file: 'self-hosted/Dockerfile'
-          cache-from: ghcr.io/getsentry/sentry:latest
-          cache-to: type=inline
+          image_name: 'sentry'
           platforms: linux/${{ matrix.platform }}
-          tags: sentry:${{ matrix.platform }}
-          outputs: type=docker,dest=/tmp/sentry-${{ matrix.platform }}.tar
-          push: false
-          build-args: |
+          dockerfile_path: 'self-hosted/Dockerfile'
+          tag_suffix: -${{ matrix.platform }}
+          build_args: |
             SOURCE_COMMIT=${{ github.sha }}
             TARGETARCH=${{ matrix.platform }}
-
-      - name: Upload Image
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: sentry-${{ matrix.platform }}
-          path: /tmp/sentry-${{ matrix.platform }}.tar
+          ghcr: true
+          tag_nightly: false
+          tag_latest: false
 
   assemble:
     needs: [self-hosted]
@@ -117,101 +103,11 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
 
-      - name: Download amd64 Image
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.2
-        with:
-          name: sentry-amd64
-          path: /tmp
-
-      - name: Load amd64 Image
-        run: docker load --input /tmp/sentry-amd64.tar
-
-      - name: Download arm64 Image
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.2
-        with:
-          name: sentry-arm64
-          path: /tmp
-
-      - name: Load arm64 Image
-        run: docker load --input /tmp/sentry-arm64.tar
-
-      - name: Push to GitHub Container Registry
+      - name: Create multiplatform manifests
         run: |
-          docker tag sentry:amd64 ghcr.io/getsentry/sentry:${{ github.sha }}-amd64
-          docker push ghcr.io/getsentry/sentry:${{ github.sha }}-amd64
-
-          docker tag sentry:arm64 ghcr.io/getsentry/sentry:${{ github.sha }}-arm64
-          docker push ghcr.io/getsentry/sentry:${{ github.sha }}-arm64
-
-          docker manifest create \
-            ghcr.io/getsentry/sentry:${{ github.sha }} \
-            --amend ghcr.io/getsentry/sentry:${{ github.sha }}-amd64 \
-            --amend ghcr.io/getsentry/sentry:${{ github.sha }}-arm64
-
-          docker manifest push ghcr.io/getsentry/sentry:${{ github.sha }}
-
-          docker manifest create \
-            ghcr.io/getsentry/sentry:latest \
-            --amend ghcr.io/getsentry/sentry:${{ github.sha }}-amd64 \
-            --amend ghcr.io/getsentry/sentry:${{ github.sha }}-arm64
-
-          docker manifest push ghcr.io/getsentry/sentry:latest
-
-          docker manifest create \
-            ghcr.io/getsentry/sentry:nightly \
-            --amend ghcr.io/getsentry/sentry:${{ github.sha }}-amd64 \
-            --amend ghcr.io/getsentry/sentry:${{ github.sha }}-arm64
-
-          docker manifest push ghcr.io/getsentry/sentry:nightly
-
-          # These manifests below are being used for development purposes.
-          # We shall keep it as is.
-          docker manifest create \
-            ghcr.io/getsentry/sentry-self-hosted:${{ github.sha }} \
-            --amend ghcr.io/getsentry/sentry:${{ github.sha }}-amd64 \
-            --amend ghcr.io/getsentry/sentry:${{ github.sha }}-arm64
-
-          docker manifest push ghcr.io/getsentry/sentry-self-hosted:${{ github.sha }}
-
-          docker manifest create \
-            ghcr.io/getsentry/sentry-self-hosted:latest \
-            --amend ghcr.io/getsentry/sentry:${{ github.sha }}-amd64 \
-            --amend ghcr.io/getsentry/sentry:${{ github.sha }}-arm64
-
-          docker manifest push ghcr.io/getsentry/sentry-self-hosted:latest
-
-  publish-dockerhub:
-    needs: [assemble]
-    runs-on: ubuntu-latest
-    if: ${{ (github.ref_name == 'master') }}
-    steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
-      - name: Get short SHA for docker tag
-        id: short_sha
-        shell: bash
-        run: |
-          SHORT_SHA=$(git rev-parse --short "$GITHUB_SHA")
-          if [[ -z "$SHORT_SHA" ]]; then
-            echo "Short SHA empty? Re-running rev-parse."
-            git rev-parse --short "$GITHUB_SHA"
-          else
-            echo "sha=$SHORT_SHA" >> $GITHUB_OUTPUT
-          fi
-      - name: Push built docker image
-        shell: bash
-        env:
-          SHORT_SHA: ${{ steps.short_sha.outputs.sha }}
-          IMAGE_URL: ghcr.io/getsentry/sentry-self-hosted:${{ github.sha }}
-        run: |
-          # only login if the password is set
-          if [[ "${{ secrets.DOCKER_HUB_RW_TOKEN }}" ]]; then echo "${{ secrets.DOCKER_HUB_RW_TOKEN }}" | docker login --username=sentrybuilder --password-stdin; fi
-
-          # We push 3 tags to Dockerhub:
-          # first, the full sha of the commit
-          docker buildx imagetools create --tag getsentry/sentry:${GITHUB_SHA} ghcr.io/getsentry/sentry:${{ github.sha }}
-
-          # second, the short sha of the commit
-          docker buildx imagetools create --tag getsentry/sentry:${SHORT_SHA} ghcr.io/getsentry/sentry:${{ github.sha }}
-
-          # finally, nightly
-          docker buildx imagetools create --tag getsentry/sentry:nightly ghcr.io/getsentry/sentry:${{ github.sha }}
+          docker buildx imagetools create \
+            --tag ghcr.io/getsentry/sentry:${{ github.sha }} \
+            --tag ghcr.io/getsentry/sentry:nightly \
+            --tag ghcr.io/getsentry/sentry:latest \
+            ghcr.io/getsentry/sentry:${{ github.sha }}-amd64 \
+            ghcr.io/getsentry/sentry:${{ github.sha }}-arm64

.pre-commit-config.yaml

@@ -61,23 +61,7 @@ repos:
         entry: python -m tools.lint_requirements
         language: python
         files: requirements-.*\.txt$
-        # exclude the overrides file from this linter -- it doesn't apply at all
-        exclude: ^requirements-getsentry-overrides\.txt$
         additional_dependencies: [packaging==24.1]
-      - id: requirements-overrides
-        name: use pinned archives (see comment in file)
-        stages: [pre-commit]
-        language: pygrep
-        entry: |
-          (?x)
-          ^
-          # it's a comment line
-          (?!\#.*$)
-          # it's a blank line
-          (?!$)
-          # it's a pinned archive
-          (?![a-z-]+[ ]@[ ]https://github\.com/getsentry/[^/]+/archive/[a-f0-9]{40}\.zip$)
-        files: ^requirements-getsentry-overrides\.txt$
       - id: check-mypy-bypass
         name: do not bypass the type checker
         entry: '(^# *mypy: *ignore-errors|^# *type: *ignore|\bno_type_check\b|ignore\[import-untyped\])'