feat: add vector and analytics buckets to storage config

Author: sweatybridge

pkg/config/config.go

@@ -295,6 +295,14 @@ func (s *storage) Clone() storage {
 		img := *s.ImageTransformation
 		copy.ImageTransformation = &img
 	}
+	if s.IcebergCatalog != nil {
+		iceberg := *s.IcebergCatalog
+		copy.IcebergCatalog = &iceberg
+	}
+	if s.VectorBuckets != nil {
+		vector := *s.VectorBuckets
+		copy.VectorBuckets = &vector
+	}
 	if s.S3Protocol != nil {
 		s3 := *s.S3Protocol
 		copy.S3Protocol = &s3

pkg/config/storage.go

@@ -14,6 +14,8 @@ type (
 		ImgProxyImage       string               `toml:"-"`
 		FileSizeLimit       sizeInBytes          `toml:"file_size_limit"`
 		ImageTransformation *imageTransformation `toml:"image_transformation"`
+		IcebergCatalog      *icebergCatalog      `toml:"iceberg_catalog"`
+		VectorBuckets       *vectorBuckets       `toml:"vector_buckets"`
 		S3Protocol          *s3Protocol          `toml:"s3_protocol"`
 		S3Credentials       storageS3Credentials `toml:"-"`
 		Buckets             BucketConfig         `toml:"buckets"`
@@ -23,6 +25,19 @@ type (
 		Enabled bool `toml:"enabled"`
 	}
 
+	icebergCatalog struct {
+		Enabled       bool `toml:"enabled"`
+		MaxNamespaces uint `toml:"max_namespaces"`
+		MaxTables     uint `toml:"max_tables"`
+		MaxCatalogs   uint `toml:"max_catalogs"`
+	}
+
+	vectorBuckets struct {
+		Enabled    bool `toml:"enabled"`
+		MaxBuckets uint `toml:"max_buckets"`
+		MaxIndexes uint `toml:"max_indexes"`
+	}
+
 	s3Protocol struct {
 		Enabled bool `toml:"enabled"`
 	}
@@ -70,6 +85,17 @@ func (s *storage) ToUpdateStorageConfigBody() v1API.UpdateStorageConfigBody {
 	if s.ImageTransformation != nil {
 		body.Features.ImageTransformation.Enabled = s.ImageTransformation.Enabled
 	}
+	if s.IcebergCatalog != nil {
+		body.Features.IcebergCatalog.Enabled = s.IcebergCatalog.Enabled
+		body.Features.IcebergCatalog.MaxNamespaces = cast.UintToInt(s.IcebergCatalog.MaxNamespaces)
+		body.Features.IcebergCatalog.MaxTables = cast.UintToInt(s.IcebergCatalog.MaxTables)
+		body.Features.IcebergCatalog.MaxCatalogs = cast.UintToInt(s.IcebergCatalog.MaxCatalogs)
+	}
+	if s.VectorBuckets != nil {
+		body.Features.VectorBuckets.Enabled = s.VectorBuckets.Enabled
+		body.Features.VectorBuckets.MaxBuckets = cast.UintToInt(s.VectorBuckets.MaxBuckets)
+		body.Features.VectorBuckets.MaxIndexes = cast.UintToInt(s.VectorBuckets.MaxIndexes)
+	}
 	if s.S3Protocol != nil {
 		body.Features.S3Protocol.Enabled = s.S3Protocol.Enabled
 	}
@@ -83,6 +109,17 @@ func (s *storage) FromRemoteStorageConfig(remoteConfig v1API.StorageConfigRespon
 	if s.ImageTransformation != nil {
 		s.ImageTransformation.Enabled = remoteConfig.Features.ImageTransformation.Enabled
 	}
+	if s.IcebergCatalog != nil {
+		s.IcebergCatalog.Enabled = remoteConfig.Features.IcebergCatalog.Enabled
+		s.IcebergCatalog.MaxNamespaces = cast.IntToUint(remoteConfig.Features.IcebergCatalog.MaxNamespaces)
+		s.IcebergCatalog.MaxTables = cast.IntToUint(remoteConfig.Features.IcebergCatalog.MaxTables)
+		s.IcebergCatalog.MaxCatalogs = cast.IntToUint(remoteConfig.Features.IcebergCatalog.MaxCatalogs)
+	}
+	if s.VectorBuckets != nil {
+		s.VectorBuckets.Enabled = remoteConfig.Features.VectorBuckets.Enabled
+		s.VectorBuckets.MaxBuckets = cast.IntToUint(remoteConfig.Features.VectorBuckets.MaxBuckets)
+		s.VectorBuckets.MaxIndexes = cast.IntToUint(remoteConfig.Features.VectorBuckets.MaxIndexes)
+	}
 	if s.S3Protocol != nil {
 		s.S3Protocol.Enabled = remoteConfig.Features.S3Protocol.Enabled
 	}

pkg/config/templates/config.toml

@@ -105,12 +105,25 @@ enabled = true
 # The maximum file size allowed (e.g. "5MB", "500KB").
 file_size_limit = "50MiB"
 
+# [storage.s3_protocol]
+# enabled = true
+
 # Image transformation API is available to Supabase Pro plan.
 # [storage.image_transformation]
 # enabled = true
 
-# [storage.s3_protocol]
-# enabled = false
+# Iceberge Catalog is available to Supabase Pro plan.
+# [storage.iceberg_catalog]
+# enabled = true
+# max_namespaces = 0
+# max_tables = 0
+# max_catalogs = 0
+
+# Vector Buckets is available to Supabase Pro plan.
+# [storage.vector_buckets]
+# enabled = true
+# max_buckets = 0
+# max_indexes = 0
 
 # Uncomment to configure local storage buckets
 # [storage.buckets.images]

pkg/config/testdata/config.toml

@@ -105,12 +105,25 @@ enabled = true
 # The maximum file size allowed (e.g. "5MB", "500KB").
 file_size_limit = "50MiB"
 
+[storage.s3_protocol]
+enabled = true
+
 # Image transformation API is available to Supabase Pro plan.
 [storage.image_transformation]
 enabled = true
 
-[storage.s3_protocol]
+# Iceberge Catalog is available to Supabase Pro plan.
+[storage.iceberg_catalog]
+enabled = true
+max_namespaces = 0
+max_tables = 0
+max_catalogs = 0
+
+# Vector Buckets is available to Supabase Pro plan.
+[storage.vector_buckets]
 enabled = true
+max_buckets = 0
+max_indexes = 0
 
 # Uncomment to configure local storage buckets
 [storage.buckets.images]