Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ISSUE: 1585 | Add --wait flag to databases resize command #1590

Merged
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 48 additions & 2 deletions commands/databases.go
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,9 @@ For PostgreSQL and MySQL clusters, you can also provide a disk size in MiB to sc
AddIntFlag(cmdDatabaseResize, doctl.ArgDatabaseNumNodes, "", 0, nodeNumberDetails, requiredOpt())
AddStringFlag(cmdDatabaseResize, doctl.ArgSizeSlug, "", "", nodeSizeDetails, requiredOpt())
AddIntFlag(cmdDatabaseResize, doctl.ArgDatabaseStorageSizeMib, "", 0, storageSizeMiBDetails)
cmdDatabaseResize.Example = `The following example resizes a PostgreSQL or MySQL database to have two nodes, 16 vCPUs, 64 GB of memory, and 2048 GiB of storage space: doctl databases resize ca9f591d-9999-5555-a0ef-1c02d1d1e352 --num-nodes 2 --size db-s-16vcpu-64gb --storage-size-mib 2048000`
AddBoolFlag(cmdDatabaseResize, doctl.ArgCommandWait, "", false,
"Boolean that specifies whether to wait for an app to complete before returning control to the terminal")
cmdDatabaseResize.Example = `The following example resizes a PostgreSQL or MySQL database to have two nodes, 16 vCPUs, 64 GB of memory, and 2048 GiB of storage space: doctl databases resize ca9f591d-9999-5555-a0ef-1c02d1d1e352 --num-nodes 2 --size db-s-16vcpu-64gb --storage-size-mib 2048000 --wait true`

cmdDatabaseMigrate := CmdBuilder(cmd, RunDatabaseMigrate, "migrate <database-cluster-id>", "Migrate a database cluster to a new region", `Migrates the specified database cluster to a new region.`, Writer,
aliasOpt("m"))
Expand Down Expand Up @@ -511,13 +513,57 @@ func RunDatabaseResize(c *CmdConfig) error {
}

id := c.Args[0]
dbs := c.Databases()

r, err := buildDatabaseResizeRequestFromArgs(c)
if err != nil {
return err
}

return c.Databases().Resize(id, r)
// Resize the database
err = dbs.Resize(id, r)
if err != nil {
return err
}

// Retrieve the database object after resize (to check status or further actions)
db, err := dbs.Get(id)
if err != nil {
return fmt.Errorf("failed to retrieve the database after resize: %v", err)
}
andrewsomething marked this conversation as resolved.
Show resolved Hide resolved

// Check if the --wait flag was passed
wait, err := c.Doit.GetBool(c.NS, doctl.ArgCommandWait)
if err != nil {
return err
}

if wait {
connection := db.Connection

notice("Database resizing is in progress, waiting for database to be online")

err := waitForDatabaseReady(dbs, id)
if err != nil {
return fmt.Errorf(
"database couldn't enter the `online` state after resizing: %v",
err,
)
}

db, err = dbs.Get(id)
if err != nil {
return fmt.Errorf(
"failed to retrieve the resized database: %v",
err,
)
}
db.Connection = connection
}

notice("Database resized successfully")

return displayDatabases(c, false, *db)
andrewsomething marked this conversation as resolved.
Show resolved Hide resolved
}

func buildDatabaseResizeRequestFromArgs(c *CmdConfig) (*godo.DatabaseResizeRequest, error) {
Expand Down
Loading