ref(plugins): move new_sentry_plugins into sentry_plugins (#15700)

conftest.py

@@ -32,7 +32,7 @@ def install_sentry_plugins():
     from sentry.runner.importer import install_plugin_apps
     from django.conf import settings
 
-    install_plugin_apps("sentry.new_apps", settings)
+    install_plugin_apps("sentry.apps", settings)
 
     from sentry.runner.initializer import register_plugins
 

setup.py

@@ -140,31 +140,31 @@ setup(
     include_package_data=True,
     entry_points={
         "console_scripts": ["sentry = sentry.runner:main"],
-        "sentry.new_apps": [
-            "jira_ac = new_sentry_plugins.jira_ac",
-            "jira = new_sentry_plugins.jira",
-            "sessionstack = new_sentry_plugins.sessionstack",
+        "sentry.apps": [
+            "jira_ac = sentry_plugins.jira_ac",
+            "jira = sentry_plugins.jira",
+            "sessionstack = sentry_plugins.sessionstack",
         ],
-        "sentry.new_plugins": [
-            "amazon_sqs = new_sentry_plugins.amazon_sqs.plugin:AmazonSQSPlugin",
-            "asana = new_sentry_plugins.asana.plugin:AsanaPlugin",
-            "bitbucket = new_sentry_plugins.bitbucket.plugin:BitbucketPlugin",
-            "clubhouse = new_sentry_plugins.clubhouse.plugin:ClubhousePlugin",
-            "github = new_sentry_plugins.github.plugin:GitHubPlugin",
-            "gitlab = new_sentry_plugins.gitlab.plugin:GitLabPlugin",
-            "heroku = new_sentry_plugins.heroku.plugin:HerokuPlugin",
-            "jira = new_sentry_plugins.jira.plugin:JiraPlugin",
-            "jira_ac = new_sentry_plugins.jira_ac.plugin:JiraACPlugin",
-            "phabricator = new_sentry_plugins.phabricator.plugin:PhabricatorPlugin",
-            "pagerduty = new_sentry_plugins.pagerduty.plugin:PagerDutyPlugin",
-            "pivotal = new_sentry_plugins.pivotal.plugin:PivotalPlugin",
-            "pushover = new_sentry_plugins.pushover.plugin:PushoverPlugin",
-            "segment = new_sentry_plugins.segment.plugin:SegmentPlugin",
-            "sessionstack = new_sentry_plugins.sessionstack.plugin:SessionStackPlugin",
-            "slack = new_sentry_plugins.slack.plugin:SlackPlugin",
-            "splunk = new_sentry_plugins.splunk.plugin:SplunkPlugin",
-            "victorops = new_sentry_plugins.victorops.plugin:VictorOpsPlugin",
-            "vsts = new_sentry_plugins.vsts.plugin:VstsPlugin",
+        "sentry.plugins": [
+            "amazon_sqs = sentry_plugins.amazon_sqs.plugin:AmazonSQSPlugin",
+            "asana = sentry_plugins.asana.plugin:AsanaPlugin",
+            "bitbucket = sentry_plugins.bitbucket.plugin:BitbucketPlugin",
+            "clubhouse = sentry_plugins.clubhouse.plugin:ClubhousePlugin",
+            "github = sentry_plugins.github.plugin:GitHubPlugin",
+            "gitlab = sentry_plugins.gitlab.plugin:GitLabPlugin",
+            "heroku = sentry_plugins.heroku.plugin:HerokuPlugin",
+            "jira = sentry_plugins.jira.plugin:JiraPlugin",
+            "jira_ac = sentry_plugins.jira_ac.plugin:JiraACPlugin",
+            "phabricator = sentry_plugins.phabricator.plugin:PhabricatorPlugin",
+            "pagerduty = sentry_plugins.pagerduty.plugin:PagerDutyPlugin",
+            "pivotal = sentry_plugins.pivotal.plugin:PivotalPlugin",
+            "pushover = sentry_plugins.pushover.plugin:PushoverPlugin",
+            "segment = sentry_plugins.segment.plugin:SegmentPlugin",
+            "sessionstack = sentry_plugins.sessionstack.plugin:SessionStackPlugin",
+            "slack = sentry_plugins.slack.plugin:SlackPlugin",
+            "splunk = sentry_plugins.splunk.plugin:SplunkPlugin",
+            "victorops = sentry_plugins.victorops.plugin:VictorOpsPlugin",
+            "vsts = sentry_plugins.vsts.plugin:VstsPlugin",
         ],
     },
     classifiers=[

src/new_sentry_plugins/github/__init__.py

@@ -1,7 +0,0 @@
-from __future__ import absolute_import
-
-from new_sentry_plugins.base import assert_package_not_installed
-
-assert_package_not_installed("sentry-github")
-
-from new_sentry_plugins.github import options  # NOQA

src/sentry/runner/importer.py

@@ -79,7 +79,6 @@ class Importer(object):
         load_settings(self.config_path, settings=settings_mod, silent=True)
 
         install_plugin_apps("sentry.apps", settings_mod)
-        install_plugin_apps("sentry.new_apps", settings_mod)
 
         return settings_mod
 

src/sentry/runner/initializer.py

@@ -20,22 +20,19 @@ def register_plugins(settings, raise_on_plugin_load_failure=False):
     #         'phabricator = sentry_phabricator.plugins:PhabricatorPlugin'
     #     ],
     # },
-    entry_points = ["sentry.new_plugins", "sentry.plugins"]
-
-    for entry_point in entry_points:
-        for ep in iter_entry_points(entry_point):
-            try:
-                plugin = ep.load()
-            except Exception:
-                import traceback
+    for ep in iter_entry_points("sentry.plugins"):
+        try:
+            plugin = ep.load()
+        except Exception:
+            import traceback
 
-                click.echo(
-                    "Failed to load plugin %r:\n%s" % (ep.name, traceback.format_exc()), err=True
-                )
-                if raise_on_plugin_load_failure:
-                    raise
-            else:
-                plugins.register(plugin)
+            click.echo(
+                "Failed to load plugin %r:\n%s" % (ep.name, traceback.format_exc()), err=True
+            )
+            if raise_on_plugin_load_failure:
+                raise
+        else:
+            plugins.register(plugin)
 
     for plugin in plugins.all(version=None):
         init_plugin(plugin)

src/sentry/testutils/cases.py

@@ -674,19 +674,6 @@ class PluginTestCase(TestCase):
                 )
         self.fail("Missing app from entry_points: %r" % (name,))
 
-    # TODO (Steve): remove function
-    def assertNewAppInstalled(self, name, path):
-        for ep in iter_entry_points("sentry.new_apps"):
-            if ep.name == name:
-                ep_path = ep.module_name
-                if ep_path == path:
-                    return
-                self.fail(
-                    "Found app in entry_points, but wrong class. Got %r, expected %r"
-                    % (ep_path, path)
-                )
-        self.fail("Missing app from entry_points: %r" % (name,))
-
     def assertPluginInstalled(self, name, plugin):
         path = type(plugin).__module__ + ":" + type(plugin).__name__
         for ep in iter_entry_points("sentry.plugins"):
@@ -700,20 +687,6 @@ class PluginTestCase(TestCase):
                 )
         self.fail("Missing plugin from entry_points: %r" % (name,))
 
-    # TODO (Steve): remove function
-    def assertNewPluginInstalled(self, name, plugin):
-        path = type(plugin).__module__ + ":" + type(plugin).__name__
-        for ep in iter_entry_points("sentry.new_plugins"):
-            if ep.name == name:
-                ep_path = ep.module_name + ":" + ".".join(ep.attrs)
-                if ep_path == path:
-                    return
-                self.fail(
-                    "Found plugin in entry_points, but wrong class. Got %r, expected %r"
-                    % (ep_path, path)
-                )
-        self.fail("Missing plugin from entry_points: %r" % (name,))
-
 
 class CliTestCase(TestCase):
     runner = fixture(CliRunner)

src/new_sentry_plugins/amazon_sqs/plugin.py → src/sentry_plugins/amazon_sqs/plugin.py

@@ -4,9 +4,9 @@ import logging
 
 import boto3
 from botocore.client import ClientError
-from new_sentry_plugins.base import CorePluginMixin
+from sentry_plugins.base import CorePluginMixin
 from sentry.plugins.bases.data_forwarding import DataForwardingPlugin
-from new_sentry_plugins.utils import get_secret_field_config
+from sentry_plugins.utils import get_secret_field_config
 from sentry.utils import json, metrics
 
 logger = logging.getLogger(__name__)
@@ -93,7 +93,7 @@ class AmazonSQSPlugin(CorePluginMixin, DataForwardingPlugin):
             if e.message.startswith("An error occurred (AccessDenied)"):
                 # If there's an issue with the user's token then we can't do
                 # anything to recover. Just log and continue.
-                metrics_name = "new_sentry_plugins.amazon_sqs.access_token_invalid"
+                metrics_name = "sentry_plugins.amazon_sqs.access_token_invalid"
                 logger.info(
                     metrics_name,
                     extra={
@@ -113,7 +113,7 @@ class AmazonSQSPlugin(CorePluginMixin, DataForwardingPlugin):
                 )
                 return False
             elif e.message.endswith("must contain the parameter MessageGroupId."):
-                metrics_name = "new_sentry_plugins.amazon_sqs.missing_message_group_id"
+                metrics_name = "sentry_plugins.amazon_sqs.missing_message_group_id"
                 logger.info(
                     metrics_name,
                     extra={