diff --git a/go/.golangci.yaml b/go/.golangci.yaml index 8076775f62..2c457a41e6 100644 --- a/go/.golangci.yaml +++ b/go/.golangci.yaml @@ -72,6 +72,18 @@ linters: - ^gorm.io/gorm.*$ - ^github.com/redis/go-redis/v9.Options$ - ^github.com/go-redis/redis/v8.Options$ + - ^github.com/unkeyed/unkey/go/pkg/cli.Command$ + - ^github.com/AfterShip/clickhouse-sql-parser/parser.*BinaryOperation$ + - ^github.com/AfterShip/clickhouse-sql-parser/parser.*NestedIdentifier$ + - ^github.com/AfterShip/clickhouse-sql-parser/parser.*Ident$ + - ^github.com/AfterShip/clickhouse-sql-parser/parser.*StringLiteral$ + - ^github.com/AfterShip/clickhouse-sql-parser/parser.*WhereClause$ + - ^github.com/AfterShip/clickhouse-sql-parser/parser.*NumberLiteral$ + - ^github.com/AfterShip/clickhouse-sql-parser/parser.*LimitClause$ + - ^github.com/AfterShip/clickhouse-sql-parser/parser.*ParamExprList$ + - ^github.com/AfterShip/clickhouse-sql-parser/parser.*ColumnExprList$ + - ^github.com/AfterShip/clickhouse-sql-parser/parser.*ColumnExpr$ + - ^database/sql\.Null.*$ funlen: lines: 100 statements: 50 diff --git a/go/apps/api/integration/harness.go b/go/apps/api/integration/harness.go index 678d75d4f5..9fb94e372f 100644 --- a/go/apps/api/integration/harness.go +++ b/go/apps/api/integration/harness.go @@ -149,6 +149,7 @@ func (h *Harness) RunAPI(config ApiConfig) *ApiCluster { DatabasePrimary: mysqlHostCfg.FormatDSN(), DatabaseReadonlyReplica: "", ClickhouseURL: clickhouseHostDSN, + ClickhouseAnalyticsURL: "", RedisUrl: redisHostAddr, Region: "test", InstanceID: fmt.Sprintf("test-node-%d", i), diff --git a/go/cmd/create-clickhouse-user/main.go b/go/cmd/create-clickhouse-user/main.go index 12d3dfa7a9..4b918e1396 100644 --- a/go/cmd/create-clickhouse-user/main.go +++ b/go/cmd/create-clickhouse-user/main.go @@ -98,8 +98,9 @@ func run(ctx context.Context, cmd *cli.Command) error { // Connect to MySQL database, err := db.New(db.Config{ - PrimaryDSN: cmd.RequireString("database-primary"), - Logger: logger, + PrimaryDSN: cmd.RequireString("database-primary"), + ReadOnlyDSN: "", + Logger: logger, }) if err != nil { return fmt.Errorf("failed to connect to database: %w", err) diff --git a/go/cmd/dev/seed/verifications.go b/go/cmd/dev/seed/verifications.go index 561c930a7d..61015946c7 100644 --- a/go/cmd/dev/seed/verifications.go +++ b/go/cmd/dev/seed/verifications.go @@ -44,8 +44,9 @@ func seedVerifications(ctx context.Context, cmd *cli.Command) error { // Connect to MySQL database, err := db.New(db.Config{ - PrimaryDSN: cmd.RequireString("database-primary"), - Logger: logger, + PrimaryDSN: cmd.RequireString("database-primary"), + ReadOnlyDSN: "", + Logger: logger, }) if err != nil { return fmt.Errorf("failed to connect to MySQL: %w", err) @@ -62,8 +63,14 @@ func seedVerifications(ctx context.Context, cmd *cli.Command) error { // Create key service for proper key generation keyService, err := keys.New(keys.Config{ - DB: database, - Logger: logger, + Logger: logger, + DB: database, + RateLimiter: nil, + RBAC: nil, + Clickhouse: ch, + Region: "test", + UsageLimiter: nil, + KeyCache: nil, }) if err != nil { return fmt.Errorf("failed to create key service: %w", err) diff --git a/go/pkg/clickhouse/query-parser/parser.go b/go/pkg/clickhouse/query-parser/parser.go index cd5282fb30..30543a1383 100644 --- a/go/pkg/clickhouse/query-parser/parser.go +++ b/go/pkg/clickhouse/query-parser/parser.go @@ -12,6 +12,7 @@ import ( // NewParser creates a new parser func NewParser(config Config) *Parser { return &Parser{ + stmt: nil, config: config, cteNames: make(map[string]bool), }