fix: dbaas user creation pre-check

exoscale · Jan 9, 2025 · 136b25c · 136b25c
1 parent a7af867
commit 136b25c
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 2 deletions.
diff --git a/cmd/dbaas_database_create_mysql.go b/cmd/dbaas_database_create_mysql.go
@@ -24,7 +24,7 @@ func (c dbaasDatabaseCreateCmd) createMysql(cmd *cobra.Command, _ []string) erro
 		return err
 	}
 
-	if s.State != "running" {
+	if len(s.Databases) == 0 {
 		return fmt.Errorf("service %q is not ready for database creation", c.Name)
 	}
 

diff --git a/cmd/dbaas_database_create_pg.go b/cmd/dbaas_database_create_pg.go
@@ -22,7 +22,7 @@ func (c dbaasDatabaseCreateCmd) createPg(cmd *cobra.Command, _ []string) error {
 		return err
 	}
 
-	if s.State != "running" {
+	if len(s.Databases) == 0 {
 		return fmt.Errorf("service %q is not ready for database creation", c.Name)
 	}
 

diff --git a/cmd/dbaas_user_create_kafka.go b/cmd/dbaas_user_create_kafka.go
@@ -17,6 +17,15 @@ func (c *dbaasUserCreateCmd) createKafka(cmd *cobra.Command, _ []string) error {
 		return err
 	}
 
+	s, err := client.GetDBAASServicePG(ctx, c.Name)
+	if err != nil {
+		return err
+	}
+
+	if len(s.Users) == 0 {
+		return fmt.Errorf("service %q is not ready for user creation", c.Name)
+	}
+
 	req := v3.CreateDBAASKafkaUserRequest{Username: v3.DBAASUserUsername(c.Username)}
 
 	op, err := client.CreateDBAASKafkaUser(ctx, c.Name, req)

diff --git a/cmd/dbaas_user_create_mysql.go b/cmd/dbaas_user_create_mysql.go
@@ -17,6 +17,15 @@ func (c *dbaasUserCreateCmd) createMysql(cmd *cobra.Command, _ []string) error {
 		return err
 	}
 
+	s, err := client.GetDBAASServiceMysql(ctx, c.Name)
+	if err != nil {
+		return err
+	}
+
+	if len(s.Users) == 0 {
+		return fmt.Errorf("service %q is not ready for user creation", c.Name)
+	}
+
 	req := v3.CreateDBAASMysqlUserRequest{Username: v3.DBAASUserUsername(c.Username)}
 	if c.MysqlAuthenticationMethod != "" {
 		req.Authentication = v3.EnumMysqlAuthenticationPlugin(c.MysqlAuthenticationMethod)

diff --git a/cmd/dbaas_user_create_opensearch.go b/cmd/dbaas_user_create_opensearch.go
@@ -17,6 +17,15 @@ func (c *dbaasUserCreateCmd) createOpensearch(cmd *cobra.Command, _ []string) er
 		return err
 	}
 
+	s, err := client.GetDBAASServiceOpensearch(ctx, c.Name)
+	if err != nil {
+		return err
+	}
+
+	if len(s.Users) == 0 {
+		return fmt.Errorf("service %q is not ready for user creation", c.Name)
+	}
+
 	req := v3.CreateDBAASOpensearchUserRequest{Username: v3.DBAASUserUsername(c.Username)}
 
 	op, err := client.CreateDBAASOpensearchUser(ctx, c.Name, req)

diff --git a/cmd/dbaas_user_create_pg.go b/cmd/dbaas_user_create_pg.go
@@ -17,6 +17,15 @@ func (c *dbaasUserCreateCmd) createPg(cmd *cobra.Command, _ []string) error {
 		return err
 	}
 
+	s, err := client.GetDBAASServicePG(ctx, c.Name)
+	if err != nil {
+		return err
+	}
+
+	if len(s.Users) == 0 {
+		return fmt.Errorf("service %q is not ready for user creation", c.Name)
+	}
+
 	req := v3.CreateDBAASPostgresUserRequest{Username: v3.DBAASUserUsername(c.Username), AllowReplication: &c.PostgresAllowReplication}
 
 	op, err := client.CreateDBAASPostgresUser(ctx, c.Name, req)