feat: run on a single port (#3163)

* start v2

* start

* run

* some cleanup

* remove v2 pkg again

* simplify

* webauthn

* remove unused config

* fix login path in Dockerfile

* fix asset_generator.go

* health handler

* fix grpc web

* refactor

* merge

* build new main.go

* run new main.go

* update logging pkg

* fix error msg

* update logging

* cleanup

* cleanup

* go mod tidy

* change localDevMode

* fix customEndpoints

* update logging

* comments

* change local flag to external configs

* fix location generated go code

* fix

Co-authored-by: fforootd <florian@caos.ch>
This commit is contained in:
Livio Amstutz
2022-02-14 17:22:30 +01:00
committed by GitHub
parent 2f3a482ade
commit 389eb4a27a
306 changed files with 1708 additions and 1567 deletions

View File

@@ -1,23 +0,0 @@
package v1
import (
"github.com/caos/zitadel/internal/cache/config"
"github.com/caos/zitadel/internal/eventstore/v1/internal/repository/sql"
)
type Config struct {
Repository sql.Config
ServiceName string
Cache *config.CacheConfig
}
func Start(conf Config) (Eventstore, error) {
repo, _, err := sql.Start(conf.Repository)
if err != nil {
return nil, err
}
return &eventstore{
repo: repo,
}, nil
}

View File

@@ -2,8 +2,10 @@ package v1
import (
"context"
"database/sql"
"github.com/caos/zitadel/internal/eventstore/v1/internal/repository"
z_sql "github.com/caos/zitadel/internal/eventstore/v1/internal/repository/sql"
"github.com/caos/zitadel/internal/eventstore/v1/models"
)
@@ -20,6 +22,12 @@ type eventstore struct {
repo repository.Repository
}
func Start(db *sql.DB) (Eventstore, error) {
return &eventstore{
repo: z_sql.Start(db),
}, nil
}
func (es *eventstore) FilterEvents(ctx context.Context, searchQuery *models.SearchQuery) ([]*models.Event, error) {
if err := searchQuery.Validate(); err != nil {
return nil, err

View File

@@ -4,22 +4,10 @@ import (
"database/sql"
_ "github.com/lib/pq"
"github.com/caos/zitadel/internal/config/types"
"github.com/caos/zitadel/internal/errors"
)
type Config struct {
SQL types.SQL
}
func Start(conf Config) (*SQL, *sql.DB, error) {
client, err := conf.SQL.Start()
if err != nil {
return nil, nil, errors.ThrowPreconditionFailed(err, "SQL-9qBtr", "unable to open database connection")
}
func Start(client *sql.DB) *SQL {
return &SQL{
client: client,
}, client, nil
}
}