address comments

cmd/migrate/config.go

@@ -37,6 +37,6 @@ var (
 	flagConfigFile      = pflag.String("config.file", "", "configuration file name without extension")
 
 	// goto command flags
-	flagDirty   = pflag.Bool("dirty", false, "migration is dirty")
-	flagPVCPath = pflag.String("intermediate-path", "", "path to the mounted volume which is used to copy the migration files")
+	flagDirty     = pflag.Bool("force-dirty-handling", false, "force the handling of dirty database state")
+	flagMountPath = pflag.String("cache-dir", "", "path to the mounted volume which is used to copy the migration files")
 )

internal/cli/main.go

@@ -29,7 +29,9 @@ const (
 	   Use -format option to specify a Go time format string. Note: migrations with the same time cause "duplicate migration version" error.
            Use -tz option to specify the timezone that will be used when generating non-sequential migrations (defaults: UTC).
 `
-	gotoUsage = `goto V [-dirty] [-intermediate-path]     Migrate to version V`
+	gotoUsage = `goto V [-force-dirty-handling] [-cache-dir P]      Migrate to version V
+	Use -force-dirty-handling to handle dirty database state
+	Use -cache-dir to specify the intermediate path P for storing migrations`
 	upUsage   = `up [N]       Apply all or N up migrations`
 	downUsage = `down [N] [-all]    Apply all or N down migrations
 	Use -all to apply all down migrations`
@@ -262,28 +264,18 @@ Database drivers: `+strings.Join(database.List(), ", ")+"\n", createUsage, gotoU
 		if err != nil {
 			log.fatal("error: can't read version argument V")
 		}
-		handleDirty := viper.GetBool("dirty")
-		destPath := viper.GetString("intermediate-path")
-		srcPath := ""
-		// if sourcePtr is set, use it to get the source path
-		// otherwise, use the path flag
-		if path != "" {
-			srcPath = path
-		}
-		if sourcePtr != "" {
-			// parse the source path from the source argument
-			parse, err := url.Parse(sourcePtr)
-			if err != nil {
-				log.fatal("error: can't parse the source path from the source argument")
+		handleDirty := viper.GetBool("force-dirty-handling")
+		if handleDirty {
+			destPath := viper.GetString("cache-dir")
+			if destPath == "" {
+				log.fatal("error: cache-dir must be specified when force-dirty-handling is set")
 			}
-			srcPath = parse.Path
-		}
 
-		if handleDirty && destPath == "" {
-			log.fatal("error: intermediate-path must be specified when dirty is set")
+			if err = migrater.WithDirtyStateHandler(sourcePtr, destPath, handleDirty); err != nil {
+				log.fatalErr(err)
+			}
 		}
 
-		migrater.WithDirtyStateHandler(srcPath, destPath, handleDirty)
 		if err = gotoCmd(migrater, uint(v)); err != nil {
 			log.fatalErr(err)
 		}