Skip to content

chore(sentry10): Move all users to Sentry 10 #13022

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 31, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/sentry/api/endpoints/organization_details.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ class OrganizationSerializer(serializers.Serializer):
scrapeJavaScript = serializers.BooleanField(required=False)
isEarlyAdopter = serializers.BooleanField(required=False)
require2FA = serializers.BooleanField(required=False)
disableNewVisibilityFeatures = serializers.BooleanField(required=False)
trustedRelays = ListField(child=serializers.CharField(), required=False)

@memoize
Expand Down Expand Up @@ -231,8 +230,6 @@ def save(self):
org.flags.enhanced_privacy = self.init_data['enhancedPrivacy']
if 'isEarlyAdopter' in self.init_data:
org.flags.early_adopter = self.init_data['isEarlyAdopter']
if 'disableNewVisibilityFeatures' in self.init_data:
org.flags.disable_new_visibility_features = self.init_data['disableNewVisibilityFeatures']
if 'require2FA' in self.init_data:
org.flags.require_2fa = self.init_data['require2FA']
if 'name' in self.init_data:
Expand Down
1 change: 0 additions & 1 deletion src/sentry/api/serializers/models/organization.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ def serialize(self, obj, attrs, user):
'name': obj.name or obj.slug,
'dateCreated': obj.date_added,
'isEarlyAdopter': bool(obj.flags.early_adopter),
'disableNewVisibilityFeatures': bool(obj.flags.disable_new_visibility_features),
'require2FA': bool(obj.flags.require_2fa),
'avatar': avatar,
'features': feature_list
Expand Down
2 changes: 1 addition & 1 deletion src/sentry/conf/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -841,7 +841,7 @@ def create_partitioned_queues(name):
# DEPCREATED: pending removal.
'organizations:require-2fa': False,
# Sentry 10 - multi project interfaces.
'organizations:sentry10': False,
'organizations:sentry10': True,
# Enable basic SSO functionality, providing configurable single signon
# using services like GitHub / Google. This is *not* the same as the signup
# and login with Github / Azure DevOps that sentry.io provides.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,6 @@ const formGroups = [
label: t('Early Adopter'),
help: t("Opt-in to new features before they're released to the public"),
},
{
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 for getting rid of settings cruft!

name: 'disableNewVisibilityFeatures',
type: 'boolean',
label: t('Disable New Product Features'),
help: t('Temporarily opt-out of new product changes'),
},
],
},

Expand Down
47 changes: 0 additions & 47 deletions tests/acceptance/test_project_issues.py

This file was deleted.

4 changes: 4 additions & 0 deletions tests/acceptance/test_project_releases.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from __future__ import absolute_import

import json
import pytest

from django.conf import settings
from django.utils import timezone
Expand All @@ -25,6 +26,7 @@ def setUp(self):
self.path = u'/{}/{}/releases/'.format(
self.org.slug, self.project.slug)

@pytest.mark.skip(reason="Sentry 9 only")
def test_with_releases(self):
release = self.create_release(
project=self.project,
Expand All @@ -41,6 +43,7 @@ def test_with_releases(self):
self.browser.wait_until('.ref-project-releases')
self.browser.snapshot('project releases with releases')

@pytest.mark.skip(reason="Sentry 9 only")
def test_with_no_releases(self):
self.dismiss_assistant()
self.browser.get(self.path)
Expand Down Expand Up @@ -86,6 +89,7 @@ def setUp(self):
self.path = u'/{}/{}/releases/{}/'.format(
self.org.slug, self.project.slug, self.release.version)

@pytest.mark.skip(reason="Sentry 9 only")
def test_release_details_no_commits_no_deploys(self):
self.browser.get(self.path)
self.browser.wait_until_not('.loading')
Expand Down
30 changes: 0 additions & 30 deletions tests/sentry/api/endpoints/test_organization_details.py
Original file line number Diff line number Diff line change
Expand Up @@ -305,36 +305,6 @@ def test_various_options(self):
assert u'to {}'.format(data['scrubIPAddresses']) in log.data['scrubIPAddresses']
assert u'to {}'.format(data['scrapeJavaScript']) in log.data['scrapeJavaScript']

def test_disable_new_visibility_features(self):
org = self.create_organization(owner=self.user)
assert not org.flags.disable_new_visibility_features
self.login_as(user=self.user)
url = reverse(
'sentry-api-0-organization-details', kwargs={
'organization_slug': org.slug,
}
)

response = self.client.put(
url,
data={
'disableNewVisibilityFeatures': True,
}
)
assert response.status_code == 200, response.content
org = Organization.objects.get(id=org.id)
assert org.flags.disable_new_visibility_features

response = self.client.put(
url,
data={
'disableNewVisibilityFeatures': False,
}
)
assert response.status_code == 200, response.content
org = Organization.objects.get(id=org.id)
assert not org.flags.disable_new_visibility_features

def test_setting_trusted_relays_forbidden(self):
org = self.create_organization(owner=self.user)
self.login_as(user=self.user)
Expand Down
4 changes: 1 addition & 3 deletions tests/sentry/api/serializers/test_organization.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ class OrganizationSerializerTest(TestCase):
def test_simple(self):
user = self.create_user()
organization = self.create_organization(owner=user)
organization.flags.disable_new_visibility_features = True
organization.save()

result = serialize(organization, user)

Expand All @@ -27,5 +25,5 @@ def test_simple(self):
'invite-members',
'sso-saml2',
'sso-basic',
'sentry10',
])
assert result['disableNewVisibilityFeatures']