feat(pii): Enable advanced data scrubbing by default (#19630)

See also getsentry/sentry-docs#1786

Author: untitaker

src/sentry/conf/server.py

@@ -872,7 +872,7 @@ def create_partitioned_queues(name):
     # customized with SENTRY_ORG_SUBDOMAIN_TEMPLATE)
     "organizations:org-subdomains": False,
     # Enable access to more advanced (alpha) datascrubbing settings.
-    "organizations:datascrubbers-v2": False,
+    "organizations:datascrubbers-v2": True,
     # Enable the new version of interface/breadcrumbs
     "organizations:breadcrumbs-v2": False,
     # Enable Relay config feature

tests/acceptance/test_organization_security_privacy.py

@@ -16,46 +16,43 @@ def renders_2fa_setting(self):
         return self.browser.element_exists("#require2FA")
 
     def test_renders_2fa_setting_for_owner(self):
-        with self.feature("organizations:datascrubbers-v2"):
-            user_owner = self.create_user("[email protected]")
-            organization = self.create_organization(name="Example", owner=user_owner)
-            self.login_as(user_owner)
-            path = "/settings/{}/security-and-privacy/".format(organization.slug)
+        user_owner = self.create_user("[email protected]")
+        organization = self.create_organization(name="Example", owner=user_owner)
+        self.login_as(user_owner)
+        path = "/settings/{}/security-and-privacy/".format(organization.slug)
 
-            self.browser.get(path)
-            self.load_organization_helper()
-            assert self.renders_2fa_setting()
+        self.browser.get(path)
+        self.load_organization_helper()
+        assert self.renders_2fa_setting()
 
     def test_renders_2fa_setting_for_manager(self):
-        with self.feature("organizations:datascrubbers-v2"):
-            user_manager = self.create_user("[email protected]")
-            organization = self.create_organization(
-                name="Example", owner=self.create_user("[email protected]")
-            )
-            self.create_member(organization=organization, user=user_manager, role="manager")
-            self.login_as(user_manager)
-            path = "/settings/{}/security-and-privacy/".format(organization.slug)
-
-            self.browser.get(path)
-            self.load_organization_helper()
-            assert self.renders_2fa_setting()
+        user_manager = self.create_user("[email protected]")
+        organization = self.create_organization(
+            name="Example", owner=self.create_user("[email protected]")
+        )
+        self.create_member(organization=organization, user=user_manager, role="manager")
+        self.login_as(user_manager)
+        path = "/settings/{}/security-and-privacy/".format(organization.slug)
+
+        self.browser.get(path)
+        self.load_organization_helper()
+        assert self.renders_2fa_setting()
 
     def test_setting_2fa_without_2fa_enabled(self):
-        with self.feature("organizations:datascrubbers-v2"):
-            user_owner = self.create_user("[email protected]")
-            organization = self.create_organization(name="Example", owner=user_owner)
-            self.login_as(user_owner)
-            path = "/settings/{}/security-and-privacy/".format(organization.slug)
-
-            self.browser.get(path)
-            self.browser.wait_until_not(".loading-indicator")
-            assert not self.browser.element_exists(
-                '[data-test-id="organization-settings-security-and-privacy"] .error'
-            )
-            self.browser.click("#require2FA")
-
-            self.browser.wait_until(".modal")
-            self.browser.click('.modal [data-test-id="confirm-button"]')
-            self.browser.wait_until_not(".modal")
-            self.browser.wait_until_test_id("toast-error")
-            self.load_organization_helper("setting 2fa without 2fa enabled")
+        user_owner = self.create_user("[email protected]")
+        organization = self.create_organization(name="Example", owner=user_owner)
+        self.login_as(user_owner)
+        path = "/settings/{}/security-and-privacy/".format(organization.slug)
+
+        self.browser.get(path)
+        self.browser.wait_until_not(".loading-indicator")
+        assert not self.browser.element_exists(
+            '[data-test-id="organization-settings-security-and-privacy"] .error'
+        )
+        self.browser.click("#require2FA")
+
+        self.browser.wait_until(".modal")
+        self.browser.click('.modal [data-test-id="confirm-button"]')
+        self.browser.wait_until_not(".modal")
+        self.browser.wait_until_test_id("toast-error")
+        self.load_organization_helper("setting 2fa without 2fa enabled")

tests/acceptance/test_organization_settings.py

@@ -665,23 +665,12 @@ def test_relay_pii_config(self):
         org = self.create_organization(owner=self.user)
         url = reverse("sentry-api-0-organization-details", kwargs={"organization_slug": org.slug})
         self.login_as(user=self.user)
-        with self.feature("organizations:datascrubbers-v2"):
-            value = '{"applications": {"freeform": []}}'
-            resp = self.client.put(url, data={"relayPiiConfig": value})
-            assert resp.status_code == 200, resp.content
-            assert org.get_option("sentry:relay_pii_config") == value
-            assert resp.data["relayPiiConfig"] == value
-
-    def test_relay_pii_config_forbidden(self):
-        org = self.create_organization(owner=self.user)
-        url = reverse("sentry-api-0-organization-details", kwargs={"organization_slug": org.slug})
-        self.login_as(user=self.user)
 
         value = '{"applications": {"freeform": []}}'
         resp = self.client.put(url, data={"relayPiiConfig": value})
-        assert resp.status_code == 400
-        assert b"feature" in resp.content
-        assert org.get_option("sentry:relay_pii_config") is None
+        assert resp.status_code == 200, resp.content
+        assert org.get_option("sentry:relay_pii_config") == value
+        assert resp.data["relayPiiConfig"] == value
 
 
 class OrganizationDeleteTest(APITestCase):

tests/sentry/api/endpoints/test_organization_details.py

@@ -450,19 +450,11 @@ def test_store_crash_reports(self):
         assert resp.data["storeCrashReports"] == 10
 
     def test_relay_pii_config(self):
-        with self.feature("organizations:datascrubbers-v2"):
-            value = '{"applications": {"freeform": []}}'
-            resp = self.client.put(self.path, data={"relayPiiConfig": value})
-            assert resp.status_code == 200, resp.content
-            assert self.project.get_option("sentry:relay_pii_config") == value
-            assert resp.data["relayPiiConfig"] == value
-
-    def test_relay_pii_config_forbidden(self):
         value = '{"applications": {"freeform": []}}'
         resp = self.client.put(self.path, data={"relayPiiConfig": value})
-        assert resp.status_code == 400
-        assert b"feature" in resp.content
-        assert self.project.get_option("sentry:relay_pii_config") is None
+        assert resp.status_code == 200, resp.content
+        assert self.project.get_option("sentry:relay_pii_config") == value
+        assert resp.data["relayPiiConfig"] == value
 
     def test_sensitive_fields(self):
         resp = self.client.put(

tests/sentry/api/endpoints/test_project_details.py

@@ -37,6 +37,7 @@ def test_simple(self):
                 "releases-v2",
                 "discover-basic",
                 "discover-query",
+                "datascrubbers-v2",
             ]
         )