Merge pull request #5 from yoanbernabeu/v0.1.3

V0.1.3 - New commands and installation simplification

Author: yoanbernabeu

README.md

@@ -4,7 +4,7 @@ An Alternative CLI for Jelastic in Go
 
 ## Why rewrite the CLI in Go?
 
-The official Jelastic command-line interface (CLI) is written in Java, which can make it heavy and inconvenient to use in continuous integration/continuous deployment (CI/CD) environments.
+The [official Jelastic command-line interface (CLI)](https://www.virtuozzo.com/application-platform-docs/cli/) is written in Java, which can make it heavy and inconvenient to use in continuous integration/continuous deployment (CI/CD) environments.
 
 Rewriting the CLI in Go will make it lighter and more portable, allowing it to be easily incorporated into CI/CD pipelines and used on a variety of systems without the need for additional dependencies.
 
@@ -16,13 +16,16 @@ This will make it easier for developers to manage and deploy applications on Jel
 
 #### From binary
 
-* Debian/Ubuntu
+* Linux/Darwin
 
 ```bash
-wget https://github.com/yoanbernabeu/GoJelastic/releases/download/v0.1.2/GoJelastic-0.1.2-linux-amd64.tar.gz
-tar -xvzf GoJelastic-0.1.2-linux-amd64.tar.gz
-sudo mv GoJelastic /usr/local/bin/
-sudo chmod +x /usr/local/bin/GoJelastic
+# With wget
+wget -qO- https://raw.githubusercontent.com/yoanbernabeu/GoJelastic/main/install.sh | bash
+```
+
+```bash
+# With curl
+curl -sL https://raw.githubusercontent.com/yoanbernabeu/GoJelastic/main/install.sh | bash
 ```
 
 * Other Operating Systems

cmd/jelastic_billing_account.go

@@ -13,12 +13,19 @@ func init() {
 
 	rootCmd.AddGroup(&cobra.Group{ID: "Billing/Account", Title: "Billing/Account"})
 
+	rootCmd.AddCommand(getExtendedAccountBillingHistoryByPeriodCmd)
+	getExtendedAccountBillingHistoryByPeriodCmd.Flags().String("appid", "", "An appid is required")
+	getExtendedAccountBillingHistoryByPeriodCmd.MarkFlagRequired("appid")
+	getExtendedAccountBillingHistoryByPeriodCmd.Flags().String("startTime", "", "A startTime is required")
+	getExtendedAccountBillingHistoryByPeriodCmd.MarkFlagRequired("startTime")
+	getExtendedAccountBillingHistoryByPeriodCmd.Flags().String("endTime", "", "A endTime is required")
+	getExtendedAccountBillingHistoryByPeriodCmd.MarkFlagRequired("endTime")
 }
 
 var getAccountCmd = &cobra.Command{
 	Use:     "getAccount",
-	Short:   "Gets account by session.",
-	Long:    "Gets account by session.",
+	Short:   "Gets account by session",
+	Long:    "Gets account by session",
 	GroupID: "Billing/Account",
 	Run: func(cmd *cobra.Command, args []string) {
 		token, _ := cmd.Flags().GetString("token")
@@ -31,3 +38,22 @@ var getAccountCmd = &cobra.Command{
 		fmt.Println(response)
 	},
 }
+
+var getExtendedAccountBillingHistoryByPeriodCmd = &cobra.Command{
+	Use:     "getExtendedAccountBillingHistoryByPeriod",
+	Short:   "Gets extended account billing history by period",
+	Long:    "Gets extended account billing history by period",
+	GroupID: "Billing/Account",
+	Run: func(cmd *cobra.Command, args []string) {
+		token, _ := cmd.Flags().GetString("token")
+		url, _ := cmd.Flags().GetString("url")
+		appid, _ := cmd.Flags().GetString("appid")
+		starttime, _ := cmd.Flags().GetString("startTime")
+		endtime, _ := cmd.Flags().GetString("endTime")
+
+		finalUrl := url + "/billing/account/rest/getextendedaccountbillinghistorybyperiod" + "?session=" + token + "&appid=" + appid + "&startTime=" + starttime + "&endtime=" + endtime
+
+		response := makeRequest(finalUrl, "GET", "")
+		fmt.Println(response)
+	},
+}

cmd/jelastic_environment_control.go

@@ -44,8 +44,8 @@ func init() {
 
 var getEnvsCmd = &cobra.Command{
 	Use:     "getEnvs",
-	Short:   "Gets the information about all environments of a user.",
-	Long:    "Gets the information about all environments of a user.",
+	Short:   "Gets the information about all environments of a user",
+	Long:    "Gets the information about all environments of a user",
 	GroupID: "Environment/Control",
 	Run: func(cmd *cobra.Command, args []string) {
 		token, _ := cmd.Flags().GetString("token")

cmd/jelastic_environment_security.go

@@ -0,0 +1,32 @@
+package cmd
+
+import (
+	"fmt"
+
+	"github.com/spf13/cobra"
+)
+
+func init() {
+	rootCmd.AddCommand(getRulesCmd)
+	getRulesCmd.Flags().String("appid", "", "An appid is required")
+	getRulesCmd.MarkFlagRequired("appid")
+
+	rootCmd.AddGroup(&cobra.Group{ID: "Environment/Security", Title: "Environment/Security"})
+}
+
+var getRulesCmd = &cobra.Command{
+	Use:     "getRules",
+	Short:   "Provides information about firewall rules for the environment",
+	Long:    "Provides information about firewall rules for the environment",
+	GroupID: "Environment/Security",
+	Run: func(cmd *cobra.Command, args []string) {
+		token, _ := cmd.Flags().GetString("token")
+		url, _ := cmd.Flags().GetString("url")
+		appid, _ := cmd.Flags().GetString("appid")
+
+		finalUrl := url + "/environment/security/rest/getrules" + "?session=" + token + "&envName=" + appid
+
+		response := makeRequest(finalUrl, "GET", "")
+		fmt.Println(response)
+	},
+}

cmd/jelastic_users_account.go

@@ -0,0 +1,48 @@
+package cmd
+
+import (
+	"fmt"
+
+	"github.com/spf13/cobra"
+)
+
+func init() {
+	rootCmd.AddCommand(getUserInfoCmd)
+	rootCmd.AddCommand(recoverPasswordCmd)
+	recoverPasswordCmd.Flags().String("email", "", "An email is required")
+	recoverPasswordCmd.MarkFlagRequired("email")
+
+	rootCmd.AddGroup(&cobra.Group{ID: "Users/Account", Title: "Users/Account"})
+}
+
+var getUserInfoCmd = &cobra.Command{
+	Use:     "getUserInfo",
+	Short:   "Gets information about the user.",
+	Long:    "Gets information about the user.",
+	GroupID: "Users/Account",
+	Run: func(cmd *cobra.Command, args []string) {
+		token, _ := cmd.Flags().GetString("token")
+		url, _ := cmd.Flags().GetString("url")
+
+		finalUrl := url + "/users/account/rest/getuserinfo" + "?session=" + token
+
+		response := makeRequest(finalUrl, "GET", "")
+		fmt.Println(response)
+	},
+}
+
+var recoverPasswordCmd = &cobra.Command{
+	Use:     "recoverPassword",
+	Short:   "Sends an email with the link to reset the account password",
+	Long:    "Sends an email with the link to reset the account password",
+	GroupID: "Users/Account",
+	Run: func(cmd *cobra.Command, args []string) {
+		url, _ := cmd.Flags().GetString("url")
+		email, _ := cmd.Flags().GetString("email")
+
+		finalUrl := url + "/users/account/rest/recoverpassword" + "?email=" + email
+
+		response := makeRequest(finalUrl, "GET", "")
+		fmt.Println(response)
+	},
+}

cmd/root.go

@@ -5,8 +5,8 @@ Copyright © 2022 Yoan BERNABEU <yoan.bernabeu@gmail.com>
 package cmd
 
 import (
+	"encoding/json"
 	"fmt"
-	"io"
 	"net/http"
 	"os"
 
@@ -81,31 +81,51 @@ func writeConfig(url string, token string) {
 	fmt.Println("Config file written or updated")
 }
 
-//makeRequest makes a request to the Jelastic API
-var makeRequest = func(url string, method string, body string) string {
-
+func makeHTTPRequest(url string, method string, body string) (*http.Response, error) {
 	httpClient := &http.Client{}
 	req, err := http.NewRequest(method, url, nil)
-
 	if err != nil {
-		panic(err)
+		return nil, err
 	}
 
 	resp, err := httpClient.Do(req)
-
 	if err != nil {
-		panic(err)
+		return nil, err
 	}
 
+	return resp, nil
+}
+
+func formatResponse(resp *http.Response) (string, error) {
 	defer resp.Body.Close()
 
-	bodyBytes, err := io.ReadAll(resp.Body)
+	var data interface{}
+	err := json.NewDecoder(resp.Body).Decode(&data)
+	if err != nil {
+		return "", err
+	}
+
+	jsonBytes, err := json.MarshalIndent(data, "", "    ")
+	if err != nil {
+		return "", err
+	}
 
+	return string(jsonBytes), nil
+}
+
+//makeRequest makes a request to the Jelastic API
+func makeRequest(url string, method string, body string) string {
+	resp, err := makeHTTPRequest(url, method, body)
 	if err != nil {
-		panic(err)
+		fmt.Println(err)
+		os.Exit(1)
 	}
 
-	bodyString := string(bodyBytes)
+	formattedResponse, err := formatResponse(resp)
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
 
-	return bodyString
+	return formattedResponse
 }

docs/documentation/GoJelastic.md

@@ -20,16 +20,20 @@ An Alternative and not official CLI for Jelastic
 * [GoJelastic completion](GoJelastic_completion.md)	 - Generate the autocompletion script for the specified shell
 * [GoJelastic configure](GoJelastic_configure.md)	 - Configure your CLI
 * [GoJelastic documentation](GoJelastic_documentation.md)	 - Generate documentation
-* [GoJelastic getAccount](GoJelastic_getAccount.md)	 - Gets account by session.
+* [GoJelastic getAccount](GoJelastic_getAccount.md)	 - Gets account by session
 * [GoJelastic getContainerEnvVars](GoJelastic_getContainerEnvVars.md)	 - Gets env vars of container
 * [GoJelastic getEnv](GoJelastic_getEnv.md)	 - Gets the full information about environment
-* [GoJelastic getEnvs](GoJelastic_getEnvs.md)	 - Gets the information about all environments of a user.
+* [GoJelastic getEnvs](GoJelastic_getEnvs.md)	 - Gets the information about all environments of a user
+* [GoJelastic getExtendedAccountBillingHistoryByPeriod](GoJelastic_getExtendedAccountBillingHistoryByPeriod.md)	 - Gets extended account billing history by period
 * [GoJelastic getGroups](GoJelastic_getGroups.md)	 - Get group list
 * [GoJelastic getList](GoJelastic_getList.md)	 - Get list of an environment
 * [GoJelastic getNodeGroups](GoJelastic_getNodeGroups.md)	 - Gets node group's data.
 * [GoJelastic getRegions](GoJelastic_getRegions.md)	 - Gets available regions for the user
+* [GoJelastic getRules](GoJelastic_getRules.md)	 - Provides information about firewall rules for the environment
+* [GoJelastic getUserInfo](GoJelastic_getUserInfo.md)	 - Gets information about the user.
+* [GoJelastic recoverPassword](GoJelastic_recoverPassword.md)	 - Sends an email with the link to reset the account password
 * [GoJelastic redeployContainerById](GoJelastic_redeployContainerById.md)	 - Redeploy a container by id
 * [GoJelastic startEnv](GoJelastic_startEnv.md)	 - Start one environment
 * [GoJelastic stopEnv](GoJelastic_stopEnv.md)	 - Stop one environment
 
-###### Auto generated by spf13/cobra on 24-Dec-2022
+###### Auto generated by spf13/cobra on 30-Dec-2022

docs/documentation/GoJelastic_completion.md

@@ -29,4 +29,4 @@ See each sub-command's help for details on how to use the generated script.
 * [GoJelastic completion powershell](GoJelastic_completion_powershell.md)	 - Generate the autocompletion script for powershell
 * [GoJelastic completion zsh](GoJelastic_completion_zsh.md)	 - Generate the autocompletion script for zsh
 
-###### Auto generated by spf13/cobra on 24-Dec-2022
+###### Auto generated by spf13/cobra on 30-Dec-2022

docs/documentation/GoJelastic_completion_bash.md

@@ -48,4 +48,4 @@ GoJelastic completion bash
 
 * [GoJelastic completion](GoJelastic_completion.md)	 - Generate the autocompletion script for the specified shell
 
-###### Auto generated by spf13/cobra on 24-Dec-2022
+###### Auto generated by spf13/cobra on 30-Dec-2022

docs/documentation/GoJelastic_completion_fish.md

@@ -39,4 +39,4 @@ GoJelastic completion fish [flags]
 
 * [GoJelastic completion](GoJelastic_completion.md)	 - Generate the autocompletion script for the specified shell
 
-###### Auto generated by spf13/cobra on 24-Dec-2022
+###### Auto generated by spf13/cobra on 30-Dec-2022