fix: handle string-format query params and unblock dependabot updates

Author: aurimasbutkus

client/client.gen.go

@@ -7,6 +7,7 @@ import (
 	"github.com/hostinger/api-cli/cmd/agency_hosting/datacenters"
 	"github.com/hostinger/api-cli/cmd/agency_hosting/domains"
 	"github.com/hostinger/api-cli/cmd/agency_hosting/files"
+	"github.com/hostinger/api-cli/cmd/agency_hosting/orders"
 	"github.com/hostinger/api-cli/cmd/agency_hosting/website_setups"
 	"github.com/hostinger/api-cli/cmd/agency_hosting/websites"
 	"github.com/hostinger/api-cli/cmd/agency_hosting/wordpress"
@@ -26,6 +27,7 @@ func init() {
 	GroupCmd.AddCommand(datacenters.GroupCmd)
 	GroupCmd.AddCommand(domains.GroupCmd)
 	GroupCmd.AddCommand(files.GroupCmd)
+	GroupCmd.AddCommand(orders.GroupCmd)
 	GroupCmd.AddCommand(website_setups.GroupCmd)
 	GroupCmd.AddCommand(websites.GroupCmd)
 	GroupCmd.AddCommand(wordpress.GroupCmd)

cmd/agency_hosting/agency_hosting.go

@@ -0,0 +1,43 @@
+package orders
+
+import (
+	"context"
+	"log"
+
+	"github.com/hostinger/api-cli/api"
+	"github.com/hostinger/api-cli/client"
+	"github.com/hostinger/api-cli/output"
+	"github.com/spf13/cobra"
+)
+
+var ListPlanCmd = &cobra.Command{
+	Use:   "list-plan",
+	Short: "List Agency Plan orders",
+	Long:  "Returns a paginated list of Agency Plan orders accessible to the authenticated client.",
+	Run: func(cmd *cobra.Command, args []string) {
+		r, err := api.Request().AgencyHostingListAgencyPlanOrdersV1WithResponse(context.TODO(), listPlanParams(cmd))
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		output.Format(cmd, r.Body, r.StatusCode())
+	},
+}
+
+func init() {
+	ListPlanCmd.Flags().IntP("page", "", 0, "Page number")
+	ListPlanCmd.Flags().IntP("per-page", "", 25, "Number of items per page")
+}
+
+func listPlanParams(cmd *cobra.Command) *client.AgencyHostingListAgencyPlanOrdersV1Params {
+	params := &client.AgencyHostingListAgencyPlanOrdersV1Params{}
+	if cmd.Flags().Changed("page") {
+		v, _ := cmd.Flags().GetInt("page")
+		params.Page = &v
+	}
+	if cmd.Flags().Changed("per-page") {
+		v, _ := cmd.Flags().GetInt("per-page")
+		params.PerPage = &v
+	}
+	return params
+}

cmd/agency_hosting/orders/list_plan.go

@@ -0,0 +1,14 @@
+package orders
+
+import (
+	"github.com/spf13/cobra"
+)
+
+var GroupCmd = &cobra.Command{
+	Use:   "orders",
+	Short: "Orders commands",
+}
+
+func init() {
+	GroupCmd.AddCommand(ListPlanCmd)
+}

cmd/agency_hosting/orders/orders.go

@@ -16,7 +16,7 @@ var ListCmd = &cobra.Command{
 	Short: "Get catalog item list",
 	Long:  "Retrieve catalog items available for order.\n\nPrices in catalog items is displayed as cents (without floating point),\ne.g: float `17.99` is displayed as integer `1799`.\n\nUse this endpoint to view available services and pricing before placing orders.",
 	Run: func(cmd *cobra.Command, args []string) {
-		utils.EnumCheck(cmd, "category", []string{"DOMAIN", "VPS"})
+		utils.EnumCheck(cmd, "category", []string{"DOMAIN", "VPS", "EMAIL"})
 		r, err := api.Request().BillingGetCatalogItemListV1WithResponse(context.TODO(), listParams(cmd))
 		if err != nil {
 			log.Fatal(err)
@@ -27,7 +27,7 @@ var ListCmd = &cobra.Command{
 }
 
 func init() {
-	ListCmd.Flags().StringP("category", "", "", "Filter catalog items by category (one of: DOMAIN, VPS)")
+	ListCmd.Flags().StringP("category", "", "", "Filter catalog items by category (one of: DOMAIN, VPS, EMAIL)")
 	ListCmd.Flags().StringP("name", "", "", "Filter catalog items by name. Use `*` for wildcard search, e.g. `.COM*` to find .com domain")
 }
 

cmd/billing/catalog/list.go

@@ -13,15 +13,15 @@ import (
 
 var CreateRemoteConnectionCmd = &cobra.Command{
 	Use:   "create-remote-connection <username> <name>",
-	Short: "Create account database remote connection",
+	Short: "Create database remote connection",
 	Long:  "Allows a remote host to connect to the specified database.\n\nProvide an IPv4/IPv6 address, or \"%\" to allow any host. The database name must be\nthe full name returned by the list databases endpoint.",
 	Args:  cobra.MatchAll(cobra.ExactArgs(2)),
 	Run: func(cmd *cobra.Command, args []string) {
 		payload, err := json.Marshal(createRemoteConnectionBody(cmd))
 		if err != nil {
 			log.Fatal(err)
 		}
-		r, err := api.Request().HostingCreateAccountDatabaseRemoteConnectionV1WithBodyWithResponse(context.TODO(), args[0], args[1], "application/json", bytes.NewReader(payload))
+		r, err := api.Request().HostingCreateDatabaseRemoteConnectionV1WithBodyWithResponse(context.TODO(), args[0], args[1], "application/json", bytes.NewReader(payload))
 		if err != nil {
 			log.Fatal(err)
 		}

cmd/hosting/databases/create_remote_connection.go

@@ -12,11 +12,11 @@ import (
 
 var DeleteRemoteConnectionCmd = &cobra.Command{
 	Use:   "delete-remote-connection <username> <name>",
-	Short: "Delete account database remote connection",
+	Short: "Delete database remote connection",
 	Long:  "Permanently removes a remote-access rule, revoking the given host's remote access to the database.\n\nIdentify the rule with the required ip query parameter (the IPv4/IPv6 address, or \"%\",\nexactly as returned by the list remote connections endpoint). The database name must be\nthe full name returned by the list databases endpoint.",
 	Args:  cobra.MatchAll(cobra.ExactArgs(2)),
 	Run: func(cmd *cobra.Command, args []string) {
-		r, err := api.Request().HostingDeleteAccountDatabaseRemoteConnectionV1WithResponse(context.TODO(), args[0], args[1], deleteRemoteConnectionParams(cmd))
+		r, err := api.Request().HostingDeleteDatabaseRemoteConnectionV1WithResponse(context.TODO(), args[0], args[1], deleteRemoteConnectionParams(cmd))
 		if err != nil {
 			log.Fatal(err)
 		}
@@ -30,8 +30,8 @@ func init() {
 	DeleteRemoteConnectionCmd.MarkFlagRequired("ip")
 }
 
-func deleteRemoteConnectionParams(cmd *cobra.Command) *client.HostingDeleteAccountDatabaseRemoteConnectionV1Params {
-	params := &client.HostingDeleteAccountDatabaseRemoteConnectionV1Params{}
+func deleteRemoteConnectionParams(cmd *cobra.Command) *client.HostingDeleteDatabaseRemoteConnectionV1Params {
+	params := &client.HostingDeleteDatabaseRemoteConnectionV1Params{}
 	ipVal, _ := cmd.Flags().GetString("ip")
 	params.Ip = ipVal
 	return params

cmd/hosting/databases/delete_remote_connection.go

@@ -12,11 +12,11 @@ import (
 
 var ListRemoteConnectionsCmd = &cobra.Command{
 	Use:   "list-remote-connections <username>",
-	Short: "List account database remote connections",
+	Short: "List database remote connections",
 	Long:  "Returns the remote-access rules for the specified account: the remote hosts\n(IPv4/IPv6 addresses, or \"%\" for any host) allowed to connect to the account databases.\n\nUse the domain filter to only return rules for databases assigned to a specific domain.",
 	Args:  cobra.MatchAll(cobra.ExactArgs(1)),
 	Run: func(cmd *cobra.Command, args []string) {
-		r, err := api.Request().HostingListAccountDatabaseRemoteConnectionsV1WithResponse(context.TODO(), args[0], listRemoteConnectionsParams(cmd))
+		r, err := api.Request().HostingListDatabaseRemoteConnectionsV1WithResponse(context.TODO(), args[0], listRemoteConnectionsParams(cmd))
 		if err != nil {
 			log.Fatal(err)
 		}
@@ -29,8 +29,8 @@ func init() {
 	ListRemoteConnectionsCmd.Flags().StringP("domain", "", "", "Filter remote connections by the domain the database is assigned to.\nRules for databases not assigned to any domain are always included.")
 }
 
-func listRemoteConnectionsParams(cmd *cobra.Command) *client.HostingListAccountDatabaseRemoteConnectionsV1Params {
-	params := &client.HostingListAccountDatabaseRemoteConnectionsV1Params{}
+func listRemoteConnectionsParams(cmd *cobra.Command) *client.HostingListDatabaseRemoteConnectionsV1Params {
+	params := &client.HostingListDatabaseRemoteConnectionsV1Params{}
 	if cmd.Flags().Changed("domain") {
 		v, _ := cmd.Flags().GetString("domain")
 		params.Domain = &v

cmd/hosting/databases/list_remote_connections.go

@@ -0,0 +1,16 @@
+package aliases
+
+import (
+	"github.com/spf13/cobra"
+)
+
+var GroupCmd = &cobra.Command{
+	Use:   "aliases",
+	Short: "Aliases commands",
+}
+
+func init() {
+	GroupCmd.AddCommand(CreateAliasCmd)
+	GroupCmd.AddCommand(DeleteAliasCmd)
+	GroupCmd.AddCommand(ListCmd)
+}

cmd/mail/aliases/aliases.go

@@ -0,0 +1,43 @@
+package aliases
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"log"
+
+	"github.com/hostinger/api-cli/api"
+	"github.com/hostinger/api-cli/output"
+	"github.com/spf13/cobra"
+)
+
+var CreateAliasCmd = &cobra.Command{
+	Use:   "create-alias <mailbox-id>",
+	Short: "Create alias",
+	Long:  "Create an alias for the given mailbox. The alias address is formed\nfrom the given local part and the domain of the mailbox. Messages\nsent to the alias are delivered to the mailbox.",
+	Args:  cobra.MatchAll(cobra.ExactArgs(1)),
+	Run: func(cmd *cobra.Command, args []string) {
+		payload, err := json.Marshal(createAliasBody(cmd))
+		if err != nil {
+			log.Fatal(err)
+		}
+		r, err := api.Request().MailCreateAliasV1WithBodyWithResponse(context.TODO(), args[0], "application/json", bytes.NewReader(payload))
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		output.Format(cmd, r.Body, r.StatusCode())
+	},
+}
+
+func init() {
+	CreateAliasCmd.Flags().StringP("local-part", "", "", "Local part of the alias address (the part before the @). The domain is taken from the mailbox. Case-insensitive and stored lowercase; must start and end with a letter or digit; single dots, underscores and hyphens are allowed in between.")
+	CreateAliasCmd.MarkFlagRequired("local-part")
+}
+
+func createAliasBody(cmd *cobra.Command) map[string]any {
+	body := map[string]any{}
+	localPartVal, _ := cmd.Flags().GetString("local-part")
+	body["local_part"] = localPartVal
+	return body
+}