Delete disks command.

Author: beornf

README.md

@@ -78,7 +78,6 @@ Commands:
   addons      Manage addons
   apps        Manage apps
   deploy      Deploy an app
-  disks       Manage disks
   domains     Manage domains
   env         Manage app environment
   help        Help about any command

cmd/apps.go

@@ -167,16 +167,8 @@ func getAppName() string {
 	return filepath.Base(cwd)
 }
 
-func getDiskPlan(client *lade.Client) string {
-	plan, err := client.Plan.Default("disk")
-	if err != nil {
-		return ""
-	}
-	return plan.ID
-}
-
 func getPlan(client *lade.Client) string {
-	plan, err := client.Plan.Default("")
+	plan, err := client.Plan.Default()
 	if err != nil {
 		return ""
 	}

cmd/disks.go

@@ -20,7 +20,7 @@ var plansCmd = &cobra.Command{
 }
 
 func plansRun(client *lade.Client) error {
-	plans, err := client.Plan.List("")
+	plans, err := client.Plan.List()
 	if err != nil {
 		return err
 	}

cmd/plans.go

@@ -29,7 +29,6 @@ import (
 var (
 	validEnvName = regexp.MustCompile(`^[A-Z0-9-_]+$`)
 	validName    = regexp.MustCompile(`^[a-z][a-z0-9-_]*$`)
-	validPath    = regexp.MustCompile(`^(/[a-zA-Z0-9-_]+)+$`)
 )
 
 type optionsFunc func(*lade.Client) (*orderedmap.OrderedMap, error)
@@ -165,41 +164,6 @@ func getAddonOptions(client *lade.Client) (*orderedmap.OrderedMap, error) {
 	return options, nil
 }
 
-func getDiskOptions(appName string) optionsFunc {
-	return func(client *lade.Client) (*orderedmap.OrderedMap, error) {
-		disks, err := client.Disk.List(appName)
-		if err != nil {
-			return nil, err
-		}
-		if len(disks) == 0 {
-			return nil, errors.New("There are no disks available")
-		}
-		options := orderedmap.New()
-		for _, disk := range disks {
-			options.Set(disk.Name, disk.Name)
-		}
-		options.SortKeys(sort.Strings)
-		return options, nil
-	}
-}
-
-func getDiskPlanOptions(id string) optionsFunc {
-	return func(client *lade.Client) (*orderedmap.OrderedMap, error) {
-		plans, err := client.Plan.User(id, "disk")
-		if err != nil {
-			return nil, err
-		}
-		if len(plans) == 0 {
-			return nil, errors.New("There are no plans available")
-		}
-		options := orderedmap.New()
-		for _, plan := range plans {
-			options.Set(plan.ID, plan.ID)
-		}
-		return options, nil
-	}
-}
-
 func getDomainOptions(appName string) optionsFunc {
 	return func(client *lade.Client) (*orderedmap.OrderedMap, error) {
 		domains, err := client.Domain.List(appName)
@@ -236,7 +200,7 @@ func getKeyOptions(appName string) optionsFunc {
 
 func getPlanOptions(id string) optionsFunc {
 	return func(client *lade.Client) (*orderedmap.OrderedMap, error) {
-		plans, err := client.Plan.User(id, "")
+		plans, err := client.Plan.User(id)
 		if err != nil {
 			return nil, err
 		}
@@ -435,12 +399,6 @@ func validateAppName(client *lade.Client) survey.Validator {
 	}))
 }
 
-func validateDiskName(client *lade.Client, appName string) survey.Validator {
-	return survey.ComposeValidators(survey.Required, validateUniqueName(func(name string) error {
-		return client.Disk.Head(appName, name)
-	}))
-}
-
 func validateDomainName(client *lade.Client, appName string) survey.Validator {
 	return survey.ComposeValidators(survey.Required, validateUniqueName(func(name string) error {
 		return client.Domain.Head(appName, name)
@@ -477,13 +435,6 @@ func validateName(val interface{}) error {
 	return nil
 }
 
-func validatePath(val interface{}) error {
-	if !validPath.MatchString(val.(string)) {
-		return errors.New("Path must be valid absolute directory")
-	}
-	return nil
-}
-
 func validateUniqueName(fn func(string) error) survey.Validator {
 	return func(val interface{}) error {
 		err := fn(val.(string))

cmd/prompt.go

@@ -37,7 +37,6 @@ func init() {
 	RootCmd.AddCommand(addonsCmd)
 	RootCmd.AddCommand(appsCmd)
 	RootCmd.AddCommand(deployCmd)
-	RootCmd.AddCommand(disksCmd)
 	RootCmd.AddCommand(domainsCmd)
 	RootCmd.AddCommand(envCmd)
 	RootCmd.AddCommand(loginCmd)

cmd/root.go

@@ -8,7 +8,7 @@ require (
 	github.com/dustin/go-humanize v1.0.0
 	github.com/iancoleman/orderedmap v0.0.0-20180606015914-fec04b9a4f6d
 	github.com/jinzhu/configor v1.1.1
-	github.com/lade-io/go-lade v0.1.6
+	github.com/lade-io/go-lade v0.1.7
 	github.com/mattn/go-colorable v0.1.12
 	github.com/mattn/go-isatty v0.0.14
 	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d

go.mod

@@ -450,6 +450,8 @@ github.com/lade-io/go-lade v0.1.5 h1:Am5fEt3SaURMaGzGqX82NqkiH8yG1hEu0TcE4+m1Nso
 github.com/lade-io/go-lade v0.1.5/go.mod h1:kQDkodhmNS1E7FMCVSGmSqvQPgwyNk47tS42JwfrszA=
 github.com/lade-io/go-lade v0.1.6 h1:WA+4Br3H5W6g0yRe2ep0O0QDSTSVQ9qPm01JE9ZO5BY=
 github.com/lade-io/go-lade v0.1.6/go.mod h1:kQDkodhmNS1E7FMCVSGmSqvQPgwyNk47tS42JwfrszA=
+github.com/lade-io/go-lade v0.1.7 h1:SobPauUkN+n9SZ6RRGS8uNFt6PaviFxzeT1IN65Eui4=
+github.com/lade-io/go-lade v0.1.7/go.mod h1:kQDkodhmNS1E7FMCVSGmSqvQPgwyNk47tS42JwfrszA=
 github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=