2 files changed, 8 insertions, 42 deletions
diff --git a/pkg/api/handlers/utils/handler.go b/pkg/api/handlers/utils/handler.go
index b3c674788..7625f9546 100644
--- a/pkg/api/handlers/utils/handler.go
+++ b/pkg/api/handlers/utils/handler.go
@@ -10,49 +10,14 @@ import (
 	"unsafe"
 
 	"github.com/blang/semver"
+	"github.com/containers/podman/v3/version"
 	"github.com/gorilla/mux"
 	jsoniter "github.com/json-iterator/go"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
 
-type (
-	// VersionTree determines which API endpoint tree for version
-	VersionTree int
-	// VersionLevel determines which API level, current or something from the past
-	VersionLevel int
-)
-
-const (
-	// LibpodTree supports Libpod endpoints
-	LibpodTree = VersionTree(iota)
-	// CompatTree supports Libpod endpoints
-	CompatTree
-
-	// CurrentAPIVersion announces what is the current API level
-	CurrentAPIVersion = VersionLevel(iota)
-	// MinimalAPIVersion announces what is the oldest API level supported
-	MinimalAPIVersion
-)
-
 var (
-	// See https://docs.docker.com/engine/api/v1.40/
-	// libpod compat handlers are expected to honor docker API versions
-
-	// APIVersion provides the current and minimal API versions for compat and libpod endpoint trees
-	// Note: GET|HEAD /_ping is never versioned and provides the API-Version and Libpod-API-Version headers to allow
-	//       clients to shop for the Version they wish to support
-	APIVersion = map[VersionTree]map[VersionLevel]semver.Version{
-		LibpodTree: {
-			CurrentAPIVersion: semver.MustParse("3.0.0"),
-			MinimalAPIVersion: semver.MustParse("3.0.0"),
-		},
-		CompatTree: {
-			CurrentAPIVersion: semver.MustParse("1.40.0"),
-			MinimalAPIVersion: semver.MustParse("1.24.0"),
-		},
-	}
-
 	// ErrVersionNotGiven returned when version not given by client
 	ErrVersionNotGiven = errors.New("version not given in URL path")
 	// ErrVersionNotSupported returned when given version is too old
@@ -98,14 +63,14 @@ func SupportedVersion(r *http.Request, condition string) (semver.Version, error)
 // SupportedVersionWithDefaults validates that the version provided by client valid is supported by server
 // minimal API version <= client path version <= maximum API version focused on the endpoint tree from URL
 func SupportedVersionWithDefaults(r *http.Request) (semver.Version, error) {
-	tree := CompatTree
+	tree := version.Compat
 	if IsLibpodRequest(r) {
-		tree = LibpodTree
+		tree = version.Libpod
 	}
 
 	return SupportedVersion(r,
-		fmt.Sprintf(">=%s <=%s", APIVersion[tree][MinimalAPIVersion].String(),
-			APIVersion[tree][CurrentAPIVersion].String()))
+		fmt.Sprintf(">=%s <=%s", version.APIVersion[tree][version.MinimalAPI].String(),
+			version.APIVersion[tree][version.CurrentAPI].String()))
 }
 
 // WriteResponse encodes the given value as JSON or string and renders it for http client
diff --git a/pkg/api/handlers/utils/handler_test.go b/pkg/api/handlers/utils/handler_test.go
index d9fd22b80..18a1d2678 100644
--- a/pkg/api/handlers/utils/handler_test.go
+++ b/pkg/api/handlers/utils/handler_test.go
@@ -7,17 +7,18 @@ import (
 	"net/http/httptest"
 	"testing"
 
+	"github.com/containers/podman/v3/version"
 	"github.com/gorilla/mux"
 )
 
 func TestSupportedVersion(t *testing.T) {
 	req, err := http.NewRequest("GET",
-		fmt.Sprintf("/v%s/libpod/testing/versions", APIVersion[LibpodTree][CurrentAPIVersion]),
+		fmt.Sprintf("/v%s/libpod/testing/versions", version.APIVersion[version.Libpod][version.CurrentAPI]),
 		nil)
 	if err != nil {
 		t.Fatal(err)
 	}
-	req = mux.SetURLVars(req, map[string]string{"version": APIVersion[LibpodTree][CurrentAPIVersion].String()})
+	req = mux.SetURLVars(req, map[string]string{"version": version.APIVersion[version.Libpod][version.CurrentAPI].String()})
 
 	rr := httptest.NewRecorder()
 	handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {