fix for reading yaml/toml config in cmd/integration

cmd/integration/commands/flags.go

@@ -48,6 +48,10 @@ func must(err error) {
 	}
 }
 
+func withConfig(cmd *cobra.Command) {
+	cmd.Flags().String("config", "", "yaml/toml config file location")
+}
+
 func withMining(cmd *cobra.Command) {
 	cmd.Flags().Bool("mine", false, "Enable mining")
 	cmd.Flags().StringArray("miner.notify", nil, "Comma separated HTTP URL list to notify of new work packages")

cmd/integration/commands/reset_state.go

@@ -13,13 +13,14 @@ import (
 	"github.com/ledgerwatch/erigon-lib/kv/kvcfg"
 	"github.com/ledgerwatch/erigon-lib/kv/rawdbv3"
 	"github.com/ledgerwatch/erigon-lib/state"
+	"github.com/ledgerwatch/log/v3"
+	"github.com/spf13/cobra"
+
 	"github.com/ledgerwatch/erigon/core/rawdb/rawdbhelpers"
 	reset2 "github.com/ledgerwatch/erigon/core/rawdb/rawdbreset"
 	"github.com/ledgerwatch/erigon/eth/stagedsync/stages"
 	"github.com/ledgerwatch/erigon/ethdb/prune"
 	"github.com/ledgerwatch/erigon/turbo/snapshotsync"
-	"github.com/ledgerwatch/log/v3"
-	"github.com/spf13/cobra"
 )
 
 var cmdResetState = &cobra.Command{
@@ -60,6 +61,7 @@ var cmdResetState = &cobra.Command{
 }
 
 func init() {
+	withConfig(cmdResetState)
 	withDataDir(cmdResetState)
 	withChain(cmdResetState)
 

cmd/integration/commands/stages.go

@@ -351,41 +351,43 @@ var cmdForceSetHistoryV3 = &cobra.Command{
 }
 
 func init() {
+	withConfig(cmdPrintStages)
 	withDataDir(cmdPrintStages)
 	withChain(cmdPrintStages)
 	withHeimdall(cmdPrintStages)
 	rootCmd.AddCommand(cmdPrintStages)
 
+	withConfig(cmdStageSenders)
 	withIntegrityChecks(cmdStageSenders)
 	withReset(cmdStageSenders)
 	withBlock(cmdStageSenders)
 	withUnwind(cmdStageSenders)
 	withDataDir(cmdStageSenders)
 	withChain(cmdStageSenders)
 	withHeimdall(cmdStageSenders)
-
 	rootCmd.AddCommand(cmdStageSenders)
 
+	withConfig(cmdStageSnapshots)
 	withDataDir(cmdStageSnapshots)
 	withReset(cmdStageSnapshots)
-
 	rootCmd.AddCommand(cmdStageSnapshots)
 
+	withConfig(cmdStageHeaders)
 	withDataDir(cmdStageHeaders)
 	withUnwind(cmdStageHeaders)
 	withReset(cmdStageHeaders)
 	withChain(cmdStageHeaders)
 	withHeimdall(cmdStageHeaders)
-
 	rootCmd.AddCommand(cmdStageHeaders)
 
+	withConfig(cmdStageBodies)
 	withDataDir(cmdStageBodies)
 	withUnwind(cmdStageBodies)
 	withChain(cmdStageBodies)
 	withHeimdall(cmdStageBodies)
-
 	rootCmd.AddCommand(cmdStageBodies)
 
+	withConfig(cmdStageExec)
 	withDataDir(cmdStageExec)
 	withReset(cmdStageExec)
 	withBlock(cmdStageExec)
@@ -396,9 +398,9 @@ func init() {
 	withChain(cmdStageExec)
 	withHeimdall(cmdStageExec)
 	withWorkers(cmdStageExec)
-
 	rootCmd.AddCommand(cmdStageExec)
 
+	withConfig(cmdStageHashState)
 	withDataDir(cmdStageHashState)
 	withReset(cmdStageHashState)
 	withBlock(cmdStageHashState)
@@ -407,9 +409,9 @@ func init() {
 	withBatchSize(cmdStageHashState)
 	withChain(cmdStageHashState)
 	withHeimdall(cmdStageHashState)
-
 	rootCmd.AddCommand(cmdStageHashState)
 
+	withConfig(cmdStageTrie)
 	withDataDir(cmdStageTrie)
 	withReset(cmdStageTrie)
 	withBlock(cmdStageTrie)
@@ -418,73 +420,76 @@ func init() {
 	withIntegrityChecks(cmdStageTrie)
 	withChain(cmdStageTrie)
 	withHeimdall(cmdStageTrie)
-
 	rootCmd.AddCommand(cmdStageTrie)
 
+	withConfig(cmdStageHistory)
 	withDataDir(cmdStageHistory)
 	withReset(cmdStageHistory)
 	withBlock(cmdStageHistory)
 	withUnwind(cmdStageHistory)
 	withPruneTo(cmdStageHistory)
 	withChain(cmdStageHistory)
 	withHeimdall(cmdStageHistory)
-
 	rootCmd.AddCommand(cmdStageHistory)
 
+	withConfig(cmdLogIndex)
 	withDataDir(cmdLogIndex)
 	withReset(cmdLogIndex)
 	withBlock(cmdLogIndex)
 	withUnwind(cmdLogIndex)
 	withPruneTo(cmdLogIndex)
 	withChain(cmdLogIndex)
 	withHeimdall(cmdLogIndex)
-
 	rootCmd.AddCommand(cmdLogIndex)
 
+	withConfig(cmdCallTraces)
 	withDataDir(cmdCallTraces)
 	withReset(cmdCallTraces)
 	withBlock(cmdCallTraces)
 	withUnwind(cmdCallTraces)
 	withPruneTo(cmdCallTraces)
 	withChain(cmdCallTraces)
 	withHeimdall(cmdCallTraces)
-
 	rootCmd.AddCommand(cmdCallTraces)
 
+	withConfig(cmdStageTxLookup)
 	withReset(cmdStageTxLookup)
 	withBlock(cmdStageTxLookup)
 	withUnwind(cmdStageTxLookup)
 	withDataDir(cmdStageTxLookup)
 	withPruneTo(cmdStageTxLookup)
 	withChain(cmdStageTxLookup)
 	withHeimdall(cmdStageTxLookup)
-
 	rootCmd.AddCommand(cmdStageTxLookup)
 
+	withConfig(cmdPrintMigrations)
 	withDataDir(cmdPrintMigrations)
 	rootCmd.AddCommand(cmdPrintMigrations)
 
+	withConfig(cmdRemoveMigration)
 	withDataDir(cmdRemoveMigration)
 	withMigration(cmdRemoveMigration)
 	withChain(cmdRemoveMigration)
 	withHeimdall(cmdRemoveMigration)
 	rootCmd.AddCommand(cmdRemoveMigration)
 
+	withConfig(cmdRunMigrations)
 	withDataDir(cmdRunMigrations)
 	withChain(cmdRunMigrations)
 	withHeimdall(cmdRunMigrations)
 	rootCmd.AddCommand(cmdRunMigrations)
 
+	withConfig(cmdSetSnap)
 	withDataDir2(cmdSetSnap)
 	withChain(cmdSetSnap)
 	rootCmd.AddCommand(cmdSetSnap)
 
+	withConfig(cmdForceSetHistoryV3)
 	withDataDir2(cmdForceSetHistoryV3)
 	cmdForceSetHistoryV3.Flags().BoolVar(&_forceSetHistoryV3, "history.v3", false, "")
 	rootCmd.AddCommand(cmdForceSetHistoryV3)
 
-	rootCmd.AddCommand(cmdForceSetHistoryV3)
-
+	withConfig(cmdSetPrune)
 	withDataDir(cmdSetPrune)
 	withChain(cmdSetPrune)
 	cmdSetPrune.Flags().StringVar(&pruneFlag, "prune", "hrtc", "")

cmd/integration/commands/state_domains.go

@@ -41,6 +41,7 @@ import (
 )
 
 func init() {
+	withConfig(stateDomains)
 	withDataDir(stateDomains)
 	withUnwind(stateDomains)
 	withUnwindEvery(stateDomains)
@@ -52,7 +53,6 @@ func init() {
 	withStartTx(stateDomains)
 	withCommitment(stateDomains)
 	withTraceFromTx(stateDomains)
-
 	rootCmd.AddCommand(stateDomains)
 }
 

cmd/integration/commands/state_stages.go

@@ -121,6 +121,7 @@ var loopExecCmd = &cobra.Command{
 }
 
 func init() {
+	withConfig(stateStages)
 	withDataDir2(stateStages)
 	withReferenceChaindata(stateStages)
 	withUnwind(stateStages)
@@ -131,24 +132,23 @@ func init() {
 	withChain(stateStages)
 	withHeimdall(stateStages)
 	withWorkers(stateStages)
-
 	rootCmd.AddCommand(stateStages)
 
+	withConfig(loopIhCmd)
 	withDataDir(loopIhCmd)
 	withBatchSize(loopIhCmd)
 	withUnwind(loopIhCmd)
 	withChain(loopIhCmd)
 	withHeimdall(loopIhCmd)
-
 	rootCmd.AddCommand(loopIhCmd)
 
+	withConfig(loopExecCmd)
 	withDataDir(loopExecCmd)
 	withBatchSize(loopExecCmd)
 	withUnwind(loopExecCmd)
 	withChain(loopExecCmd)
 	withHeimdall(loopExecCmd)
 	withWorkers(loopExecCmd)
-
 	rootCmd.AddCommand(loopExecCmd)
 }
 

turbo/debug/flags.go

@@ -273,6 +273,13 @@ func SetFlagsFromConfigFile(ctx *cli.Context) error {
 
 func SetCobraFlagsFromConfigFile(cmd *cobra.Command) error {
 	flags := cmd.Flags()
+
+	// flag might not be set for any reason so just exit if we're not aware of it
+	exists := flags.Lookup(configFlag.Name)
+	if exists == nil {
+		return nil
+	}
+
 	filePath, err := flags.GetString(configFlag.Name)
 	if err != nil {
 		return err