Merge branch 'master' into rjo100/improve-checkin-validator

Author: rjo100

.github/CODEOWNERS

@@ -54,6 +54,15 @@
 /src/sentry/api/authentication.py                        @getsentry/security @getsentry/enterprise
 /src/sentry/api/endpoints/auth*                          @getsentry/security @getsentry/enterprise
 /src/sentry/api/endpoints/user_permission*               @getsentry/security @getsentry/enterprise
+/src/sentry/web/frontend/auth_close.py                   @getsentry/security
+/src/sentry/web/frontend/auth_login.py                   @getsentry/security
+/src/sentry/web/frontend/auth_logout.py                  @getsentry/security
+/src/sentry/web/frontend/auth_organization_id_login.py   @getsentry/security
+/src/sentry/web/frontend/auth_organization_login.py      @getsentry/security
+/src/sentry/web/frontend/auth_provider_login.py          @getsentry/security
+/src/sentry/web/frontend/oauth_token.py                  @getsentry/security
+/src/sentry/web/frontend/oauth_authorize.py              @getsentry/security
+/src/sentry/web/frontend/openidtoken.py                  @getsentry/security
 
 ## Dev
 /.github/                                                @getsentry/owners-sentry-dev

.github/workflows/backend.yml

@@ -74,13 +74,13 @@ jobs:
       fail-fast: false
       matrix:
         # XXX: When updating this, make sure you also update MATRIX_INSTANCE_TOTAL.
-        instance: [0, 1, 2, 3, 4, 5]
+        instance: [0, 1, 2, 3, 4, 5, 6]
         pg-version: ['14']
 
     env:
       # XXX: `MATRIX_INSTANCE_TOTAL` must be hardcoded to the length of `strategy.matrix.instance`.
       # If this increases, make sure to also increase `flags.backend.after_n_builds` in `codecov.yml`.
-      MATRIX_INSTANCE_TOTAL: 6
+      MATRIX_INSTANCE_TOTAL: 7
 
     steps:
       - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0

.github/workflows/migrations.yml

@@ -65,7 +65,6 @@ jobs:
 
       - name: Setup sentry env
         uses: ./.github/actions/setup-sentry
-        id: setup
         with:
           pg-version: ${{ matrix.pg-version }}
 

.github/workflows/openapi-diff.yml

@@ -34,7 +34,6 @@ jobs:
       - name: Setup sentry env
         uses: ./.github/actions/setup-sentry
         if: steps.changes.outputs.api_docs == 'true'
-        id: setup
 
       - name: Checkout getsentry/sentry-api-schema
         uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0

.github/workflows/openapi.yml

@@ -36,7 +36,6 @@ jobs:
       - name: Setup sentry env
         uses: ./.github/actions/setup-sentry
         if: steps.changes.outputs.api_docs == 'true'
-        id: setup
 
       - name: Checkout getsentry/sentry-api-schema
         if: steps.changes.outputs.api_docs == 'true'

.github/workflows/stale.yml

@@ -37,8 +37,8 @@ const config: TransformOptions = {
             classNameMatchers: [
               'SelectField',
               'FormField',
-              'AsyncComponent',
-              'AsyncView',
+              'DeprecatedAsyncComponent',
+              'DeprecatedAsyncView',
             ],
             additionalLibraries: [/app\/sentryTypes$/],
           },

babel.config.ts

@@ -58,7 +58,7 @@ flags:
     - "src/sentry/**/*.py"
     carryforward: true
     # Do not send any status checks until N coverage reports are uploaded
-    after_n_builds: 17
+    after_n_builds: 18
 
 # Read more here: https://docs.codecov.com/docs/pull-request-comments
 comment:

codecov.yml

@@ -0,0 +1,20 @@
+[
+  {
+    "model": "sites.site",
+    "pk": 1,
+    "fields": {
+      "domain": "example.com",
+      "name": "example.com"
+    }
+  },
+  {
+    "model": "sentry.option",
+    "pk": 1,
+    "fields": {
+      "key": "sentry:latest_version",
+      "last_updated": "2023-06-22T00:00:00.000Z",
+      "last_updated_by": "unknown",
+      "value": "\"23.6.1\""
+    }
+  }
+]

fixtures/backup/datetime-formatting.json

