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.

Sign up for GitHub

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

Jump to bottom

Add support for opensearch #1523

Merged
merged 1 commit into from
Apr 12, 2024
Merged

Add support for opensearch #1523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 14 additions & 6 deletions commands/databases.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func Databases() *Command {
Use: "databases",
Aliases: []string{"db", "dbs", "d", "database"},
Short: "Display commands that manage databases",
Long: "The commands under `doctl databases` are for managing your MySQL, Redis, PostgreSQL, MongoDB, and Kafka database services.",
Long: "The commands under `doctl databases` are for managing your MySQL, Redis, PostgreSQL, MongoDB, Kafka and Opensearch database services.",
GroupID: manageResourcesGroup,
},
}
Expand All @@ -56,7 +56,7 @@ func Databases() *Command {

- The database ID, in UUID format
- The name you gave the database cluster
- The database engine. Possible values: ` + "`redis`, `pg`, `mysql` , `mongodb`, or `kafka`" + `
- The database engine. Possible values: ` + "`redis`, `pg`, `mysql` , `mongodb`, `kafka`, `opensearch`" + `
- The engine version, such as ` + "`14`" + ` for PostgreSQL version 14
- The number of nodes in the database cluster
- The region the database cluster resides in, such as ` + "`sfo2`, " + "`nyc1`" + `
Expand All @@ -81,7 +81,7 @@ You can customize the configuration using the listed flags, all of which are opt
AddStringFlag(cmdDatabaseCreate, doctl.ArgRegionSlug, "", defaultDatabaseRegion, "The data center region where the database cluster resides, such as `nyc1` or `sfo2`.")
AddStringFlag(cmdDatabaseCreate, doctl.ArgSizeSlug, "", defaultDatabaseNodeSize, nodeSizeDetails)
AddIntFlag(cmdDatabaseCreate, doctl.ArgDatabaseStorageSizeMib, "", 0, storageSizeMiBDetails)
AddStringFlag(cmdDatabaseCreate, doctl.ArgDatabaseEngine, "", defaultDatabaseEngine, "The database's engine. Possible values are: `pg`, `mysql`, `redis`, `mongodb`, and `kafka`.")
AddStringFlag(cmdDatabaseCreate, doctl.ArgDatabaseEngine, "", defaultDatabaseEngine, "The database's engine. Possible values are: `pg`, `mysql`, `redis`, `mongodb`, `kafka` and `opensearch`.")
AddStringFlag(cmdDatabaseCreate, doctl.ArgVersion, "", "", "The database engine's version, such as 14 for PostgreSQL version 14.")
AddStringFlag(cmdDatabaseCreate, doctl.ArgPrivateNetworkUUID, "", "", "The UUID of a VPC to create the database cluster in. The command uses the region's default VPC if excluded.")
AddStringFlag(cmdDatabaseCreate, doctl.ArgDatabaseRestoreFromClusterName, "", "", "The name of an existing database cluster to restore from.")
Expand Down Expand Up @@ -888,19 +888,19 @@ func databaseOptions() *Command {
cmdRegionOptions := CmdBuilder(cmd, RunDatabaseRegionOptions, "regions", "Retrieves a list of the available regions for a given database engine", `Lists the available regions for a given database engine. Some engines may not be available in certain regions.`,
Writer, aliasOpt("r"))
AddStringFlag(cmdRegionOptions, doctl.ArgDatabaseEngine, "",
"", `The database engine. Possible values: `+"`"+`mysql`+"`"+`, `+"`"+`pg`+"`"+`, `+"`"+`redis`+"`"+`, `+"`"+`kafka`+"`"+`, `+"`"+`mongodb`+"`"+``)
"", `The database engine. Possible values: `+"`"+`mysql`+"`"+`, `+"`"+`pg`+"`"+`, `+"`"+`redis`+"`"+`, `+"`"+`kafka`+"`"+`, `+"`"+`opensearch`+"`"+`, `+"`"+`mongodb`+"`"+``)
cmdRegionOptions.Example = `The following example retrieves a list of the available regions for the PostgreSQL engine: doctl databases options regions --engine pg`

cmdVersionOptions := CmdBuilder(cmd, RunDatabaseVersionOptions, "versions", "Retrieves a list of the available versions for a given database engine", `Lists the available versions for a given database engine.`,
Writer, aliasOpt("v"))
AddStringFlag(cmdVersionOptions, doctl.ArgDatabaseEngine, "",
"", `The database engine. Possible values: `+"`"+`mysql`+"`"+`, `+"`"+`pg`+"`"+`, `+"`"+`redis`+"`"+`, `+"`"+`kafka`+"`"+`, `+"`"+`mongodb`+"`"+``)
"", `The database engine. Possible values: `+"`"+`mysql`+"`"+`, `+"`"+`pg`+"`"+`, `+"`"+`redis`+"`"+`, `+"`"+`kafka`+"`"+`, `+"`"+`opensearch`+"`"+`, `+"`"+`mongodb`+"`"+``)
cmdVersionOptions.Example = `The following example retrieves a list of the available versions for the PostgreSQL engine: doctl databases options versions --engine pg`

