Addressing the following Redis related issues.

README.md

@@ -181,26 +181,27 @@ You can:
 
 The following are the different environment variables that are looked up that allow configuring the schema registry in different ways.
 
-| Variable Name         | Description                                                                   | Default                   |
-| --------------------- | ----------------------------------------------------------------------------- | ------------------------- |
-| DB_HOST               | Host name of the MySQL server                                                 | gql-schema-registry-db    |
-| DB_USERNAME           | Username to connect to MySQL                                                  | root                      |
-| DB_SECRET             | Password used to connect to MySQL                                             | root                      |
-| DB_PORT               | Port used when connecting to MySQL                                            | 3306                      |
-| DB_NAME               | Name of the MySQL database to connect to                                      | schema-registry           |
-| DB_EXECUTE_MIGRATIONS | Controls whether DB migrations are executed upon registry startup or not      | true                      |
-| REDIS_HOST            | Host name of the Redis server                                                 | gql-schema-registry-redis |
-| REDIS_PORT            | Port used when connecting to Redis                                            | 6379                      |
-| REDIS_SECRET          | Password used to connect to Redis                                             | Empty                     |
-| ASSETS_URL            | Controls the url that web assets are served from                              | localhost:6001            |
-| NODE_ENV              | Specifies the environment. Use _production_ to load js/css from `dist/assets` | Empty                     |
-| ASYNC_SCHEMA_UPDATES  | Specifies if async achema updates is enabled                                  | false                     |
-| KAFKA_BROKER_HOST     | Host name of the Kafka broker, used if ASYNC_SCHEMA_UPDATES = true            | gql-schema-registry-kafka |
-| KAFKA_BROKER_PORT     | Port used when connecting to Kafka, used if ASYNC_SCHEMA_UPDATES = true       | 9092                      |
-| KAFKA_SCHEMA_TOPIC    | Topic with new schema                                                         | graphql-schema-updates    |
-| KAFKA_QUERIES_TOPIC   | Topic with new schema                                                         | graphql-queries           |
-| LOG_LEVEL             | Minimum level of logs to output                                               | info                      |
-| LOG_TYPE              | Output log type, supports pretty or json.                                     | pretty                    |
+| Variable Name          | Description                                                                   | Default                   |
+|------------------------|-------------------------------------------------------------------------------|---------------------------|
+| DB_HOST                | Host name of the MySQL server                                                 | gql-schema-registry-db    |
+| DB_USERNAME            | Username to connect to MySQL                                                  | root                      |
+| DB_SECRET              | Password used to connect to MySQL                                             | root                      |
+| DB_PORT                | Port used when connecting to MySQL                                            | 3306                      |
+| DB_NAME                | Name of the MySQL database to connect to                                      | schema-registry           |
+| DB_EXECUTE_MIGRATIONS  | Controls whether DB migrations are executed upon registry startup or not      | true                      |
+| REDIS_HOST             | Host name of the Redis server                                                 | gql-schema-registry-redis |
+| REDIS_PORT             | Port used when connecting to Redis                                            | 6379                      |
+| REDIS_SECRET           | Password used to connect to Redis                                             | Empty                     |
+| ASSETS_URL             | Controls the url that web assets are served from                              | localhost:6001            |
+| NODE_ENV               | Specifies the environment. Use _production_ to load js/css from `dist/assets` | Empty                     |
+| ASYNC_SCHEMA_UPDATES   | Specifies if async achema updates is enabled                                  | false                     |
+| KAFKA_BROKER_HOST      | Host name of the Kafka broker, used if ASYNC_SCHEMA_UPDATES = true            | gql-schema-registry-kafka |
+| KAFKA_BROKER_PORT      | Port used when connecting to Kafka, used if ASYNC_SCHEMA_UPDATES = true       | 9092                      |
+| KAFKA_SCHEMA_TOPIC     | Topic with new schema                                                         | graphql-schema-updates    |
+| KAFKA_QUERIES_TOPIC    | Topic with new schema                                                         | graphql-queries           |
+| LOG_LEVEL              | Minimum level of logs to output                                               | info                      |
+| LOG_TYPE               | Output log type, supports pretty or json.                                     | pretty                    |
+| LOG_STREAMING_ENABLED  | Controls whether logs are streamed over Redis to be presented in UI           | false                     |
 
 For development we rely on docker network and use hostnames from `docker-compose.yml`.
 Node service uses to connect to mysql & redis and change it if you install it with own setup.
