Merge pull request #11 from dirodriguezm/functional-options

refactor: use functional options pattern for config

tapservicego/cmd/tapservice/main.go

@@ -0,0 +1,13 @@
+package main
+
+import (
+	"ataps/internal/tapsync"
+	"fmt"
+)
+
+func main() {
+	config := tapsync.NewConfig() // by default config uses env variables
+	r := tapsync.NewTapSyncService(config)
+	r.Router.Run(fmt.Sprintf(":%d", config.Port))
+	r.DB.Close()
+}

tapservicego/dagger/main.go

@@ -34,7 +34,7 @@ func (m *Tapservicego) BuildEnv(ctx context.Context, source *Directory) *Contain
 		WithExec([]string{"go", "mod", "download"}).
 		WithExec([]string{"go", "mod", "verify"}).
 		WithDirectory("/usr/src/app", source).
-		WithExec([]string{"go", "build", "-o", "/usr/local/bin/ataps", "."})
+		WithExec([]string{"go", "build", "-o", "/usr/local/bin/ataps", "cmd/tapservice/main.go"})
 }
 
 // Tests the go package
@@ -53,13 +53,13 @@ func (m *Tapservicego) Test(ctx context.Context, source *Directory) (string, err
 }
 
 // Build the tap service
-func (m *Tapservicego) Build(ctx context.Context, source *Directory) *Container {
+func (m *Tapservicego) Build(ctx context.Context, source *Directory, port int) *Container {
 	return dag.Container().
 		From("golang:1.22.3-bookworm").
 		WithExec([]string{"apt-get", "update"}).
 		WithExec([]string{"apt-get", "install", "libcfitsio-dev", "--yes"}).
 		WithFile("/bin/ataps", m.BuildEnv(ctx, source).File("/usr/local/bin/ataps")).
-		WithExposedPort(8080).
+		WithExposedPort(port).
 		WithEntrypoint([]string{"ataps"})
 }
 
@@ -71,8 +71,13 @@ func (m *Tapservicego) Run(
 	username string,
 	password string,
 	dbname *string,
+	port *int,
 ) *Container {
-	container := m.Build(ctx, source)
+	portOverride := 8080
+	if port == nil {
+		port = &portOverride
+	}
+	container := m.Build(ctx, source, *port)
 	if dbname == nil {
 		dbname = &username
 	}

tapservicego/internal/tapsync/alerce_suite_test.go

@@ -28,7 +28,7 @@ func (suite *AlerceTestSuite) SetupSuite() {
 	} else {
 		suite.T().Fatal("Unknown environment")
 	}
-	suite.Service = NewTapSyncService()
+	suite.Service = NewTapSyncService(NewConfig(WithDatabaseURL(suite.connUrl)))
 }
 
 func (suite *AlerceTestSuite) TearDownSuite() {
@@ -71,7 +71,6 @@ func (suite *AlerceTestSuite) InitializeLocalDB() {
 		suite.T().Fatal(err)
 	}
 	suite.connUrl = connStr
-	os.Setenv("DATABASE_URL", connStr)
 	db, err := GetDB(connStr)
 	if err != nil {
 		suite.T().Log("Could not connect")
@@ -98,7 +97,6 @@ func (suite *AlerceTestSuite) InitializeDaggerDB() {
 	// connect to alerce database
 	connUrl = connUrl + " dbname=alerce"
 	suite.connUrl = connUrl
-	os.Setenv("DATABASE_URL", connUrl)
 	db, err = GetDB(connUrl)
 	if err != nil {
 		suite.T().Log("Could not connect")

tapservicego/internal/tapsync/config.go

@@ -5,14 +5,32 @@ import "os"
 // Config is the configuration for the application
 type Config struct {
 	DatabaseURL string
+	Port        int
 }
 
-func GetConfig() *Config {
-	databaseUrl, ok := os.LookupEnv("DATABASE_URL")
-	if !ok {
-		panic("DATABASE_URL not set")
+type ConfigOption func(*Config)
+
+func NewConfig(opts ...ConfigOption) *Config {
+	defaultDatabaseUrl := os.Getenv("DATABASE_URL")
+	defaultPort := 8080
+	config := &Config{
+		DatabaseURL: defaultDatabaseUrl,
+		Port:        defaultPort,
+	}
+	for _, opt := range opts {
+		opt(config)
 	}
-	return &Config{
-		DatabaseURL: databaseUrl,
+	return config
+}
+
+func WithDatabaseURL(databaseUrl string) ConfigOption {
+	return func(c *Config) {
+		c.DatabaseURL = databaseUrl
+	}
+}
+
+func WithPort(port int) ConfigOption {
+	return func(c *Config) {
+		c.Port = port
 	}
 }

tapservicego/internal/tapsync/tapsync.go

@@ -178,8 +178,7 @@ type TapSyncService struct {
 	config *Config
 }
 
-func NewTapSyncService() *TapSyncService {
-	config := GetConfig()
+func NewTapSyncService(config *Config) *TapSyncService {
 	db, err := GetDB(config.DatabaseURL)
 	if err != nil {
 		panic(err)

tapservicego/internal/tapsync/tapsync_suite_test.go

@@ -14,7 +14,7 @@ import (
 type TapSyncTestSuite struct {
 	suite.Suite
 	DB            *sql.DB
-	connUrl       string
+	ConnUrl       string
 	PsqlContainer *postgres.PostgresContainer
 	ctx           context.Context
 	Service       *TapSyncService
@@ -28,7 +28,7 @@ func (suite *TapSyncTestSuite) SetupSuite() {
 	} else {
 		suite.T().Fatal("Unknown environment")
 	}
-	suite.Service = NewTapSyncService()
+	suite.Service = NewTapSyncService(NewConfig(WithDatabaseURL(suite.ConnUrl)))
 }
 
 func (suite *TapSyncTestSuite) TearDownSuite() {
@@ -38,12 +38,6 @@ func (suite *TapSyncTestSuite) TearDownSuite() {
 	suite.DB.Close()
 }
 
-func (suite *TapSyncTestSuite) SetupTest() {
-}
-
-func (suite *TapSyncTestSuite) TearDownTest() {
-}
-
 func TestTapSyncTestSuite(t *testing.T) {
 	suite.Run(t, new(TapSyncTestSuite))
 }
@@ -61,14 +55,13 @@ func (suite *TapSyncTestSuite) InitializeLocalDB() {
 	if err != nil {
 		suite.T().Fatal(err)
 	}
-	suite.connUrl = connStr
-	os.Setenv("DATABASE_URL", connStr)
 	db, err := GetDB(connStr)
 	if err != nil {
 		suite.T().Log("Could not connect")
 		suite.T().Fatal(err)
 	}
 	suite.DB = db
+	suite.ConnUrl = connStr
 }
 
 func (suite *TapSyncTestSuite) InitializeDaggerDB() {
@@ -88,12 +81,11 @@ func (suite *TapSyncTestSuite) InitializeDaggerDB() {
 	db.Close()
 	// connect to tapsync database
 	connUrl = connUrl + " dbname=tapsync"
-	suite.connUrl = connUrl
-	os.Setenv("DATABASE_URL", connUrl)
 	db, err = GetDB(connUrl)
 	if err != nil {
 		suite.T().Log("Could not connect")
 		suite.T().Fatal(err)
 	}
 	suite.DB = db
+	suite.ConnUrl = connUrl
 }