cmdSlugOptions := CmdBuilder(cmd, RunDatabaseSlugOptions, "slugs", "Retrieves a list of the available slugs for a given database engine", `Lists the available slugs for a given database engine.`,
Writer, aliasOpt("s"))
AddStringFlag(cmdSlugOptions, doctl.ArgDatabaseEngine, "",
"", `The database engine. Possible values: `+"`"+`mysql`+"`"+`, `+"`"+`pg`+"`"+`, `+"`"+`redis`+"`"+`, `+"`"+`kafka`+"`"+`, `+"`"+`mongodb`+"`"+``, requiredOpt())
"", `The database engine. Possible values: `+"`"+`mysql`+"`"+`, `+"`"+`pg`+"`"+`, `+"`"+`redis`+"`"+`, `+"`"+`kafka`+"`"+`, `+"`"+`opensearch`+"`"+`, `+"`"+`mongodb`+"`"+``, requiredOpt())
cmdSlugOptions.Example = `The following example retrieves a list of the available slugs for the PostgreSQL engine: doctl databases options slugs --engine pg`

return cmd
Expand Down Expand Up @@ -957,12 +957,15 @@ func RunDatabaseRegionOptions(c *CmdConfig) error {
regions["redis"] = options.RedisOptions.Regions
case "kafka":
regions["kafka"] = options.KafkaOptions.Regions
case "opensearch":
regions["opensearch"] = options.OpensearchOptions.Regions
case "":
regions["mongodb"] = options.MongoDBOptions.Regions
regions["mysql"] = options.MySQLOptions.Regions
regions["pg"] = options.PostgresSQLOptions.Regions
regions["redis"] = options.RedisOptions.Regions
regions["kafka"] = options.KafkaOptions.Regions
regions["opensearch"] = options.OpensearchOptions.Regions
}

return displayDatabaseRegionOptions(c, regions)
Expand All @@ -989,12 +992,15 @@ func RunDatabaseVersionOptions(c *CmdConfig) error {
versions["redis"] = options.RedisOptions.Versions
case "kafka":
versions["kafka"] = options.KafkaOptions.Versions
case "opensearch":
versions["opensearch"] = options.OpensearchOptions.Versions
case "":
versions["mongodb"] = options.MongoDBOptions.Versions
versions["mysql"] = options.MySQLOptions.Versions
versions["pg"] = options.PostgresSQLOptions.Versions
versions["redis"] = options.RedisOptions.Versions
versions["kafka"] = options.KafkaOptions.Versions
versions["opensearch"] = options.OpensearchOptions.Versions
}

return displayDatabaseVersionOptions(c, versions)
Expand Down Expand Up @@ -1024,6 +1030,8 @@ func RunDatabaseSlugOptions(c *CmdConfig) error {
layouts = options.RedisOptions.Layouts
case "kafka":
layouts = options.KafkaOptions.Layouts
case "opensearch":
layouts = options.OpensearchOptions.Layouts
}

return displayDatabaseLayoutOptions(c, layouts)
Expand Down
3 changes: 3 additions & 0 deletions commands/displayers/database.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,9 @@ func (do *DatabaseOptions) KV() []map[string]any {
if nonEmptyOptionsFn(do.DatabaseOptions.KafkaOptions) {
engines = append(engines, "kafka")
}
if nonEmptyOptionsFn(do.DatabaseOptions.OpensearchOptions) {
engines = append(engines, "opensearch")
}

out := make([]map[string]any, 0, len(engines))
for _, eng := range engines {
Expand Down
20 changes: 9 additions & 11 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.21
require (
github.com/blang/semver v3.5.1+incompatible
github.com/creack/pty v1.1.11
github.com/digitalocean/godo v1.111.0
github.com/digitalocean/godo v1.113.0
github.com/docker/cli v24.0.5+incompatible
github.com/docker/docker v24.0.9+incompatible
github.com/docker/docker-credential-helpers v0.7.0 // indirect
Expand All @@ -29,11 +29,10 @@ require (
github.com/spf13/cobra v1.7.0
github.com/spf13/viper v1.11.0
github.com/stretchr/testify v1.8.4
golang.org/x/crypto v0.17.0
golang.org/x/net v0.17.0 // indirect
golang.org/x/oauth2 v0.10.0
golang.org/x/sys v0.15.0 // indirect
google.golang.org/protobuf v1.33.0 // indirect
golang.org/x/crypto v0.22.0
golang.org/x/net v0.24.0 // indirect
golang.org/x/oauth2 v0.19.0
golang.org/x/sys v0.19.0 // indirect
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.26.2
k8s.io/apimachinery v0.26.2
Expand All @@ -55,7 +54,7 @@ require (
github.com/muesli/termenv v0.12.0
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8
go.uber.org/mock v0.2.0
golang.org/x/term v0.15.0
golang.org/x/term v0.19.0
gopkg.in/yaml.v3 v3.0.1
)

Expand All @@ -74,11 +73,11 @@ require (
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-retryablehttp v0.7.4 // indirect
github.com/hashicorp/go-retryablehttp v0.7.5 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hokaccha/go-prettyjson v0.0.0-20210113012101-fb4e108d2519 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
Expand Down Expand Up @@ -115,9 +114,8 @@ require (
github.com/subosito/gotenv v1.2.0 // indirect
golang.org/x/mod v0.11.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.10.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.66.4 // indirect
k8s.io/klog/v2 v2.90.1 // indirect
Expand Down
Loading
Loading