java-module: Fix init.sh running command

m-cmp · Nov 7, 2024 · cddd44e · cddd44e
1 parent dce3519
commit cddd44e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 33 deletions.
diff --git a/...-manager/src/main/java/mcmp/mc/observability/mco11ymanager/service/MonitoringService.java b/...-manager/src/main/java/mcmp/mc/observability/mco11ymanager/service/MonitoringService.java
@@ -28,22 +28,22 @@ public class MonitoringService {
     private final TumblebugClient tumblebugClient;
 
     @Value("${feign.cb-tumblebug.url}")
-    private String tumblebugURL;
+    private final String tumblebugURL = "";
 
-    @Value("${feign.cb-tumblebug.id}")
-    private String tumblebugID;
+    @Value("${feign.cb-tumblebug.id:}")
+    private final String tumblebugID = "";
 
-    @Value("${feign.cb-tumblebug.pw}")
-    private String tumblebugPW;
+    @Value("${feign.cb-tumblebug.pw:}")
+    private final String tumblebugPW = "";
 
-    @Value("${feign.cb-spider.url}")
-    private String spiderURL;
+    @Value("${feign.cb-spider.url:}")
+    private final String spiderURL = "";
 
-    @Value("${feign.cb-spider.id}")
-    private String spiderID;
+    @Value("${feign.cb-spider.id:}")
+    private final String spiderID = "";
 
-    @Value("${feign.cb-spider.pw}")
-    private String spiderPW;
+    @Value("${feign.cb-spider.pw:}")
+    private final String spiderPW = "";
 
     public TumblebugNS getNs() {
         return tumblebugClient.getNSList();
@@ -139,26 +139,6 @@ public boolean installAgent(String nsId, String mciId, String targetId) {
                 for (TumblebugMCI.Vm vm : mci.getVm()) {
                     if (!vm.getId().equals(targetId)) continue;
 
-                    if (tumblebugURL == null) {
-                        tumblebugURL = "";
-                    }
-                    if (tumblebugID == null) {
-                        tumblebugID = "";
-                    }
-                    if (tumblebugPW == null) {
-                        tumblebugPW = "";
-                    }
-
-                    if (spiderURL == null) {
-                        spiderURL = "";
-                    }
-                    if (spiderID == null) {
-                        spiderID = "";
-                    }
-                    if (spiderPW == null) {
-                        spiderPW = "";
-                    }
-
                     List<String> cmdList = new ArrayList<>();
                     cmdList.add("wget https://github.com/m-cmp/mc-observability/raw/main/java-module/scripts/init.sh -O init.sh");
                     cmdList.add("chmod +x init.sh");

diff --git a/java-module/scripts/init.sh b/java-module/scripts/init.sh
@@ -36,10 +36,10 @@ cat <<EOF > .env
 NS_ID=$2
 MCI_ID=$3
 TARGET_ID=$4
-TUMBLEBUG_URL=http://$5:1323
+TUMBLEBUG_URL=$5
 TUMBLEBUG_ID=$6
 TUMBLEBUG_PW=$7
-SPIDER_URL=http://$8:1024
+SPIDER_URL=$8
 SPIDER_ID=$9
 SPIDER_PW=${10}
 SPIDER_MONITORING_INFLUXDB_URL=http://$1:8086