address comment.

Signed-off-by: Morven Cao <lcao@redhat.com>

Author: morvencao

Makefile

@@ -294,7 +294,11 @@ generate:
 
 run: install
 	maestro migration
-	maestro server
+	@if [ "$(MESSAGE_DRIVER_TYPE)" = "grpc" ]; then \
+		maestro server --message-broker-type=$(MESSAGE_DRIVER_TYPE); \
+	else \
+		maestro server --message-broker-type=$(MESSAGE_DRIVER_TYPE) --message-broker-config-file=./secrets/$(MESSAGE_DRIVER_TYPE).config; \
+	fi
 .PHONY: run
 
 # Run Swagger and host the api docs
@@ -476,8 +480,12 @@ pubsub/teardown:
 	$(container_tool) rm pubsub-maestro
 
 .PHONY: pubsub/init
-pubsub/init:
+pubsub/init: pubsub/setup
 	@echo "Initializing Pub/Sub emulator topics and subscriptions..."
+	@echo "Waiting for emulator to be ready..."
+	@for i in {1..30}; do \
+		curl -s http://localhost:$(pubsub_port) >/dev/null 2>&1 && break || sleep 1; \
+	done
 	@PUBSUB_EMULATOR_HOST=localhost:$(pubsub_port) PUBSUB_PROJECT_ID=$(pubsub_project_id) python3 hack/init-pubsub-emulator.py
 
 crc/login:

README.md

@@ -116,8 +116,7 @@ $ make run
 
 # OR run with Pub/Sub emulator
 # First, ensure the Pub/Sub emulator is running and configured
-$ ./maestro migration
-$ ./maestro server --message-broker-type=pubsub --message-broker-config-file=./secrets/pubsub.config
+$ MESSAGE_DRIVER_TYPE=pubsub make run
 ```
 
 #### List the consumers

test/e2e/pkg/suite_test.go

@@ -11,8 +11,6 @@ import (
 	"testing"
 	"time"
 
-	"k8s.io/klog/v2"
-
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/openshift-online/ocm-sdk-go/logging"