From 7113aad8eb91069c1c5cbff4c40ea07028d40a92 Mon Sep 17 00:00:00 2001
From: "Michael N. Lipp" <mnl@mnl.de>
Date: Wed, 9 Aug 2023 21:42:09 +0200
Subject: [PATCH] Use dash in k8s context, but not for directories.

---
 .../org/jdrupes/vmoperator/runner/qemu/Configuration.java | 8 +++++---
 .../src/org/jdrupes/vmoperator/runner/qemu/Runner.java    | 8 ++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Configuration.java b/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Configuration.java
index 32baccd..76577cd 100644
--- a/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Configuration.java
+++ b/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Configuration.java
@@ -337,7 +337,7 @@ public class Configuration implements Dto {
     private boolean checkRuntimeDir() {
         // Runtime directory (sockets etc.)
         if (runtimeDir == null) {
-            var appDir = FsdUtils.runtimeDir(Runner.APP_NAME);
+            var appDir = FsdUtils.runtimeDir(Runner.APP_NAME.replace("-", ""));
             if (!Files.exists(appDir) && appDir.toFile().mkdirs()) {
                 try {
                     // When appDir is derived from XDG_RUNTIME_DIR
@@ -353,7 +353,8 @@ public class Configuration implements Dto {
                         runtimeDir));
                 }
             }
-            runtimeDir = FsdUtils.runtimeDir(Runner.APP_NAME).resolve(vm.name);
+            runtimeDir = FsdUtils.runtimeDir(Runner.APP_NAME.replace("-", ""))
+                .resolve(vm.name);
             runtimeDir.toFile().mkdir();
             swtpmSocket = runtimeDir.resolve("swtpm-sock");
             monitorSocket = runtimeDir.resolve("monitor.sock");
@@ -372,7 +373,8 @@ public class Configuration implements Dto {
     private boolean checkDataDir() {
         // Data directory
         if (dataDir == null) {
-            dataDir = FsdUtils.dataHome(Runner.APP_NAME).resolve(vm.name);
+            dataDir = FsdUtils.dataHome(Runner.APP_NAME.replace("-", ""))
+                .resolve(vm.name);
         }
         if (!Files.exists(dataDir)) {
             dataDir.toFile().mkdirs();
diff --git a/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Runner.java b/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Runner.java
index 11baff9..25a5872 100644
--- a/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Runner.java
+++ b/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Runner.java
@@ -160,9 +160,9 @@ import org.jgrapes.util.events.WatchFile;
 public class Runner extends Component {
 
     /** The Constant APP_NAME. */
-    public static final String APP_NAME = "vmrunner";
+    public static final String APP_NAME = "vm-runner";
     private static final String TEMPLATE_DIR
-        = "/opt/" + APP_NAME + "/templates";
+        = "/opt/" + APP_NAME.replace("-", "") + "/templates";
     private static final String DEFAULT_TEMPLATE
         = "Standard-VM-latest.ftl.yaml";
     private static final String SAVED_TEMPLATE = "VM.ftl.yaml";
@@ -214,7 +214,7 @@ public class Runner extends Component {
 
         // Configuration store with file in /etc/opt (default)
         File config = new File(cmdLine.getOptionValue('c',
-            "/etc/opt/" + APP_NAME + "/config.yaml"));
+            "/etc/opt/" + APP_NAME.replace("-", "") + "/config.yaml"));
         // Don't rely on night config to produce a good exception
         // for this simple case
         if (!Files.isReadable(config.toPath())) {
@@ -552,7 +552,7 @@ public class Runner extends Component {
     static {
         try {
             InputStream props;
-            var path = FsdUtils.findConfigFile(Runner.APP_NAME,
+            var path = FsdUtils.findConfigFile(Runner.APP_NAME.replace("-", ""),
                 "logging.properties");
             if (path.isPresent()) {
                 props = Files.newInputStream(path.get());