Skip to content

Commit 274bf6b

Browse files
committedOct 24, 2019
feat(migrations): switch to go-based migrator
the migrations package we were using didn't allow for backfills
1 parent 218b1de commit 274bf6b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+1059
-4646
lines changed
 

‎cmd/configmap-server/main.go

+10-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package main
22

33
import (
44
"context"
5+
"database/sql"
56
"fmt"
67
"net"
78

@@ -98,11 +99,19 @@ func runCmdFunc(cmd *cobra.Command, args []string) error {
9899
logger.Fatalf("error getting configmap: %s", err)
99100
}
100101

101-
sqlLoader, err := sqlite.NewSQLLiteLoader(sqlite.WithDBName(dbName))
102+
db, err := sql.Open("sqlite3", dbName)
102103
if err != nil {
103104
return err
104105
}
105106

107+
sqlLoader, err := sqlite.NewSQLLiteLoader(db)
108+
if err != nil {
109+
return err
110+
}
111+
if err := sqlLoader.Migrate(context.TODO()); err != nil {
112+
return err
113+
}
114+
106115
configMapPopulator := sqlite.NewSQLLoaderForConfigMap(sqlLoader, *configMap)
107116
if err := configMapPopulator.Populate(); err != nil {
108117
err = fmt.Errorf("error loading manifests from configmap: %s", err)

‎cmd/initializer/main.go

+12-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package main
22

33
import (
4+
"context"
5+
"database/sql"
46
"fmt"
57

68
"github.com/sirupsen/logrus"
@@ -53,11 +55,19 @@ func runCmdFunc(cmd *cobra.Command, args []string) error {
5355
return err
5456
}
5557

56-
dbLoader, err := sqlite.NewSQLLiteLoader(sqlite.WithDBName(outFilename))
58+
db, err := sql.Open("sqlite3", outFilename)
5759
if err != nil {
5860
return err
5961
}
60-
defer dbLoader.Close()
62+
defer db.Close()
63+
64+
dbLoader, err := sqlite.NewSQLLiteLoader(db)
65+
if err != nil {
66+
return err
67+
}
68+
if err := dbLoader.Migrate(context.TODO()); err != nil {
69+
return err
70+
}
6171

6272
loader := sqlite.NewSQLLoaderForDirectory(dbLoader, manifestDir)
6373
if err := loader.Populate(); err != nil {

0 commit comments

Comments
 (0)
Please sign in to comment.