cli: kata-env: add runtime path to output

`kata-env` did not include the path to the runtime exe itself. Add that into the Runtime section. Fixes: #577 Signed-off-by: Graham Whaley <[email protected]>
kata-containers · Aug 21, 2018 · 4784ac7 · 4784ac7
1 parent 9155da8
commit 4784ac7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/cli/kata-env.go b/cli/kata-env.go
@@ -24,7 +24,7 @@ import (
 //
 // XXX: Increment for every change to the output format
 // (meaning any change to the EnvInfo type).
-const formatVersion = "1.0.13"
+const formatVersion = "1.0.14"
 
 // MetaInfo stores information on the format of the output itself
 type MetaInfo struct {
@@ -64,6 +64,7 @@ type RuntimeInfo struct {
 	Version RuntimeVersionInfo
 	Config  RuntimeConfigInfo
 	Debug   bool
+	Path    string
 }
 
 // RuntimeVersionInfo stores details of the runtime version
@@ -154,9 +155,12 @@ func getRuntimeInfo(configFile string, config oci.RuntimeConfig) RuntimeInfo {
 		Path: configFile,
 	}
 
+	runtimePath, _ := os.Executable()
+
 	return RuntimeInfo{
 		Version: runtimeVersion,
 		Config:  runtimeConfig,
+		Path:    runtimePath,
 	}
 }
 

diff --git a/cli/kata-env_test.go b/cli/kata-env_test.go
@@ -255,6 +255,8 @@ func getExpectedKernel(config oci.RuntimeConfig) KernelInfo {
 }
 
 func getExpectedRuntimeDetails(configFile string) RuntimeInfo {
+	runtimePath, _ := os.Executable()
+
 	return RuntimeInfo{
 		Version: RuntimeVersionInfo{
 			Semver: version,
@@ -264,6 +266,7 @@ func getExpectedRuntimeDetails(configFile string) RuntimeInfo {
 		Config: RuntimeConfigInfo{
 			Path: configFile,
 		},
+		Path: runtimePath,
 	}
 }