Skip to content

Commit 01ead4d

Browse files
authored
Merge pull request #6 from yoanbernabeu/v0.1.4
v0.1.4
2 parents 2f1ec68 + 2be61a7 commit 01ead4d

33 files changed

+210
-27
lines changed

cmd/configure.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ var configure = &cobra.Command{
2121
Use: "configure",
2222
Short: "Configure your CLI",
2323
Long: "Configure your CLI",
24-
Example: `jelastic configure --token=your_token --url=your_url`,
24+
Example: `GoJelastic configure --token=token --url=url`,
2525
GroupID: "configure",
2626
Run: func(cmd *cobra.Command, args []string) {
2727
writeConfig(cmd.Flags().Lookup("url").Value.String(), cmd.Flags().Lookup("token").Value.String())
@@ -32,7 +32,7 @@ var documentation = &cobra.Command{
3232
Use: "documentation",
3333
Short: "Generate documentation",
3434
Long: "Generate documentation",
35-
Example: `jelastic documentation`,
35+
Example: `GoJelastic documentation`,
3636
Run: func(cmd *cobra.Command, args []string) {
3737
err := doc.GenMarkdownTree(rootCmd, "./docs/documentation")
3838
if err != nil {

cmd/jelastic_billing_account.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ var getAccountCmd = &cobra.Command{
2727
Short: "Gets account by session",
2828
Long: "Gets account by session",
2929
GroupID: "Billing/Account",
30+
Example: "GoJelastic billing/account getAccount --token=token --url=url --appid=appid",
3031
Run: func(cmd *cobra.Command, args []string) {
3132
token, _ := cmd.Flags().GetString("token")
3233
url, _ := cmd.Flags().GetString("url")
@@ -44,6 +45,7 @@ var getExtendedAccountBillingHistoryByPeriodCmd = &cobra.Command{
4445
Short: "Gets extended account billing history by period",
4546
Long: "Gets extended account billing history by period",
4647
GroupID: "Billing/Account",
48+
Example: "GoJelastic billing/account getExtendedAccountBillingHistoryByPeriod --token=token --url=url --appid=appid --startTime=startTime --endTime=endTime",
4749
Run: func(cmd *cobra.Command, args []string) {
4850
token, _ := cmd.Flags().GetString("token")
4951
url, _ := cmd.Flags().GetString("url")

cmd/jelastic_environment_control.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ var getEnvsCmd = &cobra.Command{
4747
Short: "Gets the information about all environments of a user",
4848
Long: "Gets the information about all environments of a user",
4949
GroupID: "Environment/Control",
50+
Example: `GoJelastic getEnvs --token=token --url=url`,
5051
Run: func(cmd *cobra.Command, args []string) {
5152
token, _ := cmd.Flags().GetString("token")
5253
url, _ := cmd.Flags().GetString("url")
@@ -63,6 +64,7 @@ var getEnvCmd = &cobra.Command{
6364
Short: "Gets the full information about environment",
6465
Long: "Gets the full information about environment (list of the nodes, settings etc.).",
6566
GroupID: "Environment/Control",
67+
Example: `GoJelastic getEnv --token=token --url=url --appid=appid`,
6668
Run: func(cmd *cobra.Command, args []string) {
6769
token, _ := cmd.Flags().GetString("token")
6870
url, _ := cmd.Flags().GetString("url")
@@ -80,6 +82,7 @@ var startEnvCmd = &cobra.Command{
8082
Short: "Start one environment",
8183
Long: "Start one environment",
8284
GroupID: "Environment/Control",
85+
Example: `GoJelastic startEnv --token=token --url=url --appid=appid`,
8386
Run: func(cmd *cobra.Command, args []string) {
8487
token, _ := cmd.Flags().GetString("token")
8588
url, _ := cmd.Flags().GetString("url")
@@ -97,6 +100,7 @@ var stopEnvCmd = &cobra.Command{
97100
Short: "Stop one environment",
98101
Long: "Stop one environment",
99102
GroupID: "Environment/Control",
103+
Example: `GoJelastic stopEnv --token=token --url=url --appid=appid`,
100104
Run: func(cmd *cobra.Command, args []string) {
101105
token, _ := cmd.Flags().GetString("token")
102106
url, _ := cmd.Flags().GetString("url")
@@ -114,6 +118,7 @@ var redeployContainerByIdCmd = &cobra.Command{
114118
Short: "Redeploy a container by id",
115119
Long: "Redeploy a container by id and specify Tag",
116120
GroupID: "Environment/Control",
121+
Example: `GoJelastic redeployContainerById --token=token --url=url --nodeid=nodeid --tag=tag --appid=appid`,
117122
Run: func(cmd *cobra.Command, args []string) {
118123
token, _ := cmd.Flags().GetString("token")
119124
url, _ := cmd.Flags().GetString("url")
@@ -133,6 +138,7 @@ var getRegionsCmd = &cobra.Command{
133138
Short: "Gets available regions for the user",
134139
Long: "Gets available regions for the user",
135140
GroupID: "Environment/Control",
141+
Example: `GoJelastic getRegions --token=token --url=url --appid=appid`,
136142
Run: func(cmd *cobra.Command, args []string) {
137143
token, _ := cmd.Flags().GetString("token")
138144
url, _ := cmd.Flags().GetString("url")
@@ -150,6 +156,7 @@ var getContainerEnvVarsCmd = &cobra.Command{
150156
Short: "Gets env vars of container",
151157
Long: "Gets env vars of container",
152158
GroupID: "Environment/Control",
159+
Example: `GoJelastic getContainerEnvVars --token=token --url=url --appid=appid --nodeid=nodeid`,
153160
Run: func(cmd *cobra.Command, args []string) {
154161
token, _ := cmd.Flags().GetString("token")
155162
url, _ := cmd.Flags().GetString("url")

cmd/jelastic_environment_export.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ var getListCmd = &cobra.Command{
2020
Short: "Get list of an environment",
2121
Long: "Get list of an environment",
2222
GroupID: "Environment/Export",
23+
Example: `GoJelastic getList --token=token --url=url --appid=appid`,
2324
Run: func(cmd *cobra.Command, args []string) {
2425
token, _ := cmd.Flags().GetString("token")
2526
url, _ := cmd.Flags().GetString("url")

cmd/jelastic_environment_group.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ var getGroupsCmd = &cobra.Command{
1919
Short: "Get group list",
2020
Long: "Get group list",
2121
GroupID: "Environment/Group",
22+
Example: `GoJelastic getGroups --token=token --url=url --appid=appid`,
2223
Run: func(cmd *cobra.Command, args []string) {
2324
token, _ := cmd.Flags().GetString("token")
2425
url, _ := cmd.Flags().GetString("url")

cmd/jelastic_environment_node_group.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ var getNodeGroupsCmd = &cobra.Command{
2323
Short: "Gets node group's data.",
2424
Long: "Gets node group's data.",
2525
GroupID: "Environment/NodeGroup",
26+
Example: `GoJelastic getNodeGroups --token=token --url=url --appid=appid --nodeid=nodeid`,
2627
Run: func(cmd *cobra.Command, args []string) {
2728
token, _ := cmd.Flags().GetString("token")
2829
url, _ := cmd.Flags().GetString("url")

cmd/jelastic_environment_security.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ var getRulesCmd = &cobra.Command{
1919
Short: "Provides information about firewall rules for the environment",
2020
Long: "Provides information about firewall rules for the environment",
2121
GroupID: "Environment/Security",
22+
Example: `GoJelastic getRules --token=token --url=url --appid=appid`,
2223
Run: func(cmd *cobra.Command, args []string) {
2324
token, _ := cmd.Flags().GetString("token")
2425
url, _ := cmd.Flags().GetString("url")

cmd/jelastic_marketplace_jps.go

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
package cmd
2+
3+
import (
4+
"fmt"
5+
6+
"github.com/spf13/cobra"
7+
)
8+
9+
func init() {
10+
rootCmd.AddCommand(installCmd)
11+
installCmd.Flags().String("jps", "", "A JPS manifest is required")
12+
installCmd.Flags().String("envName", "", "An environment name is required")
13+
installCmd.Flags().String("envGroups", "", "An environment groups is optional")
14+
installCmd.MarkFlagRequired("jps")
15+
installCmd.MarkFlagRequired("envName")
16+
17+
rootCmd.AddGroup(&cobra.Group{ID: "Marketplace/JPS", Title: "Marketplace/JPS"})
18+
}
19+
20+
var installCmd = &cobra.Command{
21+
Use: "install",
22+
Short: "Installs a custom JPS manifest.",
23+
Long: "Installs a custom JPS manifest.",
24+
GroupID: "Marketplace/JPS",
25+
Example: `GoJelastic install --token=token --url=url --jps=jps --envName=envName --envGroups=envGroups`,
26+
Run: func(cmd *cobra.Command, args []string) {
27+
token, _ := cmd.Flags().GetString("token")
28+
url, _ := cmd.Flags().GetString("url")
29+
jps, _ := cmd.Flags().GetString("jps")
30+
envName, _ := cmd.Flags().GetString("envName")
31+
envGroups, _ := cmd.Flags().GetString("envGroups")
32+
33+
finalUrl := url + "/marketplace/jps/rest/install" + "?session=" + token + "&envName=" + envName + "&jps=" + jps + "&envGroups=" + envGroups
34+
35+
response := makeRequest(finalUrl, "POST", "")
36+
fmt.Println(response)
37+
},
38+
}

cmd/jelastic_users_account.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ var getUserInfoCmd = &cobra.Command{
2020
Short: "Gets information about the user.",
2121
Long: "Gets information about the user.",
2222
GroupID: "Users/Account",
23+
Example: `GoJelastic getUserInfo --token=token --url=url`,
2324
Run: func(cmd *cobra.Command, args []string) {
2425
token, _ := cmd.Flags().GetString("token")
2526
url, _ := cmd.Flags().GetString("url")
@@ -36,6 +37,7 @@ var recoverPasswordCmd = &cobra.Command{
3637
Short: "Sends an email with the link to reset the account password",
3738
Long: "Sends an email with the link to reset the account password",
3839
GroupID: "Users/Account",
40+
Example: `GoJelastic recoverPassword --url=url --email=email`,
3941
Run: func(cmd *cobra.Command, args []string) {
4042
url, _ := cmd.Flags().GetString("url")
4143
email, _ := cmd.Flags().GetString("email")

docs/documentation/GoJelastic.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,10 @@ An Alternative and not official CLI for Jelastic
3131
* [GoJelastic getRegions](GoJelastic_getRegions.md) - Gets available regions for the user
3232
* [GoJelastic getRules](GoJelastic_getRules.md) - Provides information about firewall rules for the environment
3333
* [GoJelastic getUserInfo](GoJelastic_getUserInfo.md) - Gets information about the user.
34+
* [GoJelastic install](GoJelastic_install.md) - Installs a custom JPS manifest.
3435
* [GoJelastic recoverPassword](GoJelastic_recoverPassword.md) - Sends an email with the link to reset the account password
3536
* [GoJelastic redeployContainerById](GoJelastic_redeployContainerById.md) - Redeploy a container by id
3637
* [GoJelastic startEnv](GoJelastic_startEnv.md) - Start one environment
3738
* [GoJelastic stopEnv](GoJelastic_stopEnv.md) - Stop one environment
3839

39-
###### Auto generated by spf13/cobra on 30-Dec-2022
40+
###### Auto generated by spf13/cobra on 16-Jan-2023

0 commit comments

Comments
 (0)