fix(warehouse): control plane client needs to be initialized for mast…

…er mode (#2826)
rudderlabs · Dec 21, 2022 · 5ad7ee7 · 5ad7ee7
1 parent dfc4b23
commit 5ad7ee7
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/warehouse/warehouse.go b/warehouse/warehouse.go
@@ -2189,13 +2189,6 @@ func Start(ctx context.Context, app app.App) error {
 			reporting.AddClient(ctx, types.Config{ConnInfo: psqlInfo, ClientName: types.WAREHOUSE_REPORTING_CLIENT})
 			return nil
 		}))
-		region := config.GetString("region", "")
-
-		controlPlaneClient = controlplane.NewClient(
-			backendconfig.GetConfigBackendURL(),
-			backendconfig.DefaultBackendConfig.Identity(),
-			controlplane.WithRegion(region),
-		)
 	}
 
 	if isStandAlone() && isMaster() {
@@ -2206,7 +2199,7 @@ func Start(ctx context.Context, app app.App) error {
 			backendconfig.DefaultBackendConfig.WaitForConfig(ctx)
 
 			c := controlplane.NewClient(
-				config.GetString("CONFIG_BACKEND_URL", "https://api.rudderstack.com"),
+				backendconfig.GetConfigBackendURL(),
 				backendconfig.DefaultBackendConfig.Identity(),
 			)
 
@@ -2232,6 +2225,14 @@ func Start(ctx context.Context, app app.App) error {
 
 		backendconfig.DefaultBackendConfig.WaitForConfig(ctx)
 
+		region := config.GetString("region", "")
+
+		controlPlaneClient = controlplane.NewClient(
+			backendconfig.GetConfigBackendURL(),
+			backendconfig.DefaultBackendConfig.Identity(),
+			controlplane.WithRegion(region),
+		)
+
 		tenantManager = &multitenant.Manager{
 			BackendConfig: backendconfig.DefaultBackendConfig,
 		}