refactor: update BlobIndexerConfig

Author: Monika-Bitfly

backend/pkg/commons/types/config.go

@@ -19,24 +19,15 @@ type Bigtable struct {
 
 // Config is a struct to hold the configuration data
 type Config struct {
-	JustV2         bool           `yaml:"justV2" env:"JUST_V2"` // temp, remove at some point
-	DeploymentType string         `yaml:"deploymentType" env:"DEPLOYMENT_TYPE"`
-	ReaderDatabase DatabaseConfig `yaml:"readerDatabase" env:", prefix=READER_"`
-	WriterDatabase DatabaseConfig `yaml:"writerDatabase" env:", prefix=WRITER_"`
-	AlloyReader    DatabaseConfig `yaml:"alloyReader" env:", prefix=ALLOY_READER_"`
-	AlloyWriter    DatabaseConfig `yaml:"alloyWriter" env:", prefix=ALLOY_WRITER_"`
-	Bigtable       Bigtable       `yaml:"bigtable" env:", prefix=BIGTABLE_"`
-	RawBigtable    Bigtable       `yaml:"rawBigtable" env:", prefix=RAW_BIGTABLE_"`
-	BlobIndexer    struct {
-		S3 struct {
-			Endpoint        string `yaml:"endpoint" env:"ENDPOINT"`                 // s3 endpoint
-			Bucket          string `yaml:"bucket" env:"BUCKET"`                     // s3 bucket
-			AccessKeyId     string `yaml:"accessKeyId" env:"ACCESS_KEY_ID"`         // s3 access key id
-			AccessKeySecret string `yaml:"accessKeySecret" env:"ACCESS_KEY_SECRET"` // s3 access key secret
-		} `yaml:"s3" env:", prefix=S3_"`
-		PruneMarginEpochs    uint64 `yaml:"pruneMarginEpochs" env:"PRUNE_MARGIN_EPOCHS"`       // PruneMarginEpochs helps blobindexer to decide if connected node has pruned too far to have no holes in the data, set it to same value as lighthouse flag --blob-prune-margin-epochs
-		DisableStatusReports bool   `yaml:"disableStatusReports" env:"DISABLE_STATUS_REPORTS"` // disable status reports (no connection to db needed)
-	} `yaml:"blobIndexer" env:", prefix=BLOB_INDEXER_"`
+	JustV2                    bool              `yaml:"justV2" env:"JUST_V2"` // temp, remove at some point
+	DeploymentType            string            `yaml:"deploymentType" env:"DEPLOYMENT_TYPE"`
+	ReaderDatabase            DatabaseConfig    `yaml:"readerDatabase" env:", prefix=READER_"`
+	WriterDatabase            DatabaseConfig    `yaml:"writerDatabase" env:", prefix=WRITER_"`
+	AlloyReader               DatabaseConfig    `yaml:"alloyReader" env:", prefix=ALLOY_READER_"`
+	AlloyWriter               DatabaseConfig    `yaml:"alloyWriter" env:", prefix=ALLOY_WRITER_"`
+	Bigtable                  Bigtable          `yaml:"bigtable" env:", prefix=BIGTABLE_"`
+	RawBigtable               Bigtable          `yaml:"rawBigtable" env:", prefix=RAW_BIGTABLE_"`
+	BlobIndexer               BlobIndexerConfig `yaml:"blobIndexer" env:", prefix=BLOB_INDEXER_"`
 	Chain                     `yaml:"chain"`
 	Eth1ErigonEndpoint        string `yaml:"eth1ErigonEndpoint" env:"ETH1_ERIGON_ENDPOINT"`
 	Eth1GethEndpoint          string `yaml:"eth1GethEndpoint" env:"ETH1_GETH_ENDPOINT"`
@@ -282,3 +273,14 @@ type ServiceMonitoringConfiguration struct {
 	Name     string        `yaml:"name" env:"NAME"`
 	Duration time.Duration `yaml:"duration" env:"DURATION"`
 }
+
+type BlobIndexerConfig struct {
+	S3 struct {
+		Endpoint        string `yaml:"endpoint" env:"ENDPOINT"`                 // s3 endpoint
+		Bucket          string `yaml:"bucket" env:"BUCKET"`                     // s3 bucket
+		AccessKeyId     string `yaml:"accessKeyId" env:"ACCESS_KEY_ID"`         // s3 access key id
+		AccessKeySecret string `yaml:"accessKeySecret" env:"ACCESS_KEY_SECRET"` // s3 access key secret
+	} `yaml:"s3" env:", prefix=S3_"`
+	PruneMarginEpochs    uint64 `yaml:"pruneMarginEpochs" env:"PRUNE_MARGIN_EPOCHS"`       // PruneMarginEpochs helps blobindexer to decide if connected node has pruned too far to have no holes in the data, set it to same value as lighthouse flag --blob-prune-margin-epochs
+	DisableStatusReports bool   `yaml:"disableStatusReports" env:"DISABLE_STATUS_REPORTS"` // disable status reports (no connection to db needed)
+}