Skip to content

Commit

Permalink
feat: db runtime as resource output (#3523)
Browse files Browse the repository at this point in the history
- Uses DatabaseRuntime directly as Resource output in provisioning
- Separate Read and Write connector in the runtime
- Extract logic under `internal/infra` to convert the runtime connector
to a DSN
  • Loading branch information
jvmakine authored Nov 26, 2024
1 parent 66221c7 commit deb9b75
Show file tree
Hide file tree
Showing 32 changed files with 1,559 additions and 1,554 deletions.
2 changes: 1 addition & 1 deletion backend/controller/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ import (
"github.com/TBD54566975/ftl/backend/controller/console"
"github.com/TBD54566975/ftl/backend/controller/dal"
dalmodel "github.com/TBD54566975/ftl/backend/controller/dal/model"
"github.com/TBD54566975/ftl/backend/controller/dsn"
"github.com/TBD54566975/ftl/backend/controller/encryption"
"github.com/TBD54566975/ftl/backend/controller/leases"
"github.com/TBD54566975/ftl/backend/controller/leases/dbleaser"
Expand All @@ -56,6 +55,7 @@ import (
frontend "github.com/TBD54566975/ftl/frontend/console"
"github.com/TBD54566975/ftl/internal/configuration"
cf "github.com/TBD54566975/ftl/internal/configuration/manager"
"github.com/TBD54566975/ftl/internal/dsn"
"github.com/TBD54566975/ftl/internal/log"
ftlmaps "github.com/TBD54566975/ftl/internal/maps"
"github.com/TBD54566975/ftl/internal/model"
Expand Down
2 changes: 1 addition & 1 deletion backend/controller/sql/database_integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/alecthomas/assert/v2"

"github.com/TBD54566975/ftl/backend/controller/dsn"
"github.com/TBD54566975/ftl/internal/dsn"
in "github.com/TBD54566975/ftl/internal/integration"
)

Expand Down
2 changes: 1 addition & 1 deletion backend/controller/sql/sqltest/testing.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (

"github.com/alecthomas/assert/v2"

"github.com/TBD54566975/ftl/backend/controller/dsn"
"github.com/TBD54566975/ftl/backend/controller/sql/databasetesting"
"github.com/TBD54566975/ftl/internal/dsn"
"github.com/TBD54566975/ftl/internal/flock"
)

Expand Down
Loading

0 comments on commit deb9b75

Please sign in to comment.