@@ -166,7 +166,7 @@
   "pk": 1,
   "fields": {
     "date_updated": "2023-06-22T23:00:00.123Z",
-    "date_added": "2023-06-22T22:59:57.073Z",
+    "date_added": "2023-06-22T22:59:57.000Z",
     "user": [
       "[email protected]"
     ],

fixtures/backup/fresh-install.json

@@ -1,4 +1,6 @@
-export function AccountEmails(params = []) {
+import type {UserEmail} from 'sentry/types';
+
+export function AccountEmails(params: UserEmail[] = []): UserEmail[] {
   return [
     {
       email: '[email protected]',

fixtures/js-stubs/accountAppearance.js

@@ -1,9 +1,16 @@
-export function ActivityFeed(params = {}) {
+import {
+  type Activity,
+  EventOrGroupType,
+  GroupActivityType,
+  IssueCategory,
+  IssueType,
+} from 'sentry/types';
+
+export function ActivityFeed(params: Partial<Activity> = {}): Activity {
   return {
     data: {text: 'Very interesting comment'},
     dateCreated: '2019-04-29T21:43:32.280Z',
-    project: {
-      status: 'active',
+    project: TestStubs.Project({
       features: [
         'releases',
         'sample-events',
@@ -13,21 +20,18 @@ export function ActivityFeed(params = {}) {
         'similarity-view',
         'data-forwarding',
       ],
-      color: '#bf873f',
       isInternal: true,
-      isPublic: false,
       dateCreated: '2019-03-09T06:52:19.832Z',
       id: '1',
       slug: 'internal',
       name: 'Internal',
       hasAccess: true,
       isBookmarked: false,
-      platform: null,
+      platform: undefined,
       firstEvent: '2019-03-09T06:56:15Z',
-      avatar: {avatarUuid: null, avatarType: 'letter_avatar'},
       isMember: true,
-    },
-    user: {
+    }),
+    user: TestStubs.User({
       username: '[email protected]',
       lastLogin: '2019-04-23T00:10:19.787Z',
       isSuperuser: true,
@@ -52,8 +56,8 @@ export function ActivityFeed(params = {}) {
       avatar: {avatarUuid: null, avatarType: 'letter_avatar'},
       hasPasswordAuth: true,
       email: '[email protected]',
-    },
-    type: 'note',
+    }),
+    type: GroupActivityType.NOTE,
     issue: {
       platform: 'javascript',
       lastSeen: '2019-04-26T16:34:12.288Z',
@@ -62,25 +66,48 @@ export function ActivityFeed(params = {}) {
       culprit: '/organizations/:orgId/issues/:groupId/feedback/',
       title: 'Error: user efedback',
       id: '524',
-      assignedTo: null,
-      logger: null,
-      type: 'error',
+      assignedTo: {
+        id: '1',
+        name: 'actor',
+        type: 'user',
+      },
+      issueCategory: IssueCategory.ERROR,
+      issueType: IssueType.ERROR,
+      participants: [],
+      latestEvent: TestStubs.Event(),
+      isUnhandled: true,
+      pluginActions: [],
+      pluginContexts: [],
+      seenBy: [],
+      filtered: null,
+      pluginIssues: [],
+      // there is a nasty type issue here where "reprocessing" cannot be assigned to
+      // resolution status | "reprocessing" and "reprocessing" cannot be assigned to resolution
+      // status (fails even if I as const it).
+      // @ts-expect-error
+      status: 'reprocessing',
+      activity: [],
+      logger: 'critical',
+      type: EventOrGroupType.ERROR,
       annotations: [],
-      metadata: {type: 'Error', value: 'user efedback', filename: '<anonymous>'},
-      status: 'unresolved',
+      metadata: {type: 'Error', value: 'user feedback', filename: '<anonymous>'},
       subscriptionDetails: {reason: 'commented'},
       isPublic: false,
       hasSeen: true,
       shortId: 'INTERNAL-DW',
-      shareId: null,
+      shareId: '99',
       firstSeen: '2019-04-26T16:34:12.288Z',
       count: '1',
       permalink: 'http://localhost:8000/organizations/sentry/issues/524/?project=1',
       level: 'error',
       isSubscribed: true,
       isBookmarked: false,
-      project: {platform: null, slug: 'internal', id: '1', name: 'Internal'},
-      statusDetails: {},
+      project: TestStubs.Project({
+        platform: undefined,
+        slug: 'internal',
+        id: '1',
+        name: 'Internal',
+      }),
     },
     id: '48',
     ...params,

fixtures/js-stubs/accountEmails.js renamed to fixtures/js-stubs/accountEmails.tsx

@@ -1,4 +1,8 @@
-export function ApiApplication(params = {}) {
+import type {ApiApplication as ApiApplicationType} from 'sentry/types';
+
+export function ApiApplication(
+  params: Partial<ApiApplicationType> = {}
+): ApiApplicationType {
   return {
     allowedOrigins: [],
     clientID: 'aowekr12903i9i423094i23904j',
@@ -8,6 +12,7 @@ export function ApiApplication(params = {}) {
     name: 'Adjusted Shrimp',
     privacyUrl: null,
     redirectUris: [],
+    termsUrl: null,
     ...params,
   };
 }

fixtures/js-stubs/activityFeed.js renamed to fixtures/js-stubs/activityFeed.tsx

@@ -0,0 +1,17 @@
+import type {InternalAppApiToken as InternalAppApiTokenType} from 'sentry/types';
+
+export function ApiToken(
+  params: Partial<InternalAppApiTokenType> = {}
+): InternalAppApiTokenType {
+  return {
+    id: '1',
+    token: 'apitoken123',
+    dateCreated: new Date('Thu Jan 11 2018 18:01:41 GMT-0800 (PST)').toISOString(),
+    scopes: ['project:read', 'project:write'],
+    application: null,
+    refreshToken: 'refresh_token',
+    expiresAt: new Date('Thu Jan 11 2018 18:01:41 GMT-0800 (PST)').toISOString(),
+    state: 'active',
+    ...params,
+  };
+}