github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-04 02:56:18 +00:00
Code Issues Projects Releases Wiki Activity

cli: kata-env: add runtime path to output

Browse Source 
`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 <graham.whaley@intel.com>
This commit is contained in:
Graham Whaley 2018-08-13 14:08:02 +01:00
parent 4220a7a9be
commit 8b69c75144
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cli/kata-env.go
View File

@ -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,
}
}

3
cli/kata-env_test.go
View File

@ -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,
}
}