Explorar o código

fix migration script

Mohammed Nafees %!s(int64=3) %!d(string=hai) anos
pai
achega
711ef13d71
Modificáronse 2 ficheiros con 8 adicións e 6 borrados
  1. 3 3
      cmd/migrate/main.go
  2. 5 3
      cmd/migrate/migrate_legacy_rbac/migrate.go

+ 3 - 3
cmd/migrate/main.go

@@ -79,9 +79,9 @@ func main() {
 		}
 	}
 
-	// if err := InstanceMigrate(db, envConf.DBConf); err != nil {
-	// 	logger.Fatal().Err(err).Msg("vault migration failed")
-	// }
+	if err := InstanceMigrate(db, envConf.DBConf); err != nil {
+		logger.Fatal().Err(err).Msg("vault migration failed")
+	}
 }
 
 type RotateConf struct {

+ 5 - 3
cmd/migrate/migrate_legacy_rbac/migrate.go

@@ -92,10 +92,12 @@ func MigrateFromLegacyRBAC(db *_gorm.DB, logger *lr.Logger) error {
 			delete(legacyRoleKindUsersMap, types.RoleCustom) // added just to make sure nothing goes wrong from here
 
 			for roleKind, users := range legacyRoleKindUsersMap {
-				err := projectRoleRepo.UpdateUsersInProjectRole(project.ID, fmt.Sprintf("%d-%s", project.ID, roleKind), users)
+				if len(users) > 0 {
+					err := projectRoleRepo.UpdateUsersInProjectRole(project.ID, fmt.Sprintf("%d-%s", project.ID, roleKind), users)
 
-				if err != nil {
-					return err
+					if err != nil {
+						return err
+					}
 				}
 			}