Merge branch 'main' into feature/show-estimated-cost-for-data-diff

Author: DjamilaBaroudi

cmd/render.go

@@ -29,6 +29,7 @@ import (
 	"github.com/bruin-data/bruin/pkg/query"
 	"github.com/bruin-data/bruin/pkg/snowflake"
 	"github.com/bruin-data/bruin/pkg/synapse"
+	"github.com/muesli/termenv"
 	"github.com/pkg/errors"
 	"github.com/spf13/afero"
 	"github.com/urfave/cli/v3"
@@ -392,8 +393,13 @@ func highlightCode(code string, language string) string {
 	if (o.Mode() & os.ModeCharDevice) != os.ModeCharDevice {
 		return code
 	}
+	style := "monokai"
+	if !termenv.HasDarkBackground() {
+		style = "github"
+	}
+
 	b := new(strings.Builder)
-	err = quick.Highlight(b, code, language, "terminal16m", "monokai")
+	err = quick.Highlight(b, code, language, "terminal16m", style)
 	if err != nil {
 		errorPrinter.Printf("Failed to highlight the query: %v\n", err.Error())
 		return code

go.mod

@@ -50,6 +50,7 @@ require (
 	github.com/kluctl/go-embed-python v0.0.0-3.13.1-20241219-1
 	github.com/manifoldco/promptui v0.9.0
 	github.com/microsoft/go-mssqldb v1.8.2
+	github.com/muesli/termenv v0.16.0
 	github.com/nikolalohinski/gonja/v2 v2.3.4
 	github.com/pashagolub/pgxmock/v3 v3.4.0
 	github.com/pkg/errors v0.9.1
@@ -294,7 +295,6 @@ require (
 	github.com/mtibben/percent v0.2.1 // indirect
 	github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
 	github.com/muesli/cancelreader v0.2.2 // indirect
-	github.com/muesli/termenv v0.16.0 // indirect
 	github.com/nakabonne/nestif v0.3.1 // indirect
 	github.com/nishanths/exhaustive v0.12.0 // indirect
 	github.com/nishanths/predeclared v0.2.2 // indirect

pkg/ansisql/operator.go

@@ -81,6 +81,9 @@ func (o *QuerySensor) RunTask(ctx context.Context, p *pipeline.Pipeline, t *pipe
 			}); ok {
 				res, err := querier.Select(ctx, qry[0])
 				if err != nil {
+					if printerExists {
+						fmt.Fprintln(printer, "Error: Sensor query failed:", err)
+					}
 					return err
 				}
 				intRes, err := helpers.CastResultToInteger(res, true)
@@ -189,6 +192,9 @@ func (ts *TableSensor) RunTask(ctx context.Context, p *pipeline.Pipeline, t *pip
 		default:
 			res, err := tableChecker.Select(ctx, extractedQuery)
 			if err != nil {
+				if printerExists {
+					fmt.Fprintln(printer, "Error: Sensor query failed:", err)
+				}
 				return err
 			}
 			intRes, err := helpers.CastResultToInteger(res, true)

pkg/config/lakehouse.go

@@ -3,6 +3,7 @@ package config
 import (
 	"errors"
 	"fmt"
+	"slices"
 )
 
 type LakehouseFormat string
@@ -36,20 +37,18 @@ type CatalogAuth struct {
 	Password string `yaml:"password,omitempty" json:"password,omitempty" mapstructure:"password"`
 }
 
-func (auth *CatalogAuth) IsAWS() bool {
-	if auth == nil {
-		return false
-	}
+func (auth CatalogAuth) IsAWS() bool {
 	return auth.AccessKey != "" && auth.SecretKey != ""
 }
 
-func (auth *CatalogAuth) IsPostgres() bool {
-	if auth == nil {
-		return false
-	}
+func (auth CatalogAuth) IsPostgres() bool {
 	return auth.Username != "" && auth.Password != ""
 }
 
+func (auth CatalogAuth) IsZero() bool {
+	return auth == (CatalogAuth{})
+}
+
 type CatalogConfig struct {
 	Type CatalogType `yaml:"type" json:"type" mapstructure:"type"`
 
@@ -66,7 +65,18 @@ type CatalogConfig struct {
 	Database string `yaml:"database,omitempty" json:"database,omitempty" mapstructure:"database"`
 
 	// Authentication
-	Auth *CatalogAuth `yaml:"auth,omitempty" json:"auth,omitempty" mapstructure:"auth"`
+	Auth CatalogAuth `yaml:"auth,omitempty" json:"auth,omitempty" mapstructure:"auth"`
+}
+
+func (c CatalogConfig) IsZero() bool {
+	return c.Type == "" &&
+		c.CatalogID == "" &&
+		c.Region == "" &&
+		c.Path == "" &&
+		c.Host == "" &&
+		c.Port == 0 &&
+		c.Database == "" &&
+		c.Auth.IsZero()
 }
 
 type StorageType string
@@ -76,72 +86,83 @@ const (
 	// Future: StorageTypeGCS, StorageTypeLocal.
 )
 
+var (
+	supportedCatalogTypes = []CatalogType{
+		CatalogTypeGlue,
+		CatalogTypePostgres,
+		CatalogTypeDuckDB,
+		CatalogTypeSQLite,
+	}
+	supportedStorageTypes = []StorageType{
+		StorageTypeS3,
+	}
+)
+
 type StorageAuth struct {
 	// AWS S3 credentials
 	AccessKey    string `yaml:"access_key,omitempty" json:"access_key,omitempty" mapstructure:"access_key"`
 	SecretKey    string `yaml:"secret_key,omitempty" json:"secret_key,omitempty" mapstructure:"secret_key"`
 	SessionToken string `yaml:"session_token,omitempty" json:"session_token,omitempty" mapstructure:"session_token"`
 }
 
-func (a *StorageAuth) IsS3() bool {
-	if a == nil {
-		return false
-	}
+func (a StorageAuth) IsS3() bool {
 	return a.AccessKey != "" && a.SecretKey != ""
 }
 
+func (a StorageAuth) IsZero() bool {
+	return a == (StorageAuth{})
+}
+
 type StorageConfig struct {
-	Type   StorageType  `yaml:"type" json:"type" mapstructure:"type"`
-	Path   string       `yaml:"path,omitempty" json:"path,omitempty" mapstructure:"path"`
-	Region string       `yaml:"region,omitempty" json:"region,omitempty" mapstructure:"region"`
-	Auth   *StorageAuth `yaml:"auth,omitempty" json:"auth,omitempty" mapstructure:"auth"`
+	Type   StorageType `yaml:"type" json:"type" mapstructure:"type"`
+	Path   string      `yaml:"path,omitempty" json:"path,omitempty" mapstructure:"path"`
+	Region string      `yaml:"region,omitempty" json:"region,omitempty" mapstructure:"region"`
+	Auth   StorageAuth `yaml:"auth,omitempty" json:"auth,omitempty" mapstructure:"auth"`
+}
+
+func (s StorageConfig) IsZero() bool {
+	return s.Type == "" &&
+		s.Path == "" &&
+		s.Region == "" &&
+		s.Auth.IsZero()
 }
 
 type LakehouseConfig struct {
 	Format  LakehouseFormat `yaml:"format" json:"format" mapstructure:"format"`
-	Catalog *CatalogConfig  `yaml:"catalog,omitempty" json:"catalog,omitempty" mapstructure:"catalog"`
-	Storage *StorageConfig  `yaml:"storage,omitempty" json:"storage,omitempty" mapstructure:"storage"`
+	Catalog CatalogConfig   `yaml:"catalog,omitempty" json:"catalog,omitempty" mapstructure:"catalog"`
+	Storage StorageConfig   `yaml:"storage,omitempty" json:"storage,omitempty" mapstructure:"storage"`
+}
+
+func (lh *LakehouseConfig) IsZero() bool {
+	if lh == nil {
+		return true
+	}
+
+	return lh.Format == "" && lh.Catalog.IsZero() && lh.Storage.IsZero()
 }
 
 // Validate performs basic structural validation of the LakehouseConfig (engine-agnostic).
 func (lh *LakehouseConfig) Validate() error {
+	if lh == nil {
+		return nil
+	}
+
 	if lh.Format == "" {
 		return errors.New("lakehouse format is required")
 	}
 
-	switch lh.Format {
-	case LakehouseFormatIceberg:
-		// valid format
-	case LakehouseFormatDuckLake:
-		// valid format
-	default:
+	if !slices.Contains([]LakehouseFormat{LakehouseFormatIceberg, LakehouseFormatDuckLake}, lh.Format) {
 		return fmt.Errorf("unsupported lakehouse format: %s (supported: iceberg, ducklake)", lh.Format)
 	}
 
 	// Validate catalog type if specified
-	if lh.Catalog != nil && lh.Catalog.Type != "" {
-		switch lh.Catalog.Type {
-		case CatalogTypeGlue:
-			// valid catalog type
-		case CatalogTypePostgres:
-			// valid catalog type
-		case CatalogTypeDuckDB:
-			// valid catalog type
-		case CatalogTypeSQLite:
-			// valid catalog type
-		default:
-			return fmt.Errorf("unsupported catalog type: %s (supported: glue, postgres, duckdb, sqlite)", lh.Catalog.Type)
-		}
+	if lh.Catalog.Type == "" || !slices.Contains(supportedCatalogTypes, lh.Catalog.Type) {
+		return errors.New("empty or unsupported catalog type: (supported: glue, postgres, duckdb, sqlite)")
 	}
 
 	// Validate storage type if specified
-	if lh.Storage != nil && lh.Storage.Type != "" {
-		switch lh.Storage.Type {
-		case StorageTypeS3:
-			// valid storage type
-		default:
-			return fmt.Errorf("unsupported storage type: %s (supported: s3)", lh.Storage.Type)
-		}
+	if lh.Storage.Type == "" || !slices.Contains(supportedStorageTypes, lh.Storage.Type) {
+		return errors.New("empty or unsupported storage type: (supported: s3)")
 	}
 
 	return nil