refactor info

the current implementation of info, while typed, is very loosely done so.  we need stronger types for our apiv2 implmentation and bindings.

Signed-off-by: Brent Baude <bbaude@redhat.com>

6 files changed, 47 insertions, 31 deletions

diff --git a/pkg/api/handlers/compat/containers.go b/pkg/api/handlers/compat/containers.go
index 2ce113d30..c53af0f26 100644
--- a/pkg/api/handlers/compat/containers.go
+++ b/pkg/api/handlers/compat/containers.go
@@ -94,15 +94,9 @@ func ListContainers(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 	// TODO filters still need to be applied
-	infoData, err := runtime.Info()
-	if err != nil {
-		utils.InternalServerError(w, errors.Wrapf(err, "Failed to obtain system info"))
-		return
-	}
-
 	var list = make([]*handlers.Container, len(containers))
 	for i, ctnr := range containers {
-		api, err := handlers.LibpodToContainer(ctnr, infoData, query.Size)
+		api, err := handlers.LibpodToContainer(ctnr, query.Size)
 		if err != nil {
 			utils.InternalServerError(w, err)
 			return
diff --git a/pkg/api/handlers/compat/info.go b/pkg/api/handlers/compat/info.go
index 104d0793b..179b4a3e0 100644
--- a/pkg/api/handlers/compat/info.go
+++ b/pkg/api/handlers/compat/info.go
@@ -33,8 +33,6 @@ func GetInfo(w http.ResponseWriter, r *http.Request) {
 		utils.Error(w, "Something went wrong.", http.StatusInternalServerError, errors.Wrapf(err, "Failed to obtain system memory info"))
 		return
 	}
-	hostInfo := infoData[0].Data
-	storeInfo := infoData[1].Data
 
 	configInfo, err := runtime.GetConfig()
 	if err != nil {
@@ -64,44 +62,44 @@ func GetInfo(w http.ResponseWriter, r *http.Request) {
 		ClusterAdvertise:   "",
 		ClusterStore:       "",
 		ContainerdCommit:   docker.Commit{},
-		Containers:         storeInfo["ContainerStore"].(map[string]interface{})["number"].(int),
+		Containers:         infoData.Store.ContainerStore.Number,
 		ContainersPaused:   stateInfo[define.ContainerStatePaused],
 		ContainersRunning:  stateInfo[define.ContainerStateRunning],
 		ContainersStopped:  stateInfo[define.ContainerStateStopped] + stateInfo[define.ContainerStateExited],
 		Debug:              log.IsLevelEnabled(log.DebugLevel),
 		DefaultRuntime:     configInfo.Engine.OCIRuntime,
-		DockerRootDir:      storeInfo["GraphRoot"].(string),
-		Driver:             storeInfo["GraphDriverName"].(string),
-		DriverStatus:       getGraphStatus(storeInfo),
+		DockerRootDir:      infoData.Store.GraphRoot,
+		Driver:             infoData.Store.GraphDriverName,
+		DriverStatus:       getGraphStatus(infoData.Store.GraphStatus),
 		ExperimentalBuild:  true,
 		GenericResources:   nil,
 		HTTPProxy:          getEnv("http_proxy"),
 		HTTPSProxy:         getEnv("https_proxy"),
 		ID:                 uuid.New().String(),
 		IPv4Forwarding:     !sysInfo.IPv4ForwardingDisabled,
-		Images:             storeInfo["ImageStore"].(map[string]interface{})["number"].(int),
+		Images:             infoData.Store.ImageStore.Number,
 		IndexServerAddress: "",
 		InitBinary:         "",
 		InitCommit:         docker.Commit{},
 		Isolation:          "",
 		KernelMemory:       sysInfo.KernelMemory,
 		KernelMemoryTCP:    false,
-		KernelVersion:      hostInfo["kernel"].(string),
+		KernelVersion:      infoData.Host.Kernel,
 		Labels:             nil,
 		LiveRestoreEnabled: false,
 		LoggingDriver:      "",
-		MemTotal:           hostInfo["MemTotal"].(int64),
+		MemTotal:           infoData.Host.MemTotal,
 		MemoryLimit:        sysInfo.MemoryLimit,
 		NCPU:               goRuntime.NumCPU(),
 		NEventsListener:    0,
 		NFd:                getFdCount(),
 		NGoroutines:        goRuntime.NumGoroutine(),
-		Name:               hostInfo["hostname"].(string),
+		Name:               infoData.Host.Hostname,
 		NoProxy:            getEnv("no_proxy"),
 		OSType:             goRuntime.GOOS,
-		OSVersion:          hostInfo["Distribution"].(map[string]interface{})["version"].(string),
+		OSVersion:          infoData.Host.Distribution.Version,
 		OomKillDisable:     sysInfo.OomKillDisable,
-		OperatingSystem:    hostInfo["Distribution"].(map[string]interface{})["distribution"].(string),
+		OperatingSystem:    infoData.Host.Distribution.Distribution,
 		PidsLimit:          sysInfo.PidsLimit,
 		Plugins:            docker.PluginsInfo{},
 		ProductLicense:     "Apache-2.0",
@@ -118,21 +116,21 @@ func GetInfo(w http.ResponseWriter, r *http.Request) {
 		SystemTime:   time.Now().Format(time.RFC3339Nano),
 		Warnings:     []string{},
 	},
-		BuildahVersion:     hostInfo["BuildahVersion"].(string),
+		BuildahVersion:     infoData.Host.BuildahVersion,
 		CPURealtimePeriod:  sysInfo.CPURealtimePeriod,
 		CPURealtimeRuntime: sysInfo.CPURealtimeRuntime,
-		CgroupVersion:      hostInfo["CgroupVersion"].(string),
+		CgroupVersion:      infoData.Host.CGroupsVersion,
 		Rootless:           rootless.IsRootless(),
-		SwapFree:           hostInfo["SwapFree"].(int64),
-		SwapTotal:          hostInfo["SwapTotal"].(int64),
-		Uptime:             hostInfo["uptime"].(string),
+		SwapFree:           infoData.Host.SwapFree,
+		SwapTotal:          infoData.Host.SwapTotal,
+		Uptime:             infoData.Host.Uptime,
 	}
 	utils.WriteResponse(w, http.StatusOK, info)
 }
 
-func getGraphStatus(storeInfo map[string]interface{}) [][2]string {
+func getGraphStatus(storeInfo map[string]string) [][2]string {
 	var graphStatus [][2]string
-	for k, v := range storeInfo["GraphStatus"].(map[string]string) {
+	for k, v := range storeInfo {
 		graphStatus = append(graphStatus, [2]string{k, v})
 	}
 	return graphStatus
diff --git a/pkg/api/handlers/compat/version.go b/pkg/api/handlers/compat/version.go
index c7f7917ac..35a95b562 100644
--- a/pkg/api/handlers/compat/version.go
+++ b/pkg/api/handlers/compat/version.go
@@ -30,8 +30,6 @@ func VersionHandler(w http.ResponseWriter, r *http.Request) {
 		utils.Error(w, "Something went wrong.", http.StatusInternalServerError, errors.Wrapf(err, "Failed to obtain system memory info"))
 		return
 	}
-	hostInfo := infoData[0].Data
-
 	components := []docker.ComponentVersion{{
 		Name:    "Podman Engine",
 		Version: versionInfo.Version,
@@ -42,7 +40,7 @@ func VersionHandler(w http.ResponseWriter, r *http.Request) {
 			"Experimental":  "true",
 			"GitCommit":     versionInfo.GitCommit,
 			"GoVersion":     versionInfo.GoVersion,
-			"KernelVersion": hostInfo["kernel"].(string),
+			"KernelVersion": infoData.Host.Kernel,
 			"MinAPIVersion": handlers.MinimalApiVersion,
 			"Os":            goRuntime.GOOS,
 		},
@@ -52,7 +50,7 @@ func VersionHandler(w http.ResponseWriter, r *http.Request) {
 		Platform: struct {
 			Name string
 		}{
-			Name: fmt.Sprintf("%s/%s/%s", goRuntime.GOOS, goRuntime.GOARCH, hostInfo["Distribution"].(map[string]interface{})["distribution"].(string)),
+			Name: fmt.Sprintf("%s/%s/%s-%s", goRuntime.GOOS, goRuntime.GOARCH, infoData.Host.Distribution.Distribution, infoData.Host.Distribution.Version),
 		},
 		APIVersion:    components[0].Details["APIVersion"],
 		Arch:          components[0].Details["Arch"],
diff --git a/pkg/api/handlers/libpod/info.go b/pkg/api/handlers/libpod/info.go
new file mode 100644
index 000000000..cbf03aa17
--- /dev/null
+++ b/pkg/api/handlers/libpod/info.go
@@ -0,0 +1,18 @@
+package libpod
+
+import (
+	"net/http"
+
+	"github.com/containers/libpod/libpod"
+	"github.com/containers/libpod/pkg/api/handlers/utils"
+)
+
+func GetInfo(w http.ResponseWriter, r *http.Request) {
+	runtime := r.Context().Value("runtime").(*libpod.Runtime)
+	info, err := runtime.Info()
+	if err != nil {
+		utils.InternalServerError(w, err)
+		return
+	}
+	utils.WriteResponse(w, http.StatusOK, info)
+}
diff --git a/pkg/api/handlers/libpod/swagger.go b/pkg/api/handlers/libpod/swagger.go
index 1fad2dd1a..5dbc33098 100644
--- a/pkg/api/handlers/libpod/swagger.go
+++ b/pkg/api/handlers/libpod/swagger.go
@@ -5,6 +5,7 @@ import (
 	"os"
 
 	"github.com/containers/image/v5/manifest"
+	"github.com/containers/libpod/libpod/define"
 	"github.com/containers/libpod/pkg/api/handlers/utils"
 	"github.com/containers/libpod/pkg/domain/entities"
 	"github.com/pkg/errors"
@@ -76,6 +77,13 @@ type swagRmPodResponse struct {
 	Body entities.PodRmReport
 }
 
+// Info
+// swagger:response InfoResponse
+type swagInfoResponse struct {
+	// in:body
+	Body define.Info
+}
+
 func ServeSwagger(w http.ResponseWriter, r *http.Request) {
 	path := DefaultPodmanSwaggerSpec
 	if p, found := os.LookupEnv("PODMAN_SWAGGER_SPEC"); found {
diff --git a/pkg/api/handlers/types.go b/pkg/api/handlers/types.go
index 496512f2e..f1c932ebc 100644
--- a/pkg/api/handlers/types.go
+++ b/pkg/api/handlers/types.go
@@ -353,7 +353,7 @@ func ImageDataToImageInspect(ctx context.Context, l *libpodImage.Image) (*ImageI
 
 }
 
-func LibpodToContainer(l *libpod.Container, infoData []define.InfoData, sz bool) (*Container, error) {
+func LibpodToContainer(l *libpod.Container, sz bool) (*Container, error) {
 	imageId, imageName := l.Image()
 
 	var (