add some connection infos

app/catalog/catalog.go

@@ -71,14 +71,21 @@ func printContainerInfo(container engine.Container, info map[string]string) {
 		rowsPorts = append(rowsPorts, []string{fmt.Sprintf("localhost:%d", *p.HostPort), fmt.Sprintf("%s://%s:%d", p.Proto, container.IPAddress, p.Port)})
 	}
 
-	cli.Table([]string{"Mapping", "Target"}, rowsPorts)
-	cli.Info()
+	if len(rowsPorts) > 0 {
+		cli.Table([]string{"Mapping", "Target"}, rowsPorts)
+	}
 
 	rowsInfo := [][]string{}
 
 	for k, v := range info {
 		rowsInfo = append(rowsInfo, []string{k, v})
 	}
 
-	cli.Table([]string{"Description", "Value"}, rowsInfo)
+	if len(rowsInfo) > 0 {
+		if len(rowsPorts) > 0 {
+			cli.Info()
+		}
+
+		cli.Table([]string{"Description", "Value"}, rowsInfo)
+	}
 }

pkg/catalog/etcd/etcd.go

@@ -1,6 +1,8 @@
 package etcd
 
 import (
+	"fmt"
+
 	"github.com/adrianliechti/devkit/pkg/catalog"
 	"github.com/adrianliechti/devkit/pkg/engine"
 	"github.com/sethvargo/go-password/password"
@@ -75,7 +77,19 @@ func (m *Manager) New() (engine.Container, error) {
 }
 
 func (m *Manager) Info(instance engine.Container) (map[string]string, error) {
-	return map[string]string{}, nil
+	var uri string
+
+	for _, p := range instance.Ports {
+		if p.HostPort == nil || p.Port != 2379 {
+			continue
+		}
+
+		uri = fmt.Sprintf("http://localhost:%d", *p.HostPort)
+	}
+
+	return map[string]string{
+		"URI": uri,
+	}, nil
 }
 
 func (m *Manager) Shell(instance engine.Container) (string, error) {

pkg/catalog/mongodb/mongodb.go

@@ -1,6 +1,8 @@
 package mongodb
 
 import (
+	"fmt"
+
 	"github.com/adrianliechti/devkit/pkg/catalog"
 	"github.com/adrianliechti/devkit/pkg/engine"
 	"github.com/sethvargo/go-password/password"
@@ -39,15 +41,13 @@ const (
 func (m *Manager) New() (engine.Container, error) {
 	image := "mongo:5-focal"
 
-	database := "db"
 	username := "root"
 	password := password.MustGenerate(10, 4, 0, false, false)
 
 	return engine.Container{
 		Image: image,
 
 		Env: map[string]string{
-			"MONGO_INITDB_DATABASE":      database,
 			"MONGO_INITDB_ROOT_USERNAME": username,
 			"MONGO_INITDB_ROOT_PASSWORD": password,
 		},
@@ -68,14 +68,23 @@ func (m *Manager) New() (engine.Container, error) {
 }
 
 func (m *Manager) Info(instance engine.Container) (map[string]string, error) {
-	database := instance.Env["MONGO_INITDB_DATABASE"]
 	username := instance.Env["MONGO_INITDB_ROOT_USERNAME"]
 	password := instance.Env["MONGO_INITDB_ROOT_PASSWORD"]
 
+	var uri string
+
+	for _, p := range instance.Ports {
+		if p.HostPort == nil || p.Port != 27017 {
+			continue
+		}
+
+		uri = fmt.Sprintf("mongodb://%s:%s@localhost:%d", username, password, *p.HostPort)
+	}
+
 	return map[string]string{
-		"Database": database,
 		"Username": username,
 		"Password": password,
+		"URI":      uri,
 	}, nil
 }
 

pkg/catalog/nats/nats.go

@@ -1,6 +1,8 @@
 package nats
 
 import (
+	"fmt"
+
 	"github.com/adrianliechti/devkit/pkg/catalog"
 	"github.com/adrianliechti/devkit/pkg/engine"
 	"github.com/sethvargo/go-password/password"
@@ -71,8 +73,19 @@ func (m *Manager) Info(instance engine.Container) (map[string]string, error) {
 	username := instance.Env["USERNAME"]
 	password := instance.Env["PASSWORD"]
 
+	var uri string
+
+	for _, p := range instance.Ports {
+		if p.HostPort == nil || p.Port != 4222 {
+			continue
+		}
+
+		uri = fmt.Sprintf("nats://%s:%s@localhost:%d", username, password, *p.HostPort)
+	}
+
 	return map[string]string{
 		"Username": username,
 		"Password": password,
+		"URI":      uri,
 	}, nil
 }

pkg/catalog/postgres/postgres.go

@@ -1,6 +1,8 @@
 package postgres
 
 import (
+	"fmt"
+
 	"github.com/adrianliechti/devkit/pkg/catalog"
 	"github.com/adrianliechti/devkit/pkg/engine"
 	"github.com/sethvargo/go-password/password"
@@ -39,7 +41,7 @@ const (
 func (m *Manager) New() (engine.Container, error) {
 	image := "postgres:14-bullseye"
 
-	database := "postgres"
+	database := "db"
 	username := "postgres"
 	password := password.MustGenerate(10, 4, 0, false, false)
 
@@ -72,10 +74,21 @@ func (m *Manager) Info(instance engine.Container) (map[string]string, error) {
 	username := instance.Env["POSTGRES_USER"]
 	password := instance.Env["POSTGRES_PASSWORD"]
 
+	var uri string
+
+	for _, p := range instance.Ports {
+		if p.HostPort == nil || p.Port != 5432 {
+			continue
+		}
+
+		uri = fmt.Sprintf("postgresql://%s:%s@localhost:%d/%s?sslmode=disable", username, password, *p.HostPort, database)
+	}
+
 	return map[string]string{
 		"Database": database,
 		"Username": username,
 		"Password": password,
+		"URI":      uri,
 	}, nil
 }
 

pkg/catalog/redis/redis.go

@@ -1,6 +1,8 @@
 package redis
 
 import (
+	"fmt"
+
 	"github.com/adrianliechti/devkit/pkg/catalog"
 	"github.com/adrianliechti/devkit/pkg/engine"
 	"github.com/sethvargo/go-password/password"
@@ -66,8 +68,19 @@ func (m *Manager) New() (engine.Container, error) {
 func (m *Manager) Info(instance engine.Container) (map[string]string, error) {
 	password := instance.Env["REDIS_PASSWORD"]
 
+	var uri string
+
+	for _, p := range instance.Ports {
+		if p.HostPort == nil || p.Port != 6379 {
+			continue
+		}
+
+		uri = fmt.Sprintf("redis://:%s@localhost:%d", password, *p.HostPort)
+	}
+
 	return map[string]string{
 		"Password": password,
+		"URI":      uri,
 	}, nil
 }