Merge pull request #152 from ceph/remove-amqp

remove everything to do with amqp messages

Author: dmick

pyproject.toml

@@ -16,7 +16,6 @@ dependencies = [
   "pecan-notario",
   "requests",
   "jinja2",
-  "pika",
 ]
 classifiers = [
   'Development Status :: 4 - Beta',

requirements.txt

@@ -9,5 +9,4 @@ alembic==1.13.2
 ipython==5.0.0
 requests==2.25.1
 jinja2==3.1.4
-pika==1.2.0
 enum34==1.1.10

shaman/controllers/api/__init__.py

@@ -1,4 +1,3 @@
 import shaman.controllers.api.repos # noqa
 import shaman.controllers.api.nodes # noqa
 import shaman.controllers.api.builds # noqa
-import shaman.controllers.api.bus # noqa

shaman/controllers/api/bus/__init__.py

@@ -24,7 +24,6 @@ def index(self):
     nodes = api.nodes.NodesController()
     search = _search.SearchController()
     builds = api.builds.ProjectsAPIController()
-    bus = api.bus.BusController()
 
 
 class RootController(object):

shaman/controllers/root.py

@@ -1,5 +1,4 @@
 import datetime
-import json
 from sqlalchemy import create_engine, MetaData, event
 from sqlalchemy.orm import scoped_session, sessionmaker, object_session, mapper
 from sqlalchemy.ext.declarative import declarative_base
@@ -70,23 +69,6 @@ def _date_json_converter(item):
     if isinstance(item, datetime.datetime):
         return str(item)
 
-
-def publish_update_message(mapper, connection, target):
-    """
-    Send a message to RabbitMQ everytime a Repo
-    is updated
-    """
-    from shaman.util import publish_message
-
-    if isinstance(target, Build):
-        topic = "builds"
-    elif isinstance(target, Repo):
-        topic = "repos"
-    routing_key = "{}.{}".format(target.project.name, topic)
-    body = json.dumps(target.__json__(), default=_date_json_converter)
-    publish_message(routing_key, body)
-
-
 # Utilities:
 
 def get_or_create(model, **kwargs):

shaman/models/__init__.py

@@ -4,7 +4,7 @@
 from sqlalchemy.orm import relationship, backref, deferred
 from sqlalchemy.event import listen
 from sqlalchemy.orm.exc import DetachedInstanceError
-from shaman.models import Base, update_timestamp, publish_update_message
+from shaman.models import Base, update_timestamp
 from shaman.models.types import JSONType
 
 
@@ -125,4 +125,3 @@ def get_url(self, up_to_part=None):
 # listen for timestamp modifications
 listen(Build, 'before_insert', update_timestamp)
 listen(Build, 'before_update', update_timestamp)
-listen(Build, 'after_update', publish_update_message)

shaman/models/builds.py

@@ -3,7 +3,7 @@
 from sqlalchemy.orm import relationship, backref, deferred
 from sqlalchemy.event import listen
 from sqlalchemy.orm.exc import DetachedInstanceError
-from shaman.models import Base, update_timestamp, publish_update_message
+from shaman.models import Base, update_timestamp
 from shaman.models.types import JSONType
 
 
@@ -101,4 +101,3 @@ def get_url(self):
 # listen for timestamp modifications
 listen(Repo, 'before_insert', update_timestamp)
 listen(Repo, 'before_update', update_timestamp)
-listen(Repo, 'after_update', publish_update_message)

shaman/models/repos.py

@@ -43,24 +43,6 @@ def factory():
     return Factory
 
 
-@pytest.fixture(autouse=True)
-def no_pika_requests(monkeypatch, factory):
-    """
-    If you don't do anything to patch pika, this fxiture will automatically
-    patchn it and prevent outbound requests.
-    """
-    fake_connection = factory(
-        queue_bind=lambda: True,
-        close=lambda: True,
-        channel=lambda: factory(
-            exchange_declare=lambda *a, **kw: True,
-            queue_bind=lambda *a: True,
-            basic_publish=lambda *a, **kw: True,
-            queue_declare=lambda *a, **kw: True,),
-    )
-    monkeypatch.setattr("pika.BlockingConnection", lambda *a: fake_connection)
-
-
 def config_file():
     here = os.path.abspath(os.path.dirname(__file__))
     return os.path.join(here, 'config.py')