3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-08-03 08:50:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

zero: merge pomerium/zero-sdk (#4848)

Browse source
This commit is contained in:
Denis Mishin 2023-12-11 17:31:39 -05:00 • committed by GitHub
parent c4dd965f2d
commit ea64902a73
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
54 changed files with 4800 additions and 170 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/zero/controller/controller.go
View file

@ -16,7 +16,7 @@ import (
"github.com/pomerium/pomerium/internal/zero/reconciler"
"github.com/pomerium/pomerium/pkg/cmd/pomerium"
"github.com/pomerium/pomerium/pkg/grpc/databroker"
sdk "github.com/pomerium/zero-sdk"
sdk "github.com/pomerium/pomerium/pkg/zero"
)
// Run runs Pomerium is managed mode using the provided token.

2
internal/zero/controller/mux_log.go
View file

@ -6,7 +6,7 @@ import (
"github.com/rs/zerolog"
"github.com/pomerium/pomerium/internal/log"
connect_mux "github.com/pomerium/zero-sdk/connect-mux"
connect_mux "github.com/pomerium/pomerium/pkg/zero/connect-mux"
)
func (c *controller) RunConnectLog(ctx context.Context) error {