Skip to content

Commit

Permalink
Merge branch 'master' into priscila/ref/onboarding/remove-loader-use-…
Browse files Browse the repository at this point in the history
…query-params
  • Loading branch information
priscilawebdev committed Sep 23, 2024
2 parents dda1b3b + 009b6ea commit fc80ae8
Show file tree
Hide file tree
Showing 570 changed files with 12,523 additions and 5,463 deletions.
3 changes: 3 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -512,6 +512,8 @@ tests/sentry/api/endpoints/test_organization_dashboard_widget_details.py @ge
/src/sentry/api/helpers/group_index/ @getsentry/issues
/src/sentry/api/helpers/source_map_helper.py @getsentry/issues
/src/sentry/api/issue_search.py @getsentry/issues
/src/sentry/deletions/defaults/group.py @getsentry/issues
/src/sentry/deletions/tasks/groups.py @getsentry/issues
/src/sentry/event_manager.py @getsentry/issues
/src/sentry/eventstore/models.py @getsentry/issues
/src/sentry/grouping/ @getsentry/issues
Expand Down Expand Up @@ -550,6 +552,7 @@ tests/sentry/api/endpoints/test_organization_dashboard_widget_details.py @ge
/static/app/utils/analytics.tsx @getsentry/issues
/static/app/utils/routeAnalytics/ @getsentry/issues
/tests/sentry/api/test_issue_search.py @getsentry/issues
/tests/sentry/deletions/test_group.py @getsentry/issues
/tests/sentry/event_manager/ @getsentry/issues
/tests/sentry/grouping/ @getsentry/issues
/tests/sentry/search/ @getsentry/issues
Expand Down
5 changes: 4 additions & 1 deletion biome.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
"noExcessiveNestedTestSuites": "error"
},
"nursery": {
"noDuplicateJsonKeys": "error",
"noRestrictedImports": {
"level": "warn",
"options": {
Expand Down Expand Up @@ -100,6 +99,10 @@
".devenv"
]
},
"css": {
"formatter": { "enabled": false },
"linter": { "enabled": false }
},
"formatter": {
"enabled": true,
"formatWithErrors": true,
Expand Down
6 changes: 1 addition & 5 deletions config/tsconfig.base.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,7 @@
"moduleResolution": "node",

// We add esnext to lib to pull in types for all newer ECMAScript features
"lib": [
"esnext",
"dom",
"dom.iterable"
],
"lib": ["esnext", "dom", "dom.iterable"],

// Skip type checking of all declaration files
"skipLibCheck": true,
Expand Down
23 changes: 21 additions & 2 deletions fixtures/vsts.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,17 @@ def _stub_vsts(self):
},
)

responses.add(
responses.POST,
"https://login.microsoftonline.com/common/oauth2/v2.0/token",
json={
"access_token": self.access_token,
"token_type": "grant",
"expires_in": 300, # seconds (5 min)
"refresh_token": self.refresh_token,
},
)