@@ -390,21 +391,21 @@ See main [blog post](https://medium.com/pipedrive-engineering/journey-to-federat
 
 <details>
   <summary><h3>🟢 GET /health</h3></summary>
-  
+
   returns "ok" when service is up
 </details>
 
 <details>
   <summary><h3>🟢 GET /schema/latest</h3></summary>
-  
+
 Simplified version of /schema/compose where latest versions from different services are composed.
 Some services prefer this to use this natural schema composition, as its natural and time-based.
 
 </details>
 
 <details>
   <summary><h3>🟡 POST /schema/compose</h3></summary>
-  
+
 Advanced version of schema composition, where you need to provide services & their versions.
 Used by graphql gateway to fetch schema based on currently running containers.
 

docker-compose.base.yml

@@ -25,6 +25,7 @@ services:
     image: redis:6-alpine
     ports:
       - 6004:6379
+    command: redis-server --requirepass password
     environment:
       SERVICE_NAME: 'gql-schema-registry-redis'
     networks:

docker-compose.functional.yml

@@ -13,6 +13,7 @@ services:
       - WITH_WEBPACK=${WITH_WEBPACK-1}
       - DB_SCHEMA_REGISTRY=gql-schema-registry-db
       - NODE_ENV=production
+      - REDIS_PASSWORD=password
     volumes:
       - .:/app/
     restart: always

package.json

@@ -17,8 +17,8 @@
     "test:unit:coverage": "jest --config test/unit/jest.coverage.cjs --color --detectOpenHandles --forceExit",
     "test:unit:frontend:coverage": "jest --config test/unit-frontend/jest.config.ts --color --detectOpenHandles --forceExit",
     "test:watch": "jest --config jest.config.ts --watch",
-    "test:integration": "DB_HOST=localhost DB_PORT=6000 REDIS_HOST=localhost REDIS_PORT=6004 PORT=6001 jest --config test/integration/jest.config.cjs --color --detectOpenHandles --runInBand --forceExit",
-    "test:integration:coverage": "DB_HOST=localhost DB_PORT=6000 REDIS_HOST=localhost REDIS_PORT=6004 PORT=6001 jest --config test/integration/jest.coverage.cjs --color --detectOpenHandles --runInBand --forceExit",
+    "test:integration": "DB_HOST=localhost DB_PORT=6000 REDIS_HOST=localhost REDIS_PORT=6004 REDIS_SECRET=password PORT=6001 jest --config test/integration/jest.config.cjs --color --detectOpenHandles --runInBand --forceExit",
+    "test:integration:coverage": "DB_HOST=localhost DB_PORT=6000 REDIS_HOST=localhost REDIS_PORT=6004 REDIS_SECRET=password PORT=6001 jest --config test/integration/jest.coverage.cjs --color --detectOpenHandles --runInBand --forceExit",
     "test:functional": "./node_modules/.bin/jest --config test/functional/jest.config.cjs",
     "test:performance": "TARGET_URL=localhost:6001 k6 run test/perf/minimum.test.js",
     "test:performance:dockerized": "docker-compose -f docker-compose.perf-tests.yml run --rm k6 run /scripts/minimum.test.js",

src/graphql/resolvers.ts

@@ -78,8 +78,12 @@ export default {
 				)
 			);
 
-			// @ts-ignore
-			return logs?.redis;
+			if (process.env.LOG_STREAMING_ENABLED === 'true') {
+				// @ts-ignore
+				return logs?.redis;
+			}
+
+			return '';
 		},
 
 		search: async (_, { filter }) => {

src/index.ts

@@ -5,6 +5,8 @@ import * as kafka from './kafka';
 import config from './config';
 import router from './router';
 import { logger } from './logger';
+import diplomat from './diplomat';
+import redis from './redis';
 
 const app = express();
 
@@ -100,6 +102,14 @@ export default async function init() {
 		return server;
 	}
 
+	const redisConfig = diplomat.getServiceInstance(
+		'gql-schema-registry-redis'
+	);
+
+	if (redisConfig.host) {
+		redis.initRedis();
+	}
+
 	if (config.asyncSchemaUpdates) {
 		kafka.init();
 	}

src/logger.ts

@@ -3,11 +3,14 @@ import RedisTransport from 'winston-redis-stream';
 
 const logTransports = [new transports.Console()];
 
-if (process.env.REDIS_HOST) {
+if (process.env.LOG_STREAMING_ENABLED === 'true' && process.env.REDIS_HOST) {
 	try {
 		const redis = new RedisTransport({
-			host: process.env.REDIS_HOST,
-			port: process.env.REDIS_PORT,
+			redis: {
+				host: process.env.REDIS_HOST,
+				port: process.env.REDIS_PORT,
+				password: process.env.REDIS_SECRET,
+			},
 			channel: 'logs',
 		});
 		logTransports.push(redis);