[DXP-1961] Loading service metadata for Dashboards from project localization and mesh localization. (#214)

Author: jgardo-ds

core/pom.xml

@@ -19,8 +19,7 @@
     <quarkus.package.main-class>dev.streamx.cli.StreamxCommand</quarkus.package.main-class>
 
     <!-- this should not be overridden by user, same as streamx runner dependencies -->
-    <!-- FIXME use fixed version after streamx dashboard stabilizes -->
-    <streamx.dev.dashboard.image>ghcr.io/streamx-dev/streamx-dashboard/streamx-local-dashboard:latest-jvm</streamx.dev.dashboard.image>
+    <streamx.dev.dashboard.image>ghcr.io/streamx-dev/streamx-dashboard/streamx-local-dashboard:0.0.7-patch002-jvm</streamx.dev.dashboard.image>
   </properties>
 
   <dependencies>

core/src/main/java/dev/streamx/cli/command/dev/DashboardContainer.java

@@ -12,17 +12,20 @@ public class DashboardContainer extends GenericContainer<DashboardContainer> {
   private static final int DASHBOARDS_CONTAINER_PORT = 8080;
 
   public DashboardContainer(String fullImageName, int exposedPort, String meshPath,
-      String projectDirectory) {
+      String meshDirectory, String projectDirectory) {
     super(DockerImageName.parse(fullImageName));
     setExposedPorts(List.of(DASHBOARDS_CONTAINER_PORT));
     addFixedExposedPort(exposedPort, DASHBOARDS_CONTAINER_PORT);
 
-    withFileSystemBind(projectDirectory, "/data/project", BindMode.READ_WRITE);
-    String servicesDirectory = projectDirectory + "/services";
-    withFileSystemBind(servicesDirectory, "/services-metadata-registry-root",
-        BindMode.READ_WRITE);
     withFileSystemBind(meshPath, "/data/mesh.yaml", BindMode.READ_WRITE);
+    withFileSystemBind(meshDirectory, "/data/mesh", BindMode.READ_WRITE);
+
+    if (projectDirectory != null) {
+      withFileSystemBind(projectDirectory, "/data/project", BindMode.READ_WRITE);
+    }
 
     withCreateContainerCmdModifier(cmd -> cmd.withName(CONTAINER_NAME));
+    withEnv("streamx.dashboard.mesh-manager.services-metadata-registry-roots",
+        "/data/project/services,/data/mesh/services");
   }
 }

core/src/main/java/dev/streamx/cli/command/dev/DashboardRunner.java

@@ -24,12 +24,14 @@ public class DashboardRunner {
 
   private DashboardContainer dashboardContainer;
 
-  public void startStreamxDashboard(String meshPathAsString, String projectDirectoryAsString) {
+  public void startStreamxDashboard(String meshPath, String meshDirectory,
+      String projectDirectory) {
     dashboardContainer = new DashboardContainer(
         StreamxMavenPropertiesUtils.getDashboardImage(),
         devConfig.dashboardPort(),
-        meshPathAsString,
-        projectDirectoryAsString
+        meshPath,
+        meshDirectory,
+        projectDirectory
     ).withStartupTimeout(Duration.ofSeconds(CONTAINER_TIMEOUT_IN_SECS));
     dashboardContainer.start();
 

core/src/main/java/dev/streamx/cli/command/dev/DevCommand.java

@@ -112,11 +112,20 @@ public void run() {
   private void startDashboard(Path meshPath) {
     print("Setting up StreamX Dashboard...");
     var meshPathAsString = meshPath.toAbsolutePath().normalize().toString();
-    var projectDirectory = meshPath.resolve("..");
-    var projectDirectoryAsString = projectDirectory.toAbsolutePath().normalize().toString();
+    Path meshDirectory = meshPath.resolve("..");
+    Path projectDirectory = null;
+    if (Files.exists(meshDirectory.resolve("..").normalize())) {
+      projectDirectory = meshDirectory.resolve("..").normalize();
+    }
+
+    var meshDirectoryAsString = meshDirectory.toAbsolutePath().normalize().toString();
+    var projectDirectoryAsString = projectDirectory != null
+        ? projectDirectory.toAbsolutePath().normalize().toString()
+        : null;
 
-    logger.infov("Resolved mesh {0} and project directory {1}",
-        meshPathAsString, projectDirectoryAsString);
-    dashboardRunner.startStreamxDashboard(meshPathAsString, projectDirectoryAsString);
+    logger.infov("Resolved mesh {0}, mesh directory {1} and project directory {2}",
+        meshPathAsString, meshDirectoryAsString, projectDirectoryAsString);
+    dashboardRunner.startStreamxDashboard(meshPathAsString, meshDirectoryAsString,
+        projectDirectoryAsString);
   }
 }