services/horizon/cmd: add datastore config option to ingest verify-range cmd (#5732)

Author: sreuland

services/horizon/CHANGELOG.md

@@ -7,6 +7,9 @@ file. This project adheres to [Semantic Versioning](http://semver.org/).
 
 - Update default pubnet captive core configuration to replace Whalestack with Creit Technologies in the quorum set ([5564](https://github.com/stellar/go/pull/5564)).
 
+- Add `--ledgerbackend` and `--datastore-config` options to `ingest verify-range` command to support CDP datastore backend configuration ([5553](https://github.com/stellar/go/pull/5553)).
+
+
 ## 22.0.3
 
 ### Fixed

services/horizon/cmd/db.go

@@ -49,6 +49,33 @@ var (
 	ledgerBackendType        ingest.LedgerBackendType
 )
 
+// generateLedgerBackendOpt creates a reusable ConfigOption for ledgerbackend parameter
+func generateLedgerBackendOpt(configKey *string, backendTypeVar *ingest.LedgerBackendType) *support.ConfigOption {
+	return &support.ConfigOption{
+		Name:        "ledgerbackend",
+		ConfigKey:   configKey,
+		OptType:     types.String,
+		Required:    false,
+		FlagDefault: ingest.CaptiveCoreBackend.String(),
+		Usage: fmt.Sprintf("[optional] Specify the ledger backend type: '%s' (default) or '%s'",
+			ingest.CaptiveCoreBackend.String(),
+			ingest.BufferedStorageBackend.String()),
+		CustomSetValue: func(co *support.ConfigOption) error {
+			val := viper.GetString(co.Name)
+			switch val {
+			case ingest.CaptiveCoreBackend.String():
+				*backendTypeVar = ingest.CaptiveCoreBackend
+			case ingest.BufferedStorageBackend.String():
+				*backendTypeVar = ingest.BufferedStorageBackend
+			default:
+				return fmt.Errorf("invalid ledger backend: %s, must be 'captive-core' or 'datastore'", val)
+			}
+			*co.ConfigKey.(*string) = val
+			return nil
+		},
+	}
+}
+
 func requireAndSetFlags(horizonFlags config.ConfigOptions, names ...string) error {
 	set := map[string]bool{}
 	for _, name := range names {
@@ -133,29 +160,7 @@ func ingestRangeCmdOpts() support.ConfigOptions {
 			FlagDefault: uint(5),
 			Usage:       "[optional] backoff seconds between reingest retries",
 		},
-		{
-			Name:        "ledgerbackend",
-			ConfigKey:   &ledgerBackendStr,
-			OptType:     types.String,
-			Required:    false,
-			FlagDefault: ingest.CaptiveCoreBackend.String(),
-			Usage: fmt.Sprintf("[optional] Specify the ledger backend type: '%s' (default) or '%s'",
-				ingest.CaptiveCoreBackend.String(),
-				ingest.BufferedStorageBackend.String()),
-			CustomSetValue: func(co *support.ConfigOption) error {
-				val := viper.GetString(co.Name)
-				switch val {
-				case ingest.CaptiveCoreBackend.String():
-					ledgerBackendType = ingest.CaptiveCoreBackend
-				case ingest.BufferedStorageBackend.String():
-					ledgerBackendType = ingest.BufferedStorageBackend
-				default:
-					return fmt.Errorf("invalid ledger backend: %s, must be 'captive-core' or 'datastore'", val)
-				}
-				*co.ConfigKey.(*string) = val
-				return nil
-			},
-		},
+		generateLedgerBackendOpt(&ledgerBackendStr, &ledgerBackendType),
 		{
 			Name:      "datastore-config",
 			ConfigKey: &storageBackendConfigPath,
@@ -239,7 +244,7 @@ func runDBDetectGaps(config horizon.Config) ([]history.LedgerRange, error) {
 		return nil, err
 	}
 	defer horizonSession.Close()
-	q := &history.Q{horizonSession}
+	q := &history.Q{SessionInterface: horizonSession}
 	return q.GetLedgerGaps(context.Background())
 }
 
@@ -249,7 +254,7 @@ func runDBDetectGapsInRange(config horizon.Config, start, end uint32) ([]history
 		return nil, err
 	}
 	defer horizonSession.Close()
-	q := &history.Q{horizonSession}
+	q := &history.Q{SessionInterface: horizonSession}
 	return q.GetLedgerGapsInRange(context.Background(), start, end)
 }