Small script updates

t2bot · Jul 16, 2023 · 27de3a2 · 27de3a2
1 parent f23d6b2
commit 27de3a2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/cmd/gdpr_export/main.go b/cmd/gdpr_export/main.go
@@ -33,7 +33,7 @@ func main() {
 		return
 	}
 
-	config.Runtime.IsImportProcess = true
+	config.Runtime.IsImportProcess = true // prevents us from creating media by accident
 	config.Path = *configPath
 	assets.SetupMigrations(*migrationsPath)
 	assets.SetupTemplates(*templatesPath)

diff --git a/cmd/gdpr_import/main.go b/cmd/gdpr_import/main.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"errors"
 	"flag"
 	"os"
 	"path"
@@ -12,6 +13,7 @@ import (
 	"github.com/turt2live/matrix-media-repo/common/logging"
 	"github.com/turt2live/matrix-media-repo/common/rcontext"
 	"github.com/turt2live/matrix-media-repo/common/runtime"
+	"github.com/turt2live/matrix-media-repo/util/ids"
 )
 
 func main() {
@@ -28,10 +30,14 @@ func main() {
 		configPath = &configEnv
 	}
 
-	config.Runtime.IsImportProcess = true
+	config.Runtime.IsImportProcess = true // prevents us from creating media by accident
 	config.Path = *configPath
 	assets.SetupMigrations(*migrationsPath)
 
+	if ids.GetMachineId() == 0 {
+		panic(errors.New("expected custom machine ID for import process (unsafe to import as Machine 0)"))
+	}
+
 	var err error
 	err = logging.Setup(
 		config.Get().General.LogDirectory,

diff --git a/cmd/import_synapse/main.go b/cmd/import_synapse/main.go
@@ -18,7 +18,6 @@ import (
 	"github.com/turt2live/matrix-media-repo/common/logging"
 	"github.com/turt2live/matrix-media-repo/common/rcontext"
 	"github.com/turt2live/matrix-media-repo/common/runtime"
-	"github.com/turt2live/matrix-media-repo/common/version"
 	"github.com/turt2live/matrix-media-repo/database"
 	"github.com/turt2live/matrix-media-repo/datastores"
 	"github.com/turt2live/matrix-media-repo/homeserver_interop/synapse"
@@ -46,20 +45,14 @@ func main() {
 		configPath = &configEnv
 	}
 
-	version.SetDefaults()
-	version.Print(true)
-	config.Runtime.IsImportProcess = true
+	config.Runtime.IsImportProcess = true // prevents us from creating media by accident
 	config.Path = *configPath
+	assets.SetupMigrations(*migrationsPath)
 
 	if ids.GetMachineId() == 0 {
-		_ = os.Setenv("MACHINE_ID", "1023")
-		if ids.GetMachineId() != 1023 {
-			panic(errors.New("expected machine ID 1023 or custom ID for import process"))
-		}
+		panic(errors.New("expected custom machine ID for import process (unsafe to import as Machine 0)"))
 	}
 
-	assets.SetupMigrations(*migrationsPath)
-
 	var realPsqlPassword string
 	if *postgresPassword == "" {
 		if !terminal.IsTerminal(int(os.Stdin.Fd())) {