TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-10-09 07:35:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into proto-files

Browse Source 
# Conflicts:
#	go.mod
#	go.sum
#	pkg/admin/admin.go
#	pkg/admin/api/config.go
#	pkg/auth/api/config.go
#	pkg/auth/auth.go
#	pkg/management/api/config.go
#	pkg/management/management.go
This commit is contained in:
Fabiennne
2020-03-30 17:43:59 +02:00
parent 40734f27c7 e3f9e49ef6
commit 85aa907d12
43 changed files with 771 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/admin/admin.go
View File

@@ -3,19 +3,17 @@ package admin
import (
"context"
"github.com/caos/logging"
app "github.com/caos/zitadel/internal/admin"
"github.com/caos/zitadel/internal/api/auth"
"github.com/caos/zitadel/internal/errors"
"github.com/caos/zitadel/pkg/admin/api"
)
type Config struct {
App *app.Config
API *api.Config
App app.Config
API api.Config
}
func Start(ctx context.Context, config *Config, authZ *auth.Config) error {
err := api.Start(ctx, config.API)
logging.Log("MAIN-BmOLI").OnError(err).Panic("unable to start api")
return err
func Start(ctx context.Context, config Config, authZ auth.Config) error {
return errors.ThrowUnimplemented(nil, "ADMIN-n8vw5", "not implemented yet") //TODO: implement
}

7
pkg/admin/api/config.go Normal file
View File

@@ -0,0 +1,7 @@
package api
import "github.com/caos/zitadel/internal/api/grpc"
type Config struct {
GRPC grpc.Config
}