Moved all structs exposed by API into apiv1 package

[src/xds/xds-agent.git] / lib / agent / apiv1-version.go

diff --git a/lib/agent/apiv1-version.go b/lib/agent/apiv1-version.go
index 6b4923f..c75e7f5 100644 (file)
--- a/lib/agent/apiv1-version.go
+++ b/lib/agent/apiv1-version.go
@@ -4,25 +4,14 @@ import (
        "net/http"
 
        "github.com/gin-gonic/gin"
+       "github.com/iotbzh/xds-agent/lib/apiv1"
        common "github.com/iotbzh/xds-common/golib"
 )
 
-type version struct {
-       ID            string `json:"id"`
-       Version       string `json:"version"`
-       APIVersion    string `json:"apiVersion"`
-       VersionGitTag string `json:"gitTag"`
-}
-
-type apiVersion struct {
-       Client version   `json:"client"`
-       Server []version `json:"servers"`
-}
-
 // getInfo : return various information about server
 func (s *APIService) getVersion(c *gin.Context) {
-       response := apiVersion{
-               Client: version{
+       response := apiv1.XDSVersion{
+               Client: apiv1.VersionData{
                        ID:            "",
                        Version:       s.Config.Version,
                        APIVersion:    s.Config.APIVersion,
@@ -30,9 +19,9 @@ func (s *APIService) getVersion(c *gin.Context) {
                },
        }
 
-       svrVer := []version{}
+       svrVer := []apiv1.VersionData{}
        for _, svr := range s.xdsServers {
-               res := version{}
+               res := apiv1.VersionData{}
                if err := svr.GetVersion(&res); err != nil {
                        common.APIError(c, "Cannot retrieve version of XDS server ID %s : %v", svr.ID, err.Error())
                        return