Add Credentials for RabbitMQ (#38)

* first pass at adding username + password for MQ

* moving credentials

* Fix up credentials and make rabbitmq optional

---------

Co-authored-by: Five Grant <5@fivegrant.com>

Makefile

@@ -29,22 +29,22 @@ endif
 # Turn project on
 .PHONY:up
 up:docker/docker-compose.yaml
- $(DOCKER_COMPOSE) compose --file $(DOCKER_COMPOSE_YAML) up -d
+ $(DOCKER_COMPOSE) compose --profile standalone --file $(DOCKER_COMPOSE_YAML) up -d
 
 # Rebuild all containers and turn project on
 .PHONY:up-rebuild
 up-rebuild:$(DOCKER_COMPOSE_YAML)
- $(DOCKER_COMPOSE) compose --file $(DOCKER_COMPOSE_YAML) up --build -d
+ $(DOCKER_COMPOSE) compose --profile standalone --file $(DOCKER_COMPOSE_YAML) up --build -d
 
 # Rebuild the docker image from scratch
-.PHONY:up-rebuild
+.PHONY:force-rebuild
 force-rebuild:$(DOCKER_COMPOSE_YAML)
  $(DOCKER_COMPOSE) compose --file $(DOCKER_COMPOSE_YAML) build --no-cache
 
 # Turn project off
 .PHONY:down
 down:$(DOCKER_COMPOSE_YAML)
- $(DOCKER_COMPOSE) compose --file $(DOCKER_COMPOSE_YAML) down
+ $(DOCKER_COMPOSE) compose --profile standalone --file $(DOCKER_COMPOSE_YAML) down
 
 # Restart project
 .PHONY:restart

docker/docker-compose.yaml

@@ -42,12 +42,12 @@ services:
  depends_on:
  - redis
  - api
- - rabbitmq
  networks:
  - data-api
  - pyciemss
  rabbitmq:
  container_name: rabbitmq
+ profiles: ["standalone"]
  hostname: rabbitmq
  image: 'rabbitmq:3'
  healthcheck:
@@ -57,10 +57,12 @@ services:
  retries: 5
  ports:
  - "5672:5672"
+ - "15672:15672"
  networks:
  - pyciemss
  rabbitmq-mock-consumer:
  container_name: rabbitmq-mock-consumer
+ profiles: ["standalone"]
  build:
  context: ..
  dockerfile: docker/Dockerfile.api

env.sample

@@ -3,3 +3,5 @@ REDIS_HOST=redis
 REDIS_PORT=6379
 RABBITMQ_HOST=rabbitmq.pyciemss
 RABBITMQ_PORT=5672
+RABBITMQ_USERNAME=guest
+RABBITMQ_PASSWORD=guest

service/settings.py

@@ -15,6 +15,8 @@ class Settings(BaseSettings):
  REDIS_PORT: int = 6379
  RABBITMQ_HOST: str = "rabbitmq.pyciemss"
  RABBITMQ_PORT: int = 5672
+ RABBITMQ_USERNAME: str = "guest"
+ RABBITMQ_PASSWORD: str = "guest"
 
 
 settings = Settings()

service/utils/rabbitmq.py

@@ -5,8 +5,9 @@
 
 from settings import settings
 
+creds = pika.PlainCredentials(settings.RABBITMQ_USERNAME, settings.RABBITMQ_PASSWORD)
 conn_config = pika.ConnectionParameters(
- host=settings.RABBITMQ_HOST, port=settings.RABBITMQ_PORT
+ host=settings.RABBITMQ_HOST, port=settings.RABBITMQ_PORT, credentials=creds
 )
 
 
@@ -33,7 +34,9 @@ def callback(ch, method, properties, body):
 
 
 def gen_rabbitmq_hook(job_id):
- connection = pika.BlockingConnection(conn_config)
+ connection = pika.BlockingConnection(
+ conn_config,
+ )
  channel = connection.channel()
 
  def hook(progress):