Skip to content

Commit 287f1b4

Browse files
authored
'git-gateway migrate' command will now actually migrate (#64)
* 'migrate' command will now actually migrate with no other settings required * update default env settings in app.json to use correct GITGATEWAY prefix
1 parent 160e45d commit 287f1b4

File tree

3 files changed

+27
-18
lines changed

3 files changed

+27
-18
lines changed

app.json

+16-16
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,29 @@
55
"repository": "https://github.com/netlify/git-gateway",
66
"env": {
77
"DATABASE_URL": {},
8-
"git-gateway_DB_DRIVER": {
8+
"GITGATEWAY_DB_DRIVER": {
99
"value": "sqlite3"
1010
},
11-
"git-gateway_DB_AUTOMIGRATE": {
11+
"GITGATEWAY_DB_AUTOMIGRATE": {
1212
"value": true
1313
},
14-
"git-gateway_DB_NAMESPACE": {
14+
"GITGATEWAY_DB_NAMESPACE": {
1515
"value": "auth"
1616
},
17-
"git-gateway_JWT_SECRET": {
17+
"GITGATEWAY_JWT_SECRET": {
1818
"required": true
1919
},
20-
"git-gateway_MAILER_ADMIN_EMAIL": {},
21-
"git-gateway_MAILER_HOST": {},
22-
"git-gateway_MAILER_MEMBER_FOLDER": {},
23-
"git-gateway_MAILER_PASS": {},
24-
"git-gateway_MAILER_PORT": {},
25-
"git-gateway_MAILER_SITE_URL": {},
26-
"git-gateway_MAILER_SUBJECTS_CONFIRMATION": {},
27-
"git-gateway_MAILER_SUBJECTS_RECOVERY": {},
28-
"git-gateway_MAILER_TEMPLATES_CONFIRMATION": {},
29-
"git-gateway_MAILER_TEMPLATES_EMAIL_CHANGE": {},
30-
"git-gateway_MAILER_TEMPLATES_RECOVERY": {},
31-
"git-gateway_MAILER_USER": {}
20+
"GITGATEWAY_MAILER_ADMIN_EMAIL": {},
21+
"GITGATEWAY_MAILER_HOST": {},
22+
"GITGATEWAY_MAILER_MEMBER_FOLDER": {},
23+
"GITGATEWAY_MAILER_PASS": {},
24+
"GITGATEWAY_MAILER_PORT": {},
25+
"GITGATEWAY_MAILER_SITE_URL": {},
26+
"GITGATEWAY_MAILER_SUBJECTS_CONFIRMATION": {},
27+
"GITGATEWAY_MAILER_SUBJECTS_RECOVERY": {},
28+
"GITGATEWAY_MAILER_TEMPLATES_CONFIRMATION": {},
29+
"GITGATEWAY_MAILER_TEMPLATES_EMAIL_CHANGE": {},
30+
"GITGATEWAY_MAILER_TEMPLATES_RECOVERY": {},
31+
"GITGATEWAY_MAILER_USER": {}
3232
}
3333
}

cmd/migrate_cmd.go

+10-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
var migrateCmd = cobra.Command{
1111
Use: "migrate",
12-
Long: "Migrate database strucutures. This will create new tables and add missing columns and indexes.",
12+
Long: "Migrate database structures. This will create new tables and add missing columns and indexes.",
1313
Run: func(cmd *cobra.Command, args []string) {
1414
execWithConfig(cmd, migrate)
1515
},
@@ -20,5 +20,14 @@ func migrate(globalConfig *conf.GlobalConfiguration, config *conf.Configuration)
2020
if err != nil {
2121
logrus.Fatalf("Error opening database: %+v", err)
2222
}
23+
2324
defer db.Close()
25+
26+
err = db.Automigrate()
27+
if err != nil {
28+
logrus.Fatalf("Error automigrating database: %+v", err)
29+
}
30+
31+
logrus.Info("Automigration successful")
32+
2433
}

models/instance.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func (i *Instance) BeforeSave() error {
5252
return nil
5353
}
5454

55-
// Config loads the the base configuration values with defaults.
55+
// Config loads the base configuration values with defaults.
5656
func (i *Instance) Config() (*conf.Configuration, error) {
5757
if i.BaseConfig == nil {
5858
return nil, errors.New("no configuration data available")

0 commit comments

Comments
 (0)