Merge pull request #4 from gnosischain/gather-env-vars-for-ch

update: gathering ch info from env vars
gnosischain · Sep 12, 2024 · 5169bfd · 5169bfd
2 parents 8c71ad9 + 5e722d2
commit 5169bfd
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 16 deletions.
diff --git a/cmd/cmd.go b/cmd/cmd.go
@@ -38,24 +38,27 @@ var ConsumerCommand = &cli.Command{
 			Value: "consumer-" + uuid.New().String(),
 		},
 		&cli.StringFlag{
-			Name:  "endpoint",
-			Usage: "Clickhouse server endpoint",
-			Value: "", // If empty URL, run the consumer without Clickhouse
+			Name:   "endpoint",
+			Usage:  "Clickhouse server endpoint",
+			Value:  "", // If empty URL, run the consumer without Clickhouse
+			EnvVar: "VALTRACK_CH_URL",
 		},
 		&cli.StringFlag{
 			Name:  "db",
 			Usage: "Clickhouse database name",
 			Value: "default",
 		},
 		&cli.StringFlag{
-			Name:  "username",
-			Usage: "Clickhouse username",
-			Value: "default",
+			Name:   "username",
+			Usage:  "Clickhouse username",
+			Value:  "default",
+			EnvVar: "CLICKHOUSE_USER",
 		},
 		&cli.StringFlag{
-			Name:  "password",
-			Usage: "Clickhouse password",
-			Value: "",
+			Name:   "password",
+			Usage:  "Clickhouse password",
+			Value:  "",
+			EnvVar: "CLICKHOUSE_PASSWORD",
 		},
 		&cli.StringFlag{
 			Name:  "dune.namespace",
@@ -116,13 +119,13 @@ func runConsumer(c *cli.Context) error {
 		DuneNamespace: c.String("dune.namespace"),
 		DuneApiKey:    c.String("dune.api-key"),
 		ChCfg: clickhouse.ClickhouseConfig{
-			Endpoint:                       c.String("endpoint"),
-			DB:                             c.String("db"),
-			Username:                       c.String("username"),
-			Password:                       c.String("password"),
-			MaxValidatorBatchSize:          c.Uint64("max-validator-batch-size"),
-			MaxIPMetadataBatchSize:         c.Uint64("max-ip-metadata-batch-size"),
-			MaxPeerDiscoveredEventsBatchSize: c.Uint64("max-peer-discovered-events-batch-size"),
+			Endpoint:                           c.String("endpoint"),
+			DB:                                 c.String("db"),
+			Username:                           c.String("username"),
+			Password:                           c.String("password"),
+			MaxValidatorBatchSize:              c.Uint64("max-validator-batch-size"),
+			MaxIPMetadataBatchSize:             c.Uint64("max-ip-metadata-batch-size"),
+			MaxPeerDiscoveredEventsBatchSize:   c.Uint64("max-peer-discovered-events-batch-size"),
 			MaxMetadataReceivedEventsBatchSize: c.Uint64("max-metadata-received-events-batch-size"),
 		},
 	}

diff --git a/pkg/ethereum/utils.go b/pkg/ethereum/utils.go
@@ -15,6 +15,12 @@ func getCrawlerLocation() string {
 	if region := os.Getenv("AWS_REGION"); region != "" {
 		return region
 	}
+	if region := os.Getenv("AWS_DEFAULT_REGION"); region != "" {
+		return region
+	}
+	if region := os.Getenv("REGION"); region != "" {
+		return region
+	}
 	return "UNKOWN_REGION"
 }