responses.add(
responses.GET,
"https://app.vssps.visualstudio.com/_apis/accounts?memberId=%s&api-version=4.1"
Expand Down Expand Up @@ -195,19 +206,27 @@ def assert_vsts_oauth_redirect(self, redirect):
assert redirect.netloc == "app.vssps.visualstudio.com"
assert redirect.path == "/oauth2/authorize"

def assert_vsts_new_oauth_redirect(self, redirect):
assert redirect.scheme == "https"
assert redirect.netloc == "login.microsoftonline.com"
assert redirect.path == "/common/oauth2/v2.0/authorize"

def assert_account_selection(self, response, account_id=None):
account_id = account_id or self.vsts_account_id
assert response.status_code == 200
assert f'<option value="{account_id}"'.encode() in response.content

@assume_test_silo_mode(SiloMode.CONTROL)
def assert_installation(self):
def assert_installation(self, new=False):
# Initial request to the installation URL for VSTS
resp = self.make_init_request()
redirect = urlparse(resp["Location"])

assert resp.status_code == 302
self.assert_vsts_oauth_redirect(redirect)
if new:
self.assert_vsts_new_oauth_redirect(redirect)
else:
self.assert_vsts_oauth_redirect(redirect)

query = parse_qs(redirect.query)

Expand Down
7 changes: 7 additions & 0 deletions jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,15 @@ const {
GITHUB_PR_REF,
GITHUB_RUN_ID,
GITHUB_RUN_ATTEMPT,
USING_YARN_TEST,
} = process.env;

if (USING_YARN_TEST === undefined) {
// eslint-disable-next-line no-console
console.error('Do not run `jest` directly, use `yarn test` instead!');
process.exit();
}

const IS_MASTER_BRANCH = GITHUB_PR_REF === 'refs/heads/master';

const BALANCE_RESULTS_PATH = path.resolve(
Expand Down
2 changes: 1 addition & 1 deletion migrations_lockfile.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ hybridcloud: 0016_add_control_cacheversion
nodestore: 0002_nodestore_no_dictfield
remote_subscriptions: 0003_drop_remote_subscription
replays: 0004_index_together
sentry: 0763_add_created_by_to_broadcasts
sentry: 0764_migrate_bad_status_substatus_rows
social_auth: 0002_default_auto_field
uptime: 0013_uptime_subscription_new_unique
workflow_engine: 0005_data_source_detector
11 changes: 5 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@
"@sentry/utils": "^8.28.0",
"@sentry/webpack-plugin": "^2.22.2",
"@spotlightjs/spotlight": "^2.0.0-alpha.1",
"@tanstack/react-query": "^4.29.7",
"@tanstack/react-query-devtools": "^4.36.1",
"@tanstack/react-query": "^5.56.2",
"@tanstack/react-query-devtools": "^5.56.2",
"@tanstack/react-virtual": "^3.5.1",
"@types/color": "^3.0.3",
"@types/diff": "5.2.1",
Expand Down Expand Up @@ -128,6 +128,7 @@
"jest-fetch-mock": "^3.0.3",
"js-beautify": "^1.15.1",
"js-cookie": "3.0.1",
"jsonrepair": "^3.8.0",
"less": "^4.1.3",
"less-loader": "^12.2.0",
"lightningcss": "^1.26.0",
Expand Down Expand Up @@ -178,7 +179,7 @@
"zxcvbn": "^4.4.2"
},
"devDependencies": {
"@biomejs/biome": "^1.8.3",
"@biomejs/biome": "^1.9.1",
"@codecov/webpack-plugin": "^1.0.0",
"@pmmmwh/react-refresh-webpack-plugin": "0.5.15",
"@sentry/jest-environment": "6.0.0",
Expand Down Expand Up @@ -265,9 +266,7 @@
"last 3 iOS major versions",
"Firefox ESR"
],
"test": [
"current node"
]
"test": ["current node"]
},
"volta": {
"extends": ".volta.json"
Expand Down
12 changes: 8 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,6 @@ module = [
"sentry.integrations.msteams.client",
"sentry.integrations.msteams.integration",
"sentry.integrations.msteams.notifications",
"sentry.integrations.msteams.webhook",
"sentry.integrations.notifications",
"sentry.integrations.pagerduty.actions.form",
"sentry.integrations.pagerduty.client",
Expand Down Expand Up @@ -296,7 +295,6 @@ module = [
"sentry.middleware.auth",
"sentry.middleware.ratelimit",
"sentry.middleware.superuser",
"sentry.models.integrations.sentry_app_installation",
"sentry.models.organizationaccessrequest",
"sentry.monitors.consumers.monitor_consumer",
"sentry.monitors.endpoints.base",
Expand Down Expand Up @@ -451,8 +449,7 @@ module = [
"sentry.db.models.manager.*",
"sentry.db.models.paranoia",
"sentry.db.models.utils",
"sentry.deletions",
"sentry.deletions.tasks.groups",
"sentry.deletions.*",
"sentry.digests.notifications",
"sentry.eventstore.reprocessing.redis",
"sentry.eventtypes.error",
Expand All @@ -469,11 +466,18 @@ module = [
"sentry.issues.apps",
"sentry.issues.constants",
"sentry.issues.endpoints",
"sentry.issues.endpoints.group_activities",
"sentry.issues.endpoints.group_event_details",
"sentry.issues.endpoints.group_events",
"sentry.issues.endpoints.group_participants",
"sentry.issues.endpoints.organization_group_index_stats",
"sentry.issues.endpoints.organization_group_search_views",
"sentry.issues.endpoints.organization_release_previous_commits",
"sentry.issues.endpoints.organization_searches",
"sentry.issues.endpoints.project_events",
"sentry.issues.endpoints.project_stacktrace_link",
"sentry.issues.endpoints.shared_group_details",
"sentry.issues.endpoints.team_groups_old",
"sentry.issues.escalating_group_forecast",
"sentry.issues.escalating_issues_alg",
"sentry.issues.forecasts",
Expand Down
2 changes: 1 addition & 1 deletion requirements-dev-frozen.txt
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ s3transfer==0.10.0
selenium==4.16.0
sentry-arroyo==2.16.5
sentry-cli==2.16.0
sentry-devenv==1.10.0
sentry-devenv==1.10.2
sentry-forked-django-stubs==5.0.4.post2
sentry-forked-djangorestframework-stubs==3.15.1.post1
sentry-kafka-schemas==0.1.109
Expand Down
2 changes: 1 addition & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--index-url https://pypi.devinfra.sentry.io/simple

sentry-devenv>=1.10.0
sentry-devenv>=1.10.2

covdefaults>=2.3.0
docker>=6
Expand Down
3 changes: 3 additions & 0 deletions scripts/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ process.env.NODE_ENV = 'test';
process.env.PUBLIC_URL = '';
process.env.TZ = 'America/New_York';

// Marker to indicate that we've correctly ran with `yarn test`.
process.env.USING_YARN_TEST = true;

// Makes the script crash on unhandled rejections instead of silently
// ignoring them. In the future, promise rejections that are not handled will
// terminate the Node.js process with a non-zero exit code.
Expand Down
66 changes: 14 additions & 52 deletions src/flagpole/flagpole-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,7 @@
"pattern": "^\\d{4}-\\d{2}-\\d{2}(?:T\\d{2}:\\d{2}:\\d{2}(?:\\.\\d+)?)?$"
}
},
"required": [
"name",
"owner",
"segments",
"created_at"
],
"required": ["name", "owner", "segments", "created_at"],
"definitions": {
"InCondition": {
"title": "InCondition",
Expand All @@ -54,9 +49,7 @@
"operator": {
"title": "Operator",
"default": "in",
"enum": [
"in"
],
"enum": ["in"],
"type": "string"
},
"value": {
Expand All @@ -83,10 +76,7 @@
]
}
},
"required": [
"property",
"value"
]
"required": ["property", "value"]
},
"NotInCondition": {
"title": "NotInCondition",
Expand All @@ -100,9 +90,7 @@
"operator": {
"title": "Operator",
"default": "not_in",
"enum": [
"not_in"
],
"enum": ["not_in"],
"type": "string"
},
"value": {
Expand All @@ -129,10 +117,7 @@
]
}
},
"required": [
"property",
"value"
]
"required": ["property", "value"]
},
"ContainsCondition": {
"title": "ContainsCondition",
Expand All @@ -146,9 +131,7 @@
"operator": {
"title": "Operator",
"default": "contains",
"enum": [
"contains"
],
"enum": ["contains"],
"type": "string"
},
"value": {
Expand All @@ -166,10 +149,7 @@
]
}
},
"required": [
"property",
"value"
]
"required": ["property", "value"]
},
"NotContainsCondition": {
"title": "NotContainsCondition",
Expand All @@ -183,9 +163,7 @@
"operator": {
"title": "Operator",
"default": "not_contains",
"enum": [
"not_contains"
],
"enum": ["not_contains"],
"type": "string"
},
"value": {
Expand All @@ -203,10 +181,7 @@
]
}
},
"required": [
"property",
"value"
]
"required": ["property", "value"]
},
"EqualsCondition": {
"title": "EqualsCondition",
Expand All @@ -220,9 +195,7 @@
"operator": {
"title": "Operator",
"default": "equals",
"enum": [
"equals"
],
"enum": ["equals"],
"type": "string"
},
"value": {
Expand Down Expand Up @@ -261,10 +234,7 @@
]
}
},
"required": [
"property",
"value"
]
"required": ["property", "value"]
},
"NotEqualsCondition": {
"title": "NotEqualsCondition",
Expand All @@ -278,9 +248,7 @@
"operator": {
"title": "Operator",
"default": "not_equals",
"enum": [
"not_equals"
],
"enum": ["not_equals"],
"type": "string"
},
"value": {
Expand Down Expand Up @@ -319,10 +287,7 @@
]
}
},
"required": [
"property",
"value"
]
"required": ["property", "value"]
},
"Segment": {
"title": "Segment",
Expand Down Expand Up @@ -379,10 +344,7 @@
"type": "integer"
}
},
"required": [
"name",
"conditions"
]
"required": ["name", "conditions"]
}
}
}
Loading

0 comments on commit fc80ae8

Please sign in to comment.