commit with tag nightly-25.01.08

asadarafat · Jan 5, 2025 · deebdeb · deebdeb
1 parent 8f18199
commit deebdeb
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/dist/topoviewer b/dist/topoviewer
diff --git a/go_cloudshellwrapper/clabHandlers/clabHostRoutine.go b/go_cloudshellwrapper/clabHandlers/clabHostRoutine.go
@@ -14,6 +14,8 @@ import (
 	"path"
 	"time"
 
+	"regexp"
+
 	tools "github.com/asadarafat/topoViewer/go_tools"
 	topoengine "github.com/asadarafat/topoViewer/go_topoengine"
 	"github.com/docker/docker/api/types"
@@ -101,7 +103,17 @@ func GetDockerNetworkNamespaceIDViaUnixSocket(w http.ResponseWriter, r *http.Req
 
 		log.Infof("cliOutput: %s", cliOutput)
 
-		netNamespaceID = string(cliOutput)
+		// Define the regular expression to match "net:[number]"
+		re := regexp.MustCompile(`net:\[\d+\]`)
+
+		// Find the first match in the cliOutput
+		cliOutputParsedNamespace := re.FindString(string(cliOutput))
+		if cliOutputParsedNamespace == "" {
+			log.Error("No cliOutputParsedNamespace found")
+		}
+
+		log.Infof("cliOutputParsedNamespace: %s", cliOutputParsedNamespace)
+		netNamespaceID = cliOutputParsedNamespace
 
 	} else { // colocated
 		netNamespaceID, err = os.Readlink(nsPath)

diff --git a/go_cloudshellwrapper/constants.go b/go_cloudshellwrapper/constants.go
@@ -1,6 +1,6 @@
 package cloudshellwrapper
 
-var VersionInfo string = "nightly-25.01.07"
+var VersionInfo string = "nightly-25.01.08"
 
 // create html-public files
 var HtmlPublicPrefixPath string = "./html-public/"

diff --git a/go_cloudshellwrapper/constants.go.bak b/go_cloudshellwrapper/constants.go.bak
@@ -1,6 +1,6 @@
 package cloudshellwrapper
 
-var VersionInfo string = "nightly-25.01.06"
+var VersionInfo string = "nightly-25.01.07"
 
 // create html-public files
 var HtmlPublicPrefixPath string = "./html-public/"