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>

12 files changed, 236 insertions, 106 deletions

diff --git a/pkg/adapter/info_remote.go b/pkg/adapter/info_remote.go
index 0e8fb06d1..549b01f54 100644
--- a/pkg/adapter/info_remote.go
+++ b/pkg/adapter/info_remote.go
@@ -3,51 +3,62 @@
 package adapter
 
 import (
-	"encoding/json"
-
 	"github.com/containers/libpod/libpod/define"
 	iopodman "github.com/containers/libpod/pkg/varlink"
 )
 
 // Info returns information for the host system and its components
-func (r RemoteRuntime) Info() ([]define.InfoData, error) {
+func (r RemoteRuntime) Info() (*define.Info, error) {
 	// TODO the varlink implementation for info should be updated to match the output for regular info
 	var (
-		reply    []define.InfoData
-		regInfo  map[string]interface{}
-		hostInfo map[string]interface{}
-		store    map[string]interface{}
+		reply define.Info
 	)
 
 	info, err := iopodman.GetInfo().Call(r.Conn)
 	if err != nil {
 		return nil, err
 	}
-
-	// info.host -> map[string]interface{}
-	h, err := json.Marshal(info.Host)
-	if err != nil {
-		return nil, err
+	hostInfo := define.HostInfo{
+		Arch:           info.Host.Arch,
+		BuildahVersion: info.Host.Buildah_version,
+		CPUs:           int(info.Host.Cpus),
+		Distribution: define.DistributionInfo{
+			Distribution: info.Host.Distribution.Distribution,
+			Version:      info.Host.Distribution.Version,
+		},
+		EventLogger: info.Host.Eventlogger,
+		Hostname:    info.Host.Hostname,
+		Kernel:      info.Host.Kernel,
+		MemFree:     info.Host.Mem_free,
+		MemTotal:    info.Host.Mem_total,
+		OS:          info.Host.Os,
+		SwapFree:    info.Host.Swap_free,
+		SwapTotal:   info.Host.Swap_total,
+		Uptime:      info.Host.Uptime,
 	}
-	json.Unmarshal(h, &hostInfo)
-
-	// info.store -> map[string]interface{}
-	s, err := json.Marshal(info.Store)
-	if err != nil {
-		return nil, err
+	storeInfo := define.StoreInfo{
+		ContainerStore: define.ContainerStore{
+			Number: int(info.Store.Containers),
+		},
+		GraphDriverName: info.Store.Graph_driver_name,
+		GraphRoot:       info.Store.Graph_root,
+		ImageStore: define.ImageStore{
+			Number: int(info.Store.Images),
+		},
+		RunRoot: info.Store.Run_root,
 	}
-	json.Unmarshal(s, &store)
-
-	// info.Registries -> map[string]interface{}
-	reg, err := json.Marshal(info.Registries)
-	if err != nil {
-		return nil, err
+	reply.Host = &hostInfo
+	reply.Store = &storeInfo
+	regs := make(map[string]interface{})
+	if len(info.Registries.Search) > 0 {
+		regs["search"] = info.Registries.Search
 	}
-	json.Unmarshal(reg, &regInfo)
-
-	// Add everything to the reply
-	reply = append(reply, define.InfoData{Type: "host", Data: hostInfo})
-	reply = append(reply, define.InfoData{Type: "registries", Data: regInfo})
-	reply = append(reply, define.InfoData{Type: "store", Data: store})
-	return reply, nil
+	if len(info.Registries.Blocked) > 0 {
+		regs["blocked"] = info.Registries.Blocked
+	}
+	if len(info.Registries.Insecure) > 0 {
+		regs["insecure"] = info.Registries.Insecure
+	}
+	reply.Registries = regs
+	return &reply, nil
 }
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 (
diff --git a/pkg/api/server/register_info.go b/pkg/api/server/register_info.go
index b4ab8871c..75aaa957b 100644
--- a/pkg/api/server/register_info.go
+++ b/pkg/api/server/register_info.go
@@ -4,14 +4,15 @@ import (
 	"net/http"
 
 	"github.com/containers/libpod/pkg/api/handlers/compat"
+	"github.com/containers/libpod/pkg/api/handlers/libpod"
 	"github.com/gorilla/mux"
 )
 
 func (s *APIServer) registerInfoHandlers(r *mux.Router) error {
-	// swagger:operation GET /info libpod libpodGetInfo
+	// swagger:operation GET /info compat getInfo
 	// ---
 	// tags:
-	//  - system
+	//  - system (compat)
 	// summary: Get info
 	// description: Returns information on the system and libpod configuration
 	// produces:
@@ -24,5 +25,19 @@ func (s *APIServer) registerInfoHandlers(r *mux.Router) error {
 	r.Handle(VersionedPath("/info"), s.APIHandler(compat.GetInfo)).Methods(http.MethodGet)
 	// Added non version path to URI to support docker non versioned paths
 	r.Handle("/info", s.APIHandler(compat.GetInfo)).Methods(http.MethodGet)
+	// swagger:operation GET /libpod/info libpod libpodGetInfo
+	// ---
+	// tags:
+	//  - system
+	// summary: Get info
+	// description: Returns information on the system and libpod configuration
+	// produces:
+	// - application/json
+	// responses:
+	//   200:
+	//     $ref: "#/responses/InfoResponse"
+	//   500:
+	//     $ref: "#/responses/InternalError"
+	r.Handle(VersionedPath("/libpod/info"), s.APIHandler(libpod.GetInfo)).Methods(http.MethodGet)
 	return nil
 }
diff --git a/pkg/bindings/info.go b/pkg/bindings/info.go
deleted file mode 100644
index 5f318d652..000000000
--- a/pkg/bindings/info.go
+++ /dev/null
@@ -1,3 +0,0 @@
-package bindings
-
-func (c Connection) Info() {}
diff --git a/pkg/bindings/system/info.go b/pkg/bindings/system/info.go
new file mode 100644
index 000000000..f8269cfd8
--- /dev/null
+++ b/pkg/bindings/system/info.go
@@ -0,0 +1,23 @@
+package system
+
+import (
+	"context"
+	"net/http"
+
+	"github.com/containers/libpod/libpod/define"
+	"github.com/containers/libpod/pkg/bindings"
+)
+
+// Info returns information about the libpod environment and its stores
+func Info(ctx context.Context) (define.Info, error) {
+	info := define.Info{}
+	conn, err := bindings.GetClient(ctx)
+	if err != nil {
+		return info, err
+	}
+	response, err := conn.DoRequest(nil, http.MethodGet, "/info", nil)
+	if err != nil {
+		return info, err
+	}
+	return info, response.Process(&info)
+}
diff --git a/pkg/bindings/test/info_test.go b/pkg/bindings/test/info_test.go
new file mode 100644
index 000000000..d0e651134
--- /dev/null
+++ b/pkg/bindings/test/info_test.go
@@ -0,0 +1,73 @@
+package test_bindings
+
+import (
+	"runtime"
+	"time"
+
+	"github.com/containers/libpod/pkg/bindings/containers"
+	"github.com/containers/libpod/pkg/bindings/images"
+	"github.com/containers/libpod/pkg/bindings/system"
+	"github.com/containers/libpod/pkg/specgen"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+	"github.com/onsi/gomega/gexec"
+)
+
+var _ = Describe("Podman info", func() {
+	var (
+		bt *bindingTest
+		s  *gexec.Session
+		t  bool = true
+	)
+
+	BeforeEach(func() {
+		bt = newBindingTest()
+		bt.RestoreImagesFromCache()
+		s = bt.startAPIService()
+		time.Sleep(1 * time.Second)
+		err := bt.NewConnection()
+		Expect(err).To(BeNil())
+	})
+
+	AfterEach(func() {
+		s.Kill()
+		bt.cleanup()
+	})
+
+	It("podman info", func() {
+		info, err := system.Info(bt.conn)
+		Expect(err).To(BeNil())
+		Expect(info.Host.Arch).To(Equal(runtime.GOARCH))
+		Expect(info.Host.OS).To(Equal(runtime.GOOS))
+		i, err := images.List(bt.conn, &t, nil)
+		Expect(err).To(BeNil())
+		Expect(info.Store.ImageStore.Number).To(Equal(len(i)))
+	})
+
+	It("podman info container counts", func() {
+		s := specgen.NewSpecGenerator(alpine.name)
+		_, err := containers.CreateWithSpec(bt.conn, s)
+		Expect(err).To(BeNil())
+
+		idPause, err := bt.RunTopContainer(nil, nil, nil)
+		Expect(err).To(BeNil())
+		err = containers.Pause(bt.conn, idPause)
+		Expect(err).To(BeNil())
+
+		idStop, err := bt.RunTopContainer(nil, nil, nil)
+		Expect(err).To(BeNil())
+		err = containers.Stop(bt.conn, idStop, nil)
+		Expect(err).To(BeNil())
+
+		_, err = bt.RunTopContainer(nil, nil, nil)
+		Expect(err).To(BeNil())
+
+		info, err := system.Info(bt.conn)
+		Expect(err).To(BeNil())
+
+		Expect(info.Store.ContainerStore.Number).To(BeNumerically("==", 4))
+		Expect(info.Store.ContainerStore.Paused).To(Equal(1))
+		Expect(info.Store.ContainerStore.Stopped).To(Equal(2))
+		Expect(info.Store.ContainerStore.Running).To(Equal(1))
+	})
+})
diff --git a/pkg/varlinkapi/system.go b/pkg/varlinkapi/system.go
index 04fb9f648..7bee643c2 100644
--- a/pkg/varlinkapi/system.go
+++ b/pkg/varlinkapi/system.go
@@ -44,28 +44,26 @@ func (i *LibpodAPI) GetInfo(call iopodman.VarlinkCall) error {
 		return call.ReplyErrorOccurred(err.Error())
 	}
 
-	host := info[0].Data
 	distribution := iopodman.InfoDistribution{
-		Distribution: host["Distribution"].(map[string]interface{})["distribution"].(string),
-		Version:      host["Distribution"].(map[string]interface{})["version"].(string),
+		Distribution: info.Host.Distribution.Distribution,
+		Version:      info.Host.Distribution.Version,
 	}
 	infoHost := iopodman.InfoHost{
-		Buildah_version: host["BuildahVersion"].(string),
+		Buildah_version: info.Host.BuildahVersion,
 		Distribution:    distribution,
-		Mem_free:        host["MemFree"].(int64),
-		Mem_total:       host["MemTotal"].(int64),
-		Swap_free:       host["SwapFree"].(int64),
-		Swap_total:      host["SwapTotal"].(int64),
-		Arch:            host["arch"].(string),
-		Cpus:            int64(host["cpus"].(int)),
-		Hostname:        host["hostname"].(string),
-		Kernel:          host["kernel"].(string),
-		Os:              host["os"].(string),
-		Uptime:          host["uptime"].(string),
-		Eventlogger:     host["eventlogger"].(string),
+		Mem_free:        info.Host.MemFree,
+		Mem_total:       info.Host.MemTotal,
+		Swap_free:       info.Host.SwapFree,
+		Swap_total:      info.Host.SwapTotal,
+		Arch:            info.Host.Arch,
+		Cpus:            int64(info.Host.CPUs),
+		Hostname:        info.Host.Hostname,
+		Kernel:          info.Host.Kernel,
+		Os:              info.Host.OS,
+		Uptime:          info.Host.Uptime,
+		Eventlogger:     info.Host.EventLogger,
 	}
 	podmanInfo.Host = infoHost
-	store := info[1].Data
 	pmaninfo := iopodman.InfoPodmanBinary{
 		Compiler:       goruntime.Compiler,
 		Go_version:     goruntime.Version(),
@@ -74,36 +72,33 @@ func (i *LibpodAPI) GetInfo(call iopodman.VarlinkCall) error {
 	}
 
 	graphStatus := iopodman.InfoGraphStatus{
-		Backing_filesystem:  store["GraphStatus"].(map[string]string)["Backing Filesystem"],
-		Native_overlay_diff: store["GraphStatus"].(map[string]string)["Native Overlay Diff"],
-		Supports_d_type:     store["GraphStatus"].(map[string]string)["Supports d_type"],
+		Backing_filesystem:  info.Store.GraphStatus["Backing Filesystem"],
+		Native_overlay_diff: info.Store.GraphStatus["Native Overlay Diff"],
+		Supports_d_type:     info.Store.GraphStatus["Supports d_type"],
 	}
 	infoStore := iopodman.InfoStore{
-		Graph_driver_name:    store["GraphDriverName"].(string),
-		Containers:           int64(store["ContainerStore"].(map[string]interface{})["number"].(int)),
-		Images:               int64(store["ImageStore"].(map[string]interface{})["number"].(int)),
-		Run_root:             store["RunRoot"].(string),
-		Graph_root:           store["GraphRoot"].(string),
-		Graph_driver_options: fmt.Sprintf("%v", store["GraphOptions"]),
+		Graph_driver_name:    info.Store.GraphDriverName,
+		Containers:           int64(info.Store.ContainerStore.Number),
+		Images:               int64(info.Store.ImageStore.Number),
+		Run_root:             info.Store.RunRoot,
+		Graph_root:           info.Store.GraphRoot,
+		Graph_driver_options: fmt.Sprintf("%v", info.Store.GraphOptions),
 		Graph_status:         graphStatus,
 	}
 
 	// Registry information if any is stored as the second list item
-	if len(info) > 2 {
-		for key, val := range info[2].Data {
-			if key == "search" {
-				podmanInfo.Registries.Search = val.([]string)
-				continue
-			}
-			regData := val.(sysregistriesv2.Registry)
-			if regData.Insecure {
-				podmanInfo.Registries.Insecure = append(podmanInfo.Registries.Insecure, key)
-			}
-			if regData.Blocked {
-				podmanInfo.Registries.Blocked = append(podmanInfo.Registries.Blocked, key)
-			}
+	for key, val := range info.Registries {
+		if key == "search" {
+			podmanInfo.Registries.Search = val.([]string)
+			continue
+		}
+		regData := val.(sysregistriesv2.Registry)
+		if regData.Insecure {
+			podmanInfo.Registries.Insecure = append(podmanInfo.Registries.Insecure, key)
+		}
+		if regData.Blocked {
+			podmanInfo.Registries.Blocked = append(podmanInfo.Registries.Blocked, key)
 		}
-
 	}
 	podmanInfo.Store = infoStore
 	podmanInfo.Podman = pmaninfo