select db

Author: mustard-mh

components/service-waiter/cmd/database.go

@@ -52,6 +52,10 @@ DB_CA_CERT and DB_USER(=gitpod)`,
 		cfg.Net = "tcp"
 		cfg.User = viper.GetString("username")
 		cfg.Passwd = viper.GetString("password")
+
+		// Must be "gitpod"
+		// Align to https://github.com/gitpod-io/gitpod/blob/884d922e8e33d8b936ec18d7fe3c8dcffde42b5a/components/gitpod-db/go/conn.go#L37
+		cfg.DBName = "gitpod"
 		cfg.Timeout = 1 * time.Second
 
 		dsn := cfg.FormatDSN()
@@ -84,7 +88,7 @@ DB_CA_CERT and DB_USER(=gitpod)`,
 		}
 
 		log.WithField("timeout", timeout.String()).WithField("dsn", censoredDSN).WithField("migrationName", migration.Name).WithField("migrationTimestamp", migration.Timestamp).Info("waiting for database")
-		for {
+		for ctx.Err() == nil {
 			log.Info("attempting to check if database is available")
 			if err := checkDbAvailable(ctx, cfg, &migration); err != nil {
 				log.WithError(err).Debug("retry")
@@ -94,10 +98,9 @@ DB_CA_CERT and DB_USER(=gitpod)`,
 			}
 		}
 
-		select {
-		case <-ctx.Done():
-			log.WithField("timeout", timeout.String()).Fatal("database did not become available in time")
-		default:
+		if ctx.Err() != nil {
+			log.WithField("timeout", timeout.String()).WithError(ctx.Err()).Fatal("database did not become available in time")
+		} else {
 			log.Info("database became available")
 		}
 	},
@@ -118,7 +121,7 @@ func checkDbAvailable(ctx context.Context, cfg *mysql.Config, migration *migrati
 	}
 
 	log.Info("checking if database is migrated")
-	row := db.QueryRowContext(ctx, "SELECT name FROM "+migrationTableName+" WHERE 1690915807191 = ?", migration.Timestamp)
+	row := db.QueryRowContext(ctx, "SELECT name FROM "+migrationTableName+" WHERE timestamp = ?", migration.Timestamp)
 	var name string
 	if err := row.Scan(&name); err != nil {
 		return err