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>

1 files changed, 17 insertions, 2 deletions

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
 }