Shrink VersionResponse

Signed-off-by: Weiqiang TANG <[email protected]>

pkg/antctl/definitions.go

@@ -27,19 +27,26 @@ import (
 	"github.com/vmware-tanzu/antrea/pkg/version"
 )
 
+type VersionResponse struct {
+	handlers.ComponentVersionResponse
+	AntctlVersion string `json:"antctlVersion,omitempty" yaml:"antctlVersion,omitempty"`
+}
+
 func versionTransform(reader io.Reader, single bool) (interface{}, error) {
 	b, err := ioutil.ReadAll(reader)
 	klog.Infof("version transform received: %s", string(b))
 	if err != nil {
 		return nil, err
 	}
-	var v handlers.VersionResponse
-	err = json.Unmarshal(b, &v)
+	var cv handlers.ComponentVersionResponse
+	err = json.Unmarshal(b, &cv)
 	if err != nil {
 		return nil, err
 	}
-	v.AntctlVersion = version.GetFullVersion()
-	return &v, nil
+	return &VersionResponse{
+		ComponentVersionResponse: cv,
+		AntctlVersion:            version.GetFullVersion(),
+	}, nil
 }
 
 // Definition defines command related options of the antctl.
@@ -50,7 +57,7 @@ var Definition = &CommandBundle{
 			Short:          "Print version information",
 			Long:           "Print version information of the client and the ${component}",
 			HandlerFactory: new(handlers.Version),
-			ResponseStruct: new(handlers.VersionResponse),
+			ResponseStruct: new(VersionResponse),
 			Agent:          true,
 			Controller:     true,
 			Singleton:      true,

pkg/antctl/handlers/version.go

@@ -23,25 +23,24 @@ import (
 
 var _ Factory = new(Version)
 
-// VersionResponse describes the response of the version command.
-type VersionResponse struct {
+// ComponentVersionResponse describes the response of the version command.
+type ComponentVersionResponse struct {
 	AgentVersion      string `json:"agentVersion,omitempty" yaml:"agentVersion,omitempty"`
 	ControllerVersion string `json:"controllerVersion,omitempty" yaml:"controllerVersion,omitempty"`
-	AntctlVersion     string `json:"antctlVersion,omitempty" yaml:"antctlVersion,omitempty"`
 }
 
 // Version is the implementation of Factory for `version` command.
 type Version struct{}
 
-// Handler returns the function which can handle version query, the handler function writes the VersionResponse in JSON format.
+// Handler returns the function which can handle version query, the handler function writes the ComponentVersionResponse
+// in JSON format.
 func (v *Version) Handler(agentQuerier monitor.AgentQuerier, controllerQuerier monitor.ControllerQuerier) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		var m VersionResponse
+		var m ComponentVersionResponse
 
 		if agentQuerier != nil {
 			m.AgentVersion = agentQuerier.GetVersion()
-		}
-		if controllerQuerier != nil {
+		} else if controllerQuerier != nil {
 			m.ControllerVersion = controllerQuerier.GetVersion()
 		}