startup migration scripts should run in the migrate binary

api/server/shared/config/loader/loader.go

@@ -1,7 +1,6 @@
 package loader
 
 import (
-	"errors"
 	"fmt"
 	"io/ioutil"
 	"net/http"
@@ -13,7 +12,6 @@ import (
 	"github.com/porter-dev/porter/api/server/shared/config/env"
 	"github.com/porter-dev/porter/api/server/shared/config/envloader"
 	"github.com/porter-dev/porter/api/server/shared/websocket"
-	"github.com/porter-dev/porter/cmd/migrate/startup_migrations"
 	"github.com/porter-dev/porter/internal/adapter"
 	"github.com/porter-dev/porter/internal/analytics"
 	"github.com/porter-dev/porter/internal/auth/sessionstore"
@@ -21,7 +19,6 @@ import (
 	"github.com/porter-dev/porter/internal/billing"
 	"github.com/porter-dev/porter/internal/helm/urlcache"
 	"github.com/porter-dev/porter/internal/integrations/powerdns"
-	"github.com/porter-dev/porter/internal/models"
 	"github.com/porter-dev/porter/internal/notifier"
 	"github.com/porter-dev/porter/internal/notifier/sendgrid"
 	"github.com/porter-dev/porter/internal/oauth"
@@ -82,36 +79,6 @@ func (e *EnvConfigLoader) LoadConfig() (res *config.Config, err error) {
 		return nil, err
 	}
 
-	dbMigration := &models.DbMigration{}
-
-	if err := InstanceDB.Model(&models.DbMigration{}).First(dbMigration).Error; err != nil {
-		if errors.Is(err, pgorm.ErrRecordNotFound) {
-			dbMigration.Version = 0
-		} else {
-			return nil, err
-		}
-	}
-
-	latestMigrationVersion := startup_migrations.LatestMigrationVersion
-
-	if dbMigration.Version < latestMigrationVersion {
-		for ver, fn := range startup_migrations.StartupMigrations {
-			if ver > dbMigration.Version {
-				err := fn(InstanceDB, res.Logger)
-
-				if err != nil {
-					return nil, err
-				}
-			}
-		}
-
-		dbMigration.Version = latestMigrationVersion
-
-		if err := InstanceDB.Save(dbMigration).Error; err != nil {
-			return nil, err
-		}
-	}
-
 	var key [32]byte
 
 	for i, b := range []byte(envConf.DBConf.EncryptionKey) {

cmd/migrate/main.go

@@ -1,18 +1,21 @@
 package main
 
 import (
+	"errors"
 	"log"
 
 	"github.com/porter-dev/porter/api/server/shared/config/envloader"
 	"github.com/porter-dev/porter/cmd/migrate/keyrotate"
-	migratelegacyrbac "github.com/porter-dev/porter/cmd/migrate/migrate_legacy_rbac"
 	"github.com/porter-dev/porter/cmd/migrate/populate_source_config_display_name"
+	"github.com/porter-dev/porter/cmd/migrate/startup_migrations"
 
 	adapter "github.com/porter-dev/porter/internal/adapter"
+	"github.com/porter-dev/porter/internal/models"
 	"github.com/porter-dev/porter/internal/repository/gorm"
 	lr "github.com/porter-dev/porter/pkg/logger"
 
 	"github.com/joeshaw/envdecode"
+	pgorm "gorm.io/gorm"
 )
 
 func main() {
@@ -49,6 +52,39 @@ func main() {
 		return
 	}
 
+	dbMigration := &models.DbMigration{}
+
+	if err := db.Model(&models.DbMigration{}).First(dbMigration).Error; err != nil {
+		if errors.Is(err, pgorm.ErrRecordNotFound) {
+			dbMigration.Version = 0
+		} else {
+			logger.Fatal().Err(err).Msg("failed to check for db migration version")
+			return
+		}
+	}
+
+	latestMigrationVersion := startup_migrations.LatestMigrationVersion
+
+	if dbMigration.Version < latestMigrationVersion {
+		for ver, fn := range startup_migrations.StartupMigrations {
+			if ver > dbMigration.Version {
+				err := fn(db, logger)
+
+				if err != nil {
+					logger.Fatal().Err(err).Msg("failed to run startup migration script")
+					return
+				}
+			}
+		}
+
+		dbMigration.Version = latestMigrationVersion
+
+		if err := db.Save(dbMigration).Error; err != nil {
+			logger.Fatal().Err(err).Msg("failed to update migration version to latest")
+			return
+		}
+	}
+
 	if shouldRotate, oldKeyStr, newKeyStr := shouldKeyRotate(); shouldRotate {
 		oldKey := [32]byte{}
 		newKey := [32]byte{}
@@ -71,14 +107,6 @@ func main() {
 		}
 	}
 
-	if shouldMigrateFromLegacyRBAC() {
-		err := migratelegacyrbac.MigrateFromLegacyRBAC(db, logger)
-
-		if err != nil {
-			logger.Fatal().Err(err).Msg("failed to migrate legacy RBAC")
-		}
-	}
-
 	if err := InstanceMigrate(db, envConf.DBConf); err != nil {
 		logger.Fatal().Err(err).Msg("vault migration failed")
 	}
@@ -120,22 +148,3 @@ func shouldPopulateSourceConfigDisplayName() bool {
 
 	return c.PopulateSourceConfigDisplayName
 }
-
-type MigrateLegacyRBACConf struct {
-	// we add a dummy field to avoid empty struct issue with envdecode
-	DummyField string `env:"ASDF,default=asdf"`
-
-	// if true, will migrate away from legacy RBAC to advanced RBAC
-	MigrateLegacyRBAC bool `env:"MIGRATE_LEGACY_RBAC"`
-}
-
-func shouldMigrateFromLegacyRBAC() bool {
-	var c MigrateLegacyRBACConf
-
-	if err := envdecode.StrictDecode(&c); err != nil {
-		log.Fatalf("Failed to decode migration conf: %s", err)
-		return false
-	}
-
-	return c.MigrateLegacyRBAC
-}

cmd/migrate/startup_migrations/global_map.go

@@ -8,9 +8,9 @@ import (
 
 const LatestMigrationVersion uint = 1
 
-type MigrationFunc func(db *gorm.DB, logger *lr.Logger) error
+type migrationFunc func(db *gorm.DB, logger *lr.Logger) error
 
-var StartupMigrations = make(map[uint]MigrationFunc)
+var StartupMigrations = make(map[uint]migrationFunc)
 
 func init() {
 	StartupMigrations[1] = migrate_legacy_rbac.MigrateFromLegacyRBAC