fixup! feat: add node-startup-prep-util

cartesi · May 29, 2024 · 8b5ebba · 8b5ebba
1 parent 1499cb3
commit 8b5ebba
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 9 deletions.
diff --git a/utils/node-startup-prep/.dockerignore → utils/node-pre-start/.dockerignore b/utils/node-startup-prep/.dockerignore → utils/node-pre-start/.dockerignore
diff --git a/utils/node-startup-prep/.gitignore → utils/node-pre-start/.gitignore b/utils/node-startup-prep/.gitignore → utils/node-pre-start/.gitignore
diff --git a/utils/node-startup-prep/Dockerfile → utils/node-pre-start/Dockerfile b/utils/node-startup-prep/Dockerfile → utils/node-pre-start/Dockerfile
diff --git a/utils/node-startup-prep/go.mod → utils/node-pre-start/go.mod b/utils/node-startup-prep/go.mod → utils/node-pre-start/go.mod
diff --git a/utils/node-startup-prep/go.sum → utils/node-pre-start/go.sum b/utils/node-startup-prep/go.sum → utils/node-pre-start/go.sum
diff --git a/utils/node-startup-prep/main.go → utils/node-pre-start/main.go b/utils/node-startup-prep/main.go → utils/node-pre-start/main.go
@@ -32,24 +32,27 @@ func main() {
 	if !exists {
 		log.Fatalln("ERR: Missing environment variable CARTESI_EXPERIMENTAL_SUNODO_VALIDATOR_REDIS_ENDPOINT")
 	}
-	log.Printf("CARTESI_EXPERIMENTAL_SUNODO_VALIDATOR_REDIS_ENDPOINT=%s service=node-startup-prep", _redisEndpoint)
-	u, err := url.Parse(_redisEndpoint)
+	redisEndpoint, err := url.Parse(_redisEndpoint)
 	if err != nil {
 		log.Fatalln("ERR: ", err)
 	}
-	var redisEndpoint = fmt.Sprintf("%s:%s", u.Hostname(), u.Port())
+	log.Printf("CARTESI_EXPERIMENTAL_SUNODO_VALIDATOR_REDIS_ENDPOINT=%s://%s service=node-startup-prep", redisEndpoint.Scheme, redisEndpoint.Host)
 
-	postgresEndpoint, exists := os.LookupEnv("CARTESI_POSTGRES_ENDPOINT")
+	_postgresEndpoint, exists := os.LookupEnv("CARTESI_POSTGRES_ENDPOINT")
 	if !exists {
 		log.Fatalln("ERR: Missing environment variable CARTESI_POSTGRES_ENDPOINT service=node-startup-prep")
 	}
-	log.Printf("CARTESI_POSTGRES_ENDPOINT=%s service=node-startup-prep", postgresEndpoint)
+	postgresEndpoint, err := url.Parse(_postgresEndpoint)
+	if err != nil {
+		log.Fatalln("ERR: ", err)
+	}
+	log.Printf("CARTESI_POSTGRES_ENDPOINT=%s://%s:[REDACTED]@%s/ service=node-startup-prep", postgresEndpoint.Scheme, postgresEndpoint.User.Username(), postgresEndpoint.Host)
 
 	// Clean inputs and outputs streams
 	rdb := redis.NewClient(&redis.Options{
-		Addr:     redisEndpoint,
-		Password: "", // no password set
-		DB:       0,  // use default DB
+		Addr:     redisEndpoint.Host,
+		Password: redisEndpoint.User.String(),
+		DB:       0, // use default DB
 	})
 
 	_, err = rdb.Ping(ctx).Result()
@@ -74,7 +77,7 @@ func main() {
 	log.Println("REDIS: Cleaned inputs and outputs streams.")
 
 	//connect to a PostgreSQL database
-	db, err := sqlx.Connect("postgres", postgresEndpoint)
+	db, err := sqlx.Connect("postgres", postgresEndpoint.String())
 	if err != nil {
 		log.Fatalln(err)
 	}