fix(mysql): avoid missing param error and raise cli timeout for --wait (

#93) Improve the MySQL creation flow. --------- Co-authored-by: Sebastian Nickel <[email protected]> Co-authored-by: thde <[email protected]>
ninech · Apr 26, 2024 · 0d2c036 · 0d2c036
1 parent 4f35071
commit 0d2c036
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 7 deletions.
diff --git a/create/mysql.go b/create/mysql.go
@@ -34,7 +34,7 @@ type mySQLCmd struct {
 	TransactionIsolation  storage.MySQLTransactionCharacteristic `placeholder:"${mysql_transaction_isolation}" help:"Configures the transaction_isolation variable."`
 	KeepDailyBackups      *int                                   `placeholder:"${mysql_backup_retention_days}" help:"Number of daily database backups to keep. Note that setting this to 0, backup will be disabled and existing dumps deleted immediately."`
 	Wait                  bool                                   `default:"true" help:"Wait until MySQL instance is created."`
-	WaitTimeout           time.Duration                          `default:"900s" help:"Duration to wait for MySQL getting ready. Only relevant if --wait is set."`
+	WaitTimeout           time.Duration                          `default:"25m" help:"Duration to wait for MySQL getting ready. Only relevant if --wait is set."`
 }
 
 func (cmd *mySQLCmd) Run(ctx context.Context, client *api.Client) error {
@@ -44,7 +44,7 @@ func (cmd *mySQLCmd) Run(ctx context.Context, client *api.Client) error {
 	}
 	cmd.SSHKeys = append(cmd.SSHKeys, sshkeys...)
 
-	fmt.Println("Creating new mysql. This can take up to 15 minutes.")
+	fmt.Printf("Creating new mysql. This might take some time (waiting up to %s).\n", cmd.WaitTimeout)
 	mysql := cmd.newMySQL(client.Project)
 
 	c := newCreator(client, mysql, "mysql")
@@ -89,8 +89,8 @@ func (cmd *mySQLCmd) newMySQL(namespace string) *storage.MySQL {
 			ForProvider: storage.MySQLParameters{
 				Location:     meta.LocationName(cmd.Location),
 				MachineType:  cmd.MachineType,
-				AllowedCIDRs: cmd.AllowedCidrs,
-				SSHKeys:      cmd.SSHKeys,
+				AllowedCIDRs: []storage.IPv4CIDR{}, // avoid missing parameter error
+				SSHKeys:      []storage.SSHKey{},   // avoid missing parameter error
 				SQLMode:      cmd.SQLMode,
 				CharacterSet: storage.MySQLCharacterSet{
 					Name:      cmd.CharacterSetName,
@@ -104,6 +104,13 @@ func (cmd *mySQLCmd) newMySQL(namespace string) *storage.MySQL {
 		},
 	}
 
+	if cmd.AllowedCidrs != nil {
+		mySQL.Spec.ForProvider.AllowedCIDRs = cmd.AllowedCidrs
+	}
+	if cmd.SSHKeys != nil {
+		mySQL.Spec.ForProvider.SSHKeys = cmd.SSHKeys
+	}
+
 	return mySQL
 }
 

diff --git a/create/mysql_test.go b/create/mysql_test.go
@@ -116,6 +116,14 @@ func TestMySQL(t *testing.T) {
 				return
 			}
 
+			// we set defaults for the slices
+			if tt.want.AllowedCIDRs == nil {
+				tt.want.AllowedCIDRs = []storage.IPv4CIDR{}
+			}
+			if tt.want.SSHKeys == nil {
+				tt.want.SSHKeys = []storage.SSHKey{}
+			}
+
 			if !reflect.DeepEqual(created.Spec.ForProvider, tt.want) {
 				t.Fatalf("expected mysql.Spec.ForProvider = %+v, got: %+v", created.Spec.ForProvider, tt.want)
 			}

diff --git a/go.mod b/go.mod
@@ -22,7 +22,7 @@ require (
 	github.com/mattn/go-isatty v0.0.20
 	github.com/moby/moby v26.0.0+incompatible
 	github.com/moby/term v0.5.0
-	github.com/ninech/apis v0.0.0-20240424152525-e2d75ea488d7
+	github.com/ninech/apis v0.0.0-20240425141154-83b10f0bd009
 	github.com/posener/complete v1.2.3
 	github.com/prometheus/common v0.52.2
 	github.com/stretchr/testify v1.9.0

diff --git a/go.sum b/go.sum
@@ -582,8 +582,8 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU=
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/ninech/apis v0.0.0-20240424152525-e2d75ea488d7 h1:lRZGujpQRKfasUTsq4YXr0qxLMod+q/tboa9MrMa1C0=
-github.com/ninech/apis v0.0.0-20240424152525-e2d75ea488d7/go.mod h1:6lFCwHqvcTFZvJ6zY0rxaPIoKc0CX9sHhtH/nyo/5is=
+github.com/ninech/apis v0.0.0-20240425141154-83b10f0bd009 h1:tHwnlBv0wWMtNV4XfuoUV9UBD6vq68nZzvOhwIpZj0w=
+github.com/ninech/apis v0.0.0-20240425141154-83b10f0bd009/go.mod h1:6lFCwHqvcTFZvJ6zY0rxaPIoKc0CX9sHhtH/nyo/5is=
 github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
 github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
 github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=