Skip to content

Commit c7e1113

Browse files
dwburkedwburke
committed
Merge branch 'dash-consistency' into plan-cloud-server-create
2 parents c8985f9 + 11a72b7 commit c7e1113

File tree

57 files changed

+263
-265
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+263
-265
lines changed

‎cmd/cloudBackupDetails.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ import (
2020

2121
"github.com/spf13/cobra"
2222

23-
"github.com/liquidweb/liquidweb-cli/types/api"
23+
apiTypes "github.com/liquidweb/liquidweb-cli/types/api"
2424
)
2525

2626
var cloudBackupDetailsCmd = &cobra.Command{
2727
Use: "details",
2828
Short: "Get details of a Cloud Backup",
2929
Long: `Get details of a Cloud Backup`,
3030
Run: func(cmd *cobra.Command, args []string) {
31-
backupIdFlag, _ := cmd.Flags().GetInt64("backup_id")
31+
backupIdFlag, _ := cmd.Flags().GetInt64("backup-id")
3232

3333
apiArgs := map[string]interface{}{"id": backupIdFlag}
3434

@@ -45,7 +45,7 @@ var cloudBackupDetailsCmd = &cobra.Command{
4545
func init() {
4646
cloudBackupCmd.AddCommand(cloudBackupDetailsCmd)
4747

48-
cloudBackupDetailsCmd.Flags().Int64("backup_id", -1,
48+
cloudBackupDetailsCmd.Flags().Int64("backup-id", -1,
4949
"id number of the backup (see 'cloud backup list')")
50-
cloudBackupDetailsCmd.MarkFlagRequired("backup_id")
50+
cloudBackupDetailsCmd.MarkFlagRequired("backup-id")
5151
}

‎cmd/cloudBackupList.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"github.com/spf13/cobra"
2323

2424
"github.com/liquidweb/liquidweb-cli/instance"
25-
"github.com/liquidweb/liquidweb-cli/types/api"
25+
apiTypes "github.com/liquidweb/liquidweb-cli/types/api"
2626
"github.com/liquidweb/liquidweb-cli/validate"
2727
)
2828

@@ -32,7 +32,7 @@ var cloudBackupListCmd = &cobra.Command{
3232
Long: `List Cloud Backups on your account`,
3333
Run: func(cmd *cobra.Command, args []string) {
3434
jsonFlag, _ := cmd.Flags().GetBool("json")
35-
uniqIdFlag, _ := cmd.Flags().GetString("uniq_id")
35+
uniqIdFlag, _ := cmd.Flags().GetString("uniq-id")
3636

3737
if uniqIdFlag != "" {
3838
validateFields := map[interface{}]interface{}{
@@ -83,5 +83,5 @@ func init() {
8383
cloudBackupCmd.AddCommand(cloudBackupListCmd)
8484

8585
cloudBackupListCmd.Flags().Bool("json", false, "output in json format")
86-
cloudBackupListCmd.Flags().String("uniq_id", "", "only fetch backups made from this uniq_id")
86+
cloudBackupListCmd.Flags().String("uniq-id", "", "only fetch backups made from this uniq-id")
8787
}

‎cmd/cloudBackupRestore.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020

2121
"github.com/spf13/cobra"
2222

23-
"github.com/liquidweb/liquidweb-cli/types/api"
23+
apiTypes "github.com/liquidweb/liquidweb-cli/types/api"
2424
"github.com/liquidweb/liquidweb-cli/validate"
2525
)
2626

@@ -29,9 +29,9 @@ var cloudBackupRestoreCmd = &cobra.Command{
2929
Short: "Restore a Cloud Backup on a Cloud Server",
3030
Long: `Restore a Cloud Backup on a Cloud Server.`,
3131
Run: func(cmd *cobra.Command, args []string) {
32-
uniqIdFlag, _ := cmd.Flags().GetString("uniq_id")
32+
uniqIdFlag, _ := cmd.Flags().GetString("uniq-id")
3333
rebuildFsFlag, _ := cmd.Flags().GetBool("rebuild-fs")
34-
backupIdFlag, _ := cmd.Flags().GetInt64("backup_id")
34+
backupIdFlag, _ := cmd.Flags().GetInt64("backup-id")
3535

3636
validateFields := map[interface{}]interface{}{
3737
uniqIdFlag: "UniqId",
@@ -53,17 +53,17 @@ var cloudBackupRestoreCmd = &cobra.Command{
5353
}
5454

5555
fmt.Printf("Restoring backup! %+v\n", details)
56-
fmt.Printf("\tcheck progress with 'cloud server status --uniq_id %s'\n", uniqIdFlag)
56+
fmt.Printf("\tcheck progress with 'cloud server status --uniq-id %s'\n", uniqIdFlag)
5757
},
5858
}
5959

6060
func init() {
6161
cloudBackupCmd.AddCommand(cloudBackupRestoreCmd)
6262

63-
cloudBackupRestoreCmd.Flags().String("uniq_id", "", "uniq_id of Cloud Server")
64-
cloudBackupRestoreCmd.Flags().Int64("backup_id", -1, "id of the Cloud Backup")
63+
cloudBackupRestoreCmd.Flags().String("uniq-id", "", "uniq-id of Cloud Server")
64+
cloudBackupRestoreCmd.Flags().Int64("backup-id", -1, "id of the Cloud Backup")
6565
cloudBackupRestoreCmd.Flags().Bool("rebuild-fs", false, "rebuild filesystem before restoring")
6666

67-
cloudBackupRestoreCmd.MarkFlagRequired("uniq_id")
68-
cloudBackupRestoreCmd.MarkFlagRequired("backup_id")
67+
cloudBackupRestoreCmd.MarkFlagRequired("uniq-id")
68+
cloudBackupRestoreCmd.MarkFlagRequired("backup-id")
6969
}

‎cmd/cloudImageCreate.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020

2121
"github.com/spf13/cobra"
2222

23-
"github.com/liquidweb/liquidweb-cli/types/api"
23+
apiTypes "github.com/liquidweb/liquidweb-cli/types/api"
2424
"github.com/liquidweb/liquidweb-cli/validate"
2525
)
2626

@@ -29,7 +29,7 @@ var cloudImageCreateCmd = &cobra.Command{
2929
Short: "Create a Cloud Image",
3030
Long: `Create a Cloud Image.`,
3131
Run: func(cmd *cobra.Command, args []string) {
32-
uniqIdFlag, _ := cmd.Flags().GetString("uniq_id")
32+
uniqIdFlag, _ := cmd.Flags().GetString("uniq-id")
3333
nameFlag, _ := cmd.Flags().GetString("name")
3434

3535
validateFields := map[interface{}]interface{}{
@@ -56,9 +56,9 @@ var cloudImageCreateCmd = &cobra.Command{
5656
func init() {
5757
cloudImageCmd.AddCommand(cloudImageCreateCmd)
5858

59-
cloudImageCreateCmd.Flags().String("uniq_id", "", "uniq_id of Cloud Server")
59+
cloudImageCreateCmd.Flags().String("uniq-id", "", "uniq-id of Cloud Server")
6060
cloudImageCreateCmd.Flags().String("name", "", "name for the Cloud Image")
6161

62-
cloudImageCreateCmd.MarkFlagRequired("uniq_id")
62+
cloudImageCreateCmd.MarkFlagRequired("uniq-id")
6363
cloudImageCreateCmd.MarkFlagRequired("name")
6464
}

‎cmd/cloudImageDelete.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ import (
2121

2222
"github.com/spf13/cobra"
2323

24-
"github.com/liquidweb/liquidweb-cli/types/api"
24+
apiTypes "github.com/liquidweb/liquidweb-cli/types/api"
2525
)
2626

2727
var cloudImageDeleteCmd = &cobra.Command{
2828
Use: "delete",
2929
Short: "Delete a Cloud Image",
3030
Long: `Delete a Cloud Image`,
3131
Run: func(cmd *cobra.Command, args []string) {
32-
imageIdFlag, _ := cmd.Flags().GetInt64("image_id")
32+
imageIdFlag, _ := cmd.Flags().GetInt64("image-id")
3333
forceFlag, _ := cmd.Flags().GetBool("force")
3434

3535
// if force flag wasn't passed
@@ -55,8 +55,8 @@ var cloudImageDeleteCmd = &cobra.Command{
5555
func init() {
5656
cloudImageCmd.AddCommand(cloudImageDeleteCmd)
5757

58-
cloudImageDeleteCmd.Flags().Int64("image_id", -1,
58+
cloudImageDeleteCmd.Flags().Int64("image-id", -1,
5959
"id number of the image (see 'cloud image list')")
6060
cloudImageDeleteCmd.Flags().Bool("force", false, "bypass dialog confirmation")
61-
cloudImageDeleteCmd.MarkFlagRequired("image_id")
61+
cloudImageDeleteCmd.MarkFlagRequired("image-id")
6262
}

‎cmd/cloudImageDetails.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ import (
2020

2121
"github.com/spf13/cobra"
2222

23-
"github.com/liquidweb/liquidweb-cli/types/api"
23+
apiTypes "github.com/liquidweb/liquidweb-cli/types/api"
2424
)
2525

2626
var cloudImageDetailsCmd = &cobra.Command{
2727
Use: "details",
2828
Short: "Get details of a Cloud Image",
2929
Long: `Get details of a Cloud Image`,
3030
Run: func(cmd *cobra.Command, args []string) {
31-
imageIdFlag, _ := cmd.Flags().GetInt64("image_id")
31+
imageIdFlag, _ := cmd.Flags().GetInt64("image-id")
3232

3333
apiArgs := map[string]interface{}{"id": imageIdFlag}
3434

@@ -45,7 +45,7 @@ var cloudImageDetailsCmd = &cobra.Command{
4545
func init() {
4646
cloudImageCmd.AddCommand(cloudImageDetailsCmd)
4747

48-
cloudImageDetailsCmd.Flags().Int64("image_id", -1,
48+
cloudImageDetailsCmd.Flags().Int64("image-id", -1,
4949
"id number of the image (see 'cloud image list')")
50-
cloudImageDetailsCmd.MarkFlagRequired("image_id")
50+
cloudImageDetailsCmd.MarkFlagRequired("image-id")
5151
}

‎cmd/cloudImageRename.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,16 @@ package cmd
1818
import (
1919
"fmt"
2020

21+
apiTypes "github.com/liquidweb/liquidweb-cli/types/api"
2122
"github.com/spf13/cobra"
22-
23-
"github.com/liquidweb/liquidweb-cli/types/api"
2423
)
2524

2625
var cloudImageRenameCmd = &cobra.Command{
2726
Use: "rename",
2827
Short: "Renames a Cloud Image",
2928
Long: `Renames a Cloud Image.`,
3029
Run: func(cmd *cobra.Command, args []string) {
31-
imageIdFlag, _ := cmd.Flags().GetInt64("image_id")
30+
imageIdFlag, _ := cmd.Flags().GetInt64("image-id")
3231
nameFlag, _ := cmd.Flags().GetString("name")
3332

3433
apiArgs := map[string]interface{}{"id": imageIdFlag, "name": nameFlag}
@@ -46,10 +45,10 @@ var cloudImageRenameCmd = &cobra.Command{
4645
func init() {
4746
cloudImageCmd.AddCommand(cloudImageRenameCmd)
4847

49-
cloudImageRenameCmd.Flags().Int64("image_id", -1,
48+
cloudImageRenameCmd.Flags().Int64("image-id", -1,
5049
"id number of the image (see 'cloud image list')")
5150
cloudImageRenameCmd.Flags().String("name", "", "new name for the Cloud Image")
5251

53-
cloudImageRenameCmd.MarkFlagRequired("image_id")
52+
cloudImageRenameCmd.MarkFlagRequired("image-id")
5453
cloudImageRenameCmd.MarkFlagRequired("name")
5554
}

‎cmd/cloudImageRestore.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020

2121
"github.com/spf13/cobra"
2222

23-
"github.com/liquidweb/liquidweb-cli/types/api"
23+
apiTypes "github.com/liquidweb/liquidweb-cli/types/api"
2424
"github.com/liquidweb/liquidweb-cli/validate"
2525
)
2626

@@ -29,9 +29,9 @@ var cloudImageRestoreCmd = &cobra.Command{
2929
Short: "Restore a Cloud Image on a Cloud Server",
3030
Long: `Restore a Cloud Image on a Cloud Server.`,
3131
Run: func(cmd *cobra.Command, args []string) {
32-
uniqIdFlag, _ := cmd.Flags().GetString("uniq_id")
32+
uniqIdFlag, _ := cmd.Flags().GetString("uniq-id")
3333
rebuildFsFlag, _ := cmd.Flags().GetBool("rebuild-fs")
34-
imageIdFlag, _ := cmd.Flags().GetInt64("image_id")
34+
imageIdFlag, _ := cmd.Flags().GetInt64("image-id")
3535

3636
validateFields := map[interface{}]interface{}{
3737
uniqIdFlag: "UniqId",
@@ -53,17 +53,17 @@ var cloudImageRestoreCmd = &cobra.Command{
5353
}
5454

5555
fmt.Printf("Restoring image! %+v\n", details)
56-
fmt.Printf("\tcheck progress with 'cloud server status --uniq_id %s'\n", uniqIdFlag)
56+
fmt.Printf("\tcheck progress with 'cloud server status --uniq-id %s'\n", uniqIdFlag)
5757
},
5858
}
5959

6060
func init() {
6161
cloudImageCmd.AddCommand(cloudImageRestoreCmd)
6262

63-
cloudImageRestoreCmd.Flags().String("uniq_id", "", "uniq_id of Cloud Server")
64-
cloudImageRestoreCmd.Flags().Int64("image_id", -1, "id of the Cloud Image")
63+
cloudImageRestoreCmd.Flags().String("uniq-id", "", "uniq-id of Cloud Server")
64+
cloudImageRestoreCmd.Flags().Int64("image-id", -1, "id of the Cloud Image")
6565
cloudImageRestoreCmd.Flags().Bool("rebuild-fs", false, "rebuild filesystem before restoring")
6666

67-
cloudImageRestoreCmd.MarkFlagRequired("uniq_id")
68-
cloudImageRestoreCmd.MarkFlagRequired("image_id")
67+
cloudImageRestoreCmd.MarkFlagRequired("uniq-id")
68+
cloudImageRestoreCmd.MarkFlagRequired("image-id")
6969
}

‎cmd/cloudNetworkPrivateAttach.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020

2121
"github.com/spf13/cobra"
2222

23-
"github.com/liquidweb/liquidweb-cli/types/api"
23+
apiTypes "github.com/liquidweb/liquidweb-cli/types/api"
2424
"github.com/liquidweb/liquidweb-cli/validate"
2525
)
2626

@@ -39,7 +39,7 @@ Applications that communicate internally will frequently use this for both secur
3939
and cost-savings.
4040
`,
4141
Run: func(cmd *cobra.Command, args []string) {
42-
uniqIdFlag, _ := cmd.Flags().GetString("uniq_id")
42+
uniqIdFlag, _ := cmd.Flags().GetString("uniq-id")
4343

4444
validateFields := map[interface{}]interface{}{
4545
uniqIdFlag: "UniqId",
@@ -66,12 +66,12 @@ and cost-savings.
6666
}
6767

6868
fmt.Printf("Attaching %s to private network\n", details.Attached)
69-
fmt.Printf("\n\nYou can check progress with 'cloud server status --uniq_id %s'\n", uniqIdFlag)
69+
fmt.Printf("\n\nYou can check progress with 'cloud server status --uniq-id %s'\n", uniqIdFlag)
7070
},
7171
}
7272

7373
func init() {
7474
cloudNetworkPrivateCmd.AddCommand(cloudNetworkPrivateAttachCmd)
75-
cloudNetworkPrivateAttachCmd.Flags().String("uniq_id", "", "uniq_id of the Cloud Server")
76-
cloudNetworkPrivateAttachCmd.MarkFlagRequired("uniq_id")
75+
cloudNetworkPrivateAttachCmd.Flags().String("uniq-id", "", "uniq-id of the Cloud Server")
76+
cloudNetworkPrivateAttachCmd.MarkFlagRequired("uniq-id")
7777
}

‎cmd/cloudNetworkPrivateDetach.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020

2121
"github.com/spf13/cobra"
2222

23-
"github.com/liquidweb/liquidweb-cli/types/api"
23+
apiTypes "github.com/liquidweb/liquidweb-cli/types/api"
2424
"github.com/liquidweb/liquidweb-cli/validate"
2525
)
2626

@@ -39,7 +39,7 @@ Applications that communicate internally will frequently use this for both secur
3939
and cost-savings.
4040
`,
4141
Run: func(cmd *cobra.Command, args []string) {
42-
uniqIdFlag, _ := cmd.Flags().GetString("uniq_id")
42+
uniqIdFlag, _ := cmd.Flags().GetString("uniq-id")
4343

4444
validateFields := map[interface{}]interface{}{
4545
uniqIdFlag: "UniqId",
@@ -66,12 +66,12 @@ and cost-savings.
6666
}
6767

6868
fmt.Printf("Detaching %s from private network\n", details.Detached)
69-
fmt.Printf("\n\nYou can check progress with 'cloud server status --uniq_id %s'\n\n", uniqIdFlag)
69+
fmt.Printf("\n\nYou can check progress with 'cloud server status --uniq-id %s'\n\n", uniqIdFlag)
7070
},
7171
}
7272

7373
func init() {
7474
cloudNetworkPrivateCmd.AddCommand(cloudNetworkPrivateDetachCmd)
75-
cloudNetworkPrivateDetachCmd.Flags().String("uniq_id", "", "uniq_id of the Cloud Server")
76-
cloudNetworkPrivateDetachCmd.MarkFlagRequired("uniq_id")
75+
cloudNetworkPrivateDetachCmd.Flags().String("uniq-id", "", "uniq-id of the Cloud Server")
76+
cloudNetworkPrivateDetachCmd.MarkFlagRequired("uniq-id")
7777
}

0 commit comments

Comments
 (0)