feat: move to functional options to cleanup creation of catalog

apache · Jan 22, 2024 · 6327be2 · 6327be2
1 parent bc30773
commit 6327be2
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/catalog/catalog.go b/catalog/catalog.go
@@ -22,6 +22,7 @@ import (
 	"errors"
 
 	"github.com/apache/iceberg-go/table"
+	"github.com/aws/aws-sdk-go-v2/aws"
 )
 
 type CatalogType string
@@ -39,6 +40,19 @@ var (
 	ErrNoSuchTable = errors.New("table does not exist")
 )
 
+// WithAwsConfig sets the AWS configuration for the catalog.
+func WithAwsConfig(cfg aws.Config) CatalogOption {
+	return func(o *CatalogOptions) {
+		o.awsConfig = cfg
+	}
+}
+
+type CatalogOption func(*CatalogOptions)
+
+type CatalogOptions struct {
+	awsConfig aws.Config
+}
+
 // Catalog for iceberg table operations like create, drop, load, list and others.
 type Catalog interface {
 	// ListTables returns a list of table identifiers in the catalog, with the returned

diff --git a/catalog/glue.go b/catalog/glue.go
@@ -42,9 +42,15 @@ type GlueCatalog struct {
 	glueSvc glueAPI
 }
 
-func NewGlueCatalog(awscfg aws.Config) *GlueCatalog {
+func NewGlueCatalog(opts ...CatalogOption) *GlueCatalog {
+	options := &CatalogOptions{}
+
+	for _, o := range opts {
+		o(options)
+	}
+
 	return &GlueCatalog{
-		glueSvc: glue.NewFromConfig(awscfg),
+		glueSvc: glue.NewFromConfig(options.awsConfig),
 	}
 }
 

diff --git a/catalog/glue_test.go b/catalog/glue_test.go
@@ -110,7 +110,7 @@ func TestGlueListTableIntegration(t *testing.T) {
 	awscfg, err := config.LoadDefaultConfig(context.TODO(), config.WithClientLogMode(aws.LogRequest|aws.LogResponse))
 	assert.NoError(err)
 
-	catalog := NewGlueCatalog(awscfg)
+	catalog := NewGlueCatalog(WithAwsConfig(awscfg))
 
 	tables, err := catalog.ListTables(context.TODO(), GlueDatabaseIdentifier(os.Getenv("TEST_DATABASE_NAME")))
 	assert.NoError(err)
@@ -133,7 +133,7 @@ func TestGlueLoadTableIntegration(t *testing.T) {
 	awscfg, err := config.LoadDefaultConfig(context.TODO(), config.WithClientLogMode(aws.LogRequest|aws.LogResponse))
 	assert.NoError(err)
 
-	catalog := NewGlueCatalog(awscfg)
+	catalog := NewGlueCatalog(WithAwsConfig(awscfg))
 
 	table, err := catalog.LoadTable(context.TODO(), []string{os.Getenv("TEST_DATABASE_NAME"), os.Getenv("TEST_TABLE_NAME")})
 	assert.NoError(err)