#4911: use flag config instance not global for test root cmd execution

services/horizon/cmd/db.go

@@ -76,13 +76,13 @@ func requireAndSetFlags(horizonFlags config.ConfigOptions, names ...string) erro
  return fmt.Errorf("could not find %s flags", strings.Join(missing, ","))
 }
 
-func migrate(dir schema.MigrateDir, count int) error {
- if !globalConfig.Ingest {
+func migrate(dir schema.MigrateDir, count int, horizonConfig *horizon.Config) error {
+ if !horizonConfig.Ingest {
  log.Println("Skipping migrations because ingest flag is not enabled")
  return nil
  }
 
- dbConn, err := db.Open("postgres", globalConfig.DatabaseURL)
+ dbConn, err := db.Open("postgres", horizonConfig.DatabaseURL)
  if err != nil {
  return err
  }
@@ -335,7 +335,7 @@ func DefineDBCommands(rootCmd *cobra.Command, horizonConfig *horizon.Config, hor
  return ErrUsage{cmd}
  }
 
- return migrate(schema.MigrateDown, count)
+ return migrate(schema.MigrateDown, count, horizonConfig)
  },
  }
 
@@ -359,7 +359,7 @@ func DefineDBCommands(rootCmd *cobra.Command, horizonConfig *horizon.Config, hor
  return ErrUsage{cmd}
  }
 
- return migrate(schema.MigrateRedo, count)
+ return migrate(schema.MigrateRedo, count, horizonConfig)
  },
  }
 
@@ -417,7 +417,7 @@ func DefineDBCommands(rootCmd *cobra.Command, horizonConfig *horizon.Config, hor
  }
  }
 
- return migrate(schema.MigrateUp, count)
+ return migrate(schema.MigrateUp, count, horizonConfig)
  },
  }
 

services/horizon/internal/integration/db_test.go

@@ -803,7 +803,7 @@ func TestReingestDBWithFilterRules(t *testing.T) {
  fmt.Sprintf("%d", reachedLedger),
  ))
 
- tt.NoError(horizoncmd.RootCmd.Execute())
+ tt.NoError(rootCmd.Execute())
 
  // bring up horizon, just the api server no ingestion, to query
  // for tx's that should have been repopulated on db from reingestion per