jacob-mathison/query-orchestration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merged in feature/textextraction (pull request #110)

Browse Source 
Text Extraction

* bases

* go

* splitting

* structure

* movetoasync

* movetoasync

* settinguptrigger

* reorder

* storevent

* standardisepollingvalidation

* unittests

* fixlint

* fixlint

* awscfg

* generatesample

* followthrough

* tests

* clena

* store

* externalidcleanup

* clientid

* local

* baseunittests

* putobjecttests

* tests
This commit is contained in:
Michael McGuinness
2025-04-02 18:50:03 +00:00
parent e6a4cb3990
commit 81e7223560
226 changed files with 17283 additions and 2744 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/test/database.go
+20 -15
View File
@@ -18,11 +18,10 @@ import (
type CreateDatabaseConfig struct {
Network *testcontainers.DockerNetwork
Cfg serviceconfig.ConfigProvider
RunMigrations bool
}
func CreateDB(t testing.TB, ctx context.Context, cfg *CreateDatabaseConfig) (testcontainers.Container, func()) {
func CreateDB(t testing.TB, ctx context.Context, cfg serviceconfig.ConfigProvider, dcfg *CreateDatabaseConfig) (testcontainers.Container, func()) {
alias := "postgres"
port, err := nat.NewPort("tcp", "5432")
@@ -53,10 +52,10 @@ func CreateDB(t testing.TB, ctx context.Context, cfg *CreateDatabaseConfig) (tes
),
}
if cfg.Network != nil {
req.Networks = []string{cfg.Network.Name}
if dcfg.Network != nil {
req.Networks = []string{dcfg.Network.Name}
req.NetworkAliases = map[string][]string{
cfg.Network.Name: {alias},
dcfg.Network.Name: {alias},
}
}
@@ -87,24 +86,30 @@ func CreateDB(t testing.TB, ctx context.Context, cfg *CreateDatabaseConfig) (tes
t.Setenv("PGHOST", dbcfg.DBHost)
t.Setenv("PGPORT", fmt.Sprint(dbcfg.DBPort))
if cfg.Cfg == nil {
SetCfgProvider(t, cfg.Cfg)
}
cfg.SetDBUser(dbcfg.DBUser)
cfg.SetDBSecret(dbcfg.DBSecret)
cfg.SetDBName(dbcfg.DBName)
cfg.SetDBNoSSL(dbcfg.DBNoSSL)
cfg.SetDBHost(dbcfg.DBHost)
cfg.SetDBPort(dbcfg.DBPort)
cfg.Cfg.SetDBConfig(dbcfg)
if cfg.RunMigrations {
err := db.RunMigrations(ctx, cfg.Cfg)
if dcfg.RunMigrations {
err := db.RunMigrations(ctx, cfg)
require.NoError(t, err)
err = cfg.Cfg.SetDBPool(ctx)
err = cfg.SetDBPool(ctx)
require.NoError(t, err)
}
if cfg.Network != nil {
if dcfg.Network != nil {
dbcfg.DBHost = alias
dbcfg.DBPort = port.Int()
cfg.Cfg.SetDBConfig(dbcfg)
cfg.SetDBUser(dbcfg.DBUser)
cfg.SetDBSecret(dbcfg.DBSecret)
cfg.SetDBName(dbcfg.DBName)
cfg.SetDBNoSSL(dbcfg.DBNoSSL)
cfg.SetDBHost(dbcfg.DBHost)
cfg.SetDBPort(dbcfg.DBPort)
}
return container, func() {