Refactor types to leverage generics in Go

api/auth/auth.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/alpacanetworks/alpacon-cli/api"
 	"github.com/alpacanetworks/alpacon-cli/client"
 	"github.com/alpacanetworks/alpacon-cli/config"
 	"github.com/alpacanetworks/alpacon-cli/utils"
@@ -116,7 +117,7 @@ func GetAPITokenList(ac *client.AlpaconClient) ([]APITokenAttributes, error) {
 			return nil, err
 		}
 
-		var response APITokenListResponse
+		var response api.ListResponse[APITokenResponse]
 		if err = json.Unmarshal(responseBody, &response); err != nil {
 			return nil, err
 		}
@@ -148,7 +149,7 @@ func getAPITokenIDByName(ac *client.AlpaconClient, tokenName string) (string, er
 		return "", err
 	}
 
-	var response APITokenListResponse
+	var response api.ListResponse[APITokenResponse]
 	err = json.Unmarshal(body, &response)
 	if err != nil {
 		return "", err

api/auth/types.go

@@ -18,15 +18,6 @@ type APITokenRequest struct {
 	ExpiresAt *string `json:"expires_at"`
 }
 
-type APITokenListResponse struct {
-	Count    int                `json:"count"`
-	Current  int                `json:"current"`
-	Next     int                `json:"next"`
-	Previous string             `json:"previous"`
-	Last     int                `json:"last"`
-	Results  []APITokenResponse `json:"results"`
-}
-
 type APITokenResponse struct {
 	ID        string    `json:"id"`
 	Name      string    `json:"name"`

api/cert/cert.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
+	"github.com/alpacanetworks/alpacon-cli/api"
 	"github.com/alpacanetworks/alpacon-cli/client"
 	"github.com/alpacanetworks/alpacon-cli/utils"
 	"path"
@@ -77,7 +78,7 @@ func GetCSRList(ac *client.AlpaconClient, state string) ([]CSRAttributes, error)
 			return nil, err
 		}
 
-		var response CSRListResponse
+		var response api.ListResponse[CSRResponse]
 		if err = json.Unmarshal(responseBody, &response); err != nil {
 			return nil, err
 		}
@@ -121,7 +122,7 @@ func GetAuthorityList(ac *client.AlpaconClient) ([]AuthorityAttributes, error) {
 			return nil, err
 		}
 
-		var response AuthorityListResponse
+		var response api.ListResponse[AuthorityResponse]
 		if err = json.Unmarshal(responseBody, &response); err != nil {
 			return nil, err
 		}
@@ -221,7 +222,7 @@ func GetCertificateList(ac *client.AlpaconClient) ([]CertificateAttributes, erro
 			return nil, err
 		}
 
-		var response CertificateListResponse
+		var response api.ListResponse[Certificate]
 		if err = json.Unmarshal(responseBody, &response); err != nil {
 			return nil, err
 		}

api/cert/types.go

@@ -49,15 +49,6 @@ type AuthorityCreateResponse struct {
 	UpdatedAt        time.Time `json:"updated_at"`
 }
 
-type AuthorityListResponse struct {
-	Count    int                 `json:"count"`
-	Current  int                 `json:"current"`
-	Next     int                 `json:"next"`
-	Previous string              `json:"previous"`
-	Last     int                 `json:"last"`
-	Results  []AuthorityResponse `json:"results"`
-}
-
 type AuthorityResponse struct {
 	Id               string    `json:"id"`
 	Name             string    `json:"name"`
@@ -92,15 +83,6 @@ type CSRSubmit struct {
 	CsrText string `json:"csr_text"`
 }
 
-type CSRListResponse struct {
-	Count    int           `json:"count"`
-	Current  int           `json:"current"`
-	Next     int           `json:"next"`
-	Previous string        `json:"previous"`
-	Last     int           `json:"last"`
-	Results  []CSRResponse `json:"results"`
-}
-
 type CSRResponse struct {
 	Id              string    `json:"id"`
 	Authority       string    `json:"authority"`
@@ -128,15 +110,6 @@ type CSRAttributes struct {
 	RequestedDate string   `json:"requested_date"`
 }
 
-type CertificateListResponse struct {
-	Count    int           `json:"count"`
-	Current  int           `json:"current"`
-	Next     int           `json:"next"`
-	Previous string        `json:"previous"`
-	Last     int           `json:"last"`
-	Results  []Certificate `json:"results"`
-}
-
 type Certificate struct {
 	Id        string    `json:"id"`
 	Authority string    `json:"authority"`

api/event/event.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/alpacanetworks/alpacon-cli/api"
 	"github.com/alpacanetworks/alpacon-cli/api/iam"
 	"github.com/alpacanetworks/alpacon-cli/api/server"
 	"github.com/alpacanetworks/alpacon-cli/client"
@@ -41,7 +42,7 @@ func GetEventList(ac *client.AlpaconClient, pageSize int, serverName string, use
 		return nil, err
 	}
 
-	var response EventListResponse
+	var response api.ListResponse[EventDetails]
 	if err = json.Unmarshal(responseBody, &response); err != nil {
 		return nil, err
 	}

api/event/types.go

@@ -12,15 +12,6 @@ type EventAttributes struct {
 	RequestedAt string `json:"requested_at"`
 }
 
-type EventListResponse struct {
-	Count    int            `json:"count"`
-	Current  int            `json:"current"`
-	Next     int            `json:"next"`
-	Previous int            `json:"previous"`
-	Last     int            `json:"last"`
-	Results  []EventDetails `json:"results"`
-}
-
 type EventDetails struct {
 	ID              string                 `json:"id"`
 	Shell           string                 `json:"shell"`

api/iam/iam.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/alpacanetworks/alpacon-cli/api"
 	"github.com/alpacanetworks/alpacon-cli/client"
 	"github.com/alpacanetworks/alpacon-cli/utils"
 	"strconv"
@@ -30,7 +31,7 @@ func GetUserList(ac *client.AlpaconClient) ([]UserAttributes, error) {
 			return nil, err
 		}
 
-		var response UserListResponse
+		var response api.ListResponse[UserResponse]
 		if err = json.Unmarshal(responseBody, &response); err != nil {
 			return nil, err
 		}
@@ -71,7 +72,7 @@ func GetGroupList(ac *client.AlpaconClient) ([]GroupAttributes, error) {
 			return nil, err
 		}
 
-		var response GroupListResponse
+		var response api.ListResponse[GroupResponse]
 		if err = json.Unmarshal(responseBody, &response); err != nil {
 			return nil, err
 		}
@@ -298,7 +299,7 @@ func GetUserIDByName(ac *client.AlpaconClient, userName string) (string, error)
 		return "", err
 	}
 
-	var response UserListResponse
+	var response api.ListResponse[UserResponse]
 	err = json.Unmarshal(responseBody, &response)
 	if err != nil {
 		return "", err
@@ -335,7 +336,7 @@ func GetGroupIDByName(ac *client.AlpaconClient, groupName string) (string, error
 		return "", err
 	}
 
-	var response GroupListResponse
+	var response api.ListResponse[GroupResponse]
 	err = json.Unmarshal(responseBody, &response)
 	if err != nil {
 		return "", err

api/iam/types.go

@@ -29,15 +29,6 @@ type UserDetailAttributes struct {
 	LDAPStatus    string   `json:"ldap_status"`
 }
 
-type UserListResponse struct {
-	Count    int            `json:"count"`
-	Current  int            `json:"current"`
-	Next     int            `json:"next"`
-	Previous string         `json:"previous"`
-	Last     int            `json:"last"`
-	Results  []UserResponse `json:"results"`
-}
-
 type UserResponse struct {
 	ID          string    `json:"id"`
 	Username    string    `json:"username"`
@@ -118,15 +109,6 @@ type GroupDetailAttributes struct {
 	ServersNames []string `json:"servers_names"`
 }
 
-type GroupListResponse struct {
-	Count    int             `json:"count"`
-	Current  int             `json:"current"`
-	Next     int             `json:"next"`
-	Previous string          `json:"previous"`
-	Last     int             `json:"last"`
-	Results  []GroupResponse `json:"results"`
-}
-
 type GroupResponse struct {
 	ID           string   `json:"id"`
 	Name         string   `json:"name"`

api/log/log.go

@@ -3,6 +3,7 @@ package log
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/alpacanetworks/alpacon-cli/api"
 	"github.com/alpacanetworks/alpacon-cli/api/server"
 	"github.com/alpacanetworks/alpacon-cli/client"
 	"github.com/alpacanetworks/alpacon-cli/utils"
@@ -27,7 +28,7 @@ func GetSystemLogList(ac *client.AlpaconClient, serverName string, pageSize int)
 		return nil, err
 	}
 
-	var response LogListResponse
+	var response api.ListResponse[LogEntry]
 	if err = json.Unmarshal(responseBody, &response); err != nil {
 		return nil, err
 	}

api/log/types.go

@@ -26,12 +26,3 @@ type LogEntry struct {
 	Server     string    `json:"server"`
 	ServerName string    `json:"server_name"`
 }
-
-type LogListResponse struct {
-	Count    int        `json:"count"`
-	Current  int        `json:"current"`
-	Next     int        `json:"next"`
-	Previous string     `json:"previous"`
-	Last     int        `json:"last"`
-	Results  []LogEntry `json:"results"`
-}

api/note/note.go

@@ -3,6 +3,7 @@ package note
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/alpacanetworks/alpacon-cli/api"
 	"github.com/alpacanetworks/alpacon-cli/api/iam"
 	"github.com/alpacanetworks/alpacon-cli/api/server"
 	"github.com/alpacanetworks/alpacon-cli/client"
@@ -34,7 +35,7 @@ func GetNoteList(ac *client.AlpaconClient, serverName string, pageSize int) ([]N
 		return nil, err
 	}
 
-	var response NoteListResponse
+	var response api.ListResponse[NoteDetails]
 	if err = json.Unmarshal(responseBody, &response); err != nil {
 		return nil, err
 	}

api/note/types.go

@@ -1,14 +1,5 @@
 package note
 
-type NoteListResponse struct {
-	Count    int           `json:"count"`
-	Current  int           `json:"current"`
-	Next     int           `json:"next"`
-	Previous string        `json:"previous"`
-	Last     int           `json:"last"`
-	Results  []NoteDetails `json:"results"`
-}
-
 type NoteDetails struct {
 	ID      string `json:"id"`
 	Server  string `json:"server"`

api/packages/packages.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/alpacanetworks/alpacon-cli/api"
 	"github.com/alpacanetworks/alpacon-cli/client"
 	"github.com/alpacanetworks/alpacon-cli/utils"
 	"io"
@@ -33,7 +34,7 @@ func GetSystemPackageEntry(ac *client.AlpaconClient) ([]SystemPackage, error) {
 			return nil, err
 		}
 
-		var response SystemPackageListResponse
+		var response api.ListResponse[SystemPackageDetail]
 		if err = json.Unmarshal(responseBody, &response); err != nil {
 			return nil, err
 		}
@@ -71,7 +72,7 @@ func GetPythonPackageEntry(ac *client.AlpaconClient) ([]PythonPackage, error) {
 			return nil, err
 		}
 
-		var response PythonPackageListResponse
+		var response api.ListResponse[PythonPackageDetail]
 		if err = json.Unmarshal(responseBody, &response); err != nil {
 			return nil, err
 		}
@@ -97,32 +98,43 @@ func GetPythonPackageEntry(ac *client.AlpaconClient) ([]PythonPackage, error) {
 
 func GetPackageIDByName(ac *client.AlpaconClient, fileName string, packageType string) (string, error) {
 	var url string
+	params := map[string]string{
+		"name": fileName,
+	}
 
 	if packageType == "python" {
 		url = pythonPackageEntryURL
+		var response api.ListResponse[PythonPackageDetail]
+		body, err := ac.SendGetRequest(utils.BuildURL(url, "", params))
+		if err != nil {
+			return "", err
+		}
+		err = json.Unmarshal(body, &response)
+		if err != nil {
+			return "", err
+		}
+
+		if response.Count == 0 {
+			return "", errors.New("no server found with the given name")
+		}
+		return response.Results[0].ID, nil
 	} else {
 		url = systemPackageEntryURL
-	}
-
-	params := map[string]string{
-		"name": fileName,
-	}
-	body, err := ac.SendGetRequest(utils.BuildURL(url, "", params))
-	if err != nil {
-		return "", err
-	}
-
-	var response PythonPackageListResponse
-	err = json.Unmarshal(body, &response)
-	if err != nil {
-		return "", err
-	}
+		var response api.ListResponse[SystemPackageDetail]
+		body, err := ac.SendGetRequest(utils.BuildURL(url, "", params))
+		if err != nil {
+			return "", err
+		}
+		err = json.Unmarshal(body, &response)
+		if err != nil {
+			return "", err
+		}
 
-	if response.Count == 0 {
-		return "", errors.New("no server found with the given name")
+		if response.Count == 0 {
+			return "", errors.New("no server found with the given name")
+		}
+		return response.Results[0].ID, nil
 	}
-
-	return response.Results[0].ID, nil
 }
 
 func UploadPackage(ac *client.AlpaconClient, file string, packageType string) error {