mirror of
https://github.com/andwati/zitadel.git
synced 2026-11-20 20:08:46 +00:00
perf(actionsv2): execution target router (#10564)
# Which Problems Are Solved The event execution system currently uses a projection handler that subscribes to and processes all events for all instances. This creates a high static cost because the system over-fetches event data, handling many events that are not needed by most instances. This inefficiency is also reflected in high "rows returned" metrics in the database. # How the Problems Are Solved Eliminate the use of a project handler. Instead, events for which "execution targets" are defined, are directly pushed to the queue by the eventstore. A Router is populated in the Instance object in the authz middleware. - By joining the execution targets to the instance, no additional queries are needed anymore. - As part of the instance object, execution targets are now cached as well. - Events are queued within the same transaction, giving transactional guarantees on delivery. - Uses the "insert many fast` variant of River. Multiple jobs are queued in a single round-trip to the database. - Fix compatibility with PostgreSQL 15 # Additional Changes - The signing key was stored as plain-text in the river job payload in the DB. This violated our [Secrets Storage](https://zitadel.com/docs/concepts/architecture/secrets#secrets-storage) principle. This change removed the field and only uses the encrypted version of the signing key. - Fixed the target ordering from descending to ascending. - Some minor linter warnings on the use of `io.WriteString()`. # Additional Context - Introduced in https://github.com/zitadel/zitadel/pull/9249 - Closes https://github.com/zitadel/zitadel/issues/10553 - Closes https://github.com/zitadel/zitadel/issues/9832 - Closes https://github.com/zitadel/zitadel/issues/10372 - Closes https://github.com/zitadel/zitadel/issues/10492 --------- Co-authored-by: Stefan Benz <[email protected]>
This commit is contained in:
co-authored by
Stefan Benz
parent
5721b63bcb
commit
a9ebc06c77
+12
-15
@@ -170,9 +170,15 @@ func startZitadel(ctx context.Context, config *Config, masterKey string, server
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
q, err := queue.NewQueue(&queue.Config{
|
||||||
|
Client: dbClient,
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
config.Eventstore.Pusher = new_es.NewEventstore(dbClient)
|
config.Eventstore.Pusher = new_es.NewEventstore(dbClient, new_es.WithExecutionQueueOption(q))
|
||||||
config.Eventstore.Searcher = new_es.NewEventstore(dbClient)
|
config.Eventstore.Searcher = new_es.NewEventstore(dbClient, new_es.WithExecutionQueueOption(q))
|
||||||
config.Eventstore.Querier = old_es.NewPostgres(dbClient)
|
config.Eventstore.Querier = old_es.NewPostgres(dbClient)
|
||||||
eventstoreClient := eventstore.NewEventstore(config.Eventstore)
|
eventstoreClient := eventstore.NewEventstore(config.Eventstore)
|
||||||
eventstoreV4 := es_v4.NewEventstoreFromOne(es_v4_pg.New(dbClient, &es_v4_pg.Config{
|
eventstoreV4 := es_v4.NewEventstoreFromOne(es_v4_pg.New(dbClient, &es_v4_pg.Config{
|
||||||
@@ -282,13 +288,6 @@ func startZitadel(ctx context.Context, config *Config, masterKey string, server
|
|||||||
actionsLogstoreSvc := logstore.New(queries, actionsExecutionDBEmitter, actionsExecutionStdoutEmitter)
|
actionsLogstoreSvc := logstore.New(queries, actionsExecutionDBEmitter, actionsExecutionStdoutEmitter)
|
||||||
actions.SetLogstoreService(actionsLogstoreSvc)
|
actions.SetLogstoreService(actionsLogstoreSvc)
|
||||||
|
|
||||||
q, err := queue.NewQueue(&queue.Config{
|
|
||||||
Client: dbClient,
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
notification.Register(
|
notification.Register(
|
||||||
ctx,
|
ctx,
|
||||||
config.Projections.Customizations["notifications"],
|
config.Projections.Customizations["notifications"],
|
||||||
@@ -315,12 +314,9 @@ func startZitadel(ctx context.Context, config *Config, masterKey string, server
|
|||||||
notification.Start(ctx)
|
notification.Start(ctx)
|
||||||
|
|
||||||
execution.Register(
|
execution.Register(
|
||||||
ctx,
|
|
||||||
config.Projections.Customizations["execution_handler"],
|
|
||||||
config.Executions,
|
config.Executions,
|
||||||
queries,
|
|
||||||
eventstoreClient.EventTypes(),
|
|
||||||
q,
|
q,
|
||||||
|
keys.Target,
|
||||||
)
|
)
|
||||||
execution.Start(ctx)
|
execution.Start(ctx)
|
||||||
|
|
||||||
@@ -440,7 +436,7 @@ func startAPIs(
|
|||||||
http_util.WithMaxAge(int(math.Floor(config.Quotas.Access.ExhaustedCookieMaxAge.Seconds()))),
|
http_util.WithMaxAge(int(math.Floor(config.Quotas.Access.ExhaustedCookieMaxAge.Seconds()))),
|
||||||
)
|
)
|
||||||
limitingAccessInterceptor := middleware.NewAccessInterceptor(accessSvc, exhaustedCookieHandler, &config.Quotas.Access.AccessConfig)
|
limitingAccessInterceptor := middleware.NewAccessInterceptor(accessSvc, exhaustedCookieHandler, &config.Quotas.Access.AccessConfig)
|
||||||
apis, err := api.New(ctx, config.Port, router, queries, verifier, config.SystemAuthZ, config.InternalAuthZ, tlsConfig, config.ExternalDomain, append(config.InstanceHostHeaders, config.PublicHostHeaders...), limitingAccessInterceptor)
|
apis, err := api.New(ctx, config.Port, router, queries, verifier, config.SystemAuthZ, config.InternalAuthZ, tlsConfig, config.ExternalDomain, append(config.InstanceHostHeaders, config.PublicHostHeaders...), limitingAccessInterceptor, keys.Target)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("error creating api %w", err)
|
return nil, fmt.Errorf("error creating api %w", err)
|
||||||
}
|
}
|
||||||
@@ -582,6 +578,7 @@ func startAPIs(
|
|||||||
queries,
|
queries,
|
||||||
authRepo,
|
authRepo,
|
||||||
keys.OIDC,
|
keys.OIDC,
|
||||||
|
keys.Target,
|
||||||
keys.OIDCKey,
|
keys.OIDCKey,
|
||||||
eventstore,
|
eventstore,
|
||||||
userAgentInterceptor,
|
userAgentInterceptor,
|
||||||
@@ -596,7 +593,7 @@ func startAPIs(
|
|||||||
}
|
}
|
||||||
apis.RegisterHandlerPrefixes(oidcServer, oidcPrefixes...)
|
apis.RegisterHandlerPrefixes(oidcServer, oidcPrefixes...)
|
||||||
|
|
||||||
samlProvider, err := saml.NewProvider(config.SAML, config.ExternalSecure, commands, queries, authRepo, keys.OIDC, keys.SAML, eventstore, dbClient, instanceInterceptor.Handler, userAgentInterceptor, limitingAccessInterceptor)
|
samlProvider, err := saml.NewProvider(config.SAML, config.ExternalSecure, commands, queries, authRepo, keys.OIDC, keys.SAML, keys.Target, eventstore, dbClient, instanceInterceptor.Handler, userAgentInterceptor, limitingAccessInterceptor)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("unable to start saml provider: %w", err)
|
return nil, fmt.Errorf("unable to start saml provider: %w", err)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -65,9 +65,10 @@ require (
|
|||||||
github.com/pquerna/otp v1.5.0
|
github.com/pquerna/otp v1.5.0
|
||||||
github.com/rakyll/statik v0.1.7
|
github.com/rakyll/statik v0.1.7
|
||||||
github.com/redis/go-redis/v9 v9.8.0
|
github.com/redis/go-redis/v9 v9.8.0
|
||||||
github.com/riverqueue/river v0.22.0
|
github.com/riverqueue/river v0.24.0
|
||||||
github.com/riverqueue/river/riverdriver v0.22.0
|
github.com/riverqueue/river/riverdriver v0.24.0
|
||||||
github.com/riverqueue/river/rivertype v0.22.0
|
github.com/riverqueue/river/riverdriver/riverdatabasesql v0.24.0
|
||||||
|
github.com/riverqueue/river/rivertype v0.24.0
|
||||||
github.com/riverqueue/rivercontrib/otelriver v0.5.0
|
github.com/riverqueue/rivercontrib/otelriver v0.5.0
|
||||||
github.com/robfig/cron/v3 v3.0.1
|
github.com/robfig/cron/v3 v3.0.1
|
||||||
github.com/rs/cors v1.11.1
|
github.com/rs/cors v1.11.1
|
||||||
@@ -77,7 +78,7 @@ require (
|
|||||||
github.com/sony/sonyflake v1.2.1
|
github.com/sony/sonyflake v1.2.1
|
||||||
github.com/spf13/cobra v1.9.1
|
github.com/spf13/cobra v1.9.1
|
||||||
github.com/spf13/viper v1.20.1
|
github.com/spf13/viper v1.20.1
|
||||||
github.com/stretchr/testify v1.10.0
|
github.com/stretchr/testify v1.11.1
|
||||||
github.com/ttacon/libphonenumber v1.2.1
|
github.com/ttacon/libphonenumber v1.2.1
|
||||||
github.com/twilio/twilio-go v1.26.1
|
github.com/twilio/twilio-go v1.26.1
|
||||||
github.com/zitadel/exifremove v0.1.0
|
github.com/zitadel/exifremove v0.1.0
|
||||||
@@ -97,12 +98,12 @@ require (
|
|||||||
go.opentelemetry.io/otel/sdk/metric v1.35.0
|
go.opentelemetry.io/otel/sdk/metric v1.35.0
|
||||||
go.opentelemetry.io/otel/trace v1.35.0
|
go.opentelemetry.io/otel/trace v1.35.0
|
||||||
go.uber.org/mock v0.5.2
|
go.uber.org/mock v0.5.2
|
||||||
golang.org/x/crypto v0.38.0
|
golang.org/x/crypto v0.41.0
|
||||||
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6
|
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6
|
||||||
golang.org/x/net v0.40.0
|
golang.org/x/net v0.42.0
|
||||||
golang.org/x/oauth2 v0.30.0
|
golang.org/x/oauth2 v0.30.0
|
||||||
golang.org/x/sync v0.16.0
|
golang.org/x/sync v0.16.0
|
||||||
golang.org/x/text v0.27.0
|
golang.org/x/text v0.28.0
|
||||||
google.golang.org/api v0.233.0
|
google.golang.org/api v0.233.0
|
||||||
google.golang.org/genproto/googleapis/api v0.0.0-20250512202823-5a2f75b736a9
|
google.golang.org/genproto/googleapis/api v0.0.0-20250512202823-5a2f75b736a9
|
||||||
google.golang.org/grpc v1.72.1
|
google.golang.org/grpc v1.72.1
|
||||||
@@ -150,7 +151,7 @@ require (
|
|||||||
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
|
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
|
||||||
github.com/pkg/errors v0.9.1 // indirect
|
github.com/pkg/errors v0.9.1 // indirect
|
||||||
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
|
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
|
||||||
github.com/riverqueue/river/rivershared v0.22.0 // indirect
|
github.com/riverqueue/river/rivershared v0.24.0 // indirect
|
||||||
github.com/sagikazarmark/locafero v0.7.0 // indirect
|
github.com/sagikazarmark/locafero v0.7.0 // indirect
|
||||||
github.com/sourcegraph/conc v0.3.0 // indirect
|
github.com/sourcegraph/conc v0.3.0 // indirect
|
||||||
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
|
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
|
||||||
@@ -225,7 +226,6 @@ require (
|
|||||||
github.com/prometheus/client_model v0.6.1 // indirect
|
github.com/prometheus/client_model v0.6.1 // indirect
|
||||||
github.com/prometheus/common v0.62.0 // indirect
|
github.com/prometheus/common v0.62.0 // indirect
|
||||||
github.com/prometheus/procfs v0.15.1 // indirect
|
github.com/prometheus/procfs v0.15.1 // indirect
|
||||||
github.com/riverqueue/river/riverdriver/riverpgxv5 v0.22.0
|
|
||||||
github.com/rs/xid v1.6.0 // indirect
|
github.com/rs/xid v1.6.0 // indirect
|
||||||
github.com/russellhaering/goxmldsig v1.4.0 // indirect
|
github.com/russellhaering/goxmldsig v1.4.0 // indirect
|
||||||
github.com/sirupsen/logrus v1.9.3
|
github.com/sirupsen/logrus v1.9.3
|
||||||
@@ -238,7 +238,7 @@ require (
|
|||||||
github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 // indirect
|
github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 // indirect
|
||||||
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 // indirect
|
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 // indirect
|
||||||
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
|
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
|
||||||
golang.org/x/sys v0.33.0
|
golang.org/x/sys v0.35.0
|
||||||
gopkg.in/yaml.v2 v2.4.0 // indirect
|
gopkg.in/yaml.v2 v2.4.0 // indirect
|
||||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||||
nhooyr.io/websocket v1.8.11 // indirect
|
nhooyr.io/websocket v1.8.11 // indirect
|
||||||
|
|||||||
@@ -676,18 +676,18 @@ github.com/redis/go-redis/v9 v9.8.0 h1:q3nRvjrlge/6UD7eTu/DSg2uYiU2mCL0G/uzBWqhi
|
|||||||
github.com/redis/go-redis/v9 v9.8.0/go.mod h1:huWgSWd8mW6+m0VPhJjSSQ+d6Nh1VICQ6Q5lHuCH/Iw=
|
github.com/redis/go-redis/v9 v9.8.0/go.mod h1:huWgSWd8mW6+m0VPhJjSSQ+d6Nh1VICQ6Q5lHuCH/Iw=
|
||||||
github.com/redis/rueidis v1.0.19 h1:s65oWtotzlIFN8eMPhyYwxlwLR1lUdhza2KtWprKYSo=
|
github.com/redis/rueidis v1.0.19 h1:s65oWtotzlIFN8eMPhyYwxlwLR1lUdhza2KtWprKYSo=
|
||||||
github.com/redis/rueidis v1.0.19/go.mod h1:8B+r5wdnjwK3lTFml5VtxjzGOQAC+5UmujoD12pDrEo=
|
github.com/redis/rueidis v1.0.19/go.mod h1:8B+r5wdnjwK3lTFml5VtxjzGOQAC+5UmujoD12pDrEo=
|
||||||
github.com/riverqueue/river v0.22.0 h1:PO4Ula2RqViQqNs6xjze7yFV6Zq4T3Ffv092+f4S8xQ=
|
github.com/riverqueue/river v0.24.0 h1:CesL6vymWgz0d+zNwtnSGRWaB+E8Dax+o9cxD7sUmKc=
|
||||||
github.com/riverqueue/river v0.22.0/go.mod h1:IRoWoK4RGCiPuVJUV4EWcCl9d/TMQYkk0EEYV/Wgq+U=
|
github.com/riverqueue/river v0.24.0/go.mod h1:UZ3AxU5t6WtyqNssaea/AkRS8h/kJ+E9ImSB3xyb3ns=
|
||||||
github.com/riverqueue/river/riverdriver v0.22.0 h1:i7OSFkUi6x4UKvttdFOIg7NYLYaBOFLJZvkZ0+JWS/8=
|
github.com/riverqueue/river/riverdriver v0.24.0 h1:HqGgGkls11u+YKDA7cKOdYKlQwRNJyHuGa3UtOvpdT0=
|
||||||
github.com/riverqueue/river/riverdriver v0.22.0/go.mod h1:oNdjJCeAJhN/UiZGLNL+guNqWaxMFuSD4lr5x/v/was=
|
github.com/riverqueue/river/riverdriver v0.24.0/go.mod h1:dEew9DDIKenNvzpm8Edw8+PkqP3c0zl1fKjiQTq2n/w=
|
||||||
github.com/riverqueue/river/riverdriver/riverdatabasesql v0.22.0 h1:+no3gToOK9SmWg0pDPKfOGSCsrxqqaFdD8K1NQndRbY=
|
github.com/riverqueue/river/riverdriver/riverdatabasesql v0.24.0 h1:PFm6nKOqSkqo70yuibl42PxnHzfeAwC4JLL0rg9g8qs=
|
||||||
github.com/riverqueue/river/riverdriver/riverdatabasesql v0.22.0/go.mod h1:mygiHa1dnlKRjxT1//wIvfT2fMTbfXKm37NcsxoyBoQ=
|
github.com/riverqueue/river/riverdriver/riverdatabasesql v0.24.0/go.mod h1:/7qlKzZvzkN04++TxcvUw7FmKSJ7j1qq7lvzL30MhJQ=
|
||||||
github.com/riverqueue/river/riverdriver/riverpgxv5 v0.22.0 h1:2TWbVL73gipJ2/4JNCQbifaNj+BCC/Zxpp30o1D8RTg=
|
github.com/riverqueue/river/riverdriver/riverpgxv5 v0.24.0 h1:yV37OIbRrhRwIiGeRT7P4D3szhAemu87BgCf8gTCoU4=
|
||||||
github.com/riverqueue/river/riverdriver/riverpgxv5 v0.22.0/go.mod h1:TZY/BG8w/nDxkraAEvvgyVupIz0b4+PQVUW0kIiy1fc=
|
github.com/riverqueue/river/riverdriver/riverpgxv5 v0.24.0/go.mod h1:QfznySVKC4ljx53syd/bA/LRSsydAyuD3Q9/EbSniKA=
|
||||||
github.com/riverqueue/river/rivershared v0.22.0 h1:hLPHr98d6OEfmUJ4KpIXgoy2tbQ14htWILcRBHJF11U=
|
github.com/riverqueue/river/rivershared v0.24.0 h1:KysokksW75pug2a5RTOc6WESOupWmsylVc6VWvAx+4Y=
|
||||||
github.com/riverqueue/river/rivershared v0.22.0/go.mod h1:BK+hvhECfdDLWNDH3xiGI95m2YoPfVtECZLT+my8XM8=
|
github.com/riverqueue/river/rivershared v0.24.0/go.mod h1:UIBfSdai0oWFlwFcoqG4DZX83iA/fLWTEBGrj7Oe1ho=
|
||||||
github.com/riverqueue/river/rivertype v0.22.0 h1:rSRhbd5uV/BaFTPxReCxuYTAzx+/riBZJlZdREADvO4=
|
github.com/riverqueue/river/rivertype v0.24.0 h1:xrQZm/h6U8TBPyTsQPYD5leOapuoBAcdz30bdBwTqOg=
|
||||||
github.com/riverqueue/river/rivertype v0.22.0/go.mod h1:lmdl3vLNDfchDWbYdW2uAocIuwIN+ZaXqAukdSCFqWs=
|
github.com/riverqueue/river/rivertype v0.24.0/go.mod h1:lmdl3vLNDfchDWbYdW2uAocIuwIN+ZaXqAukdSCFqWs=
|
||||||
github.com/riverqueue/rivercontrib/otelriver v0.5.0 h1:dZF4Fy7/3RaIRsyCPdpIJtzEip0pCvoJ44YpSDum8e4=
|
github.com/riverqueue/rivercontrib/otelriver v0.5.0 h1:dZF4Fy7/3RaIRsyCPdpIJtzEip0pCvoJ44YpSDum8e4=
|
||||||
github.com/riverqueue/rivercontrib/otelriver v0.5.0/go.mod h1:rXANcBrlgRvg+auD3/O6Xfs59AWeWNpa/kim62mkxGo=
|
github.com/riverqueue/rivercontrib/otelriver v0.5.0/go.mod h1:rXANcBrlgRvg+auD3/O6Xfs59AWeWNpa/kim62mkxGo=
|
||||||
github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
|
github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
|
||||||
@@ -761,8 +761,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
|
|||||||
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
|
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
|
||||||
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||||
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||||
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
|
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
|
||||||
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
|
||||||
github.com/stvp/tempredis v0.0.0-20181119212430-b82af8480203 h1:QVqDTf3h2WHt08YuiTGPZLls0Wq99X9bWd0Q5ZSBesM=
|
github.com/stvp/tempredis v0.0.0-20181119212430-b82af8480203 h1:QVqDTf3h2WHt08YuiTGPZLls0Wq99X9bWd0Q5ZSBesM=
|
||||||
github.com/stvp/tempredis v0.0.0-20181119212430-b82af8480203/go.mod h1:oqN97ltKNihBbwlX8dLpwxCl3+HnXKV/R0e+sRLd9C8=
|
github.com/stvp/tempredis v0.0.0-20181119212430-b82af8480203/go.mod h1:oqN97ltKNihBbwlX8dLpwxCl3+HnXKV/R0e+sRLd9C8=
|
||||||
github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
|
github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
|
||||||
@@ -880,8 +880,8 @@ golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8U
|
|||||||
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||||
golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||||
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||||
golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
|
golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4=
|
||||||
golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
|
golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc=
|
||||||
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
||||||
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
||||||
golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw=
|
golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw=
|
||||||
@@ -933,8 +933,8 @@ golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81R
|
|||||||
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
|
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
|
||||||
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
|
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
|
||||||
golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
||||||
golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
|
golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs=
|
||||||
golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
|
golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8=
|
||||||
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
|
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
|
||||||
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||||
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||||
@@ -985,15 +985,15 @@ golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBc
|
|||||||
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
|
golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
|
||||||
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
|
golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
|
||||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||||
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
|
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
|
||||||
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||||
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||||
golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4=
|
golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
|
||||||
golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU=
|
golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
|
||||||
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||||
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||||
golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
|
golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
|
||||||
|
|||||||
+18
-13
@@ -22,6 +22,7 @@ import (
|
|||||||
http_util "github.com/zitadel/zitadel/internal/api/http"
|
http_util "github.com/zitadel/zitadel/internal/api/http"
|
||||||
http_mw "github.com/zitadel/zitadel/internal/api/http/middleware"
|
http_mw "github.com/zitadel/zitadel/internal/api/http/middleware"
|
||||||
"github.com/zitadel/zitadel/internal/api/ui/login"
|
"github.com/zitadel/zitadel/internal/api/ui/login"
|
||||||
|
"github.com/zitadel/zitadel/internal/crypto"
|
||||||
"github.com/zitadel/zitadel/internal/query"
|
"github.com/zitadel/zitadel/internal/query"
|
||||||
"github.com/zitadel/zitadel/internal/telemetry/metrics"
|
"github.com/zitadel/zitadel/internal/telemetry/metrics"
|
||||||
"github.com/zitadel/zitadel/internal/telemetry/tracing"
|
"github.com/zitadel/zitadel/internal/telemetry/tracing"
|
||||||
@@ -48,6 +49,8 @@ type API struct {
|
|||||||
authConfig authz.Config
|
authConfig authz.Config
|
||||||
systemAuthZ authz.Config
|
systemAuthZ authz.Config
|
||||||
connectServices map[string][]string
|
connectServices map[string][]string
|
||||||
|
|
||||||
|
targetEncryptionAlgorithm crypto.EncryptionAlgorithm
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *API) ListGrpcServices() []string {
|
func (a *API) ListGrpcServices() []string {
|
||||||
@@ -99,22 +102,24 @@ func New(
|
|||||||
externalDomain string,
|
externalDomain string,
|
||||||
hostHeaders []string,
|
hostHeaders []string,
|
||||||
accessInterceptor *http_mw.AccessInterceptor,
|
accessInterceptor *http_mw.AccessInterceptor,
|
||||||
|
targetEncryptionAlgorithm crypto.EncryptionAlgorithm,
|
||||||
) (_ *API, err error) {
|
) (_ *API, err error) {
|
||||||
api := &API{
|
api := &API{
|
||||||
port: port,
|
port: port,
|
||||||
externalDomain: externalDomain,
|
externalDomain: externalDomain,
|
||||||
verifier: verifier,
|
verifier: verifier,
|
||||||
health: queries,
|
health: queries,
|
||||||
router: router,
|
router: router,
|
||||||
queries: queries,
|
queries: queries,
|
||||||
accessInterceptor: accessInterceptor,
|
accessInterceptor: accessInterceptor,
|
||||||
hostHeaders: hostHeaders,
|
hostHeaders: hostHeaders,
|
||||||
authConfig: authZ,
|
authConfig: authZ,
|
||||||
systemAuthZ: systemAuthz,
|
systemAuthZ: systemAuthz,
|
||||||
connectServices: make(map[string][]string),
|
connectServices: make(map[string][]string),
|
||||||
|
targetEncryptionAlgorithm: targetEncryptionAlgorithm,
|
||||||
}
|
}
|
||||||
|
|
||||||
api.grpcServer = server.CreateServer(api.verifier, systemAuthz, authZ, queries, externalDomain, tlsConfig, accessInterceptor.AccessService())
|
api.grpcServer = server.CreateServer(api.verifier, systemAuthz, authZ, queries, externalDomain, tlsConfig, accessInterceptor.AccessService(), targetEncryptionAlgorithm)
|
||||||
api.grpcGateway, err = server.CreateGateway(ctx, port, hostHeaders, accessInterceptor, tlsConfig)
|
api.grpcGateway, err = server.CreateGateway(ctx, port, hostHeaders, accessInterceptor, tlsConfig)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@@ -190,7 +195,7 @@ func (a *API) registerConnectServer(service server.ConnectServer) {
|
|||||||
connect_middleware.AuthorizationInterceptor(a.verifier, a.systemAuthZ, a.authConfig),
|
connect_middleware.AuthorizationInterceptor(a.verifier, a.systemAuthZ, a.authConfig),
|
||||||
connect_middleware.TranslationHandler(),
|
connect_middleware.TranslationHandler(),
|
||||||
connect_middleware.QuotaExhaustedInterceptor(a.accessInterceptor.AccessService(), system_pb.SystemService_ServiceDesc.ServiceName),
|
connect_middleware.QuotaExhaustedInterceptor(a.accessInterceptor.AccessService(), system_pb.SystemService_ServiceDesc.ServiceName),
|
||||||
connect_middleware.ExecutionHandler(a.queries),
|
connect_middleware.ExecutionHandler(a.targetEncryptionAlgorithm),
|
||||||
connect_middleware.ValidationHandler(),
|
connect_middleware.ValidationHandler(),
|
||||||
connect_middleware.ServiceHandler(),
|
connect_middleware.ServiceHandler(),
|
||||||
connect_middleware.ActivityInterceptor(),
|
connect_middleware.ActivityInterceptor(),
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import (
|
|||||||
|
|
||||||
"golang.org/x/text/language"
|
"golang.org/x/text/language"
|
||||||
|
|
||||||
|
"github.com/zitadel/zitadel/internal/execution/target"
|
||||||
"github.com/zitadel/zitadel/internal/feature"
|
"github.com/zitadel/zitadel/internal/feature"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -23,6 +24,7 @@ type Instance interface {
|
|||||||
Block() *bool
|
Block() *bool
|
||||||
AuditLogRetention() *time.Duration
|
AuditLogRetention() *time.Duration
|
||||||
Features() feature.Features
|
Features() feature.Features
|
||||||
|
ExecutionRouter() target.Router
|
||||||
}
|
}
|
||||||
|
|
||||||
type InstanceVerifier interface {
|
type InstanceVerifier interface {
|
||||||
@@ -31,13 +33,14 @@ type InstanceVerifier interface {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type instance struct {
|
type instance struct {
|
||||||
id string
|
id string
|
||||||
projectID string
|
projectID string
|
||||||
appID string
|
appID string
|
||||||
clientID string
|
clientID string
|
||||||
orgID string
|
orgID string
|
||||||
defaultLanguage language.Tag
|
defaultLanguage language.Tag
|
||||||
features feature.Features
|
features feature.Features
|
||||||
|
executionTargets target.Router
|
||||||
}
|
}
|
||||||
|
|
||||||
func (i *instance) Block() *bool {
|
func (i *instance) Block() *bool {
|
||||||
@@ -84,6 +87,10 @@ func (i *instance) Features() feature.Features {
|
|||||||
return i.features
|
return i.features
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (i *instance) ExecutionRouter() target.Router {
|
||||||
|
return i.executionTargets
|
||||||
|
}
|
||||||
|
|
||||||
func GetInstance(ctx context.Context) Instance {
|
func GetInstance(ctx context.Context) Instance {
|
||||||
instance, ok := ctx.Value(instanceKey).(Instance)
|
instance, ok := ctx.Value(instanceKey).(Instance)
|
||||||
if !ok {
|
if !ok {
|
||||||
@@ -142,3 +149,12 @@ func WithFeatures(ctx context.Context, f feature.Features) context.Context {
|
|||||||
i.features = f
|
i.features = f
|
||||||
return context.WithValue(ctx, instanceKey, i)
|
return context.WithValue(ctx, instanceKey, i)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func WithExecutionRouter(ctx context.Context, router target.Router) context.Context {
|
||||||
|
i, ok := ctx.Value(instanceKey).(*instance)
|
||||||
|
if !ok {
|
||||||
|
i = new(instance)
|
||||||
|
}
|
||||||
|
i.executionTargets = router
|
||||||
|
return context.WithValue(ctx, instanceKey, i)
|
||||||
|
}
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import (
|
|||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
"golang.org/x/text/language"
|
"golang.org/x/text/language"
|
||||||
|
|
||||||
|
"github.com/zitadel/zitadel/internal/execution/target"
|
||||||
"github.com/zitadel/zitadel/internal/feature"
|
"github.com/zitadel/zitadel/internal/feature"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -129,3 +130,7 @@ func (m *mockInstance) EnableImpersonation() bool {
|
|||||||
func (m *mockInstance) Features() feature.Features {
|
func (m *mockInstance) Features() feature.Features {
|
||||||
return feature.Features{}
|
return feature.Features{}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (m *mockInstance) ExecutionRouter() target.Router {
|
||||||
|
return target.NewRouter(nil)
|
||||||
|
}
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ import (
|
|||||||
oidc_api "github.com/zitadel/zitadel/internal/api/oidc"
|
oidc_api "github.com/zitadel/zitadel/internal/api/oidc"
|
||||||
saml_api "github.com/zitadel/zitadel/internal/api/saml"
|
saml_api "github.com/zitadel/zitadel/internal/api/saml"
|
||||||
"github.com/zitadel/zitadel/internal/domain"
|
"github.com/zitadel/zitadel/internal/domain"
|
||||||
|
target_domain "github.com/zitadel/zitadel/internal/execution/target"
|
||||||
"github.com/zitadel/zitadel/internal/integration"
|
"github.com/zitadel/zitadel/internal/integration"
|
||||||
"github.com/zitadel/zitadel/internal/query"
|
"github.com/zitadel/zitadel/internal/query"
|
||||||
"github.com/zitadel/zitadel/pkg/grpc/action/v2"
|
"github.com/zitadel/zitadel/pkg/grpc/action/v2"
|
||||||
@@ -73,7 +74,7 @@ func TestServer_ExecutionTarget(t *testing.T) {
|
|||||||
targetCreatedName := gofakeit.Name()
|
targetCreatedName := gofakeit.Name()
|
||||||
targetCreatedURL := "https://nonexistent"
|
targetCreatedURL := "https://nonexistent"
|
||||||
|
|
||||||
targetCreated := instance.CreateTarget(ctx, t, targetCreatedName, targetCreatedURL, domain.TargetTypeCall, false)
|
targetCreated := instance.CreateTarget(ctx, t, targetCreatedName, targetCreatedURL, target_domain.TargetTypeCall, false)
|
||||||
|
|
||||||
// request received by target
|
// request received by target
|
||||||
wantRequest := &middleware.ContextInfoRequest{FullMethod: fullMethod, InstanceID: instance.ID(), OrgID: orgID, ProjectID: projectID, UserID: userID, Request: middleware.Message{Message: request}}
|
wantRequest := &middleware.ContextInfoRequest{FullMethod: fullMethod, InstanceID: instance.ID(), OrgID: orgID, ProjectID: projectID, UserID: userID, Request: middleware.Message{Message: request}}
|
||||||
@@ -81,7 +82,7 @@ func TestServer_ExecutionTarget(t *testing.T) {
|
|||||||
// replace original request with different targetID
|
// replace original request with different targetID
|
||||||
urlRequest, closeRequest, calledRequest, _ := integration.TestServerCallProto(wantRequest, 0, http.StatusOK, changedRequest)
|
urlRequest, closeRequest, calledRequest, _ := integration.TestServerCallProto(wantRequest, 0, http.StatusOK, changedRequest)
|
||||||
|
|
||||||
targetRequest := waitForTarget(ctx, t, instance, urlRequest, domain.TargetTypeCall, false)
|
targetRequest := waitForTarget(ctx, t, instance, urlRequest, target_domain.TargetTypeCall, false)
|
||||||
|
|
||||||
waitForExecutionOnCondition(ctx, t, instance, conditionRequestFullMethod(fullMethod), []string{targetRequest.GetId()})
|
waitForExecutionOnCondition(ctx, t, instance, conditionRequestFullMethod(fullMethod), []string{targetRequest.GetId()})
|
||||||
|
|
||||||
@@ -148,7 +149,7 @@ func TestServer_ExecutionTarget(t *testing.T) {
|
|||||||
// after request with different targetID, return changed response
|
// after request with different targetID, return changed response
|
||||||
targetResponseURL, closeResponse, calledResponse, _ := integration.TestServerCallProto(wantResponse, 0, http.StatusOK, changedResponse)
|
targetResponseURL, closeResponse, calledResponse, _ := integration.TestServerCallProto(wantResponse, 0, http.StatusOK, changedResponse)
|
||||||
|
|
||||||
targetResponse := waitForTarget(ctx, t, instance, targetResponseURL, domain.TargetTypeCall, false)
|
targetResponse := waitForTarget(ctx, t, instance, targetResponseURL, target_domain.TargetTypeCall, false)
|
||||||
waitForExecutionOnCondition(ctx, t, instance, conditionResponseFullMethod(fullMethod), []string{targetResponse.GetId()})
|
waitForExecutionOnCondition(ctx, t, instance, conditionResponseFullMethod(fullMethod), []string{targetResponse.GetId()})
|
||||||
return func() {
|
return func() {
|
||||||
closeRequest()
|
closeRequest()
|
||||||
@@ -186,7 +187,7 @@ func TestServer_ExecutionTarget(t *testing.T) {
|
|||||||
wantRequest := &middleware.ContextInfoRequest{FullMethod: fullMethod, InstanceID: instance.ID(), OrgID: orgID, ProjectID: projectID, UserID: userID, Request: middleware.Message{Message: request}}
|
wantRequest := &middleware.ContextInfoRequest{FullMethod: fullMethod, InstanceID: instance.ID(), OrgID: orgID, ProjectID: projectID, UserID: userID, Request: middleware.Message{Message: request}}
|
||||||
urlRequest, closeRequest, calledRequest, _ := integration.TestServerCallProto(wantRequest, 0, http.StatusInternalServerError, nil)
|
urlRequest, closeRequest, calledRequest, _ := integration.TestServerCallProto(wantRequest, 0, http.StatusInternalServerError, nil)
|
||||||
|
|
||||||
targetRequest := waitForTarget(ctx, t, instance, urlRequest, domain.TargetTypeCall, true)
|
targetRequest := waitForTarget(ctx, t, instance, urlRequest, target_domain.TargetTypeCall, true)
|
||||||
waitForExecutionOnCondition(ctx, t, instance, conditionRequestFullMethod(fullMethod), []string{targetRequest.GetId()})
|
waitForExecutionOnCondition(ctx, t, instance, conditionRequestFullMethod(fullMethod), []string{targetRequest.GetId()})
|
||||||
// GetTarget with used target
|
// GetTarget with used target
|
||||||
request.Id = targetRequest.GetId()
|
request.Id = targetRequest.GetId()
|
||||||
@@ -214,7 +215,7 @@ func TestServer_ExecutionTarget(t *testing.T) {
|
|||||||
targetCreatedName := gofakeit.Name()
|
targetCreatedName := gofakeit.Name()
|
||||||
targetCreatedURL := "https://nonexistent"
|
targetCreatedURL := "https://nonexistent"
|
||||||
|
|
||||||
targetCreated := instance.CreateTarget(ctx, t, targetCreatedName, targetCreatedURL, domain.TargetTypeCall, false)
|
targetCreated := instance.CreateTarget(ctx, t, targetCreatedName, targetCreatedURL, target_domain.TargetTypeCall, false)
|
||||||
|
|
||||||
// GetTarget with used target
|
// GetTarget with used target
|
||||||
request.Id = targetCreated.GetId()
|
request.Id = targetCreated.GetId()
|
||||||
@@ -250,7 +251,7 @@ func TestServer_ExecutionTarget(t *testing.T) {
|
|||||||
// after request with different targetID, return changed response
|
// after request with different targetID, return changed response
|
||||||
targetResponseURL, closeResponse, calledResponse, _ := integration.TestServerCallProto(wantResponse, 0, http.StatusInternalServerError, nil)
|
targetResponseURL, closeResponse, calledResponse, _ := integration.TestServerCallProto(wantResponse, 0, http.StatusInternalServerError, nil)
|
||||||
|
|
||||||
targetResponse := waitForTarget(ctx, t, instance, targetResponseURL, domain.TargetTypeCall, true)
|
targetResponse := waitForTarget(ctx, t, instance, targetResponseURL, target_domain.TargetTypeCall, true)
|
||||||
waitForExecutionOnCondition(ctx, t, instance, conditionResponseFullMethod(fullMethod), []string{targetResponse.GetId()})
|
waitForExecutionOnCondition(ctx, t, instance, conditionResponseFullMethod(fullMethod), []string{targetResponse.GetId()})
|
||||||
return func() {
|
return func() {
|
||||||
closeResponse()
|
closeResponse()
|
||||||
@@ -298,7 +299,7 @@ func TestServer_ExecutionTarget_Event(t *testing.T) {
|
|||||||
urlRequest, closeF, calledF, resetF := integration.TestServerCall(nil, 0, http.StatusOK, nil)
|
urlRequest, closeF, calledF, resetF := integration.TestServerCall(nil, 0, http.StatusOK, nil)
|
||||||
defer closeF()
|
defer closeF()
|
||||||
|
|
||||||
targetResponse := waitForTarget(isolatedIAMOwnerCTX, t, instance, urlRequest, domain.TargetTypeWebhook, true)
|
targetResponse := waitForTarget(isolatedIAMOwnerCTX, t, instance, urlRequest, target_domain.TargetTypeWebhook, true)
|
||||||
waitForExecutionOnCondition(isolatedIAMOwnerCTX, t, instance, conditionEvent(event), []string{targetResponse.GetId()})
|
waitForExecutionOnCondition(isolatedIAMOwnerCTX, t, instance, conditionEvent(event), []string{targetResponse.GetId()})
|
||||||
|
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
@@ -356,7 +357,7 @@ func TestServer_ExecutionTarget_Event_LongerThanTargetTimeout(t *testing.T) {
|
|||||||
urlRequest, closeF, calledF, resetF := integration.TestServerCall(nil, 5*time.Second, http.StatusOK, nil)
|
urlRequest, closeF, calledF, resetF := integration.TestServerCall(nil, 5*time.Second, http.StatusOK, nil)
|
||||||
defer closeF()
|
defer closeF()
|
||||||
|
|
||||||
targetResponse := waitForTarget(isolatedIAMOwnerCTX, t, instance, urlRequest, domain.TargetTypeWebhook, true)
|
targetResponse := waitForTarget(isolatedIAMOwnerCTX, t, instance, urlRequest, target_domain.TargetTypeWebhook, true)
|
||||||
waitForExecutionOnCondition(isolatedIAMOwnerCTX, t, instance, conditionEvent(event), []string{targetResponse.GetId()})
|
waitForExecutionOnCondition(isolatedIAMOwnerCTX, t, instance, conditionEvent(event), []string{targetResponse.GetId()})
|
||||||
|
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
@@ -407,7 +408,7 @@ func TestServer_ExecutionTarget_Event_LongerThanTransactionTimeout(t *testing.T)
|
|||||||
urlRequest, closeF, calledF, resetF := integration.TestServerCall(nil, 1*time.Second, http.StatusOK, nil)
|
urlRequest, closeF, calledF, resetF := integration.TestServerCall(nil, 1*time.Second, http.StatusOK, nil)
|
||||||
defer closeF()
|
defer closeF()
|
||||||
|
|
||||||
targetResponse := waitForTarget(isolatedIAMOwnerCTX, t, instance, urlRequest, domain.TargetTypeWebhook, true)
|
targetResponse := waitForTarget(isolatedIAMOwnerCTX, t, instance, urlRequest, target_domain.TargetTypeWebhook, true)
|
||||||
waitForExecutionOnCondition(isolatedIAMOwnerCTX, t, instance, conditionEvent(event), []string{targetResponse.GetId()})
|
waitForExecutionOnCondition(isolatedIAMOwnerCTX, t, instance, conditionEvent(event), []string{targetResponse.GetId()})
|
||||||
|
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
@@ -490,7 +491,7 @@ func waitForExecutionOnCondition(ctx context.Context, t *testing.T, instance *in
|
|||||||
}, retryDuration, tick, "timeout waiting for expected execution result")
|
}, retryDuration, tick, "timeout waiting for expected execution result")
|
||||||
}
|
}
|
||||||
|
|
||||||
func waitForTarget(ctx context.Context, t *testing.T, instance *integration.Instance, endpoint string, ty domain.TargetType, interrupt bool) *action.CreateTargetResponse {
|
func waitForTarget(ctx context.Context, t *testing.T, instance *integration.Instance, endpoint string, ty target_domain.TargetType, interrupt bool) *action.CreateTargetResponse {
|
||||||
resp := instance.CreateTarget(ctx, t, "", endpoint, ty, interrupt)
|
resp := instance.CreateTarget(ctx, t, "", endpoint, ty, interrupt)
|
||||||
|
|
||||||
retryDuration, tick := integration.WaitForAndTickWithMaxDuration(ctx, time.Minute)
|
retryDuration, tick := integration.WaitForAndTickWithMaxDuration(ctx, time.Minute)
|
||||||
@@ -511,14 +512,14 @@ func waitForTarget(ctx context.Context, t *testing.T, instance *integration.Inst
|
|||||||
config := got.GetTargets()[0]
|
config := got.GetTargets()[0]
|
||||||
assert.Equal(ttt, config.GetEndpoint(), endpoint)
|
assert.Equal(ttt, config.GetEndpoint(), endpoint)
|
||||||
switch ty {
|
switch ty {
|
||||||
case domain.TargetTypeWebhook:
|
case target_domain.TargetTypeWebhook:
|
||||||
if !assert.NotNil(ttt, config.GetRestWebhook()) {
|
if !assert.NotNil(ttt, config.GetRestWebhook()) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
assert.Equal(ttt, interrupt, config.GetRestWebhook().GetInterruptOnError())
|
assert.Equal(ttt, interrupt, config.GetRestWebhook().GetInterruptOnError())
|
||||||
case domain.TargetTypeAsync:
|
case target_domain.TargetTypeAsync:
|
||||||
assert.NotNil(ttt, config.GetRestAsync())
|
assert.NotNil(ttt, config.GetRestAsync())
|
||||||
case domain.TargetTypeCall:
|
case target_domain.TargetTypeCall:
|
||||||
if !assert.NotNil(ttt, config.GetRestCall()) {
|
if !assert.NotNil(ttt, config.GetRestCall()) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -770,7 +771,7 @@ func expectPreUserinfoExecution(ctx context.Context, t *testing.T, instance *int
|
|||||||
|
|
||||||
targetURL, closeF, _, _ := integration.TestServerCall(expectedContextInfo, 0, http.StatusOK, response)
|
targetURL, closeF, _, _ := integration.TestServerCall(expectedContextInfo, 0, http.StatusOK, response)
|
||||||
|
|
||||||
targetResp := waitForTarget(ctx, t, instance, targetURL, domain.TargetTypeCall, true)
|
targetResp := waitForTarget(ctx, t, instance, targetURL, target_domain.TargetTypeCall, true)
|
||||||
waitForExecutionOnCondition(ctx, t, instance, conditionFunction("preuserinfo"), []string{targetResp.GetId()})
|
waitForExecutionOnCondition(ctx, t, instance, conditionFunction("preuserinfo"), []string{targetResp.GetId()})
|
||||||
return userResp.GetUserId(), closeF
|
return userResp.GetUserId(), closeF
|
||||||
}
|
}
|
||||||
@@ -1078,7 +1079,7 @@ func expectPreAccessTokenExecution(ctx context.Context, t *testing.T, instance *
|
|||||||
|
|
||||||
targetURL, closeF, _, _ := integration.TestServerCall(expectedContextInfo, 0, http.StatusOK, response)
|
targetURL, closeF, _, _ := integration.TestServerCall(expectedContextInfo, 0, http.StatusOK, response)
|
||||||
|
|
||||||
targetResp := waitForTarget(ctx, t, instance, targetURL, domain.TargetTypeCall, true)
|
targetResp := waitForTarget(ctx, t, instance, targetURL, target_domain.TargetTypeCall, true)
|
||||||
waitForExecutionOnCondition(ctx, t, instance, conditionFunction("preaccesstoken"), []string{targetResp.GetId()})
|
waitForExecutionOnCondition(ctx, t, instance, conditionFunction("preaccesstoken"), []string{targetResp.GetId()})
|
||||||
return userResp.GetUserId(), closeF
|
return userResp.GetUserId(), closeF
|
||||||
}
|
}
|
||||||
@@ -1243,7 +1244,7 @@ func expectPreSAMLResponseExecution(ctx context.Context, t *testing.T, instance
|
|||||||
|
|
||||||
targetURL, closeF, _, _ := integration.TestServerCall(expectedContextInfo, 0, http.StatusOK, response)
|
targetURL, closeF, _, _ := integration.TestServerCall(expectedContextInfo, 0, http.StatusOK, response)
|
||||||
|
|
||||||
targetResp := waitForTarget(ctx, t, instance, targetURL, domain.TargetTypeCall, true)
|
targetResp := waitForTarget(ctx, t, instance, targetURL, target_domain.TargetTypeCall, true)
|
||||||
waitForExecutionOnCondition(ctx, t, instance, conditionFunction("presamlresponse"), []string{targetResp.GetId()})
|
waitForExecutionOnCondition(ctx, t, instance, conditionFunction("presamlresponse"), []string{targetResp.GetId()})
|
||||||
|
|
||||||
return userResp.GetUserId(), closeF
|
return userResp.GetUserId(), closeF
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import (
|
|||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
|
|
||||||
"github.com/zitadel/zitadel/internal/domain"
|
target_domain "github.com/zitadel/zitadel/internal/execution/target"
|
||||||
"github.com/zitadel/zitadel/internal/integration"
|
"github.com/zitadel/zitadel/internal/integration"
|
||||||
"github.com/zitadel/zitadel/pkg/grpc/action/v2"
|
"github.com/zitadel/zitadel/pkg/grpc/action/v2"
|
||||||
)
|
)
|
||||||
@@ -18,7 +18,7 @@ import (
|
|||||||
func TestServer_SetExecution_Request(t *testing.T) {
|
func TestServer_SetExecution_Request(t *testing.T) {
|
||||||
instance := integration.NewInstance(CTX)
|
instance := integration.NewInstance(CTX)
|
||||||
isolatedIAMOwnerCTX := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
|
isolatedIAMOwnerCTX := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
|
||||||
targetResp := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://notexisting", domain.TargetTypeWebhook, false)
|
targetResp := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://notexisting", target_domain.TargetTypeWebhook, false)
|
||||||
|
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
name string
|
name string
|
||||||
@@ -175,7 +175,7 @@ func assertSetExecutionResponse(t *testing.T, creationDate, setDate time.Time, e
|
|||||||
func TestServer_SetExecution_Response(t *testing.T) {
|
func TestServer_SetExecution_Response(t *testing.T) {
|
||||||
instance := integration.NewInstance(CTX)
|
instance := integration.NewInstance(CTX)
|
||||||
isolatedIAMOwnerCTX := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
|
isolatedIAMOwnerCTX := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
|
||||||
targetResp := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://notexisting", domain.TargetTypeWebhook, false)
|
targetResp := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://notexisting", target_domain.TargetTypeWebhook, false)
|
||||||
|
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
name string
|
name string
|
||||||
@@ -319,7 +319,7 @@ func TestServer_SetExecution_Response(t *testing.T) {
|
|||||||
func TestServer_SetExecution_Event(t *testing.T) {
|
func TestServer_SetExecution_Event(t *testing.T) {
|
||||||
instance := integration.NewInstance(CTX)
|
instance := integration.NewInstance(CTX)
|
||||||
isolatedIAMOwnerCTX := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
|
isolatedIAMOwnerCTX := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
|
||||||
targetResp := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://notexisting", domain.TargetTypeWebhook, false)
|
targetResp := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://notexisting", target_domain.TargetTypeWebhook, false)
|
||||||
|
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
name string
|
name string
|
||||||
@@ -482,7 +482,7 @@ func TestServer_SetExecution_Event(t *testing.T) {
|
|||||||
func TestServer_SetExecution_Function(t *testing.T) {
|
func TestServer_SetExecution_Function(t *testing.T) {
|
||||||
instance := integration.NewInstance(CTX)
|
instance := integration.NewInstance(CTX)
|
||||||
isolatedIAMOwnerCTX := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
|
isolatedIAMOwnerCTX := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
|
||||||
targetResp := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://notexisting", domain.TargetTypeWebhook, false)
|
targetResp := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://notexisting", target_domain.TargetTypeWebhook, false)
|
||||||
|
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
name string
|
name string
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ import (
|
|||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
"google.golang.org/protobuf/types/known/durationpb"
|
"google.golang.org/protobuf/types/known/durationpb"
|
||||||
|
|
||||||
"github.com/zitadel/zitadel/internal/domain"
|
target_domain "github.com/zitadel/zitadel/internal/execution/target"
|
||||||
"github.com/zitadel/zitadel/internal/integration"
|
"github.com/zitadel/zitadel/internal/integration"
|
||||||
"github.com/zitadel/zitadel/pkg/grpc/action/v2"
|
"github.com/zitadel/zitadel/pkg/grpc/action/v2"
|
||||||
"github.com/zitadel/zitadel/pkg/grpc/filter/v2"
|
"github.com/zitadel/zitadel/pkg/grpc/filter/v2"
|
||||||
@@ -54,7 +54,7 @@ func TestServer_GetTarget(t *testing.T) {
|
|||||||
ctx: isolatedIAMOwnerCTX,
|
ctx: isolatedIAMOwnerCTX,
|
||||||
dep: func(ctx context.Context, request *action.GetTargetRequest, response *action.GetTargetResponse) error {
|
dep: func(ctx context.Context, request *action.GetTargetRequest, response *action.GetTargetResponse) error {
|
||||||
name := integration.TargetName()
|
name := integration.TargetName()
|
||||||
resp := instance.CreateTarget(ctx, t, name, "https://example.com", domain.TargetTypeWebhook, false)
|
resp := instance.CreateTarget(ctx, t, name, "https://example.com", target_domain.TargetTypeWebhook, false)
|
||||||
request.Id = resp.GetId()
|
request.Id = resp.GetId()
|
||||||
response.Target.Id = resp.GetId()
|
response.Target.Id = resp.GetId()
|
||||||
response.Target.Name = name
|
response.Target.Name = name
|
||||||
@@ -81,7 +81,7 @@ func TestServer_GetTarget(t *testing.T) {
|
|||||||
ctx: isolatedIAMOwnerCTX,
|
ctx: isolatedIAMOwnerCTX,
|
||||||
dep: func(ctx context.Context, request *action.GetTargetRequest, response *action.GetTargetResponse) error {
|
dep: func(ctx context.Context, request *action.GetTargetRequest, response *action.GetTargetResponse) error {
|
||||||
name := integration.TargetName()
|
name := integration.TargetName()
|
||||||
resp := instance.CreateTarget(ctx, t, name, "https://example.com", domain.TargetTypeAsync, false)
|
resp := instance.CreateTarget(ctx, t, name, "https://example.com", target_domain.TargetTypeAsync, false)
|
||||||
request.Id = resp.GetId()
|
request.Id = resp.GetId()
|
||||||
response.Target.Id = resp.GetId()
|
response.Target.Id = resp.GetId()
|
||||||
response.Target.Name = name
|
response.Target.Name = name
|
||||||
@@ -108,7 +108,7 @@ func TestServer_GetTarget(t *testing.T) {
|
|||||||
ctx: isolatedIAMOwnerCTX,
|
ctx: isolatedIAMOwnerCTX,
|
||||||
dep: func(ctx context.Context, request *action.GetTargetRequest, response *action.GetTargetResponse) error {
|
dep: func(ctx context.Context, request *action.GetTargetRequest, response *action.GetTargetResponse) error {
|
||||||
name := integration.TargetName()
|
name := integration.TargetName()
|
||||||
resp := instance.CreateTarget(ctx, t, name, "https://example.com", domain.TargetTypeWebhook, true)
|
resp := instance.CreateTarget(ctx, t, name, "https://example.com", target_domain.TargetTypeWebhook, true)
|
||||||
request.Id = resp.GetId()
|
request.Id = resp.GetId()
|
||||||
response.Target.Id = resp.GetId()
|
response.Target.Id = resp.GetId()
|
||||||
response.Target.Name = name
|
response.Target.Name = name
|
||||||
@@ -137,7 +137,7 @@ func TestServer_GetTarget(t *testing.T) {
|
|||||||
ctx: isolatedIAMOwnerCTX,
|
ctx: isolatedIAMOwnerCTX,
|
||||||
dep: func(ctx context.Context, request *action.GetTargetRequest, response *action.GetTargetResponse) error {
|
dep: func(ctx context.Context, request *action.GetTargetRequest, response *action.GetTargetResponse) error {
|
||||||
name := integration.TargetName()
|
name := integration.TargetName()
|
||||||
resp := instance.CreateTarget(ctx, t, name, "https://example.com", domain.TargetTypeCall, false)
|
resp := instance.CreateTarget(ctx, t, name, "https://example.com", target_domain.TargetTypeCall, false)
|
||||||
request.Id = resp.GetId()
|
request.Id = resp.GetId()
|
||||||
response.Target.Id = resp.GetId()
|
response.Target.Id = resp.GetId()
|
||||||
response.Target.Name = name
|
response.Target.Name = name
|
||||||
@@ -166,7 +166,7 @@ func TestServer_GetTarget(t *testing.T) {
|
|||||||
ctx: isolatedIAMOwnerCTX,
|
ctx: isolatedIAMOwnerCTX,
|
||||||
dep: func(ctx context.Context, request *action.GetTargetRequest, response *action.GetTargetResponse) error {
|
dep: func(ctx context.Context, request *action.GetTargetRequest, response *action.GetTargetResponse) error {
|
||||||
name := integration.TargetName()
|
name := integration.TargetName()
|
||||||
resp := instance.CreateTarget(ctx, t, name, "https://example.com", domain.TargetTypeCall, true)
|
resp := instance.CreateTarget(ctx, t, name, "https://example.com", target_domain.TargetTypeCall, true)
|
||||||
request.Id = resp.GetId()
|
request.Id = resp.GetId()
|
||||||
response.Target.Id = resp.GetId()
|
response.Target.Id = resp.GetId()
|
||||||
response.Target.Name = name
|
response.Target.Name = name
|
||||||
@@ -261,7 +261,7 @@ func TestServer_ListTargets(t *testing.T) {
|
|||||||
ctx: isolatedIAMOwnerCTX,
|
ctx: isolatedIAMOwnerCTX,
|
||||||
dep: func(ctx context.Context, request *action.ListTargetsRequest, response *action.ListTargetsResponse) {
|
dep: func(ctx context.Context, request *action.ListTargetsRequest, response *action.ListTargetsResponse) {
|
||||||
name := integration.TargetName()
|
name := integration.TargetName()
|
||||||
resp := instance.CreateTarget(ctx, t, name, "https://example.com", domain.TargetTypeWebhook, false)
|
resp := instance.CreateTarget(ctx, t, name, "https://example.com", target_domain.TargetTypeWebhook, false)
|
||||||
request.Filters[0].Filter = &action.TargetSearchFilter_InTargetIdsFilter{
|
request.Filters[0].Filter = &action.TargetSearchFilter_InTargetIdsFilter{
|
||||||
InTargetIdsFilter: &action.InTargetIDsFilter{
|
InTargetIdsFilter: &action.InTargetIDsFilter{
|
||||||
TargetIds: []string{resp.GetId()},
|
TargetIds: []string{resp.GetId()},
|
||||||
@@ -301,7 +301,7 @@ func TestServer_ListTargets(t *testing.T) {
|
|||||||
ctx: isolatedIAMOwnerCTX,
|
ctx: isolatedIAMOwnerCTX,
|
||||||
dep: func(ctx context.Context, request *action.ListTargetsRequest, response *action.ListTargetsResponse) {
|
dep: func(ctx context.Context, request *action.ListTargetsRequest, response *action.ListTargetsResponse) {
|
||||||
name := integration.TargetName()
|
name := integration.TargetName()
|
||||||
resp := instance.CreateTarget(ctx, t, name, "https://example.com", domain.TargetTypeWebhook, false)
|
resp := instance.CreateTarget(ctx, t, name, "https://example.com", target_domain.TargetTypeWebhook, false)
|
||||||
request.Filters[0].Filter = &action.TargetSearchFilter_TargetNameFilter{
|
request.Filters[0].Filter = &action.TargetSearchFilter_TargetNameFilter{
|
||||||
TargetNameFilter: &action.TargetNameFilter{
|
TargetNameFilter: &action.TargetNameFilter{
|
||||||
TargetName: name,
|
TargetName: name,
|
||||||
@@ -344,9 +344,9 @@ func TestServer_ListTargets(t *testing.T) {
|
|||||||
name1 := integration.TargetName()
|
name1 := integration.TargetName()
|
||||||
name2 := integration.TargetName()
|
name2 := integration.TargetName()
|
||||||
name3 := integration.TargetName()
|
name3 := integration.TargetName()
|
||||||
resp1 := instance.CreateTarget(ctx, t, name1, "https://example.com", domain.TargetTypeWebhook, false)
|
resp1 := instance.CreateTarget(ctx, t, name1, "https://example.com", target_domain.TargetTypeWebhook, false)
|
||||||
resp2 := instance.CreateTarget(ctx, t, name2, "https://example.com", domain.TargetTypeCall, true)
|
resp2 := instance.CreateTarget(ctx, t, name2, "https://example.com", target_domain.TargetTypeCall, true)
|
||||||
resp3 := instance.CreateTarget(ctx, t, name3, "https://example.com", domain.TargetTypeAsync, false)
|
resp3 := instance.CreateTarget(ctx, t, name3, "https://example.com", target_domain.TargetTypeAsync, false)
|
||||||
request.Filters[0].Filter = &action.TargetSearchFilter_InTargetIdsFilter{
|
request.Filters[0].Filter = &action.TargetSearchFilter_InTargetIdsFilter{
|
||||||
InTargetIdsFilter: &action.InTargetIDsFilter{
|
InTargetIdsFilter: &action.InTargetIDsFilter{
|
||||||
TargetIds: []string{resp1.GetId(), resp2.GetId(), resp3.GetId()},
|
TargetIds: []string{resp1.GetId(), resp2.GetId(), resp3.GetId()},
|
||||||
@@ -445,7 +445,7 @@ func assertPaginationResponse(t *assert.CollectT, expected *filter.PaginationRes
|
|||||||
func TestServer_ListExecutions(t *testing.T) {
|
func TestServer_ListExecutions(t *testing.T) {
|
||||||
instance := integration.NewInstance(CTX)
|
instance := integration.NewInstance(CTX)
|
||||||
isolatedIAMOwnerCTX := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
|
isolatedIAMOwnerCTX := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
|
||||||
targetResp := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", domain.TargetTypeWebhook, false)
|
targetResp := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false)
|
||||||
|
|
||||||
type args struct {
|
type args struct {
|
||||||
ctx context.Context
|
ctx context.Context
|
||||||
@@ -523,7 +523,7 @@ func TestServer_ListExecutions(t *testing.T) {
|
|||||||
args: args{
|
args: args{
|
||||||
ctx: isolatedIAMOwnerCTX,
|
ctx: isolatedIAMOwnerCTX,
|
||||||
dep: func(ctx context.Context, request *action.ListExecutionsRequest, response *action.ListExecutionsResponse) {
|
dep: func(ctx context.Context, request *action.ListExecutionsRequest, response *action.ListExecutionsResponse) {
|
||||||
target := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", domain.TargetTypeWebhook, false)
|
target := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false)
|
||||||
// add target as Filter to the request
|
// add target as Filter to the request
|
||||||
request.Filters[0] = &action.ExecutionSearchFilter{
|
request.Filters[0] = &action.ExecutionSearchFilter{
|
||||||
Filter: &action.ExecutionSearchFilter_TargetFilter{
|
Filter: &action.ExecutionSearchFilter_TargetFilter{
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ import (
|
|||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
"google.golang.org/protobuf/types/known/durationpb"
|
"google.golang.org/protobuf/types/known/durationpb"
|
||||||
|
|
||||||
"github.com/zitadel/zitadel/internal/domain"
|
target_domain "github.com/zitadel/zitadel/internal/execution/target"
|
||||||
"github.com/zitadel/zitadel/internal/integration"
|
"github.com/zitadel/zitadel/internal/integration"
|
||||||
"github.com/zitadel/zitadel/pkg/grpc/action/v2"
|
"github.com/zitadel/zitadel/pkg/grpc/action/v2"
|
||||||
)
|
)
|
||||||
@@ -26,7 +26,7 @@ func TestServer_CreateTarget(t *testing.T) {
|
|||||||
signingKey bool
|
signingKey bool
|
||||||
}
|
}
|
||||||
alreadyExistingTargetName := integration.TargetName()
|
alreadyExistingTargetName := integration.TargetName()
|
||||||
instance.CreateTarget(isolatedIAMOwnerCTX, t, alreadyExistingTargetName, "https://example.com", domain.TargetTypeAsync, false)
|
instance.CreateTarget(isolatedIAMOwnerCTX, t, alreadyExistingTargetName, "https://example.com", target_domain.TargetTypeAsync, false)
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
name string
|
name string
|
||||||
ctx context.Context
|
ctx context.Context
|
||||||
@@ -263,7 +263,7 @@ func TestServer_UpdateTarget(t *testing.T) {
|
|||||||
{
|
{
|
||||||
name: "missing permission",
|
name: "missing permission",
|
||||||
prepare: func(request *action.UpdateTargetRequest) {
|
prepare: func(request *action.UpdateTargetRequest) {
|
||||||
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", domain.TargetTypeWebhook, false).GetId()
|
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false).GetId()
|
||||||
request.Id = targetID
|
request.Id = targetID
|
||||||
},
|
},
|
||||||
args: args{
|
args: args{
|
||||||
@@ -290,7 +290,7 @@ func TestServer_UpdateTarget(t *testing.T) {
|
|||||||
{
|
{
|
||||||
name: "no change, ok",
|
name: "no change, ok",
|
||||||
prepare: func(request *action.UpdateTargetRequest) {
|
prepare: func(request *action.UpdateTargetRequest) {
|
||||||
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", domain.TargetTypeWebhook, false).GetId()
|
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false).GetId()
|
||||||
request.Id = targetID
|
request.Id = targetID
|
||||||
},
|
},
|
||||||
args: args{
|
args: args{
|
||||||
@@ -308,7 +308,7 @@ func TestServer_UpdateTarget(t *testing.T) {
|
|||||||
{
|
{
|
||||||
name: "change name, ok",
|
name: "change name, ok",
|
||||||
prepare: func(request *action.UpdateTargetRequest) {
|
prepare: func(request *action.UpdateTargetRequest) {
|
||||||
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", domain.TargetTypeWebhook, false).GetId()
|
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false).GetId()
|
||||||
request.Id = targetID
|
request.Id = targetID
|
||||||
},
|
},
|
||||||
args: args{
|
args: args{
|
||||||
@@ -326,7 +326,7 @@ func TestServer_UpdateTarget(t *testing.T) {
|
|||||||
{
|
{
|
||||||
name: "regenerate signingkey, ok",
|
name: "regenerate signingkey, ok",
|
||||||
prepare: func(request *action.UpdateTargetRequest) {
|
prepare: func(request *action.UpdateTargetRequest) {
|
||||||
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", domain.TargetTypeWebhook, false).GetId()
|
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false).GetId()
|
||||||
request.Id = targetID
|
request.Id = targetID
|
||||||
},
|
},
|
||||||
args: args{
|
args: args{
|
||||||
@@ -344,7 +344,7 @@ func TestServer_UpdateTarget(t *testing.T) {
|
|||||||
{
|
{
|
||||||
name: "change type, ok",
|
name: "change type, ok",
|
||||||
prepare: func(request *action.UpdateTargetRequest) {
|
prepare: func(request *action.UpdateTargetRequest) {
|
||||||
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", domain.TargetTypeWebhook, false).GetId()
|
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false).GetId()
|
||||||
request.Id = targetID
|
request.Id = targetID
|
||||||
},
|
},
|
||||||
args: args{
|
args: args{
|
||||||
@@ -366,7 +366,7 @@ func TestServer_UpdateTarget(t *testing.T) {
|
|||||||
{
|
{
|
||||||
name: "change url, ok",
|
name: "change url, ok",
|
||||||
prepare: func(request *action.UpdateTargetRequest) {
|
prepare: func(request *action.UpdateTargetRequest) {
|
||||||
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", domain.TargetTypeWebhook, false).GetId()
|
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false).GetId()
|
||||||
request.Id = targetID
|
request.Id = targetID
|
||||||
},
|
},
|
||||||
args: args{
|
args: args{
|
||||||
@@ -384,7 +384,7 @@ func TestServer_UpdateTarget(t *testing.T) {
|
|||||||
{
|
{
|
||||||
name: "change timeout, ok",
|
name: "change timeout, ok",
|
||||||
prepare: func(request *action.UpdateTargetRequest) {
|
prepare: func(request *action.UpdateTargetRequest) {
|
||||||
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", domain.TargetTypeWebhook, false).GetId()
|
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false).GetId()
|
||||||
request.Id = targetID
|
request.Id = targetID
|
||||||
},
|
},
|
||||||
args: args{
|
args: args{
|
||||||
@@ -402,7 +402,7 @@ func TestServer_UpdateTarget(t *testing.T) {
|
|||||||
{
|
{
|
||||||
name: "change type async, ok",
|
name: "change type async, ok",
|
||||||
prepare: func(request *action.UpdateTargetRequest) {
|
prepare: func(request *action.UpdateTargetRequest) {
|
||||||
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", domain.TargetTypeAsync, false).GetId()
|
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeAsync, false).GetId()
|
||||||
request.Id = targetID
|
request.Id = targetID
|
||||||
},
|
},
|
||||||
args: args{
|
args: args{
|
||||||
@@ -498,7 +498,7 @@ func TestServer_DeleteTarget(t *testing.T) {
|
|||||||
ctx: iamOwnerCtx,
|
ctx: iamOwnerCtx,
|
||||||
prepare: func(request *action.DeleteTargetRequest) (time.Time, time.Time) {
|
prepare: func(request *action.DeleteTargetRequest) (time.Time, time.Time) {
|
||||||
creationDate := time.Now().UTC()
|
creationDate := time.Now().UTC()
|
||||||
targetID := instance.CreateTarget(iamOwnerCtx, t, "", "https://example.com", domain.TargetTypeWebhook, false).GetId()
|
targetID := instance.CreateTarget(iamOwnerCtx, t, "", "https://example.com", target_domain.TargetTypeWebhook, false).GetId()
|
||||||
request.Id = targetID
|
request.Id = targetID
|
||||||
return creationDate, time.Time{}
|
return creationDate, time.Time{}
|
||||||
},
|
},
|
||||||
@@ -510,7 +510,7 @@ func TestServer_DeleteTarget(t *testing.T) {
|
|||||||
ctx: iamOwnerCtx,
|
ctx: iamOwnerCtx,
|
||||||
prepare: func(request *action.DeleteTargetRequest) (time.Time, time.Time) {
|
prepare: func(request *action.DeleteTargetRequest) (time.Time, time.Time) {
|
||||||
creationDate := time.Now().UTC()
|
creationDate := time.Now().UTC()
|
||||||
targetID := instance.CreateTarget(iamOwnerCtx, t, "", "https://example.com", domain.TargetTypeWebhook, false).GetId()
|
targetID := instance.CreateTarget(iamOwnerCtx, t, "", "https://example.com", target_domain.TargetTypeWebhook, false).GetId()
|
||||||
request.Id = targetID
|
request.Id = targetID
|
||||||
instance.DeleteTarget(iamOwnerCtx, t, targetID)
|
instance.DeleteTarget(iamOwnerCtx, t, targetID)
|
||||||
return creationDate, time.Now().UTC()
|
return creationDate, time.Now().UTC()
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import (
|
|||||||
"github.com/zitadel/zitadel/internal/api/grpc/filter/v2"
|
"github.com/zitadel/zitadel/internal/api/grpc/filter/v2"
|
||||||
"github.com/zitadel/zitadel/internal/command"
|
"github.com/zitadel/zitadel/internal/command"
|
||||||
"github.com/zitadel/zitadel/internal/domain"
|
"github.com/zitadel/zitadel/internal/domain"
|
||||||
|
target_domain "github.com/zitadel/zitadel/internal/execution/target"
|
||||||
"github.com/zitadel/zitadel/internal/query"
|
"github.com/zitadel/zitadel/internal/query"
|
||||||
"github.com/zitadel/zitadel/internal/zerrors"
|
"github.com/zitadel/zitadel/internal/zerrors"
|
||||||
"github.com/zitadel/zitadel/pkg/grpc/action/v2"
|
"github.com/zitadel/zitadel/pkg/grpc/action/v2"
|
||||||
@@ -89,11 +90,11 @@ func targetToPb(t *query.Target) *action.Target {
|
|||||||
SigningKey: t.SigningKey,
|
SigningKey: t.SigningKey,
|
||||||
}
|
}
|
||||||
switch t.TargetType {
|
switch t.TargetType {
|
||||||
case domain.TargetTypeWebhook:
|
case target_domain.TargetTypeWebhook:
|
||||||
target.TargetType = &action.Target_RestWebhook{RestWebhook: &action.RESTWebhook{InterruptOnError: t.InterruptOnError}}
|
target.TargetType = &action.Target_RestWebhook{RestWebhook: &action.RESTWebhook{InterruptOnError: t.InterruptOnError}}
|
||||||
case domain.TargetTypeCall:
|
case target_domain.TargetTypeCall:
|
||||||
target.TargetType = &action.Target_RestCall{RestCall: &action.RESTCall{InterruptOnError: t.InterruptOnError}}
|
target.TargetType = &action.Target_RestCall{RestCall: &action.RESTCall{InterruptOnError: t.InterruptOnError}}
|
||||||
case domain.TargetTypeAsync:
|
case target_domain.TargetTypeAsync:
|
||||||
target.TargetType = &action.Target_RestAsync{RestAsync: &action.RESTAsync{}}
|
target.TargetType = &action.Target_RestAsync{RestAsync: &action.RESTAsync{}}
|
||||||
default:
|
default:
|
||||||
target.TargetType = nil
|
target.TargetType = nil
|
||||||
|
|||||||
@@ -9,8 +9,8 @@ import (
|
|||||||
|
|
||||||
"github.com/zitadel/zitadel/internal/api/authz"
|
"github.com/zitadel/zitadel/internal/api/authz"
|
||||||
"github.com/zitadel/zitadel/internal/command"
|
"github.com/zitadel/zitadel/internal/command"
|
||||||
"github.com/zitadel/zitadel/internal/domain"
|
|
||||||
"github.com/zitadel/zitadel/internal/eventstore/v1/models"
|
"github.com/zitadel/zitadel/internal/eventstore/v1/models"
|
||||||
|
target_domain "github.com/zitadel/zitadel/internal/execution/target"
|
||||||
"github.com/zitadel/zitadel/pkg/grpc/action/v2"
|
"github.com/zitadel/zitadel/pkg/grpc/action/v2"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -66,18 +66,18 @@ func (s *Server) DeleteTarget(ctx context.Context, req *connect.Request[action.D
|
|||||||
|
|
||||||
func createTargetToCommand(req *action.CreateTargetRequest) *command.AddTarget {
|
func createTargetToCommand(req *action.CreateTargetRequest) *command.AddTarget {
|
||||||
var (
|
var (
|
||||||
targetType domain.TargetType
|
targetType target_domain.TargetType
|
||||||
interruptOnError bool
|
interruptOnError bool
|
||||||
)
|
)
|
||||||
switch t := req.GetTargetType().(type) {
|
switch t := req.GetTargetType().(type) {
|
||||||
case *action.CreateTargetRequest_RestWebhook:
|
case *action.CreateTargetRequest_RestWebhook:
|
||||||
targetType = domain.TargetTypeWebhook
|
targetType = target_domain.TargetTypeWebhook
|
||||||
interruptOnError = t.RestWebhook.InterruptOnError
|
interruptOnError = t.RestWebhook.InterruptOnError
|
||||||
case *action.CreateTargetRequest_RestCall:
|
case *action.CreateTargetRequest_RestCall:
|
||||||
targetType = domain.TargetTypeCall
|
targetType = target_domain.TargetTypeCall
|
||||||
interruptOnError = t.RestCall.InterruptOnError
|
interruptOnError = t.RestCall.InterruptOnError
|
||||||
case *action.CreateTargetRequest_RestAsync:
|
case *action.CreateTargetRequest_RestAsync:
|
||||||
targetType = domain.TargetTypeAsync
|
targetType = target_domain.TargetTypeAsync
|
||||||
}
|
}
|
||||||
return &command.AddTarget{
|
return &command.AddTarget{
|
||||||
Name: req.GetName(),
|
Name: req.GetName(),
|
||||||
@@ -106,13 +106,13 @@ func updateTargetToCommand(req *action.UpdateTargetRequest) *command.ChangeTarge
|
|||||||
if req.TargetType != nil {
|
if req.TargetType != nil {
|
||||||
switch t := req.GetTargetType().(type) {
|
switch t := req.GetTargetType().(type) {
|
||||||
case *action.UpdateTargetRequest_RestWebhook:
|
case *action.UpdateTargetRequest_RestWebhook:
|
||||||
target.TargetType = gu.Ptr(domain.TargetTypeWebhook)
|
target.TargetType = gu.Ptr(target_domain.TargetTypeWebhook)
|
||||||
target.InterruptOnError = gu.Ptr(t.RestWebhook.InterruptOnError)
|
target.InterruptOnError = gu.Ptr(t.RestWebhook.InterruptOnError)
|
||||||
case *action.UpdateTargetRequest_RestCall:
|
case *action.UpdateTargetRequest_RestCall:
|
||||||
target.TargetType = gu.Ptr(domain.TargetTypeCall)
|
target.TargetType = gu.Ptr(target_domain.TargetTypeCall)
|
||||||
target.InterruptOnError = gu.Ptr(t.RestCall.InterruptOnError)
|
target.InterruptOnError = gu.Ptr(t.RestCall.InterruptOnError)
|
||||||
case *action.UpdateTargetRequest_RestAsync:
|
case *action.UpdateTargetRequest_RestAsync:
|
||||||
target.TargetType = gu.Ptr(domain.TargetTypeAsync)
|
target.TargetType = gu.Ptr(target_domain.TargetTypeAsync)
|
||||||
target.InterruptOnError = gu.Ptr(false)
|
target.InterruptOnError = gu.Ptr(false)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import (
|
|||||||
"google.golang.org/protobuf/types/known/durationpb"
|
"google.golang.org/protobuf/types/known/durationpb"
|
||||||
|
|
||||||
"github.com/zitadel/zitadel/internal/command"
|
"github.com/zitadel/zitadel/internal/command"
|
||||||
"github.com/zitadel/zitadel/internal/domain"
|
target_domain "github.com/zitadel/zitadel/internal/execution/target"
|
||||||
"github.com/zitadel/zitadel/pkg/grpc/action/v2"
|
"github.com/zitadel/zitadel/pkg/grpc/action/v2"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -44,7 +44,7 @@ func Test_createTargetToCommand(t *testing.T) {
|
|||||||
}},
|
}},
|
||||||
want: &command.AddTarget{
|
want: &command.AddTarget{
|
||||||
Name: "target 1",
|
Name: "target 1",
|
||||||
TargetType: domain.TargetTypeWebhook,
|
TargetType: target_domain.TargetTypeWebhook,
|
||||||
Endpoint: "https://example.com/hooks/1",
|
Endpoint: "https://example.com/hooks/1",
|
||||||
Timeout: 10 * time.Second,
|
Timeout: 10 * time.Second,
|
||||||
InterruptOnError: false,
|
InterruptOnError: false,
|
||||||
@@ -62,7 +62,7 @@ func Test_createTargetToCommand(t *testing.T) {
|
|||||||
}},
|
}},
|
||||||
want: &command.AddTarget{
|
want: &command.AddTarget{
|
||||||
Name: "target 1",
|
Name: "target 1",
|
||||||
TargetType: domain.TargetTypeAsync,
|
TargetType: target_domain.TargetTypeAsync,
|
||||||
Endpoint: "https://example.com/hooks/1",
|
Endpoint: "https://example.com/hooks/1",
|
||||||
Timeout: 10 * time.Second,
|
Timeout: 10 * time.Second,
|
||||||
InterruptOnError: false,
|
InterruptOnError: false,
|
||||||
@@ -82,7 +82,7 @@ func Test_createTargetToCommand(t *testing.T) {
|
|||||||
}},
|
}},
|
||||||
want: &command.AddTarget{
|
want: &command.AddTarget{
|
||||||
Name: "target 1",
|
Name: "target 1",
|
||||||
TargetType: domain.TargetTypeCall,
|
TargetType: target_domain.TargetTypeCall,
|
||||||
Endpoint: "https://example.com/hooks/1",
|
Endpoint: "https://example.com/hooks/1",
|
||||||
Timeout: 10 * time.Second,
|
Timeout: 10 * time.Second,
|
||||||
InterruptOnError: true,
|
InterruptOnError: true,
|
||||||
@@ -155,7 +155,7 @@ func Test_updateTargetToCommand(t *testing.T) {
|
|||||||
}},
|
}},
|
||||||
want: &command.ChangeTarget{
|
want: &command.ChangeTarget{
|
||||||
Name: gu.Ptr("target 1"),
|
Name: gu.Ptr("target 1"),
|
||||||
TargetType: gu.Ptr(domain.TargetTypeWebhook),
|
TargetType: gu.Ptr(target_domain.TargetTypeWebhook),
|
||||||
Endpoint: gu.Ptr("https://example.com/hooks/1"),
|
Endpoint: gu.Ptr("https://example.com/hooks/1"),
|
||||||
Timeout: gu.Ptr(10 * time.Second),
|
Timeout: gu.Ptr(10 * time.Second),
|
||||||
InterruptOnError: gu.Ptr(false),
|
InterruptOnError: gu.Ptr(false),
|
||||||
@@ -175,7 +175,7 @@ func Test_updateTargetToCommand(t *testing.T) {
|
|||||||
}},
|
}},
|
||||||
want: &command.ChangeTarget{
|
want: &command.ChangeTarget{
|
||||||
Name: gu.Ptr("target 1"),
|
Name: gu.Ptr("target 1"),
|
||||||
TargetType: gu.Ptr(domain.TargetTypeWebhook),
|
TargetType: gu.Ptr(target_domain.TargetTypeWebhook),
|
||||||
Endpoint: gu.Ptr("https://example.com/hooks/1"),
|
Endpoint: gu.Ptr("https://example.com/hooks/1"),
|
||||||
Timeout: gu.Ptr(10 * time.Second),
|
Timeout: gu.Ptr(10 * time.Second),
|
||||||
InterruptOnError: gu.Ptr(true),
|
InterruptOnError: gu.Ptr(true),
|
||||||
@@ -193,7 +193,7 @@ func Test_updateTargetToCommand(t *testing.T) {
|
|||||||
}},
|
}},
|
||||||
want: &command.ChangeTarget{
|
want: &command.ChangeTarget{
|
||||||
Name: gu.Ptr("target 1"),
|
Name: gu.Ptr("target 1"),
|
||||||
TargetType: gu.Ptr(domain.TargetTypeAsync),
|
TargetType: gu.Ptr(target_domain.TargetTypeAsync),
|
||||||
Endpoint: gu.Ptr("https://example.com/hooks/1"),
|
Endpoint: gu.Ptr("https://example.com/hooks/1"),
|
||||||
Timeout: gu.Ptr(10 * time.Second),
|
Timeout: gu.Ptr(10 * time.Second),
|
||||||
InterruptOnError: gu.Ptr(false),
|
InterruptOnError: gu.Ptr(false),
|
||||||
@@ -213,7 +213,7 @@ func Test_updateTargetToCommand(t *testing.T) {
|
|||||||
}},
|
}},
|
||||||
want: &command.ChangeTarget{
|
want: &command.ChangeTarget{
|
||||||
Name: gu.Ptr("target 1"),
|
Name: gu.Ptr("target 1"),
|
||||||
TargetType: gu.Ptr(domain.TargetTypeCall),
|
TargetType: gu.Ptr(target_domain.TargetTypeCall),
|
||||||
Endpoint: gu.Ptr("https://example.com/hooks/1"),
|
Endpoint: gu.Ptr("https://example.com/hooks/1"),
|
||||||
Timeout: gu.Ptr(10 * time.Second),
|
Timeout: gu.Ptr(10 * time.Second),
|
||||||
InterruptOnError: gu.Ptr(true),
|
InterruptOnError: gu.Ptr(true),
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ import (
|
|||||||
oidc_api "github.com/zitadel/zitadel/internal/api/oidc"
|
oidc_api "github.com/zitadel/zitadel/internal/api/oidc"
|
||||||
saml_api "github.com/zitadel/zitadel/internal/api/saml"
|
saml_api "github.com/zitadel/zitadel/internal/api/saml"
|
||||||
"github.com/zitadel/zitadel/internal/domain"
|
"github.com/zitadel/zitadel/internal/domain"
|
||||||
|
target_domain "github.com/zitadel/zitadel/internal/execution/target"
|
||||||
"github.com/zitadel/zitadel/internal/integration"
|
"github.com/zitadel/zitadel/internal/integration"
|
||||||
"github.com/zitadel/zitadel/internal/query"
|
"github.com/zitadel/zitadel/internal/query"
|
||||||
action "github.com/zitadel/zitadel/pkg/grpc/action/v2beta"
|
action "github.com/zitadel/zitadel/pkg/grpc/action/v2beta"
|
||||||
@@ -73,7 +74,7 @@ func TestServer_ExecutionTarget(t *testing.T) {
|
|||||||
targetCreatedName := gofakeit.Name()
|
targetCreatedName := gofakeit.Name()
|
||||||
targetCreatedURL := "https://nonexistent"
|
targetCreatedURL := "https://nonexistent"
|
||||||
|
|
||||||
targetCreated := instance.CreateTarget(ctx, t, targetCreatedName, targetCreatedURL, domain.TargetTypeCall, false)
|
targetCreated := instance.CreateTarget(ctx, t, targetCreatedName, targetCreatedURL, target_domain.TargetTypeCall, false)
|
||||||
|
|
||||||
// request received by target
|
// request received by target
|
||||||
wantRequest := &middleware.ContextInfoRequest{FullMethod: fullMethod, InstanceID: instance.ID(), OrgID: orgID, ProjectID: projectID, UserID: userID, Request: middleware.Message{Message: request}}
|
wantRequest := &middleware.ContextInfoRequest{FullMethod: fullMethod, InstanceID: instance.ID(), OrgID: orgID, ProjectID: projectID, UserID: userID, Request: middleware.Message{Message: request}}
|
||||||
@@ -81,7 +82,7 @@ func TestServer_ExecutionTarget(t *testing.T) {
|
|||||||
// replace original request with different targetID
|
// replace original request with different targetID
|
||||||
urlRequest, closeRequest, calledRequest, _ := integration.TestServerCallProto(wantRequest, 0, http.StatusOK, changedRequest)
|
urlRequest, closeRequest, calledRequest, _ := integration.TestServerCallProto(wantRequest, 0, http.StatusOK, changedRequest)
|
||||||
|
|
||||||
targetRequest := waitForTarget(ctx, t, instance, urlRequest, domain.TargetTypeCall, false)
|
targetRequest := waitForTarget(ctx, t, instance, urlRequest, target_domain.TargetTypeCall, false)
|
||||||
|
|
||||||
waitForExecutionOnCondition(ctx, t, instance, conditionRequestFullMethod(fullMethod), []string{targetRequest.GetId()})
|
waitForExecutionOnCondition(ctx, t, instance, conditionRequestFullMethod(fullMethod), []string{targetRequest.GetId()})
|
||||||
|
|
||||||
@@ -148,7 +149,7 @@ func TestServer_ExecutionTarget(t *testing.T) {
|
|||||||
// after request with different targetID, return changed response
|
// after request with different targetID, return changed response
|
||||||
targetResponseURL, closeResponse, calledResponse, _ := integration.TestServerCallProto(wantResponse, 0, http.StatusOK, changedResponse)
|
targetResponseURL, closeResponse, calledResponse, _ := integration.TestServerCallProto(wantResponse, 0, http.StatusOK, changedResponse)
|
||||||
|
|
||||||
targetResponse := waitForTarget(ctx, t, instance, targetResponseURL, domain.TargetTypeCall, false)
|
targetResponse := waitForTarget(ctx, t, instance, targetResponseURL, target_domain.TargetTypeCall, false)
|
||||||
waitForExecutionOnCondition(ctx, t, instance, conditionResponseFullMethod(fullMethod), []string{targetResponse.GetId()})
|
waitForExecutionOnCondition(ctx, t, instance, conditionResponseFullMethod(fullMethod), []string{targetResponse.GetId()})
|
||||||
return func() {
|
return func() {
|
||||||
closeRequest()
|
closeRequest()
|
||||||
@@ -186,7 +187,7 @@ func TestServer_ExecutionTarget(t *testing.T) {
|
|||||||
wantRequest := &middleware.ContextInfoRequest{FullMethod: fullMethod, InstanceID: instance.ID(), OrgID: orgID, ProjectID: projectID, UserID: userID, Request: middleware.Message{Message: request}}
|
wantRequest := &middleware.ContextInfoRequest{FullMethod: fullMethod, InstanceID: instance.ID(), OrgID: orgID, ProjectID: projectID, UserID: userID, Request: middleware.Message{Message: request}}
|
||||||
urlRequest, closeRequest, calledRequest, _ := integration.TestServerCallProto(wantRequest, 0, http.StatusInternalServerError, nil)
|
urlRequest, closeRequest, calledRequest, _ := integration.TestServerCallProto(wantRequest, 0, http.StatusInternalServerError, nil)
|
||||||
|
|
||||||
targetRequest := waitForTarget(ctx, t, instance, urlRequest, domain.TargetTypeCall, true)
|
targetRequest := waitForTarget(ctx, t, instance, urlRequest, target_domain.TargetTypeCall, true)
|
||||||
waitForExecutionOnCondition(ctx, t, instance, conditionRequestFullMethod(fullMethod), []string{targetRequest.GetId()})
|
waitForExecutionOnCondition(ctx, t, instance, conditionRequestFullMethod(fullMethod), []string{targetRequest.GetId()})
|
||||||
// GetTarget with used target
|
// GetTarget with used target
|
||||||
request.Id = targetRequest.GetId()
|
request.Id = targetRequest.GetId()
|
||||||
@@ -214,7 +215,7 @@ func TestServer_ExecutionTarget(t *testing.T) {
|
|||||||
targetCreatedName := gofakeit.Name()
|
targetCreatedName := gofakeit.Name()
|
||||||
targetCreatedURL := "https://nonexistent"
|
targetCreatedURL := "https://nonexistent"
|
||||||
|
|
||||||
targetCreated := instance.CreateTarget(ctx, t, targetCreatedName, targetCreatedURL, domain.TargetTypeCall, false)
|
targetCreated := instance.CreateTarget(ctx, t, targetCreatedName, targetCreatedURL, target_domain.TargetTypeCall, false)
|
||||||
|
|
||||||
// GetTarget with used target
|
// GetTarget with used target
|
||||||
request.Id = targetCreated.GetId()
|
request.Id = targetCreated.GetId()
|
||||||
@@ -250,7 +251,7 @@ func TestServer_ExecutionTarget(t *testing.T) {
|
|||||||
// after request with different targetID, return changed response
|
// after request with different targetID, return changed response
|
||||||
targetResponseURL, closeResponse, calledResponse, _ := integration.TestServerCallProto(wantResponse, 0, http.StatusInternalServerError, nil)
|
targetResponseURL, closeResponse, calledResponse, _ := integration.TestServerCallProto(wantResponse, 0, http.StatusInternalServerError, nil)
|
||||||
|
|
||||||
targetResponse := waitForTarget(ctx, t, instance, targetResponseURL, domain.TargetTypeCall, true)
|
targetResponse := waitForTarget(ctx, t, instance, targetResponseURL, target_domain.TargetTypeCall, true)
|
||||||
waitForExecutionOnCondition(ctx, t, instance, conditionResponseFullMethod(fullMethod), []string{targetResponse.GetId()})
|
waitForExecutionOnCondition(ctx, t, instance, conditionResponseFullMethod(fullMethod), []string{targetResponse.GetId()})
|
||||||
return func() {
|
return func() {
|
||||||
closeResponse()
|
closeResponse()
|
||||||
@@ -305,7 +306,7 @@ func TestServer_ExecutionTarget_Event(t *testing.T) {
|
|||||||
urlRequest, closeF, calledF, resetF := integration.TestServerCall(nil, 0, http.StatusOK, nil)
|
urlRequest, closeF, calledF, resetF := integration.TestServerCall(nil, 0, http.StatusOK, nil)
|
||||||
defer closeF()
|
defer closeF()
|
||||||
|
|
||||||
targetResponse := waitForTarget(isolatedIAMOwnerCTX, t, instance, urlRequest, domain.TargetTypeWebhook, true)
|
targetResponse := waitForTarget(isolatedIAMOwnerCTX, t, instance, urlRequest, target_domain.TargetTypeWebhook, true)
|
||||||
waitForExecutionOnCondition(isolatedIAMOwnerCTX, t, instance, conditionEvent(event), []string{targetResponse.GetId()})
|
waitForExecutionOnCondition(isolatedIAMOwnerCTX, t, instance, conditionEvent(event), []string{targetResponse.GetId()})
|
||||||
|
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
@@ -363,7 +364,7 @@ func TestServer_ExecutionTarget_Event_LongerThanTargetTimeout(t *testing.T) {
|
|||||||
urlRequest, closeF, calledF, resetF := integration.TestServerCall(nil, 5*time.Second, http.StatusOK, nil)
|
urlRequest, closeF, calledF, resetF := integration.TestServerCall(nil, 5*time.Second, http.StatusOK, nil)
|
||||||
defer closeF()
|
defer closeF()
|
||||||
|
|
||||||
targetResponse := waitForTarget(isolatedIAMOwnerCTX, t, instance, urlRequest, domain.TargetTypeWebhook, true)
|
targetResponse := waitForTarget(isolatedIAMOwnerCTX, t, instance, urlRequest, target_domain.TargetTypeWebhook, true)
|
||||||
waitForExecutionOnCondition(isolatedIAMOwnerCTX, t, instance, conditionEvent(event), []string{targetResponse.GetId()})
|
waitForExecutionOnCondition(isolatedIAMOwnerCTX, t, instance, conditionEvent(event), []string{targetResponse.GetId()})
|
||||||
|
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
@@ -414,7 +415,7 @@ func TestServer_ExecutionTarget_Event_LongerThanTransactionTimeout(t *testing.T)
|
|||||||
urlRequest, closeF, calledF, resetF := integration.TestServerCall(nil, 1*time.Second, http.StatusOK, nil)
|
urlRequest, closeF, calledF, resetF := integration.TestServerCall(nil, 1*time.Second, http.StatusOK, nil)
|
||||||
defer closeF()
|
defer closeF()
|
||||||
|
|
||||||
targetResponse := waitForTarget(isolatedIAMOwnerCTX, t, instance, urlRequest, domain.TargetTypeWebhook, true)
|
targetResponse := waitForTarget(isolatedIAMOwnerCTX, t, instance, urlRequest, target_domain.TargetTypeWebhook, true)
|
||||||
waitForExecutionOnCondition(isolatedIAMOwnerCTX, t, instance, conditionEvent(event), []string{targetResponse.GetId()})
|
waitForExecutionOnCondition(isolatedIAMOwnerCTX, t, instance, conditionEvent(event), []string{targetResponse.GetId()})
|
||||||
|
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
@@ -506,7 +507,7 @@ func setExecution(ctx context.Context, t *testing.T, instance *integration.Insta
|
|||||||
return target
|
return target
|
||||||
}
|
}
|
||||||
|
|
||||||
func waitForTarget(ctx context.Context, t *testing.T, instance *integration.Instance, endpoint string, ty domain.TargetType, interrupt bool) *action.CreateTargetResponse {
|
func waitForTarget(ctx context.Context, t *testing.T, instance *integration.Instance, endpoint string, ty target_domain.TargetType, interrupt bool) *action.CreateTargetResponse {
|
||||||
resp := createTarget(ctx, t, instance, "", endpoint, ty, interrupt)
|
resp := createTarget(ctx, t, instance, "", endpoint, ty, interrupt)
|
||||||
|
|
||||||
retryDuration, tick := integration.WaitForAndTickWithMaxDuration(ctx, time.Minute)
|
retryDuration, tick := integration.WaitForAndTickWithMaxDuration(ctx, time.Minute)
|
||||||
@@ -527,14 +528,14 @@ func waitForTarget(ctx context.Context, t *testing.T, instance *integration.Inst
|
|||||||
config := got.GetTargets()[0]
|
config := got.GetTargets()[0]
|
||||||
assert.Equal(ttt, config.GetEndpoint(), endpoint)
|
assert.Equal(ttt, config.GetEndpoint(), endpoint)
|
||||||
switch ty {
|
switch ty {
|
||||||
case domain.TargetTypeWebhook:
|
case target_domain.TargetTypeWebhook:
|
||||||
if !assert.NotNil(ttt, config.GetRestWebhook()) {
|
if !assert.NotNil(ttt, config.GetRestWebhook()) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
assert.Equal(ttt, interrupt, config.GetRestWebhook().GetInterruptOnError())
|
assert.Equal(ttt, interrupt, config.GetRestWebhook().GetInterruptOnError())
|
||||||
case domain.TargetTypeAsync:
|
case target_domain.TargetTypeAsync:
|
||||||
assert.NotNil(ttt, config.GetRestAsync())
|
assert.NotNil(ttt, config.GetRestAsync())
|
||||||
case domain.TargetTypeCall:
|
case target_domain.TargetTypeCall:
|
||||||
if !assert.NotNil(ttt, config.GetRestCall()) {
|
if !assert.NotNil(ttt, config.GetRestCall()) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -544,7 +545,7 @@ func waitForTarget(ctx context.Context, t *testing.T, instance *integration.Inst
|
|||||||
return resp
|
return resp
|
||||||
}
|
}
|
||||||
|
|
||||||
func createTarget(ctx context.Context, t *testing.T, instance *integration.Instance, name, endpoint string, ty domain.TargetType, interrupt bool) *action.CreateTargetResponse {
|
func createTarget(ctx context.Context, t *testing.T, instance *integration.Instance, name, endpoint string, ty target_domain.TargetType, interrupt bool) *action.CreateTargetResponse {
|
||||||
if name == "" {
|
if name == "" {
|
||||||
name = gofakeit.Name()
|
name = gofakeit.Name()
|
||||||
}
|
}
|
||||||
@@ -554,19 +555,19 @@ func createTarget(ctx context.Context, t *testing.T, instance *integration.Insta
|
|||||||
Timeout: durationpb.New(5 * time.Second),
|
Timeout: durationpb.New(5 * time.Second),
|
||||||
}
|
}
|
||||||
switch ty {
|
switch ty {
|
||||||
case domain.TargetTypeWebhook:
|
case target_domain.TargetTypeWebhook:
|
||||||
req.TargetType = &action.CreateTargetRequest_RestWebhook{
|
req.TargetType = &action.CreateTargetRequest_RestWebhook{
|
||||||
RestWebhook: &action.RESTWebhook{
|
RestWebhook: &action.RESTWebhook{
|
||||||
InterruptOnError: interrupt,
|
InterruptOnError: interrupt,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
case domain.TargetTypeCall:
|
case target_domain.TargetTypeCall:
|
||||||
req.TargetType = &action.CreateTargetRequest_RestCall{
|
req.TargetType = &action.CreateTargetRequest_RestCall{
|
||||||
RestCall: &action.RESTCall{
|
RestCall: &action.RESTCall{
|
||||||
InterruptOnError: interrupt,
|
InterruptOnError: interrupt,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
case domain.TargetTypeAsync:
|
case target_domain.TargetTypeAsync:
|
||||||
req.TargetType = &action.CreateTargetRequest_RestAsync{
|
req.TargetType = &action.CreateTargetRequest_RestAsync{
|
||||||
RestAsync: &action.RESTAsync{},
|
RestAsync: &action.RESTAsync{},
|
||||||
}
|
}
|
||||||
@@ -818,7 +819,7 @@ func expectPreUserinfoExecution(ctx context.Context, t *testing.T, instance *int
|
|||||||
|
|
||||||
targetURL, closeF, _, _ := integration.TestServerCall(expectedContextInfo, 0, http.StatusOK, response)
|
targetURL, closeF, _, _ := integration.TestServerCall(expectedContextInfo, 0, http.StatusOK, response)
|
||||||
|
|
||||||
targetResp := waitForTarget(ctx, t, instance, targetURL, domain.TargetTypeCall, true)
|
targetResp := waitForTarget(ctx, t, instance, targetURL, target_domain.TargetTypeCall, true)
|
||||||
waitForExecutionOnCondition(ctx, t, instance, conditionFunction("preuserinfo"), []string{targetResp.GetId()})
|
waitForExecutionOnCondition(ctx, t, instance, conditionFunction("preuserinfo"), []string{targetResp.GetId()})
|
||||||
return userResp.GetUserId(), closeF
|
return userResp.GetUserId(), closeF
|
||||||
}
|
}
|
||||||
@@ -1126,7 +1127,7 @@ func expectPreAccessTokenExecution(ctx context.Context, t *testing.T, instance *
|
|||||||
|
|
||||||
targetURL, closeF, _, _ := integration.TestServerCall(expectedContextInfo, 0, http.StatusOK, response)
|
targetURL, closeF, _, _ := integration.TestServerCall(expectedContextInfo, 0, http.StatusOK, response)
|
||||||
|
|
||||||
targetResp := waitForTarget(ctx, t, instance, targetURL, domain.TargetTypeCall, true)
|
targetResp := waitForTarget(ctx, t, instance, targetURL, target_domain.TargetTypeCall, true)
|
||||||
waitForExecutionOnCondition(ctx, t, instance, conditionFunction("preaccesstoken"), []string{targetResp.GetId()})
|
waitForExecutionOnCondition(ctx, t, instance, conditionFunction("preaccesstoken"), []string{targetResp.GetId()})
|
||||||
return userResp.GetUserId(), closeF
|
return userResp.GetUserId(), closeF
|
||||||
}
|
}
|
||||||
@@ -1291,7 +1292,7 @@ func expectPreSAMLResponseExecution(ctx context.Context, t *testing.T, instance
|
|||||||
|
|
||||||
targetURL, closeF, _, _ := integration.TestServerCall(expectedContextInfo, 0, http.StatusOK, response)
|
targetURL, closeF, _, _ := integration.TestServerCall(expectedContextInfo, 0, http.StatusOK, response)
|
||||||
|
|
||||||
targetResp := waitForTarget(ctx, t, instance, targetURL, domain.TargetTypeCall, true)
|
targetResp := waitForTarget(ctx, t, instance, targetURL, target_domain.TargetTypeCall, true)
|
||||||
waitForExecutionOnCondition(ctx, t, instance, conditionFunction("presamlresponse"), []string{targetResp.GetId()})
|
waitForExecutionOnCondition(ctx, t, instance, conditionFunction("presamlresponse"), []string{targetResp.GetId()})
|
||||||
|
|
||||||
return userResp.GetUserId(), closeF
|
return userResp.GetUserId(), closeF
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import (
|
|||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
|
|
||||||
"github.com/zitadel/zitadel/internal/domain"
|
target_domain "github.com/zitadel/zitadel/internal/execution/target"
|
||||||
"github.com/zitadel/zitadel/internal/integration"
|
"github.com/zitadel/zitadel/internal/integration"
|
||||||
action "github.com/zitadel/zitadel/pkg/grpc/action/v2beta"
|
action "github.com/zitadel/zitadel/pkg/grpc/action/v2beta"
|
||||||
)
|
)
|
||||||
@@ -18,7 +18,7 @@ import (
|
|||||||
func TestServer_SetExecution_Request(t *testing.T) {
|
func TestServer_SetExecution_Request(t *testing.T) {
|
||||||
instance := integration.NewInstance(CTX)
|
instance := integration.NewInstance(CTX)
|
||||||
isolatedIAMOwnerCTX := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
|
isolatedIAMOwnerCTX := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
|
||||||
targetResp := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://notexisting", domain.TargetTypeWebhook, false)
|
targetResp := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://notexisting", target_domain.TargetTypeWebhook, false)
|
||||||
|
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
name string
|
name string
|
||||||
@@ -175,7 +175,7 @@ func assertSetExecutionResponse(t *testing.T, creationDate, setDate time.Time, e
|
|||||||
func TestServer_SetExecution_Response(t *testing.T) {
|
func TestServer_SetExecution_Response(t *testing.T) {
|
||||||
instance := integration.NewInstance(CTX)
|
instance := integration.NewInstance(CTX)
|
||||||
isolatedIAMOwnerCTX := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
|
isolatedIAMOwnerCTX := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
|
||||||
targetResp := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://notexisting", domain.TargetTypeWebhook, false)
|
targetResp := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://notexisting", target_domain.TargetTypeWebhook, false)
|
||||||
|
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
name string
|
name string
|
||||||
@@ -319,7 +319,7 @@ func TestServer_SetExecution_Response(t *testing.T) {
|
|||||||
func TestServer_SetExecution_Event(t *testing.T) {
|
func TestServer_SetExecution_Event(t *testing.T) {
|
||||||
instance := integration.NewInstance(CTX)
|
instance := integration.NewInstance(CTX)
|
||||||
isolatedIAMOwnerCTX := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
|
isolatedIAMOwnerCTX := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
|
||||||
targetResp := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://notexisting", domain.TargetTypeWebhook, false)
|
targetResp := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://notexisting", target_domain.TargetTypeWebhook, false)
|
||||||
|
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
name string
|
name string
|
||||||
@@ -482,7 +482,7 @@ func TestServer_SetExecution_Event(t *testing.T) {
|
|||||||
func TestServer_SetExecution_Function(t *testing.T) {
|
func TestServer_SetExecution_Function(t *testing.T) {
|
||||||
instance := integration.NewInstance(CTX)
|
instance := integration.NewInstance(CTX)
|
||||||
isolatedIAMOwnerCTX := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
|
isolatedIAMOwnerCTX := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
|
||||||
targetResp := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://notexisting", domain.TargetTypeWebhook, false)
|
targetResp := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://notexisting", target_domain.TargetTypeWebhook, false)
|
||||||
|
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
name string
|
name string
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import (
|
|||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
"google.golang.org/protobuf/types/known/durationpb"
|
"google.golang.org/protobuf/types/known/durationpb"
|
||||||
|
|
||||||
"github.com/zitadel/zitadel/internal/domain"
|
target_domain "github.com/zitadel/zitadel/internal/execution/target"
|
||||||
"github.com/zitadel/zitadel/internal/integration"
|
"github.com/zitadel/zitadel/internal/integration"
|
||||||
action "github.com/zitadel/zitadel/pkg/grpc/action/v2beta"
|
action "github.com/zitadel/zitadel/pkg/grpc/action/v2beta"
|
||||||
filter "github.com/zitadel/zitadel/pkg/grpc/filter/v2beta"
|
filter "github.com/zitadel/zitadel/pkg/grpc/filter/v2beta"
|
||||||
@@ -55,7 +55,7 @@ func TestServer_GetTarget(t *testing.T) {
|
|||||||
ctx: isolatedIAMOwnerCTX,
|
ctx: isolatedIAMOwnerCTX,
|
||||||
dep: func(ctx context.Context, request *action.GetTargetRequest, response *action.GetTargetResponse) error {
|
dep: func(ctx context.Context, request *action.GetTargetRequest, response *action.GetTargetResponse) error {
|
||||||
name := gofakeit.Name()
|
name := gofakeit.Name()
|
||||||
resp := instance.CreateTarget(ctx, t, name, "https://example.com", domain.TargetTypeWebhook, false)
|
resp := instance.CreateTarget(ctx, t, name, "https://example.com", target_domain.TargetTypeWebhook, false)
|
||||||
request.Id = resp.GetId()
|
request.Id = resp.GetId()
|
||||||
response.Target.Id = resp.GetId()
|
response.Target.Id = resp.GetId()
|
||||||
response.Target.Name = name
|
response.Target.Name = name
|
||||||
@@ -82,7 +82,7 @@ func TestServer_GetTarget(t *testing.T) {
|
|||||||
ctx: isolatedIAMOwnerCTX,
|
ctx: isolatedIAMOwnerCTX,
|
||||||
dep: func(ctx context.Context, request *action.GetTargetRequest, response *action.GetTargetResponse) error {
|
dep: func(ctx context.Context, request *action.GetTargetRequest, response *action.GetTargetResponse) error {
|
||||||
name := gofakeit.Name()
|
name := gofakeit.Name()
|
||||||
resp := instance.CreateTarget(ctx, t, name, "https://example.com", domain.TargetTypeAsync, false)
|
resp := instance.CreateTarget(ctx, t, name, "https://example.com", target_domain.TargetTypeAsync, false)
|
||||||
request.Id = resp.GetId()
|
request.Id = resp.GetId()
|
||||||
response.Target.Id = resp.GetId()
|
response.Target.Id = resp.GetId()
|
||||||
response.Target.Name = name
|
response.Target.Name = name
|
||||||
@@ -109,7 +109,7 @@ func TestServer_GetTarget(t *testing.T) {
|
|||||||
ctx: isolatedIAMOwnerCTX,
|
ctx: isolatedIAMOwnerCTX,
|
||||||
dep: func(ctx context.Context, request *action.GetTargetRequest, response *action.GetTargetResponse) error {
|
dep: func(ctx context.Context, request *action.GetTargetRequest, response *action.GetTargetResponse) error {
|
||||||
name := gofakeit.Name()
|
name := gofakeit.Name()
|
||||||
resp := instance.CreateTarget(ctx, t, name, "https://example.com", domain.TargetTypeWebhook, true)
|
resp := instance.CreateTarget(ctx, t, name, "https://example.com", target_domain.TargetTypeWebhook, true)
|
||||||
request.Id = resp.GetId()
|
request.Id = resp.GetId()
|
||||||
response.Target.Id = resp.GetId()
|
response.Target.Id = resp.GetId()
|
||||||
response.Target.Name = name
|
response.Target.Name = name
|
||||||
@@ -138,7 +138,7 @@ func TestServer_GetTarget(t *testing.T) {
|
|||||||
ctx: isolatedIAMOwnerCTX,
|
ctx: isolatedIAMOwnerCTX,
|
||||||
dep: func(ctx context.Context, request *action.GetTargetRequest, response *action.GetTargetResponse) error {
|
dep: func(ctx context.Context, request *action.GetTargetRequest, response *action.GetTargetResponse) error {
|
||||||
name := gofakeit.Name()
|
name := gofakeit.Name()
|
||||||
resp := instance.CreateTarget(ctx, t, name, "https://example.com", domain.TargetTypeCall, false)
|
resp := instance.CreateTarget(ctx, t, name, "https://example.com", target_domain.TargetTypeCall, false)
|
||||||
request.Id = resp.GetId()
|
request.Id = resp.GetId()
|
||||||
response.Target.Id = resp.GetId()
|
response.Target.Id = resp.GetId()
|
||||||
response.Target.Name = name
|
response.Target.Name = name
|
||||||
@@ -167,7 +167,7 @@ func TestServer_GetTarget(t *testing.T) {
|
|||||||
ctx: isolatedIAMOwnerCTX,
|
ctx: isolatedIAMOwnerCTX,
|
||||||
dep: func(ctx context.Context, request *action.GetTargetRequest, response *action.GetTargetResponse) error {
|
dep: func(ctx context.Context, request *action.GetTargetRequest, response *action.GetTargetResponse) error {
|
||||||
name := gofakeit.Name()
|
name := gofakeit.Name()
|
||||||
resp := instance.CreateTarget(ctx, t, name, "https://example.com", domain.TargetTypeCall, true)
|
resp := instance.CreateTarget(ctx, t, name, "https://example.com", target_domain.TargetTypeCall, true)
|
||||||
request.Id = resp.GetId()
|
request.Id = resp.GetId()
|
||||||
response.Target.Id = resp.GetId()
|
response.Target.Id = resp.GetId()
|
||||||
response.Target.Name = name
|
response.Target.Name = name
|
||||||
@@ -262,7 +262,7 @@ func TestServer_ListTargets(t *testing.T) {
|
|||||||
ctx: isolatedIAMOwnerCTX,
|
ctx: isolatedIAMOwnerCTX,
|
||||||
dep: func(ctx context.Context, request *action.ListTargetsRequest, response *action.ListTargetsResponse) {
|
dep: func(ctx context.Context, request *action.ListTargetsRequest, response *action.ListTargetsResponse) {
|
||||||
name := gofakeit.Name()
|
name := gofakeit.Name()
|
||||||
resp := instance.CreateTarget(ctx, t, name, "https://example.com", domain.TargetTypeWebhook, false)
|
resp := instance.CreateTarget(ctx, t, name, "https://example.com", target_domain.TargetTypeWebhook, false)
|
||||||
request.Filters[0].Filter = &action.TargetSearchFilter_InTargetIdsFilter{
|
request.Filters[0].Filter = &action.TargetSearchFilter_InTargetIdsFilter{
|
||||||
InTargetIdsFilter: &action.InTargetIDsFilter{
|
InTargetIdsFilter: &action.InTargetIDsFilter{
|
||||||
TargetIds: []string{resp.GetId()},
|
TargetIds: []string{resp.GetId()},
|
||||||
@@ -302,7 +302,7 @@ func TestServer_ListTargets(t *testing.T) {
|
|||||||
ctx: isolatedIAMOwnerCTX,
|
ctx: isolatedIAMOwnerCTX,
|
||||||
dep: func(ctx context.Context, request *action.ListTargetsRequest, response *action.ListTargetsResponse) {
|
dep: func(ctx context.Context, request *action.ListTargetsRequest, response *action.ListTargetsResponse) {
|
||||||
name := gofakeit.Name()
|
name := gofakeit.Name()
|
||||||
resp := instance.CreateTarget(ctx, t, name, "https://example.com", domain.TargetTypeWebhook, false)
|
resp := instance.CreateTarget(ctx, t, name, "https://example.com", target_domain.TargetTypeWebhook, false)
|
||||||
request.Filters[0].Filter = &action.TargetSearchFilter_TargetNameFilter{
|
request.Filters[0].Filter = &action.TargetSearchFilter_TargetNameFilter{
|
||||||
TargetNameFilter: &action.TargetNameFilter{
|
TargetNameFilter: &action.TargetNameFilter{
|
||||||
TargetName: name,
|
TargetName: name,
|
||||||
@@ -345,9 +345,9 @@ func TestServer_ListTargets(t *testing.T) {
|
|||||||
name1 := gofakeit.Name()
|
name1 := gofakeit.Name()
|
||||||
name2 := gofakeit.Name()
|
name2 := gofakeit.Name()
|
||||||
name3 := gofakeit.Name()
|
name3 := gofakeit.Name()
|
||||||
resp1 := instance.CreateTarget(ctx, t, name1, "https://example.com", domain.TargetTypeWebhook, false)
|
resp1 := instance.CreateTarget(ctx, t, name1, "https://example.com", target_domain.TargetTypeWebhook, false)
|
||||||
resp2 := instance.CreateTarget(ctx, t, name2, "https://example.com", domain.TargetTypeCall, true)
|
resp2 := instance.CreateTarget(ctx, t, name2, "https://example.com", target_domain.TargetTypeCall, true)
|
||||||
resp3 := instance.CreateTarget(ctx, t, name3, "https://example.com", domain.TargetTypeAsync, false)
|
resp3 := instance.CreateTarget(ctx, t, name3, "https://example.com", target_domain.TargetTypeAsync, false)
|
||||||
request.Filters[0].Filter = &action.TargetSearchFilter_InTargetIdsFilter{
|
request.Filters[0].Filter = &action.TargetSearchFilter_InTargetIdsFilter{
|
||||||
InTargetIdsFilter: &action.InTargetIDsFilter{
|
InTargetIdsFilter: &action.InTargetIDsFilter{
|
||||||
TargetIds: []string{resp1.GetId(), resp2.GetId(), resp3.GetId()},
|
TargetIds: []string{resp1.GetId(), resp2.GetId(), resp3.GetId()},
|
||||||
@@ -446,7 +446,7 @@ func assertPaginationResponse(t *assert.CollectT, expected *filter.PaginationRes
|
|||||||
func TestServer_ListExecutions(t *testing.T) {
|
func TestServer_ListExecutions(t *testing.T) {
|
||||||
instance := integration.NewInstance(CTX)
|
instance := integration.NewInstance(CTX)
|
||||||
isolatedIAMOwnerCTX := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
|
isolatedIAMOwnerCTX := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
|
||||||
targetResp := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", domain.TargetTypeWebhook, false)
|
targetResp := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false)
|
||||||
|
|
||||||
type args struct {
|
type args struct {
|
||||||
ctx context.Context
|
ctx context.Context
|
||||||
@@ -524,7 +524,7 @@ func TestServer_ListExecutions(t *testing.T) {
|
|||||||
args: args{
|
args: args{
|
||||||
ctx: isolatedIAMOwnerCTX,
|
ctx: isolatedIAMOwnerCTX,
|
||||||
dep: func(ctx context.Context, request *action.ListExecutionsRequest, response *action.ListExecutionsResponse) {
|
dep: func(ctx context.Context, request *action.ListExecutionsRequest, response *action.ListExecutionsResponse) {
|
||||||
target := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", domain.TargetTypeWebhook, false)
|
target := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false)
|
||||||
// add target as Filter to the request
|
// add target as Filter to the request
|
||||||
request.Filters[0] = &action.ExecutionSearchFilter{
|
request.Filters[0] = &action.ExecutionSearchFilter{
|
||||||
Filter: &action.ExecutionSearchFilter_TargetFilter{
|
Filter: &action.ExecutionSearchFilter_TargetFilter{
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ import (
|
|||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
"google.golang.org/protobuf/types/known/durationpb"
|
"google.golang.org/protobuf/types/known/durationpb"
|
||||||
|
|
||||||
"github.com/zitadel/zitadel/internal/domain"
|
target_domain "github.com/zitadel/zitadel/internal/execution/target"
|
||||||
"github.com/zitadel/zitadel/internal/integration"
|
"github.com/zitadel/zitadel/internal/integration"
|
||||||
action "github.com/zitadel/zitadel/pkg/grpc/action/v2beta"
|
action "github.com/zitadel/zitadel/pkg/grpc/action/v2beta"
|
||||||
)
|
)
|
||||||
@@ -26,7 +26,7 @@ func TestServer_CreateTarget(t *testing.T) {
|
|||||||
signingKey bool
|
signingKey bool
|
||||||
}
|
}
|
||||||
alreadyExistingTargetName := gofakeit.AppName()
|
alreadyExistingTargetName := gofakeit.AppName()
|
||||||
instance.CreateTarget(isolatedIAMOwnerCTX, t, alreadyExistingTargetName, "https://example.com", domain.TargetTypeAsync, false)
|
instance.CreateTarget(isolatedIAMOwnerCTX, t, alreadyExistingTargetName, "https://example.com", target_domain.TargetTypeAsync, false)
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
name string
|
name string
|
||||||
ctx context.Context
|
ctx context.Context
|
||||||
@@ -263,7 +263,7 @@ func TestServer_UpdateTarget(t *testing.T) {
|
|||||||
{
|
{
|
||||||
name: "missing permission",
|
name: "missing permission",
|
||||||
prepare: func(request *action.UpdateTargetRequest) {
|
prepare: func(request *action.UpdateTargetRequest) {
|
||||||
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", domain.TargetTypeWebhook, false).GetId()
|
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false).GetId()
|
||||||
request.Id = targetID
|
request.Id = targetID
|
||||||
},
|
},
|
||||||
args: args{
|
args: args{
|
||||||
@@ -290,7 +290,7 @@ func TestServer_UpdateTarget(t *testing.T) {
|
|||||||
{
|
{
|
||||||
name: "no change, ok",
|
name: "no change, ok",
|
||||||
prepare: func(request *action.UpdateTargetRequest) {
|
prepare: func(request *action.UpdateTargetRequest) {
|
||||||
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", domain.TargetTypeWebhook, false).GetId()
|
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false).GetId()
|
||||||
request.Id = targetID
|
request.Id = targetID
|
||||||
},
|
},
|
||||||
args: args{
|
args: args{
|
||||||
@@ -308,7 +308,7 @@ func TestServer_UpdateTarget(t *testing.T) {
|
|||||||
{
|
{
|
||||||
name: "change name, ok",
|
name: "change name, ok",
|
||||||
prepare: func(request *action.UpdateTargetRequest) {
|
prepare: func(request *action.UpdateTargetRequest) {
|
||||||
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", domain.TargetTypeWebhook, false).GetId()
|
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false).GetId()
|
||||||
request.Id = targetID
|
request.Id = targetID
|
||||||
},
|
},
|
||||||
args: args{
|
args: args{
|
||||||
@@ -326,7 +326,7 @@ func TestServer_UpdateTarget(t *testing.T) {
|
|||||||
{
|
{
|
||||||
name: "regenerate signingkey, ok",
|
name: "regenerate signingkey, ok",
|
||||||
prepare: func(request *action.UpdateTargetRequest) {
|
prepare: func(request *action.UpdateTargetRequest) {
|
||||||
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", domain.TargetTypeWebhook, false).GetId()
|
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false).GetId()
|
||||||
request.Id = targetID
|
request.Id = targetID
|
||||||
},
|
},
|
||||||
args: args{
|
args: args{
|
||||||
@@ -344,7 +344,7 @@ func TestServer_UpdateTarget(t *testing.T) {
|
|||||||
{
|
{
|
||||||
name: "change type, ok",
|
name: "change type, ok",
|
||||||
prepare: func(request *action.UpdateTargetRequest) {
|
prepare: func(request *action.UpdateTargetRequest) {
|
||||||
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", domain.TargetTypeWebhook, false).GetId()
|
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false).GetId()
|
||||||
request.Id = targetID
|
request.Id = targetID
|
||||||
},
|
},
|
||||||
args: args{
|
args: args{
|
||||||
@@ -366,7 +366,7 @@ func TestServer_UpdateTarget(t *testing.T) {
|
|||||||
{
|
{
|
||||||
name: "change url, ok",
|
name: "change url, ok",
|
||||||
prepare: func(request *action.UpdateTargetRequest) {
|
prepare: func(request *action.UpdateTargetRequest) {
|
||||||
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", domain.TargetTypeWebhook, false).GetId()
|
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false).GetId()
|
||||||
request.Id = targetID
|
request.Id = targetID
|
||||||
},
|
},
|
||||||
args: args{
|
args: args{
|
||||||
@@ -384,7 +384,7 @@ func TestServer_UpdateTarget(t *testing.T) {
|
|||||||
{
|
{
|
||||||
name: "change timeout, ok",
|
name: "change timeout, ok",
|
||||||
prepare: func(request *action.UpdateTargetRequest) {
|
prepare: func(request *action.UpdateTargetRequest) {
|
||||||
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", domain.TargetTypeWebhook, false).GetId()
|
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeWebhook, false).GetId()
|
||||||
request.Id = targetID
|
request.Id = targetID
|
||||||
},
|
},
|
||||||
args: args{
|
args: args{
|
||||||
@@ -402,7 +402,7 @@ func TestServer_UpdateTarget(t *testing.T) {
|
|||||||
{
|
{
|
||||||
name: "change type async, ok",
|
name: "change type async, ok",
|
||||||
prepare: func(request *action.UpdateTargetRequest) {
|
prepare: func(request *action.UpdateTargetRequest) {
|
||||||
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", domain.TargetTypeAsync, false).GetId()
|
targetID := instance.CreateTarget(isolatedIAMOwnerCTX, t, "", "https://example.com", target_domain.TargetTypeAsync, false).GetId()
|
||||||
request.Id = targetID
|
request.Id = targetID
|
||||||
},
|
},
|
||||||
args: args{
|
args: args{
|
||||||
@@ -498,7 +498,7 @@ func TestServer_DeleteTarget(t *testing.T) {
|
|||||||
ctx: iamOwnerCtx,
|
ctx: iamOwnerCtx,
|
||||||
prepare: func(request *action.DeleteTargetRequest) (time.Time, time.Time) {
|
prepare: func(request *action.DeleteTargetRequest) (time.Time, time.Time) {
|
||||||
creationDate := time.Now().UTC()
|
creationDate := time.Now().UTC()
|
||||||
targetID := instance.CreateTarget(iamOwnerCtx, t, "", "https://example.com", domain.TargetTypeWebhook, false).GetId()
|
targetID := instance.CreateTarget(iamOwnerCtx, t, "", "https://example.com", target_domain.TargetTypeWebhook, false).GetId()
|
||||||
request.Id = targetID
|
request.Id = targetID
|
||||||
return creationDate, time.Time{}
|
return creationDate, time.Time{}
|
||||||
},
|
},
|
||||||
@@ -510,7 +510,7 @@ func TestServer_DeleteTarget(t *testing.T) {
|
|||||||
ctx: iamOwnerCtx,
|
ctx: iamOwnerCtx,
|
||||||
prepare: func(request *action.DeleteTargetRequest) (time.Time, time.Time) {
|
prepare: func(request *action.DeleteTargetRequest) (time.Time, time.Time) {
|
||||||
creationDate := time.Now().UTC()
|
creationDate := time.Now().UTC()
|
||||||
targetID := instance.CreateTarget(iamOwnerCtx, t, "", "https://example.com", domain.TargetTypeWebhook, false).GetId()
|
targetID := instance.CreateTarget(iamOwnerCtx, t, "", "https://example.com", target_domain.TargetTypeWebhook, false).GetId()
|
||||||
request.Id = targetID
|
request.Id = targetID
|
||||||
instance.DeleteTarget(iamOwnerCtx, t, targetID)
|
instance.DeleteTarget(iamOwnerCtx, t, targetID)
|
||||||
return creationDate, time.Now().UTC()
|
return creationDate, time.Now().UTC()
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import (
|
|||||||
filter "github.com/zitadel/zitadel/internal/api/grpc/filter/v2beta"
|
filter "github.com/zitadel/zitadel/internal/api/grpc/filter/v2beta"
|
||||||
"github.com/zitadel/zitadel/internal/command"
|
"github.com/zitadel/zitadel/internal/command"
|
||||||
"github.com/zitadel/zitadel/internal/domain"
|
"github.com/zitadel/zitadel/internal/domain"
|
||||||
|
target_domain "github.com/zitadel/zitadel/internal/execution/target"
|
||||||
"github.com/zitadel/zitadel/internal/query"
|
"github.com/zitadel/zitadel/internal/query"
|
||||||
"github.com/zitadel/zitadel/internal/zerrors"
|
"github.com/zitadel/zitadel/internal/zerrors"
|
||||||
action "github.com/zitadel/zitadel/pkg/grpc/action/v2beta"
|
action "github.com/zitadel/zitadel/pkg/grpc/action/v2beta"
|
||||||
@@ -89,11 +90,11 @@ func targetToPb(t *query.Target) *action.Target {
|
|||||||
SigningKey: t.SigningKey,
|
SigningKey: t.SigningKey,
|
||||||
}
|
}
|
||||||
switch t.TargetType {
|
switch t.TargetType {
|
||||||
case domain.TargetTypeWebhook:
|
case target_domain.TargetTypeWebhook:
|
||||||
target.TargetType = &action.Target_RestWebhook{RestWebhook: &action.RESTWebhook{InterruptOnError: t.InterruptOnError}}
|
target.TargetType = &action.Target_RestWebhook{RestWebhook: &action.RESTWebhook{InterruptOnError: t.InterruptOnError}}
|
||||||
case domain.TargetTypeCall:
|
case target_domain.TargetTypeCall:
|
||||||
target.TargetType = &action.Target_RestCall{RestCall: &action.RESTCall{InterruptOnError: t.InterruptOnError}}
|
target.TargetType = &action.Target_RestCall{RestCall: &action.RESTCall{InterruptOnError: t.InterruptOnError}}
|
||||||
case domain.TargetTypeAsync:
|
case target_domain.TargetTypeAsync:
|
||||||
target.TargetType = &action.Target_RestAsync{RestAsync: &action.RESTAsync{}}
|
target.TargetType = &action.Target_RestAsync{RestAsync: &action.RESTAsync{}}
|
||||||
default:
|
default:
|
||||||
target.TargetType = nil
|
target.TargetType = nil
|
||||||
|
|||||||
@@ -9,8 +9,8 @@ import (
|
|||||||
|
|
||||||
"github.com/zitadel/zitadel/internal/api/authz"
|
"github.com/zitadel/zitadel/internal/api/authz"
|
||||||
"github.com/zitadel/zitadel/internal/command"
|
"github.com/zitadel/zitadel/internal/command"
|
||||||
"github.com/zitadel/zitadel/internal/domain"
|
|
||||||
"github.com/zitadel/zitadel/internal/eventstore/v1/models"
|
"github.com/zitadel/zitadel/internal/eventstore/v1/models"
|
||||||
|
target_domain "github.com/zitadel/zitadel/internal/execution/target"
|
||||||
action "github.com/zitadel/zitadel/pkg/grpc/action/v2beta"
|
action "github.com/zitadel/zitadel/pkg/grpc/action/v2beta"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -66,18 +66,18 @@ func (s *Server) DeleteTarget(ctx context.Context, req *connect.Request[action.D
|
|||||||
|
|
||||||
func createTargetToCommand(req *action.CreateTargetRequest) *command.AddTarget {
|
func createTargetToCommand(req *action.CreateTargetRequest) *command.AddTarget {
|
||||||
var (
|
var (
|
||||||
targetType domain.TargetType
|
targetType target_domain.TargetType
|
||||||
interruptOnError bool
|
interruptOnError bool
|
||||||
)
|
)
|
||||||
switch t := req.GetTargetType().(type) {
|
switch t := req.GetTargetType().(type) {
|
||||||
case *action.CreateTargetRequest_RestWebhook:
|
case *action.CreateTargetRequest_RestWebhook:
|
||||||
targetType = domain.TargetTypeWebhook
|
targetType = target_domain.TargetTypeWebhook
|
||||||
interruptOnError = t.RestWebhook.InterruptOnError
|
interruptOnError = t.RestWebhook.InterruptOnError
|
||||||
case *action.CreateTargetRequest_RestCall:
|
case *action.CreateTargetRequest_RestCall:
|
||||||
targetType = domain.TargetTypeCall
|
targetType = target_domain.TargetTypeCall
|
||||||
interruptOnError = t.RestCall.InterruptOnError
|
interruptOnError = t.RestCall.InterruptOnError
|
||||||
case *action.CreateTargetRequest_RestAsync:
|
case *action.CreateTargetRequest_RestAsync:
|
||||||
targetType = domain.TargetTypeAsync
|
targetType = target_domain.TargetTypeAsync
|
||||||
}
|
}
|
||||||
return &command.AddTarget{
|
return &command.AddTarget{
|
||||||
Name: req.GetName(),
|
Name: req.GetName(),
|
||||||
@@ -109,13 +109,13 @@ func updateTargetToCommand(req *action.UpdateTargetRequest) *command.ChangeTarge
|
|||||||
if req.TargetType != nil {
|
if req.TargetType != nil {
|
||||||
switch t := req.GetTargetType().(type) {
|
switch t := req.GetTargetType().(type) {
|
||||||
case *action.UpdateTargetRequest_RestWebhook:
|
case *action.UpdateTargetRequest_RestWebhook:
|
||||||
target.TargetType = gu.Ptr(domain.TargetTypeWebhook)
|
target.TargetType = gu.Ptr(target_domain.TargetTypeWebhook)
|
||||||
target.InterruptOnError = gu.Ptr(t.RestWebhook.InterruptOnError)
|
target.InterruptOnError = gu.Ptr(t.RestWebhook.InterruptOnError)
|
||||||
case *action.UpdateTargetRequest_RestCall:
|
case *action.UpdateTargetRequest_RestCall:
|
||||||
target.TargetType = gu.Ptr(domain.TargetTypeCall)
|
target.TargetType = gu.Ptr(target_domain.TargetTypeCall)
|
||||||
target.InterruptOnError = gu.Ptr(t.RestCall.InterruptOnError)
|
target.InterruptOnError = gu.Ptr(t.RestCall.InterruptOnError)
|
||||||
case *action.UpdateTargetRequest_RestAsync:
|
case *action.UpdateTargetRequest_RestAsync:
|
||||||
target.TargetType = gu.Ptr(domain.TargetTypeAsync)
|
target.TargetType = gu.Ptr(target_domain.TargetTypeAsync)
|
||||||
target.InterruptOnError = gu.Ptr(false)
|
target.InterruptOnError = gu.Ptr(false)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import (
|
|||||||
"google.golang.org/protobuf/types/known/durationpb"
|
"google.golang.org/protobuf/types/known/durationpb"
|
||||||
|
|
||||||
"github.com/zitadel/zitadel/internal/command"
|
"github.com/zitadel/zitadel/internal/command"
|
||||||
"github.com/zitadel/zitadel/internal/domain"
|
target_domain "github.com/zitadel/zitadel/internal/execution/target"
|
||||||
action "github.com/zitadel/zitadel/pkg/grpc/action/v2beta"
|
action "github.com/zitadel/zitadel/pkg/grpc/action/v2beta"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -44,7 +44,7 @@ func Test_createTargetToCommand(t *testing.T) {
|
|||||||
}},
|
}},
|
||||||
want: &command.AddTarget{
|
want: &command.AddTarget{
|
||||||
Name: "target 1",
|
Name: "target 1",
|
||||||
TargetType: domain.TargetTypeWebhook,
|
TargetType: target_domain.TargetTypeWebhook,
|
||||||
Endpoint: "https://example.com/hooks/1",
|
Endpoint: "https://example.com/hooks/1",
|
||||||
Timeout: 10 * time.Second,
|
Timeout: 10 * time.Second,
|
||||||
InterruptOnError: false,
|
InterruptOnError: false,
|
||||||
@@ -62,7 +62,7 @@ func Test_createTargetToCommand(t *testing.T) {
|
|||||||
}},
|
}},
|
||||||
want: &command.AddTarget{
|
want: &command.AddTarget{
|
||||||
Name: "target 1",
|
Name: "target 1",
|
||||||
TargetType: domain.TargetTypeAsync,
|
TargetType: target_domain.TargetTypeAsync,
|
||||||
Endpoint: "https://example.com/hooks/1",
|
Endpoint: "https://example.com/hooks/1",
|
||||||
Timeout: 10 * time.Second,
|
Timeout: 10 * time.Second,
|
||||||
InterruptOnError: false,
|
InterruptOnError: false,
|
||||||
@@ -82,7 +82,7 @@ func Test_createTargetToCommand(t *testing.T) {
|
|||||||
}},
|
}},
|
||||||
want: &command.AddTarget{
|
want: &command.AddTarget{
|
||||||
Name: "target 1",
|
Name: "target 1",
|
||||||
TargetType: domain.TargetTypeCall,
|
TargetType: target_domain.TargetTypeCall,
|
||||||
Endpoint: "https://example.com/hooks/1",
|
Endpoint: "https://example.com/hooks/1",
|
||||||
Timeout: 10 * time.Second,
|
Timeout: 10 * time.Second,
|
||||||
InterruptOnError: true,
|
InterruptOnError: true,
|
||||||
@@ -155,7 +155,7 @@ func Test_updateTargetToCommand(t *testing.T) {
|
|||||||
}},
|
}},
|
||||||
want: &command.ChangeTarget{
|
want: &command.ChangeTarget{
|
||||||
Name: gu.Ptr("target 1"),
|
Name: gu.Ptr("target 1"),
|
||||||
TargetType: gu.Ptr(domain.TargetTypeWebhook),
|
TargetType: gu.Ptr(target_domain.TargetTypeWebhook),
|
||||||
Endpoint: gu.Ptr("https://example.com/hooks/1"),
|
Endpoint: gu.Ptr("https://example.com/hooks/1"),
|
||||||
Timeout: gu.Ptr(10 * time.Second),
|
Timeout: gu.Ptr(10 * time.Second),
|
||||||
InterruptOnError: gu.Ptr(false),
|
InterruptOnError: gu.Ptr(false),
|
||||||
@@ -175,7 +175,7 @@ func Test_updateTargetToCommand(t *testing.T) {
|
|||||||
}},
|
}},
|
||||||
want: &command.ChangeTarget{
|
want: &command.ChangeTarget{
|
||||||
Name: gu.Ptr("target 1"),
|
Name: gu.Ptr("target 1"),
|
||||||
TargetType: gu.Ptr(domain.TargetTypeWebhook),
|
TargetType: gu.Ptr(target_domain.TargetTypeWebhook),
|
||||||
Endpoint: gu.Ptr("https://example.com/hooks/1"),
|
Endpoint: gu.Ptr("https://example.com/hooks/1"),
|
||||||
Timeout: gu.Ptr(10 * time.Second),
|
Timeout: gu.Ptr(10 * time.Second),
|
||||||
InterruptOnError: gu.Ptr(true),
|
InterruptOnError: gu.Ptr(true),
|
||||||
@@ -193,7 +193,7 @@ func Test_updateTargetToCommand(t *testing.T) {
|
|||||||
}},
|
}},
|
||||||
want: &command.ChangeTarget{
|
want: &command.ChangeTarget{
|
||||||
Name: gu.Ptr("target 1"),
|
Name: gu.Ptr("target 1"),
|
||||||
TargetType: gu.Ptr(domain.TargetTypeAsync),
|
TargetType: gu.Ptr(target_domain.TargetTypeAsync),
|
||||||
Endpoint: gu.Ptr("https://example.com/hooks/1"),
|
Endpoint: gu.Ptr("https://example.com/hooks/1"),
|
||||||
Timeout: gu.Ptr(10 * time.Second),
|
Timeout: gu.Ptr(10 * time.Second),
|
||||||
InterruptOnError: gu.Ptr(false),
|
InterruptOnError: gu.Ptr(false),
|
||||||
@@ -213,7 +213,7 @@ func Test_updateTargetToCommand(t *testing.T) {
|
|||||||
}},
|
}},
|
||||||
want: &command.ChangeTarget{
|
want: &command.ChangeTarget{
|
||||||
Name: gu.Ptr("target 1"),
|
Name: gu.Ptr("target 1"),
|
||||||
TargetType: gu.Ptr(domain.TargetTypeCall),
|
TargetType: gu.Ptr(target_domain.TargetTypeCall),
|
||||||
Endpoint: gu.Ptr("https://example.com/hooks/1"),
|
Endpoint: gu.Ptr("https://example.com/hooks/1"),
|
||||||
Timeout: gu.Ptr(10 * time.Second),
|
Timeout: gu.Ptr(10 * time.Second),
|
||||||
InterruptOnError: gu.Ptr(true),
|
InterruptOnError: gu.Ptr(true),
|
||||||
|
|||||||
@@ -9,18 +9,18 @@ import (
|
|||||||
"google.golang.org/protobuf/proto"
|
"google.golang.org/protobuf/proto"
|
||||||
|
|
||||||
"github.com/zitadel/zitadel/internal/api/authz"
|
"github.com/zitadel/zitadel/internal/api/authz"
|
||||||
|
"github.com/zitadel/zitadel/internal/crypto"
|
||||||
"github.com/zitadel/zitadel/internal/execution"
|
"github.com/zitadel/zitadel/internal/execution"
|
||||||
"github.com/zitadel/zitadel/internal/query"
|
target_domain "github.com/zitadel/zitadel/internal/execution/target"
|
||||||
"github.com/zitadel/zitadel/internal/telemetry/tracing"
|
"github.com/zitadel/zitadel/internal/telemetry/tracing"
|
||||||
)
|
)
|
||||||
|
|
||||||
func ExecutionHandler(queries *query.Queries) connect.UnaryInterceptorFunc {
|
func ExecutionHandler(alg crypto.EncryptionAlgorithm) connect.UnaryInterceptorFunc {
|
||||||
return func(handler connect.UnaryFunc) connect.UnaryFunc {
|
return func(handler connect.UnaryFunc) connect.UnaryFunc {
|
||||||
return func(ctx context.Context, req connect.AnyRequest) (_ connect.AnyResponse, err error) {
|
return func(ctx context.Context, req connect.AnyRequest) (_ connect.AnyResponse, err error) {
|
||||||
requestTargets, responseTargets := execution.QueryExecutionTargetsForRequestAndResponse(ctx, queries, req.Spec().Procedure)
|
|
||||||
|
|
||||||
// call targets otherwise return req
|
requestTargets := execution.QueryExecutionTargetsForRequest(ctx, req.Spec().Procedure)
|
||||||
handledReq, err := executeTargetsForRequest(ctx, requestTargets, req.Spec().Procedure, req)
|
handledReq, err := executeTargetsForRequest(ctx, requestTargets, req.Spec().Procedure, req, alg)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -30,12 +30,13 @@ func ExecutionHandler(queries *query.Queries) connect.UnaryInterceptorFunc {
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
return executeTargetsForResponse(ctx, responseTargets, req.Spec().Procedure, handledReq, response)
|
responseTargets := execution.QueryExecutionTargetsForResponse(ctx, req.Spec().Procedure)
|
||||||
|
return executeTargetsForResponse(ctx, responseTargets, req.Spec().Procedure, handledReq, response, alg)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func executeTargetsForRequest(ctx context.Context, targets []execution.Target, fullMethod string, req connect.AnyRequest) (_ connect.AnyRequest, err error) {
|
func executeTargetsForRequest(ctx context.Context, targets []target_domain.Target, fullMethod string, req connect.AnyRequest, alg crypto.EncryptionAlgorithm) (_ connect.AnyRequest, err error) {
|
||||||
ctx, span := tracing.NewSpan(ctx)
|
ctx, span := tracing.NewSpan(ctx)
|
||||||
defer func() { span.EndWithError(err) }()
|
defer func() { span.EndWithError(err) }()
|
||||||
|
|
||||||
@@ -54,14 +55,14 @@ func executeTargetsForRequest(ctx context.Context, targets []execution.Target, f
|
|||||||
Request: Message{req.Any().(proto.Message)},
|
Request: Message{req.Any().(proto.Message)},
|
||||||
}
|
}
|
||||||
|
|
||||||
_, err = execution.CallTargets(ctx, targets, info)
|
_, err = execution.CallTargets(ctx, targets, info, alg)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
return req, nil
|
return req, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func executeTargetsForResponse(ctx context.Context, targets []execution.Target, fullMethod string, req connect.AnyRequest, resp connect.AnyResponse) (_ connect.AnyResponse, err error) {
|
func executeTargetsForResponse(ctx context.Context, targets []target_domain.Target, fullMethod string, req connect.AnyRequest, resp connect.AnyResponse, alg crypto.EncryptionAlgorithm) (_ connect.AnyResponse, err error) {
|
||||||
ctx, span := tracing.NewSpan(ctx)
|
ctx, span := tracing.NewSpan(ctx)
|
||||||
defer func() { span.EndWithError(err) }()
|
defer func() { span.EndWithError(err) }()
|
||||||
|
|
||||||
@@ -81,7 +82,7 @@ func executeTargetsForResponse(ctx context.Context, targets []execution.Target,
|
|||||||
Response: Message{resp.Any().(proto.Message)},
|
Response: Message{resp.Any().(proto.Message)},
|
||||||
}
|
}
|
||||||
|
|
||||||
_, err = execution.CallTargets(ctx, targets, info)
|
_, err = execution.CallTargets(ctx, targets, info, alg)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,48 +16,10 @@ import (
|
|||||||
"google.golang.org/protobuf/proto"
|
"google.golang.org/protobuf/proto"
|
||||||
"google.golang.org/protobuf/types/known/structpb"
|
"google.golang.org/protobuf/types/known/structpb"
|
||||||
|
|
||||||
"github.com/zitadel/zitadel/internal/domain"
|
|
||||||
"github.com/zitadel/zitadel/internal/execution"
|
"github.com/zitadel/zitadel/internal/execution"
|
||||||
|
target_domain "github.com/zitadel/zitadel/internal/execution/target"
|
||||||
)
|
)
|
||||||
|
|
||||||
var _ execution.Target = &mockExecutionTarget{}
|
|
||||||
|
|
||||||
type mockExecutionTarget struct {
|
|
||||||
InstanceID string
|
|
||||||
ExecutionID string
|
|
||||||
TargetID string
|
|
||||||
TargetType domain.TargetType
|
|
||||||
Endpoint string
|
|
||||||
Timeout time.Duration
|
|
||||||
InterruptOnError bool
|
|
||||||
SigningKey string
|
|
||||||
}
|
|
||||||
|
|
||||||
func (e *mockExecutionTarget) SetEndpoint(endpoint string) {
|
|
||||||
e.Endpoint = endpoint
|
|
||||||
}
|
|
||||||
func (e *mockExecutionTarget) IsInterruptOnError() bool {
|
|
||||||
return e.InterruptOnError
|
|
||||||
}
|
|
||||||
func (e *mockExecutionTarget) GetEndpoint() string {
|
|
||||||
return e.Endpoint
|
|
||||||
}
|
|
||||||
func (e *mockExecutionTarget) GetTargetType() domain.TargetType {
|
|
||||||
return e.TargetType
|
|
||||||
}
|
|
||||||
func (e *mockExecutionTarget) GetTimeout() time.Duration {
|
|
||||||
return e.Timeout
|
|
||||||
}
|
|
||||||
func (e *mockExecutionTarget) GetTargetID() string {
|
|
||||||
return e.TargetID
|
|
||||||
}
|
|
||||||
func (e *mockExecutionTarget) GetExecutionID() string {
|
|
||||||
return e.ExecutionID
|
|
||||||
}
|
|
||||||
func (e *mockExecutionTarget) GetSigningKey() string {
|
|
||||||
return e.SigningKey
|
|
||||||
}
|
|
||||||
|
|
||||||
func newMockContentRequest(content string) *connect.Request[structpb.Struct] {
|
func newMockContentRequest(content string) *connect.Request[structpb.Struct] {
|
||||||
return connect.NewRequest(&structpb.Struct{
|
return connect.NewRequest(&structpb.Struct{
|
||||||
Fields: map[string]*structpb.Value{
|
Fields: map[string]*structpb.Value{
|
||||||
@@ -103,7 +65,7 @@ func Test_executeTargetsForGRPCFullMethod_request(t *testing.T) {
|
|||||||
type args struct {
|
type args struct {
|
||||||
ctx context.Context
|
ctx context.Context
|
||||||
|
|
||||||
executionTargets []execution.Target
|
executionTargets []target_domain.Target
|
||||||
targets []target
|
targets []target
|
||||||
fullMethod string
|
fullMethod string
|
||||||
req connect.AnyRequest
|
req connect.AnyRequest
|
||||||
@@ -134,7 +96,7 @@ func Test_executeTargetsForGRPCFullMethod_request(t *testing.T) {
|
|||||||
args{
|
args{
|
||||||
ctx: context.Background(),
|
ctx: context.Background(),
|
||||||
fullMethod: "/service/method",
|
fullMethod: "/service/method",
|
||||||
executionTargets: []execution.Target{},
|
executionTargets: []target_domain.Target{},
|
||||||
req: newMockContentRequest("request"),
|
req: newMockContentRequest("request"),
|
||||||
},
|
},
|
||||||
res{
|
res{
|
||||||
@@ -146,12 +108,11 @@ func Test_executeTargetsForGRPCFullMethod_request(t *testing.T) {
|
|||||||
args{
|
args{
|
||||||
ctx: context.Background(),
|
ctx: context.Background(),
|
||||||
fullMethod: "/service/method",
|
fullMethod: "/service/method",
|
||||||
executionTargets: []execution.Target{
|
executionTargets: []target_domain.Target{
|
||||||
&mockExecutionTarget{
|
{
|
||||||
InstanceID: "instance",
|
|
||||||
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
||||||
TargetID: "target",
|
TargetID: "target",
|
||||||
TargetType: domain.TargetTypeCall,
|
TargetType: target_domain.TargetTypeCall,
|
||||||
Timeout: time.Minute,
|
Timeout: time.Minute,
|
||||||
InterruptOnError: true,
|
InterruptOnError: true,
|
||||||
},
|
},
|
||||||
@@ -168,14 +129,12 @@ func Test_executeTargetsForGRPCFullMethod_request(t *testing.T) {
|
|||||||
args{
|
args{
|
||||||
ctx: context.Background(),
|
ctx: context.Background(),
|
||||||
fullMethod: "/service/method",
|
fullMethod: "/service/method",
|
||||||
executionTargets: []execution.Target{
|
executionTargets: []target_domain.Target{
|
||||||
&mockExecutionTarget{
|
{
|
||||||
InstanceID: "instance",
|
|
||||||
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
||||||
TargetID: "target",
|
TargetID: "target",
|
||||||
TargetType: domain.TargetTypeCall,
|
TargetType: target_domain.TargetTypeCall,
|
||||||
Timeout: time.Minute,
|
Timeout: time.Minute,
|
||||||
SigningKey: "signingkey",
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
targets: []target{
|
targets: []target{
|
||||||
@@ -197,15 +156,13 @@ func Test_executeTargetsForGRPCFullMethod_request(t *testing.T) {
|
|||||||
args{
|
args{
|
||||||
ctx: context.Background(),
|
ctx: context.Background(),
|
||||||
fullMethod: "/service/method",
|
fullMethod: "/service/method",
|
||||||
executionTargets: []execution.Target{
|
executionTargets: []target_domain.Target{
|
||||||
&mockExecutionTarget{
|
{
|
||||||
InstanceID: "instance",
|
|
||||||
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
||||||
TargetID: "target",
|
TargetID: "target",
|
||||||
TargetType: domain.TargetTypeCall,
|
TargetType: target_domain.TargetTypeCall,
|
||||||
Timeout: time.Minute,
|
Timeout: time.Minute,
|
||||||
InterruptOnError: true,
|
InterruptOnError: true,
|
||||||
SigningKey: "signingkey",
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -228,15 +185,13 @@ func Test_executeTargetsForGRPCFullMethod_request(t *testing.T) {
|
|||||||
args{
|
args{
|
||||||
ctx: context.Background(),
|
ctx: context.Background(),
|
||||||
fullMethod: "/service/method",
|
fullMethod: "/service/method",
|
||||||
executionTargets: []execution.Target{
|
executionTargets: []target_domain.Target{
|
||||||
&mockExecutionTarget{
|
{
|
||||||
InstanceID: "instance",
|
|
||||||
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
||||||
TargetID: "target",
|
TargetID: "target",
|
||||||
TargetType: domain.TargetTypeCall,
|
TargetType: target_domain.TargetTypeCall,
|
||||||
Timeout: time.Second,
|
Timeout: time.Second,
|
||||||
InterruptOnError: true,
|
InterruptOnError: true,
|
||||||
SigningKey: "signingkey",
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
targets: []target{
|
targets: []target{
|
||||||
@@ -258,15 +213,13 @@ func Test_executeTargetsForGRPCFullMethod_request(t *testing.T) {
|
|||||||
args{
|
args{
|
||||||
ctx: context.Background(),
|
ctx: context.Background(),
|
||||||
fullMethod: "/service/method",
|
fullMethod: "/service/method",
|
||||||
executionTargets: []execution.Target{
|
executionTargets: []target_domain.Target{
|
||||||
&mockExecutionTarget{
|
{
|
||||||
InstanceID: "instance",
|
|
||||||
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
||||||
TargetID: "target",
|
TargetID: "target",
|
||||||
TargetType: domain.TargetTypeCall,
|
TargetType: target_domain.TargetTypeCall,
|
||||||
Timeout: time.Second,
|
Timeout: time.Second,
|
||||||
InterruptOnError: true,
|
InterruptOnError: true,
|
||||||
SigningKey: "signingkey",
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
targets: []target{
|
targets: []target{
|
||||||
@@ -283,15 +236,13 @@ func Test_executeTargetsForGRPCFullMethod_request(t *testing.T) {
|
|||||||
args{
|
args{
|
||||||
ctx: context.Background(),
|
ctx: context.Background(),
|
||||||
fullMethod: "/service/method",
|
fullMethod: "/service/method",
|
||||||
executionTargets: []execution.Target{
|
executionTargets: []target_domain.Target{
|
||||||
&mockExecutionTarget{
|
{
|
||||||
InstanceID: "instance",
|
|
||||||
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
||||||
TargetID: "target",
|
TargetID: "target",
|
||||||
TargetType: domain.TargetTypeCall,
|
TargetType: target_domain.TargetTypeCall,
|
||||||
Timeout: time.Minute,
|
Timeout: time.Minute,
|
||||||
InterruptOnError: true,
|
InterruptOnError: true,
|
||||||
SigningKey: "signingkey",
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
targets: []target{
|
targets: []target{
|
||||||
@@ -313,14 +264,12 @@ func Test_executeTargetsForGRPCFullMethod_request(t *testing.T) {
|
|||||||
args{
|
args{
|
||||||
ctx: context.Background(),
|
ctx: context.Background(),
|
||||||
fullMethod: "/service/method",
|
fullMethod: "/service/method",
|
||||||
executionTargets: []execution.Target{
|
executionTargets: []target_domain.Target{
|
||||||
&mockExecutionTarget{
|
{
|
||||||
InstanceID: "instance",
|
|
||||||
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
||||||
TargetID: "target",
|
TargetID: "target",
|
||||||
TargetType: domain.TargetTypeAsync,
|
TargetType: target_domain.TargetTypeAsync,
|
||||||
Timeout: time.Second,
|
Timeout: time.Second,
|
||||||
SigningKey: "signingkey",
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
targets: []target{
|
targets: []target{
|
||||||
@@ -342,14 +291,12 @@ func Test_executeTargetsForGRPCFullMethod_request(t *testing.T) {
|
|||||||
args{
|
args{
|
||||||
ctx: context.Background(),
|
ctx: context.Background(),
|
||||||
fullMethod: "/service/method",
|
fullMethod: "/service/method",
|
||||||
executionTargets: []execution.Target{
|
executionTargets: []target_domain.Target{
|
||||||
&mockExecutionTarget{
|
{
|
||||||
InstanceID: "instance",
|
|
||||||
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
||||||
TargetID: "target",
|
TargetID: "target",
|
||||||
TargetType: domain.TargetTypeAsync,
|
TargetType: target_domain.TargetTypeAsync,
|
||||||
Timeout: time.Minute,
|
Timeout: time.Minute,
|
||||||
SigningKey: "signingkey",
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
targets: []target{
|
targets: []target{
|
||||||
@@ -371,15 +318,13 @@ func Test_executeTargetsForGRPCFullMethod_request(t *testing.T) {
|
|||||||
args{
|
args{
|
||||||
ctx: context.Background(),
|
ctx: context.Background(),
|
||||||
fullMethod: "/service/method",
|
fullMethod: "/service/method",
|
||||||
executionTargets: []execution.Target{
|
executionTargets: []target_domain.Target{
|
||||||
&mockExecutionTarget{
|
{
|
||||||
InstanceID: "instance",
|
|
||||||
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
||||||
TargetID: "target",
|
TargetID: "target",
|
||||||
TargetType: domain.TargetTypeWebhook,
|
TargetType: target_domain.TargetTypeWebhook,
|
||||||
Timeout: time.Minute,
|
Timeout: time.Minute,
|
||||||
InterruptOnError: true,
|
InterruptOnError: true,
|
||||||
SigningKey: "signingkey",
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
targets: []target{
|
targets: []target{
|
||||||
@@ -400,15 +345,13 @@ func Test_executeTargetsForGRPCFullMethod_request(t *testing.T) {
|
|||||||
args{
|
args{
|
||||||
ctx: context.Background(),
|
ctx: context.Background(),
|
||||||
fullMethod: "/service/method",
|
fullMethod: "/service/method",
|
||||||
executionTargets: []execution.Target{
|
executionTargets: []target_domain.Target{
|
||||||
&mockExecutionTarget{
|
{
|
||||||
InstanceID: "instance",
|
|
||||||
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
||||||
TargetID: "target",
|
TargetID: "target",
|
||||||
TargetType: domain.TargetTypeWebhook,
|
TargetType: target_domain.TargetTypeWebhook,
|
||||||
Timeout: time.Second,
|
Timeout: time.Second,
|
||||||
InterruptOnError: true,
|
InterruptOnError: true,
|
||||||
SigningKey: "signingkey",
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
targets: []target{
|
targets: []target{
|
||||||
@@ -430,15 +373,13 @@ func Test_executeTargetsForGRPCFullMethod_request(t *testing.T) {
|
|||||||
args{
|
args{
|
||||||
ctx: context.Background(),
|
ctx: context.Background(),
|
||||||
fullMethod: "/service/method",
|
fullMethod: "/service/method",
|
||||||
executionTargets: []execution.Target{
|
executionTargets: []target_domain.Target{
|
||||||
&mockExecutionTarget{
|
{
|
||||||
InstanceID: "instance",
|
|
||||||
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
||||||
TargetID: "target",
|
TargetID: "target",
|
||||||
TargetType: domain.TargetTypeWebhook,
|
TargetType: target_domain.TargetTypeWebhook,
|
||||||
Timeout: time.Minute,
|
Timeout: time.Minute,
|
||||||
InterruptOnError: true,
|
InterruptOnError: true,
|
||||||
SigningKey: "signingkey",
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
targets: []target{
|
targets: []target{
|
||||||
@@ -460,33 +401,27 @@ func Test_executeTargetsForGRPCFullMethod_request(t *testing.T) {
|
|||||||
args{
|
args{
|
||||||
ctx: context.Background(),
|
ctx: context.Background(),
|
||||||
fullMethod: "/service/method",
|
fullMethod: "/service/method",
|
||||||
executionTargets: []execution.Target{
|
executionTargets: []target_domain.Target{
|
||||||
&mockExecutionTarget{
|
{
|
||||||
InstanceID: "instance",
|
|
||||||
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
||||||
TargetID: "target1",
|
TargetID: "target1",
|
||||||
TargetType: domain.TargetTypeCall,
|
TargetType: target_domain.TargetTypeCall,
|
||||||
Timeout: time.Minute,
|
Timeout: time.Minute,
|
||||||
InterruptOnError: true,
|
InterruptOnError: true,
|
||||||
SigningKey: "signingkey",
|
|
||||||
},
|
},
|
||||||
&mockExecutionTarget{
|
{
|
||||||
InstanceID: "instance",
|
|
||||||
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
||||||
TargetID: "target2",
|
TargetID: "target2",
|
||||||
TargetType: domain.TargetTypeCall,
|
TargetType: target_domain.TargetTypeCall,
|
||||||
Timeout: time.Minute,
|
Timeout: time.Minute,
|
||||||
InterruptOnError: true,
|
InterruptOnError: true,
|
||||||
SigningKey: "signingkey",
|
|
||||||
},
|
},
|
||||||
&mockExecutionTarget{
|
{
|
||||||
InstanceID: "instance",
|
|
||||||
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
||||||
TargetID: "target3",
|
TargetID: "target3",
|
||||||
TargetType: domain.TargetTypeCall,
|
TargetType: target_domain.TargetTypeCall,
|
||||||
Timeout: time.Minute,
|
Timeout: time.Minute,
|
||||||
InterruptOnError: true,
|
InterruptOnError: true,
|
||||||
SigningKey: "signingkey",
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -521,33 +456,27 @@ func Test_executeTargetsForGRPCFullMethod_request(t *testing.T) {
|
|||||||
args{
|
args{
|
||||||
ctx: context.Background(),
|
ctx: context.Background(),
|
||||||
fullMethod: "/service/method",
|
fullMethod: "/service/method",
|
||||||
executionTargets: []execution.Target{
|
executionTargets: []target_domain.Target{
|
||||||
&mockExecutionTarget{
|
{
|
||||||
InstanceID: "instance",
|
|
||||||
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
||||||
TargetID: "target1",
|
TargetID: "target1",
|
||||||
TargetType: domain.TargetTypeCall,
|
TargetType: target_domain.TargetTypeCall,
|
||||||
Timeout: time.Minute,
|
Timeout: time.Minute,
|
||||||
InterruptOnError: true,
|
InterruptOnError: true,
|
||||||
SigningKey: "signingkey",
|
|
||||||
},
|
},
|
||||||
&mockExecutionTarget{
|
{
|
||||||
InstanceID: "instance",
|
|
||||||
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
||||||
TargetID: "target2",
|
TargetID: "target2",
|
||||||
TargetType: domain.TargetTypeCall,
|
TargetType: target_domain.TargetTypeCall,
|
||||||
Timeout: time.Second,
|
Timeout: time.Second,
|
||||||
InterruptOnError: true,
|
InterruptOnError: true,
|
||||||
SigningKey: "signingkey",
|
|
||||||
},
|
},
|
||||||
&mockExecutionTarget{
|
{
|
||||||
InstanceID: "instance",
|
|
||||||
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
||||||
TargetID: "target3",
|
TargetID: "target3",
|
||||||
TargetType: domain.TargetTypeCall,
|
TargetType: target_domain.TargetTypeCall,
|
||||||
Timeout: time.Second,
|
Timeout: time.Second,
|
||||||
InterruptOnError: true,
|
InterruptOnError: true,
|
||||||
SigningKey: "signingkey",
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
targets: []target{
|
targets: []target{
|
||||||
@@ -588,8 +517,7 @@ func Test_executeTargetsForGRPCFullMethod_request(t *testing.T) {
|
|||||||
target.respBody,
|
target.respBody,
|
||||||
)
|
)
|
||||||
|
|
||||||
et := tt.args.executionTargets[i].(*mockExecutionTarget)
|
tt.args.executionTargets[i].Endpoint = url
|
||||||
et.SetEndpoint(url)
|
|
||||||
closeFuncs[i] = closeF
|
closeFuncs[i] = closeF
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -598,6 +526,7 @@ func Test_executeTargetsForGRPCFullMethod_request(t *testing.T) {
|
|||||||
tt.args.executionTargets,
|
tt.args.executionTargets,
|
||||||
tt.args.fullMethod,
|
tt.args.fullMethod,
|
||||||
tt.args.req,
|
tt.args.req,
|
||||||
|
nil,
|
||||||
)
|
)
|
||||||
|
|
||||||
if tt.res.wantErr {
|
if tt.res.wantErr {
|
||||||
@@ -672,7 +601,7 @@ func Test_executeTargetsForGRPCFullMethod_response(t *testing.T) {
|
|||||||
type args struct {
|
type args struct {
|
||||||
ctx context.Context
|
ctx context.Context
|
||||||
|
|
||||||
executionTargets []execution.Target
|
executionTargets []target_domain.Target
|
||||||
targets []target
|
targets []target
|
||||||
fullMethod string
|
fullMethod string
|
||||||
req connect.AnyRequest
|
req connect.AnyRequest
|
||||||
@@ -705,7 +634,7 @@ func Test_executeTargetsForGRPCFullMethod_response(t *testing.T) {
|
|||||||
args{
|
args{
|
||||||
ctx: context.Background(),
|
ctx: context.Background(),
|
||||||
fullMethod: "/service/method",
|
fullMethod: "/service/method",
|
||||||
executionTargets: []execution.Target{},
|
executionTargets: []target_domain.Target{},
|
||||||
req: newMockContentRequest("request"),
|
req: newMockContentRequest("request"),
|
||||||
resp: newMockContentResponse("response"),
|
resp: newMockContentResponse("response"),
|
||||||
},
|
},
|
||||||
@@ -718,15 +647,13 @@ func Test_executeTargetsForGRPCFullMethod_response(t *testing.T) {
|
|||||||
args{
|
args{
|
||||||
ctx: context.Background(),
|
ctx: context.Background(),
|
||||||
fullMethod: "/service/method",
|
fullMethod: "/service/method",
|
||||||
executionTargets: []execution.Target{
|
executionTargets: []target_domain.Target{
|
||||||
&mockExecutionTarget{
|
{
|
||||||
InstanceID: "instance",
|
|
||||||
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
||||||
TargetID: "target",
|
TargetID: "target",
|
||||||
TargetType: domain.TargetTypeCall,
|
TargetType: target_domain.TargetTypeCall,
|
||||||
Timeout: time.Minute,
|
Timeout: time.Minute,
|
||||||
InterruptOnError: true,
|
InterruptOnError: true,
|
||||||
SigningKey: "signingkey",
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
targets: []target{
|
targets: []target{
|
||||||
@@ -749,15 +676,13 @@ func Test_executeTargetsForGRPCFullMethod_response(t *testing.T) {
|
|||||||
args{
|
args{
|
||||||
ctx: context.Background(),
|
ctx: context.Background(),
|
||||||
fullMethod: "/service/method",
|
fullMethod: "/service/method",
|
||||||
executionTargets: []execution.Target{
|
executionTargets: []target_domain.Target{
|
||||||
&mockExecutionTarget{
|
{
|
||||||
InstanceID: "instance",
|
|
||||||
ExecutionID: "response./zitadel.session.v2.SessionService/SetSession",
|
ExecutionID: "response./zitadel.session.v2.SessionService/SetSession",
|
||||||
TargetID: "target",
|
TargetID: "target",
|
||||||
TargetType: domain.TargetTypeCall,
|
TargetType: target_domain.TargetTypeCall,
|
||||||
Timeout: time.Minute,
|
Timeout: time.Minute,
|
||||||
InterruptOnError: true,
|
InterruptOnError: true,
|
||||||
SigningKey: "signingkey",
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
targets: []target{
|
targets: []target{
|
||||||
@@ -787,8 +712,7 @@ func Test_executeTargetsForGRPCFullMethod_response(t *testing.T) {
|
|||||||
target.respBody,
|
target.respBody,
|
||||||
)
|
)
|
||||||
|
|
||||||
et := tt.args.executionTargets[i].(*mockExecutionTarget)
|
tt.args.executionTargets[i].Endpoint = url
|
||||||
et.SetEndpoint(url)
|
|
||||||
closeFuncs[i] = closeF
|
closeFuncs[i] = closeF
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -798,6 +722,7 @@ func Test_executeTargetsForGRPCFullMethod_response(t *testing.T) {
|
|||||||
tt.args.fullMethod,
|
tt.args.fullMethod,
|
||||||
tt.args.req,
|
tt.args.req,
|
||||||
tt.args.resp,
|
tt.args.resp,
|
||||||
|
nil,
|
||||||
)
|
)
|
||||||
|
|
||||||
if tt.res.wantErr {
|
if tt.res.wantErr {
|
||||||
|
|||||||
@@ -9,17 +9,17 @@ import (
|
|||||||
"google.golang.org/protobuf/proto"
|
"google.golang.org/protobuf/proto"
|
||||||
|
|
||||||
"github.com/zitadel/zitadel/internal/api/authz"
|
"github.com/zitadel/zitadel/internal/api/authz"
|
||||||
|
"github.com/zitadel/zitadel/internal/crypto"
|
||||||
"github.com/zitadel/zitadel/internal/execution"
|
"github.com/zitadel/zitadel/internal/execution"
|
||||||
"github.com/zitadel/zitadel/internal/query"
|
target_domain "github.com/zitadel/zitadel/internal/execution/target"
|
||||||
"github.com/zitadel/zitadel/internal/telemetry/tracing"
|
"github.com/zitadel/zitadel/internal/telemetry/tracing"
|
||||||
)
|
)
|
||||||
|
|
||||||
func ExecutionHandler(queries *query.Queries) grpc.UnaryServerInterceptor {
|
func ExecutionHandler(alg crypto.EncryptionAlgorithm) grpc.UnaryServerInterceptor {
|
||||||
return func(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (interface{}, error) {
|
return func(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (interface{}, error) {
|
||||||
requestTargets, responseTargets := execution.QueryExecutionTargetsForRequestAndResponse(ctx, queries, info.FullMethod)
|
requestTargets := execution.QueryExecutionTargetsForRequest(ctx, info.FullMethod)
|
||||||
|
|
||||||
// call targets otherwise return req
|
// call targets otherwise return req
|
||||||
handledReq, err := executeTargetsForRequest(ctx, requestTargets, info.FullMethod, req)
|
handledReq, err := executeTargetsForRequest(ctx, requestTargets, info.FullMethod, req, alg)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -29,11 +29,12 @@ func ExecutionHandler(queries *query.Queries) grpc.UnaryServerInterceptor {
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
return executeTargetsForResponse(ctx, responseTargets, info.FullMethod, handledReq, response)
|
responseTargets := execution.QueryExecutionTargetsForResponse(ctx, info.FullMethod)
|
||||||
|
return executeTargetsForResponse(ctx, responseTargets, info.FullMethod, handledReq, response, alg)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func executeTargetsForRequest(ctx context.Context, targets []execution.Target, fullMethod string, req interface{}) (_ interface{}, err error) {
|
func executeTargetsForRequest(ctx context.Context, targets []target_domain.Target, fullMethod string, req interface{}, alg crypto.EncryptionAlgorithm) (_ interface{}, err error) {
|
||||||
ctx, span := tracing.NewSpan(ctx)
|
ctx, span := tracing.NewSpan(ctx)
|
||||||
defer func() { span.EndWithError(err) }()
|
defer func() { span.EndWithError(err) }()
|
||||||
|
|
||||||
@@ -52,10 +53,10 @@ func executeTargetsForRequest(ctx context.Context, targets []execution.Target, f
|
|||||||
Request: Message{req.(proto.Message)},
|
Request: Message{req.(proto.Message)},
|
||||||
}
|
}
|
||||||
|
|
||||||
return execution.CallTargets(ctx, targets, info)
|
return execution.CallTargets(ctx, targets, info, alg)
|
||||||
}
|
}
|
||||||
|
|
||||||
func executeTargetsForResponse(ctx context.Context, targets []execution.Target, fullMethod string, req, resp interface{}) (_ interface{}, err error) {
|
func executeTargetsForResponse(ctx context.Context, targets []target_domain.Target, fullMethod string, req, resp interface{}, alg crypto.EncryptionAlgorithm) (_ interface{}, err error) {
|
||||||
ctx, span := tracing.NewSpan(ctx)
|
ctx, span := tracing.NewSpan(ctx)
|
||||||
defer func() { span.EndWithError(err) }()
|
defer func() { span.EndWithError(err) }()
|
||||||
|
|
||||||
@@ -75,7 +76,7 @@ func executeTargetsForResponse(ctx context.Context, targets []execution.Target,
|
|||||||
Response: Message{resp.(proto.Message)},
|
Response: Message{resp.(proto.Message)},
|
||||||
}
|
}
|
||||||
|
|
||||||
return execution.CallTargets(ctx, targets, info)
|
return execution.CallTargets(ctx, targets, info, alg)
|
||||||
}
|
}
|
||||||
|
|
||||||
var _ execution.ContextInfo = &ContextInfoRequest{}
|
var _ execution.ContextInfo = &ContextInfoRequest{}
|
||||||
|
|||||||
@@ -15,48 +15,10 @@ import (
|
|||||||
"google.golang.org/protobuf/proto"
|
"google.golang.org/protobuf/proto"
|
||||||
"google.golang.org/protobuf/types/known/structpb"
|
"google.golang.org/protobuf/types/known/structpb"
|
||||||
|
|
||||||
"github.com/zitadel/zitadel/internal/domain"
|
|
||||||
"github.com/zitadel/zitadel/internal/execution"
|
"github.com/zitadel/zitadel/internal/execution"
|
||||||
|
target_domain "github.com/zitadel/zitadel/internal/execution/target"
|
||||||
)
|
)
|
||||||
|
|
||||||
var _ execution.Target = &mockExecutionTarget{}
|
|
||||||
|
|
||||||
type mockExecutionTarget struct {
|
|
||||||
InstanceID string
|
|
||||||
ExecutionID string
|
|
||||||
TargetID string
|
|
||||||
TargetType domain.TargetType
|
|
||||||
Endpoint string
|
|
||||||
Timeout time.Duration
|
|
||||||
InterruptOnError bool
|
|
||||||
SigningKey string
|
|
||||||
}
|
|
||||||
|
|
||||||
func (e *mockExecutionTarget) SetEndpoint(endpoint string) {
|
|
||||||
e.Endpoint = endpoint
|
|
||||||
}
|
|
||||||
func (e *mockExecutionTarget) IsInterruptOnError() bool {
|
|
||||||
return e.InterruptOnError
|
|
||||||
}
|
|
||||||
func (e *mockExecutionTarget) GetEndpoint() string {
|
|
||||||
return e.Endpoint
|
|
||||||
}
|
|
||||||
func (e *mockExecutionTarget) GetTargetType() domain.TargetType {
|
|
||||||
return e.TargetType
|
|
||||||
}
|
|
||||||
func (e *mockExecutionTarget) GetTimeout() time.Duration {
|
|
||||||
return e.Timeout
|
|
||||||
}
|
|
||||||
func (e *mockExecutionTarget) GetTargetID() string {
|
|
||||||
return e.TargetID
|
|
||||||
}
|
|
||||||
func (e *mockExecutionTarget) GetExecutionID() string {
|
|
||||||
return e.ExecutionID
|
|
||||||
}
|
|
||||||
func (e *mockExecutionTarget) GetSigningKey() string {
|
|
||||||
return e.SigningKey
|
|
||||||
}
|
|
||||||
|
|
||||||
func newMockContentRequest(content string) proto.Message {
|
func newMockContentRequest(content string) proto.Message {
|
||||||
return &structpb.Struct{
|
return &structpb.Struct{
|
||||||
Fields: map[string]*structpb.Value{
|
Fields: map[string]*structpb.Value{
|
||||||
@@ -92,7 +54,7 @@ func Test_executeTargetsForGRPCFullMethod_request(t *testing.T) {
|
|||||||
type args struct {
|
type args struct {
|
||||||
ctx context.Context
|
ctx context.Context
|
||||||
|
|
||||||
executionTargets []execution.Target
|
executionTargets []target_domain.Target
|
||||||
targets []target
|
targets []target
|
||||||
fullMethod string
|
fullMethod string
|
||||||
req interface{}
|
req interface{}
|
||||||
@@ -123,7 +85,7 @@ func Test_executeTargetsForGRPCFullMethod_request(t *testing.T) {
|
|||||||
args{
|
args{
|
||||||
ctx: context.Background(),
|
ctx: context.Background(),
|
||||||
fullMethod: "/service/method",
|
fullMethod: "/service/method",
|
||||||
executionTargets: []execution.Target{},
|
executionTargets: []target_domain.Target{},
|
||||||
req: newMockContentRequest("request"),
|
req: newMockContentRequest("request"),
|
||||||
},
|
},
|
||||||
res{
|
res{
|
||||||
@@ -135,12 +97,11 @@ func Test_executeTargetsForGRPCFullMethod_request(t *testing.T) {
|
|||||||
args{
|
args{
|
||||||
ctx: context.Background(),
|
ctx: context.Background(),
|
||||||
fullMethod: "/service/method",
|
fullMethod: "/service/method",
|
||||||
executionTargets: []execution.Target{
|
executionTargets: []target_domain.Target{
|
||||||
&mockExecutionTarget{
|
{
|
||||||
InstanceID: "instance",
|
|
||||||
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
||||||
TargetID: "target",
|
TargetID: "target",
|
||||||
TargetType: domain.TargetTypeCall,
|
TargetType: target_domain.TargetTypeCall,
|
||||||
Timeout: time.Minute,
|
Timeout: time.Minute,
|
||||||
InterruptOnError: true,
|
InterruptOnError: true,
|
||||||
},
|
},
|
||||||
@@ -157,14 +118,12 @@ func Test_executeTargetsForGRPCFullMethod_request(t *testing.T) {
|
|||||||
args{
|
args{
|
||||||
ctx: context.Background(),
|
ctx: context.Background(),
|
||||||
fullMethod: "/service/method",
|
fullMethod: "/service/method",
|
||||||
executionTargets: []execution.Target{
|
executionTargets: []target_domain.Target{
|
||||||
&mockExecutionTarget{
|
{
|
||||||
InstanceID: "instance",
|
|
||||||
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
||||||
TargetID: "target",
|
TargetID: "target",
|
||||||
TargetType: domain.TargetTypeCall,
|
TargetType: target_domain.TargetTypeCall,
|
||||||
Timeout: time.Minute,
|
Timeout: time.Minute,
|
||||||
SigningKey: "signingkey",
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
targets: []target{
|
targets: []target{
|
||||||
@@ -186,15 +145,13 @@ func Test_executeTargetsForGRPCFullMethod_request(t *testing.T) {
|
|||||||
args{
|
args{
|
||||||
ctx: context.Background(),
|
ctx: context.Background(),
|
||||||
fullMethod: "/service/method",
|
fullMethod: "/service/method",
|
||||||
executionTargets: []execution.Target{
|
executionTargets: []target_domain.Target{
|
||||||
&mockExecutionTarget{
|
{
|
||||||
InstanceID: "instance",
|
|
||||||
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
||||||
TargetID: "target",
|
TargetID: "target",
|
||||||
TargetType: domain.TargetTypeCall,
|
TargetType: target_domain.TargetTypeCall,
|
||||||
Timeout: time.Minute,
|
Timeout: time.Minute,
|
||||||
InterruptOnError: true,
|
InterruptOnError: true,
|
||||||
SigningKey: "signingkey",
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -217,15 +174,13 @@ func Test_executeTargetsForGRPCFullMethod_request(t *testing.T) {
|
|||||||
args{
|
args{
|
||||||
ctx: context.Background(),
|
ctx: context.Background(),
|
||||||
fullMethod: "/service/method",
|
fullMethod: "/service/method",
|
||||||
executionTargets: []execution.Target{
|
executionTargets: []target_domain.Target{
|
||||||
&mockExecutionTarget{
|
{
|
||||||
InstanceID: "instance",
|
|
||||||
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
||||||
TargetID: "target",
|
TargetID: "target",
|
||||||
TargetType: domain.TargetTypeCall,
|
TargetType: target_domain.TargetTypeCall,
|
||||||
Timeout: time.Second,
|
Timeout: time.Second,
|
||||||
InterruptOnError: true,
|
InterruptOnError: true,
|
||||||
SigningKey: "signingkey",
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
targets: []target{
|
targets: []target{
|
||||||
@@ -247,15 +202,13 @@ func Test_executeTargetsForGRPCFullMethod_request(t *testing.T) {
|
|||||||
args{
|
args{
|
||||||
ctx: context.Background(),
|
ctx: context.Background(),
|
||||||
fullMethod: "/service/method",
|
fullMethod: "/service/method",
|
||||||
executionTargets: []execution.Target{
|
executionTargets: []target_domain.Target{
|
||||||
&mockExecutionTarget{
|
{
|
||||||
InstanceID: "instance",
|
|
||||||
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
||||||
TargetID: "target",
|
TargetID: "target",
|
||||||
TargetType: domain.TargetTypeCall,
|
TargetType: target_domain.TargetTypeCall,
|
||||||
Timeout: time.Second,
|
Timeout: time.Second,
|
||||||
InterruptOnError: true,
|
InterruptOnError: true,
|
||||||
SigningKey: "signingkey",
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
targets: []target{
|
targets: []target{
|
||||||
@@ -272,15 +225,13 @@ func Test_executeTargetsForGRPCFullMethod_request(t *testing.T) {
|
|||||||
args{
|
args{
|
||||||
ctx: context.Background(),
|
ctx: context.Background(),
|
||||||
fullMethod: "/service/method",
|
fullMethod: "/service/method",
|
||||||
executionTargets: []execution.Target{
|
executionTargets: []target_domain.Target{
|
||||||
&mockExecutionTarget{
|
{
|
||||||
InstanceID: "instance",
|
|
||||||
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
||||||
TargetID: "target",
|
TargetID: "target",
|
||||||
TargetType: domain.TargetTypeCall,
|
TargetType: target_domain.TargetTypeCall,
|
||||||
Timeout: time.Minute,
|
Timeout: time.Minute,
|
||||||
InterruptOnError: true,
|
InterruptOnError: true,
|
||||||
SigningKey: "signingkey",
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
targets: []target{
|
targets: []target{
|
||||||
@@ -302,14 +253,12 @@ func Test_executeTargetsForGRPCFullMethod_request(t *testing.T) {
|
|||||||
args{
|
args{
|
||||||
ctx: context.Background(),
|
ctx: context.Background(),
|
||||||
fullMethod: "/service/method",
|
fullMethod: "/service/method",
|
||||||
executionTargets: []execution.Target{
|
executionTargets: []target_domain.Target{
|
||||||
&mockExecutionTarget{
|
{
|
||||||
InstanceID: "instance",
|
|
||||||
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
||||||
TargetID: "target",
|
TargetID: "target",
|
||||||
TargetType: domain.TargetTypeAsync,
|
TargetType: target_domain.TargetTypeAsync,
|
||||||
Timeout: time.Second,
|
Timeout: time.Second,
|
||||||
SigningKey: "signingkey",
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
targets: []target{
|
targets: []target{
|
||||||
@@ -331,14 +280,12 @@ func Test_executeTargetsForGRPCFullMethod_request(t *testing.T) {
|
|||||||
args{
|
args{
|
||||||
ctx: context.Background(),
|
ctx: context.Background(),
|
||||||
fullMethod: "/service/method",
|
fullMethod: "/service/method",
|
||||||
executionTargets: []execution.Target{
|
executionTargets: []target_domain.Target{
|
||||||
&mockExecutionTarget{
|
{
|
||||||
InstanceID: "instance",
|
|
||||||
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
||||||
TargetID: "target",
|
TargetID: "target",
|
||||||
TargetType: domain.TargetTypeAsync,
|
TargetType: target_domain.TargetTypeAsync,
|
||||||
Timeout: time.Minute,
|
Timeout: time.Minute,
|
||||||
SigningKey: "signingkey",
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
targets: []target{
|
targets: []target{
|
||||||
@@ -360,15 +307,13 @@ func Test_executeTargetsForGRPCFullMethod_request(t *testing.T) {
|
|||||||
args{
|
args{
|
||||||
ctx: context.Background(),
|
ctx: context.Background(),
|
||||||
fullMethod: "/service/method",
|
fullMethod: "/service/method",
|
||||||
executionTargets: []execution.Target{
|
executionTargets: []target_domain.Target{
|
||||||
&mockExecutionTarget{
|
{
|
||||||
InstanceID: "instance",
|
|
||||||
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
||||||
TargetID: "target",
|
TargetID: "target",
|
||||||
TargetType: domain.TargetTypeWebhook,
|
TargetType: target_domain.TargetTypeWebhook,
|
||||||
Timeout: time.Minute,
|
Timeout: time.Minute,
|
||||||
InterruptOnError: true,
|
InterruptOnError: true,
|
||||||
SigningKey: "signingkey",
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
targets: []target{
|
targets: []target{
|
||||||
@@ -389,15 +334,13 @@ func Test_executeTargetsForGRPCFullMethod_request(t *testing.T) {
|
|||||||
args{
|
args{
|
||||||
ctx: context.Background(),
|
ctx: context.Background(),
|
||||||
fullMethod: "/service/method",
|
fullMethod: "/service/method",
|
||||||
executionTargets: []execution.Target{
|
executionTargets: []target_domain.Target{
|
||||||
&mockExecutionTarget{
|
{
|
||||||
InstanceID: "instance",
|
|
||||||
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
||||||
TargetID: "target",
|
TargetID: "target",
|
||||||
TargetType: domain.TargetTypeWebhook,
|
TargetType: target_domain.TargetTypeWebhook,
|
||||||
Timeout: time.Second,
|
Timeout: time.Second,
|
||||||
InterruptOnError: true,
|
InterruptOnError: true,
|
||||||
SigningKey: "signingkey",
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
targets: []target{
|
targets: []target{
|
||||||
@@ -419,15 +362,13 @@ func Test_executeTargetsForGRPCFullMethod_request(t *testing.T) {
|
|||||||
args{
|
args{
|
||||||
ctx: context.Background(),
|
ctx: context.Background(),
|
||||||
fullMethod: "/service/method",
|
fullMethod: "/service/method",
|
||||||
executionTargets: []execution.Target{
|
executionTargets: []target_domain.Target{
|
||||||
&mockExecutionTarget{
|
{
|
||||||
InstanceID: "instance",
|
|
||||||
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
||||||
TargetID: "target",
|
TargetID: "target",
|
||||||
TargetType: domain.TargetTypeWebhook,
|
TargetType: target_domain.TargetTypeWebhook,
|
||||||
Timeout: time.Minute,
|
Timeout: time.Minute,
|
||||||
InterruptOnError: true,
|
InterruptOnError: true,
|
||||||
SigningKey: "signingkey",
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
targets: []target{
|
targets: []target{
|
||||||
@@ -449,33 +390,27 @@ func Test_executeTargetsForGRPCFullMethod_request(t *testing.T) {
|
|||||||
args{
|
args{
|
||||||
ctx: context.Background(),
|
ctx: context.Background(),
|
||||||
fullMethod: "/service/method",
|
fullMethod: "/service/method",
|
||||||
executionTargets: []execution.Target{
|
executionTargets: []target_domain.Target{
|
||||||
&mockExecutionTarget{
|
{
|
||||||
InstanceID: "instance",
|
|
||||||
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
||||||
TargetID: "target1",
|
TargetID: "target1",
|
||||||
TargetType: domain.TargetTypeCall,
|
TargetType: target_domain.TargetTypeCall,
|
||||||
Timeout: time.Minute,
|
Timeout: time.Minute,
|
||||||
InterruptOnError: true,
|
InterruptOnError: true,
|
||||||
SigningKey: "signingkey",
|
|
||||||
},
|
},
|
||||||
&mockExecutionTarget{
|
{
|
||||||
InstanceID: "instance",
|
|
||||||
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
||||||
TargetID: "target2",
|
TargetID: "target2",
|
||||||
TargetType: domain.TargetTypeCall,
|
TargetType: target_domain.TargetTypeCall,
|
||||||
Timeout: time.Minute,
|
Timeout: time.Minute,
|
||||||
InterruptOnError: true,
|
InterruptOnError: true,
|
||||||
SigningKey: "signingkey",
|
|
||||||
},
|
},
|
||||||
&mockExecutionTarget{
|
{
|
||||||
InstanceID: "instance",
|
|
||||||
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
||||||
TargetID: "target3",
|
TargetID: "target3",
|
||||||
TargetType: domain.TargetTypeCall,
|
TargetType: target_domain.TargetTypeCall,
|
||||||
Timeout: time.Minute,
|
Timeout: time.Minute,
|
||||||
InterruptOnError: true,
|
InterruptOnError: true,
|
||||||
SigningKey: "signingkey",
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -510,33 +445,27 @@ func Test_executeTargetsForGRPCFullMethod_request(t *testing.T) {
|
|||||||
args{
|
args{
|
||||||
ctx: context.Background(),
|
ctx: context.Background(),
|
||||||
fullMethod: "/service/method",
|
fullMethod: "/service/method",
|
||||||
executionTargets: []execution.Target{
|
executionTargets: []target_domain.Target{
|
||||||
&mockExecutionTarget{
|
{
|
||||||
InstanceID: "instance",
|
|
||||||
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
||||||
TargetID: "target1",
|
TargetID: "target1",
|
||||||
TargetType: domain.TargetTypeCall,
|
TargetType: target_domain.TargetTypeCall,
|
||||||
Timeout: time.Minute,
|
Timeout: time.Minute,
|
||||||
InterruptOnError: true,
|
InterruptOnError: true,
|
||||||
SigningKey: "signingkey",
|
|
||||||
},
|
},
|
||||||
&mockExecutionTarget{
|
{
|
||||||
InstanceID: "instance",
|
|
||||||
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
||||||
TargetID: "target2",
|
TargetID: "target2",
|
||||||
TargetType: domain.TargetTypeCall,
|
TargetType: target_domain.TargetTypeCall,
|
||||||
Timeout: time.Second,
|
Timeout: time.Second,
|
||||||
InterruptOnError: true,
|
InterruptOnError: true,
|
||||||
SigningKey: "signingkey",
|
|
||||||
},
|
},
|
||||||
&mockExecutionTarget{
|
{
|
||||||
InstanceID: "instance",
|
|
||||||
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
||||||
TargetID: "target3",
|
TargetID: "target3",
|
||||||
TargetType: domain.TargetTypeCall,
|
TargetType: target_domain.TargetTypeCall,
|
||||||
Timeout: time.Second,
|
Timeout: time.Second,
|
||||||
InterruptOnError: true,
|
InterruptOnError: true,
|
||||||
SigningKey: "signingkey",
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
targets: []target{
|
targets: []target{
|
||||||
@@ -577,8 +506,7 @@ func Test_executeTargetsForGRPCFullMethod_request(t *testing.T) {
|
|||||||
target.respBody,
|
target.respBody,
|
||||||
)
|
)
|
||||||
|
|
||||||
et := tt.args.executionTargets[i].(*mockExecutionTarget)
|
tt.args.executionTargets[i].Endpoint = url
|
||||||
et.SetEndpoint(url)
|
|
||||||
closeFuncs[i] = closeF
|
closeFuncs[i] = closeF
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -587,6 +515,7 @@ func Test_executeTargetsForGRPCFullMethod_request(t *testing.T) {
|
|||||||
tt.args.executionTargets,
|
tt.args.executionTargets,
|
||||||
tt.args.fullMethod,
|
tt.args.fullMethod,
|
||||||
tt.args.req,
|
tt.args.req,
|
||||||
|
nil,
|
||||||
)
|
)
|
||||||
|
|
||||||
if tt.res.wantErr {
|
if tt.res.wantErr {
|
||||||
@@ -640,7 +569,7 @@ func testServerCall(
|
|||||||
http.Error(w, "error", http.StatusInternalServerError)
|
http.Error(w, "error", http.StatusInternalServerError)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if _, err := io.WriteString(w, string(resp)); err != nil {
|
if _, err := w.Write(resp); err != nil {
|
||||||
http.Error(w, "error", http.StatusInternalServerError)
|
http.Error(w, "error", http.StatusInternalServerError)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -661,7 +590,7 @@ func Test_executeTargetsForGRPCFullMethod_response(t *testing.T) {
|
|||||||
type args struct {
|
type args struct {
|
||||||
ctx context.Context
|
ctx context.Context
|
||||||
|
|
||||||
executionTargets []execution.Target
|
executionTargets []target_domain.Target
|
||||||
targets []target
|
targets []target
|
||||||
fullMethod string
|
fullMethod string
|
||||||
req interface{}
|
req interface{}
|
||||||
@@ -694,7 +623,7 @@ func Test_executeTargetsForGRPCFullMethod_response(t *testing.T) {
|
|||||||
args{
|
args{
|
||||||
ctx: context.Background(),
|
ctx: context.Background(),
|
||||||
fullMethod: "/service/method",
|
fullMethod: "/service/method",
|
||||||
executionTargets: []execution.Target{},
|
executionTargets: []target_domain.Target{},
|
||||||
req: newMockContentRequest("request"),
|
req: newMockContentRequest("request"),
|
||||||
resp: newMockContentRequest("response"),
|
resp: newMockContentRequest("response"),
|
||||||
},
|
},
|
||||||
@@ -707,15 +636,13 @@ func Test_executeTargetsForGRPCFullMethod_response(t *testing.T) {
|
|||||||
args{
|
args{
|
||||||
ctx: context.Background(),
|
ctx: context.Background(),
|
||||||
fullMethod: "/service/method",
|
fullMethod: "/service/method",
|
||||||
executionTargets: []execution.Target{
|
executionTargets: []target_domain.Target{
|
||||||
&mockExecutionTarget{
|
{
|
||||||
InstanceID: "instance",
|
|
||||||
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
ExecutionID: "request./zitadel.session.v2.SessionService/SetSession",
|
||||||
TargetID: "target",
|
TargetID: "target",
|
||||||
TargetType: domain.TargetTypeCall,
|
TargetType: target_domain.TargetTypeCall,
|
||||||
Timeout: time.Minute,
|
Timeout: time.Minute,
|
||||||
InterruptOnError: true,
|
InterruptOnError: true,
|
||||||
SigningKey: "signingkey",
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
targets: []target{
|
targets: []target{
|
||||||
@@ -738,15 +665,13 @@ func Test_executeTargetsForGRPCFullMethod_response(t *testing.T) {
|
|||||||
args{
|
args{
|
||||||
ctx: context.Background(),
|
ctx: context.Background(),
|
||||||
fullMethod: "/service/method",
|
fullMethod: "/service/method",
|
||||||
executionTargets: []execution.Target{
|
executionTargets: []target_domain.Target{
|
||||||
&mockExecutionTarget{
|
{
|
||||||
InstanceID: "instance",
|
|
||||||
ExecutionID: "response./zitadel.session.v2.SessionService/SetSession",
|
ExecutionID: "response./zitadel.session.v2.SessionService/SetSession",
|
||||||
TargetID: "target",
|
TargetID: "target",
|
||||||
TargetType: domain.TargetTypeCall,
|
TargetType: target_domain.TargetTypeCall,
|
||||||
Timeout: time.Minute,
|
Timeout: time.Minute,
|
||||||
InterruptOnError: true,
|
InterruptOnError: true,
|
||||||
SigningKey: "signingkey",
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
targets: []target{
|
targets: []target{
|
||||||
@@ -776,8 +701,7 @@ func Test_executeTargetsForGRPCFullMethod_response(t *testing.T) {
|
|||||||
target.respBody,
|
target.respBody,
|
||||||
)
|
)
|
||||||
|
|
||||||
et := tt.args.executionTargets[i].(*mockExecutionTarget)
|
tt.args.executionTargets[i].Endpoint = url
|
||||||
et.SetEndpoint(url)
|
|
||||||
closeFuncs[i] = closeF
|
closeFuncs[i] = closeF
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -787,6 +711,7 @@ func Test_executeTargetsForGRPCFullMethod_response(t *testing.T) {
|
|||||||
tt.args.fullMethod,
|
tt.args.fullMethod,
|
||||||
tt.args.req,
|
tt.args.req,
|
||||||
tt.args.resp,
|
tt.args.resp,
|
||||||
|
nil,
|
||||||
)
|
)
|
||||||
|
|
||||||
if tt.res.wantErr {
|
if tt.res.wantErr {
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ import (
|
|||||||
|
|
||||||
"github.com/zitadel/zitadel/internal/api/authz"
|
"github.com/zitadel/zitadel/internal/api/authz"
|
||||||
http_util "github.com/zitadel/zitadel/internal/api/http"
|
http_util "github.com/zitadel/zitadel/internal/api/http"
|
||||||
|
"github.com/zitadel/zitadel/internal/execution/target"
|
||||||
"github.com/zitadel/zitadel/internal/feature"
|
"github.com/zitadel/zitadel/internal/feature"
|
||||||
object_v3 "github.com/zitadel/zitadel/pkg/grpc/object/v3alpha"
|
object_v3 "github.com/zitadel/zitadel/pkg/grpc/object/v3alpha"
|
||||||
)
|
)
|
||||||
@@ -295,3 +296,7 @@ func (m *mockInstance) EnableImpersonation() bool {
|
|||||||
func (m *mockInstance) Features() feature.Features {
|
func (m *mockInstance) Features() feature.Features {
|
||||||
return feature.Features{}
|
return feature.Features{}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (m *mockInstance) ExecutionRouter() target.Router {
|
||||||
|
return target.NewRouter(nil)
|
||||||
|
}
|
||||||
|
|||||||
@@ -9,11 +9,12 @@ import (
|
|||||||
"google.golang.org/grpc"
|
"google.golang.org/grpc"
|
||||||
"google.golang.org/grpc/credentials"
|
"google.golang.org/grpc/credentials"
|
||||||
healthpb "google.golang.org/grpc/health/grpc_health_v1"
|
healthpb "google.golang.org/grpc/health/grpc_health_v1"
|
||||||
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
|
"google.golang.org/protobuf/reflect/protoreflect"
|
||||||
|
|
||||||
"github.com/zitadel/zitadel/internal/api/authz"
|
"github.com/zitadel/zitadel/internal/api/authz"
|
||||||
grpc_api "github.com/zitadel/zitadel/internal/api/grpc"
|
grpc_api "github.com/zitadel/zitadel/internal/api/grpc"
|
||||||
"github.com/zitadel/zitadel/internal/api/grpc/server/middleware"
|
"github.com/zitadel/zitadel/internal/api/grpc/server/middleware"
|
||||||
|
"github.com/zitadel/zitadel/internal/crypto"
|
||||||
"github.com/zitadel/zitadel/internal/logstore"
|
"github.com/zitadel/zitadel/internal/logstore"
|
||||||
"github.com/zitadel/zitadel/internal/logstore/record"
|
"github.com/zitadel/zitadel/internal/logstore/record"
|
||||||
"github.com/zitadel/zitadel/internal/query"
|
"github.com/zitadel/zitadel/internal/query"
|
||||||
@@ -60,6 +61,7 @@ func CreateServer(
|
|||||||
externalDomain string,
|
externalDomain string,
|
||||||
tlsConfig *tls.Config,
|
tlsConfig *tls.Config,
|
||||||
accessSvc *logstore.Service[*record.AccessLog],
|
accessSvc *logstore.Service[*record.AccessLog],
|
||||||
|
targetEncAlg crypto.EncryptionAlgorithm,
|
||||||
) *grpc.Server {
|
) *grpc.Server {
|
||||||
metricTypes := []metrics.MetricType{metrics.MetricTypeTotalCount, metrics.MetricTypeRequestCount, metrics.MetricTypeStatusCode}
|
metricTypes := []metrics.MetricType{metrics.MetricTypeTotalCount, metrics.MetricTypeRequestCount, metrics.MetricTypeStatusCode}
|
||||||
serverOptions := []grpc.ServerOption{
|
serverOptions := []grpc.ServerOption{
|
||||||
@@ -75,7 +77,7 @@ func CreateServer(
|
|||||||
middleware.AuthorizationInterceptor(verifier, systemAuthz, authConfig),
|
middleware.AuthorizationInterceptor(verifier, systemAuthz, authConfig),
|
||||||
middleware.TranslationHandler(),
|
middleware.TranslationHandler(),
|
||||||
middleware.QuotaExhaustedInterceptor(accessSvc, system_pb.SystemService_ServiceDesc.ServiceName),
|
middleware.QuotaExhaustedInterceptor(accessSvc, system_pb.SystemService_ServiceDesc.ServiceName),
|
||||||
middleware.ExecutionHandler(queries),
|
middleware.ExecutionHandler(targetEncAlg),
|
||||||
middleware.ValidationHandler(),
|
middleware.ValidationHandler(),
|
||||||
middleware.ServiceHandler(),
|
middleware.ServiceHandler(),
|
||||||
middleware.ActivityInterceptor(),
|
middleware.ActivityInterceptor(),
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ import (
|
|||||||
|
|
||||||
"github.com/zitadel/zitadel/internal/api/authz"
|
"github.com/zitadel/zitadel/internal/api/authz"
|
||||||
zitadel_http "github.com/zitadel/zitadel/internal/api/http"
|
zitadel_http "github.com/zitadel/zitadel/internal/api/http"
|
||||||
|
"github.com/zitadel/zitadel/internal/execution/target"
|
||||||
"github.com/zitadel/zitadel/internal/feature"
|
"github.com/zitadel/zitadel/internal/feature"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -351,3 +352,7 @@ func (m *mockInstance) EnableImpersonation() bool {
|
|||||||
func (m *mockInstance) Features() feature.Features {
|
func (m *mockInstance) Features() feature.Features {
|
||||||
return feature.Features{}
|
return feature.Features{}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (m *mockInstance) ExecutionRouter() target.Router {
|
||||||
|
return target.NewRouter(nil)
|
||||||
|
}
|
||||||
|
|||||||
@@ -108,6 +108,7 @@ func NewServer(
|
|||||||
query *query.Queries,
|
query *query.Queries,
|
||||||
repo repository.Repository,
|
repo repository.Repository,
|
||||||
encryptionAlg crypto.EncryptionAlgorithm,
|
encryptionAlg crypto.EncryptionAlgorithm,
|
||||||
|
targetEncryptionAlgorithm crypto.EncryptionAlgorithm,
|
||||||
cryptoKey []byte,
|
cryptoKey []byte,
|
||||||
es *eventstore.Eventstore,
|
es *eventstore.Eventstore,
|
||||||
userAgentCookie, instanceHandler func(http.Handler) http.Handler,
|
userAgentCookie, instanceHandler func(http.Handler) http.Handler,
|
||||||
@@ -162,6 +163,7 @@ func NewServer(
|
|||||||
fallbackLogger: fallbackLogger,
|
fallbackLogger: fallbackLogger,
|
||||||
hasher: hasher,
|
hasher: hasher,
|
||||||
encAlg: encryptionAlg,
|
encAlg: encryptionAlg,
|
||||||
|
targetEncryptionAlgorithm: targetEncryptionAlgorithm,
|
||||||
opCrypto: op.NewAESCrypto(opConfig.CryptoKey),
|
opCrypto: op.NewAESCrypto(opConfig.CryptoKey),
|
||||||
assetAPIPrefix: assets.AssetAPI(),
|
assetAPIPrefix: assets.AssetAPI(),
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -36,11 +36,12 @@ type Server struct {
|
|||||||
defaultIdTokenLifetime time.Duration
|
defaultIdTokenLifetime time.Duration
|
||||||
jwksCacheControlMaxAge time.Duration
|
jwksCacheControlMaxAge time.Duration
|
||||||
|
|
||||||
fallbackLogger *slog.Logger
|
fallbackLogger *slog.Logger
|
||||||
hasher *crypto.Hasher
|
hasher *crypto.Hasher
|
||||||
signingKeyAlgorithm string
|
signingKeyAlgorithm string
|
||||||
encAlg crypto.EncryptionAlgorithm
|
encAlg crypto.EncryptionAlgorithm
|
||||||
opCrypto op.Crypto
|
targetEncryptionAlgorithm crypto.EncryptionAlgorithm
|
||||||
|
opCrypto op.Crypto
|
||||||
|
|
||||||
assetAPIPrefix func(ctx context.Context) string
|
assetAPIPrefix func(ctx context.Context) string
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -429,10 +429,8 @@ func (s *Server) userinfoFlows(ctx context.Context, qu *query.OIDCUserInfo, user
|
|||||||
if function == "" {
|
if function == "" {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
executionTargets, err := execution.QueryExecutionTargetsForFunction(ctx, s.query, function)
|
|
||||||
if err != nil {
|
executionTargets := execution.QueryExecutionTargetsForFunction(ctx, function)
|
||||||
return err
|
|
||||||
}
|
|
||||||
info := &ContextInfo{
|
info := &ContextInfo{
|
||||||
Function: function,
|
Function: function,
|
||||||
UserInfo: userInfo,
|
UserInfo: userInfo,
|
||||||
@@ -443,7 +441,7 @@ func (s *Server) userinfoFlows(ctx context.Context, qu *query.OIDCUserInfo, user
|
|||||||
UserGrants: qu.UserGrants,
|
UserGrants: qu.UserGrants,
|
||||||
}
|
}
|
||||||
|
|
||||||
resp, err := execution.CallTargets(ctx, executionTargets, info)
|
resp, err := execution.CallTargets(ctx, executionTargets, info, s.targetEncryptionAlgorithm)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -42,6 +42,7 @@ func NewProvider(
|
|||||||
repo repository.Repository,
|
repo repository.Repository,
|
||||||
encAlg crypto.EncryptionAlgorithm,
|
encAlg crypto.EncryptionAlgorithm,
|
||||||
certEncAlg crypto.EncryptionAlgorithm,
|
certEncAlg crypto.EncryptionAlgorithm,
|
||||||
|
targetEncAlg crypto.EncryptionAlgorithm,
|
||||||
es *eventstore.Eventstore,
|
es *eventstore.Eventstore,
|
||||||
projections *database.DB,
|
projections *database.DB,
|
||||||
instanceHandler,
|
instanceHandler,
|
||||||
@@ -56,6 +57,7 @@ func NewProvider(
|
|||||||
repo,
|
repo,
|
||||||
encAlg,
|
encAlg,
|
||||||
certEncAlg,
|
certEncAlg,
|
||||||
|
targetEncAlg,
|
||||||
es,
|
es,
|
||||||
projections,
|
projections,
|
||||||
fmt.Sprintf("%s%s?%s=", login.HandlerPrefix, login.EndpointLogin, login.QueryAuthRequestID),
|
fmt.Sprintf("%s%s?%s=", login.HandlerPrefix, login.EndpointLogin, login.QueryAuthRequestID),
|
||||||
@@ -114,6 +116,7 @@ func newStorage(
|
|||||||
repo repository.Repository,
|
repo repository.Repository,
|
||||||
encAlg crypto.EncryptionAlgorithm,
|
encAlg crypto.EncryptionAlgorithm,
|
||||||
certEncAlg crypto.EncryptionAlgorithm,
|
certEncAlg crypto.EncryptionAlgorithm,
|
||||||
|
targetEncAlg crypto.EncryptionAlgorithm,
|
||||||
es *eventstore.Eventstore,
|
es *eventstore.Eventstore,
|
||||||
db *database.DB,
|
db *database.DB,
|
||||||
defaultLoginURL string,
|
defaultLoginURL string,
|
||||||
@@ -123,6 +126,7 @@ func newStorage(
|
|||||||
return &Storage{
|
return &Storage{
|
||||||
encAlg: encAlg,
|
encAlg: encAlg,
|
||||||
certEncAlg: certEncAlg,
|
certEncAlg: certEncAlg,
|
||||||
|
targetEncAlg: targetEncAlg,
|
||||||
locker: crdb.NewLocker(db.DB, locksTable, signingKey),
|
locker: crdb.NewLocker(db.DB, locksTable, signingKey),
|
||||||
eventstore: es,
|
eventstore: es,
|
||||||
repo: repo,
|
repo: repo,
|
||||||
|
|||||||
@@ -56,6 +56,7 @@ type Storage struct {
|
|||||||
certificateAlgorithm string
|
certificateAlgorithm string
|
||||||
encAlg crypto.EncryptionAlgorithm
|
encAlg crypto.EncryptionAlgorithm
|
||||||
certEncAlg crypto.EncryptionAlgorithm
|
certEncAlg crypto.EncryptionAlgorithm
|
||||||
|
targetEncAlg crypto.EncryptionAlgorithm
|
||||||
|
|
||||||
eventstore *eventstore.Eventstore
|
eventstore *eventstore.Eventstore
|
||||||
repo repository.Repository
|
repo repository.Repository
|
||||||
@@ -390,10 +391,7 @@ func (p *Storage) getCustomAttributes(ctx context.Context, user *query.User, use
|
|||||||
}
|
}
|
||||||
|
|
||||||
function := exec_repo.ID(domain.ExecutionTypeFunction, domain.ActionFunctionPreSAMLResponse.LocalizationKey())
|
function := exec_repo.ID(domain.ExecutionTypeFunction, domain.ActionFunctionPreSAMLResponse.LocalizationKey())
|
||||||
executionTargets, err := execution.QueryExecutionTargetsForFunction(ctx, p.query, function)
|
executionTargets := execution.QueryExecutionTargetsForFunction(ctx, function)
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
// correct time for utc
|
// correct time for utc
|
||||||
user.CreationDate = user.CreationDate.UTC()
|
user.CreationDate = user.CreationDate.UTC()
|
||||||
@@ -405,7 +403,7 @@ func (p *Storage) getCustomAttributes(ctx context.Context, user *query.User, use
|
|||||||
UserGrants: userGrants.UserGrants,
|
UserGrants: userGrants.UserGrants,
|
||||||
}
|
}
|
||||||
|
|
||||||
resp, err := execution.CallTargets(ctx, executionTargets, info)
|
resp, err := execution.CallTargets(ctx, executionTargets, info, p.targetEncAlg)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import (
|
|||||||
"github.com/zitadel/zitadel/internal/crypto"
|
"github.com/zitadel/zitadel/internal/crypto"
|
||||||
"github.com/zitadel/zitadel/internal/domain"
|
"github.com/zitadel/zitadel/internal/domain"
|
||||||
"github.com/zitadel/zitadel/internal/eventstore"
|
"github.com/zitadel/zitadel/internal/eventstore"
|
||||||
|
target_domain "github.com/zitadel/zitadel/internal/execution/target"
|
||||||
"github.com/zitadel/zitadel/internal/repository/execution"
|
"github.com/zitadel/zitadel/internal/repository/execution"
|
||||||
"github.com/zitadel/zitadel/internal/repository/target"
|
"github.com/zitadel/zitadel/internal/repository/target"
|
||||||
"github.com/zitadel/zitadel/internal/zerrors"
|
"github.com/zitadel/zitadel/internal/zerrors"
|
||||||
@@ -170,7 +171,7 @@ func TestCommands_SetExecutionRequest(t *testing.T) {
|
|||||||
target.NewAddedEvent(context.Background(),
|
target.NewAddedEvent(context.Background(),
|
||||||
target.NewAggregate("target", "instance"),
|
target.NewAggregate("target", "instance"),
|
||||||
"name",
|
"name",
|
||||||
domain.TargetTypeWebhook,
|
target_domain.TargetTypeWebhook,
|
||||||
"https://example.com",
|
"https://example.com",
|
||||||
time.Second,
|
time.Second,
|
||||||
true,
|
true,
|
||||||
@@ -225,7 +226,7 @@ func TestCommands_SetExecutionRequest(t *testing.T) {
|
|||||||
target.NewAddedEvent(context.Background(),
|
target.NewAddedEvent(context.Background(),
|
||||||
target.NewAggregate("target", "instance"),
|
target.NewAggregate("target", "instance"),
|
||||||
"name",
|
"name",
|
||||||
domain.TargetTypeWebhook,
|
target_domain.TargetTypeWebhook,
|
||||||
"https://example.com",
|
"https://example.com",
|
||||||
time.Second,
|
time.Second,
|
||||||
true,
|
true,
|
||||||
@@ -280,7 +281,7 @@ func TestCommands_SetExecutionRequest(t *testing.T) {
|
|||||||
target.NewAddedEvent(context.Background(),
|
target.NewAddedEvent(context.Background(),
|
||||||
target.NewAggregate("target", "instance"),
|
target.NewAggregate("target", "instance"),
|
||||||
"name",
|
"name",
|
||||||
domain.TargetTypeWebhook,
|
target_domain.TargetTypeWebhook,
|
||||||
"https://example.com",
|
"https://example.com",
|
||||||
time.Second,
|
time.Second,
|
||||||
true,
|
true,
|
||||||
@@ -852,7 +853,7 @@ func TestCommands_SetExecutionResponse(t *testing.T) {
|
|||||||
target.NewAddedEvent(context.Background(),
|
target.NewAddedEvent(context.Background(),
|
||||||
target.NewAggregate("target", "instance"),
|
target.NewAggregate("target", "instance"),
|
||||||
"name",
|
"name",
|
||||||
domain.TargetTypeWebhook,
|
target_domain.TargetTypeWebhook,
|
||||||
"https://example.com",
|
"https://example.com",
|
||||||
time.Second,
|
time.Second,
|
||||||
true,
|
true,
|
||||||
@@ -952,7 +953,7 @@ func TestCommands_SetExecutionResponse(t *testing.T) {
|
|||||||
target.NewAddedEvent(context.Background(),
|
target.NewAddedEvent(context.Background(),
|
||||||
target.NewAggregate("target", "instance"),
|
target.NewAggregate("target", "instance"),
|
||||||
"name",
|
"name",
|
||||||
domain.TargetTypeWebhook,
|
target_domain.TargetTypeWebhook,
|
||||||
"https://example.com",
|
"https://example.com",
|
||||||
time.Second,
|
time.Second,
|
||||||
true,
|
true,
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import (
|
|||||||
"github.com/zitadel/zitadel/internal/crypto"
|
"github.com/zitadel/zitadel/internal/crypto"
|
||||||
"github.com/zitadel/zitadel/internal/domain"
|
"github.com/zitadel/zitadel/internal/domain"
|
||||||
"github.com/zitadel/zitadel/internal/eventstore/v1/models"
|
"github.com/zitadel/zitadel/internal/eventstore/v1/models"
|
||||||
|
target_domain "github.com/zitadel/zitadel/internal/execution/target"
|
||||||
"github.com/zitadel/zitadel/internal/repository/target"
|
"github.com/zitadel/zitadel/internal/repository/target"
|
||||||
"github.com/zitadel/zitadel/internal/zerrors"
|
"github.com/zitadel/zitadel/internal/zerrors"
|
||||||
)
|
)
|
||||||
@@ -17,7 +18,7 @@ type AddTarget struct {
|
|||||||
models.ObjectRoot
|
models.ObjectRoot
|
||||||
|
|
||||||
Name string
|
Name string
|
||||||
TargetType domain.TargetType
|
TargetType target_domain.TargetType
|
||||||
Endpoint string
|
Endpoint string
|
||||||
Timeout time.Duration
|
Timeout time.Duration
|
||||||
InterruptOnError bool
|
InterruptOnError bool
|
||||||
@@ -90,7 +91,7 @@ type ChangeTarget struct {
|
|||||||
models.ObjectRoot
|
models.ObjectRoot
|
||||||
|
|
||||||
Name *string
|
Name *string
|
||||||
TargetType *domain.TargetType
|
TargetType *target_domain.TargetType
|
||||||
Endpoint *string
|
Endpoint *string
|
||||||
Timeout *time.Duration
|
Timeout *time.Duration
|
||||||
InterruptOnError *bool
|
InterruptOnError *bool
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import (
|
|||||||
"github.com/zitadel/zitadel/internal/crypto"
|
"github.com/zitadel/zitadel/internal/crypto"
|
||||||
"github.com/zitadel/zitadel/internal/domain"
|
"github.com/zitadel/zitadel/internal/domain"
|
||||||
"github.com/zitadel/zitadel/internal/eventstore"
|
"github.com/zitadel/zitadel/internal/eventstore"
|
||||||
|
target_domain "github.com/zitadel/zitadel/internal/execution/target"
|
||||||
"github.com/zitadel/zitadel/internal/repository/target"
|
"github.com/zitadel/zitadel/internal/repository/target"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -15,7 +16,7 @@ type TargetWriteModel struct {
|
|||||||
eventstore.WriteModel
|
eventstore.WriteModel
|
||||||
|
|
||||||
Name string
|
Name string
|
||||||
TargetType domain.TargetType
|
TargetType target_domain.TargetType
|
||||||
Endpoint string
|
Endpoint string
|
||||||
Timeout time.Duration
|
Timeout time.Duration
|
||||||
InterruptOnError bool
|
InterruptOnError bool
|
||||||
@@ -86,7 +87,7 @@ func (wm *TargetWriteModel) NewChangedEvent(
|
|||||||
ctx context.Context,
|
ctx context.Context,
|
||||||
agg *eventstore.Aggregate,
|
agg *eventstore.Aggregate,
|
||||||
name *string,
|
name *string,
|
||||||
targetType *domain.TargetType,
|
targetType *target_domain.TargetType,
|
||||||
endpoint *string,
|
endpoint *string,
|
||||||
timeout *time.Duration,
|
timeout *time.Duration,
|
||||||
interruptOnError *bool,
|
interruptOnError *bool,
|
||||||
|
|||||||
@@ -8,8 +8,8 @@ import (
|
|||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
|
|
||||||
"github.com/zitadel/zitadel/internal/crypto"
|
"github.com/zitadel/zitadel/internal/crypto"
|
||||||
"github.com/zitadel/zitadel/internal/domain"
|
|
||||||
"github.com/zitadel/zitadel/internal/eventstore"
|
"github.com/zitadel/zitadel/internal/eventstore"
|
||||||
|
target_domain "github.com/zitadel/zitadel/internal/execution/target"
|
||||||
"github.com/zitadel/zitadel/internal/repository/target"
|
"github.com/zitadel/zitadel/internal/repository/target"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -17,7 +17,7 @@ func targetAddEvent(aggID, resourceOwner string) *target.AddedEvent {
|
|||||||
return target.NewAddedEvent(context.Background(),
|
return target.NewAddedEvent(context.Background(),
|
||||||
target.NewAggregate(aggID, resourceOwner),
|
target.NewAggregate(aggID, resourceOwner),
|
||||||
"name",
|
"name",
|
||||||
domain.TargetTypeWebhook,
|
target_domain.TargetTypeWebhook,
|
||||||
"https://example.com",
|
"https://example.com",
|
||||||
time.Second,
|
time.Second,
|
||||||
false,
|
false,
|
||||||
|
|||||||
@@ -9,9 +9,9 @@ import (
|
|||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
|
|
||||||
"github.com/zitadel/zitadel/internal/crypto"
|
"github.com/zitadel/zitadel/internal/crypto"
|
||||||
"github.com/zitadel/zitadel/internal/domain"
|
|
||||||
"github.com/zitadel/zitadel/internal/eventstore"
|
"github.com/zitadel/zitadel/internal/eventstore"
|
||||||
"github.com/zitadel/zitadel/internal/eventstore/v1/models"
|
"github.com/zitadel/zitadel/internal/eventstore/v1/models"
|
||||||
|
target_domain "github.com/zitadel/zitadel/internal/execution/target"
|
||||||
"github.com/zitadel/zitadel/internal/id"
|
"github.com/zitadel/zitadel/internal/id"
|
||||||
"github.com/zitadel/zitadel/internal/id/mock"
|
"github.com/zitadel/zitadel/internal/id/mock"
|
||||||
"github.com/zitadel/zitadel/internal/repository/target"
|
"github.com/zitadel/zitadel/internal/repository/target"
|
||||||
@@ -130,7 +130,7 @@ func TestCommands_AddTarget(t *testing.T) {
|
|||||||
target.NewAddedEvent(context.Background(),
|
target.NewAddedEvent(context.Background(),
|
||||||
target.NewAggregate("id1", "instance"),
|
target.NewAggregate("id1", "instance"),
|
||||||
"name",
|
"name",
|
||||||
domain.TargetTypeWebhook,
|
target_domain.TargetTypeWebhook,
|
||||||
"https://example.com",
|
"https://example.com",
|
||||||
time.Second,
|
time.Second,
|
||||||
false,
|
false,
|
||||||
@@ -153,7 +153,7 @@ func TestCommands_AddTarget(t *testing.T) {
|
|||||||
Name: "name",
|
Name: "name",
|
||||||
Endpoint: "https://example.com",
|
Endpoint: "https://example.com",
|
||||||
Timeout: time.Second,
|
Timeout: time.Second,
|
||||||
TargetType: domain.TargetTypeWebhook,
|
TargetType: target_domain.TargetTypeWebhook,
|
||||||
},
|
},
|
||||||
resourceOwner: "instance",
|
resourceOwner: "instance",
|
||||||
},
|
},
|
||||||
@@ -177,7 +177,7 @@ func TestCommands_AddTarget(t *testing.T) {
|
|||||||
ctx: context.Background(),
|
ctx: context.Background(),
|
||||||
add: &AddTarget{
|
add: &AddTarget{
|
||||||
Name: "name",
|
Name: "name",
|
||||||
TargetType: domain.TargetTypeWebhook,
|
TargetType: target_domain.TargetTypeWebhook,
|
||||||
Timeout: time.Second,
|
Timeout: time.Second,
|
||||||
Endpoint: "https://example.com",
|
Endpoint: "https://example.com",
|
||||||
},
|
},
|
||||||
@@ -204,7 +204,7 @@ func TestCommands_AddTarget(t *testing.T) {
|
|||||||
ctx: context.Background(),
|
ctx: context.Background(),
|
||||||
add: &AddTarget{
|
add: &AddTarget{
|
||||||
Name: "name",
|
Name: "name",
|
||||||
TargetType: domain.TargetTypeWebhook,
|
TargetType: target_domain.TargetTypeWebhook,
|
||||||
Timeout: time.Second,
|
Timeout: time.Second,
|
||||||
Endpoint: "https://example.com",
|
Endpoint: "https://example.com",
|
||||||
},
|
},
|
||||||
@@ -235,7 +235,7 @@ func TestCommands_AddTarget(t *testing.T) {
|
|||||||
ctx: context.Background(),
|
ctx: context.Background(),
|
||||||
add: &AddTarget{
|
add: &AddTarget{
|
||||||
Name: "name",
|
Name: "name",
|
||||||
TargetType: domain.TargetTypeWebhook,
|
TargetType: target_domain.TargetTypeWebhook,
|
||||||
Endpoint: "https://example.com",
|
Endpoint: "https://example.com",
|
||||||
Timeout: time.Second,
|
Timeout: time.Second,
|
||||||
InterruptOnError: true,
|
InterruptOnError: true,
|
||||||
@@ -419,7 +419,7 @@ func TestCommands_ChangeTarget(t *testing.T) {
|
|||||||
ObjectRoot: models.ObjectRoot{
|
ObjectRoot: models.ObjectRoot{
|
||||||
AggregateID: "id1",
|
AggregateID: "id1",
|
||||||
},
|
},
|
||||||
TargetType: gu.Ptr(domain.TargetTypeWebhook),
|
TargetType: gu.Ptr(target_domain.TargetTypeWebhook),
|
||||||
},
|
},
|
||||||
resourceOwner: "instance",
|
resourceOwner: "instance",
|
||||||
},
|
},
|
||||||
@@ -505,7 +505,7 @@ func TestCommands_ChangeTarget(t *testing.T) {
|
|||||||
[]target.Changes{
|
[]target.Changes{
|
||||||
target.ChangeName("name", "name2"),
|
target.ChangeName("name", "name2"),
|
||||||
target.ChangeEndpoint("https://example2.com"),
|
target.ChangeEndpoint("https://example2.com"),
|
||||||
target.ChangeTargetType(domain.TargetTypeCall),
|
target.ChangeTargetType(target_domain.TargetTypeCall),
|
||||||
target.ChangeTimeout(10 * time.Second),
|
target.ChangeTimeout(10 * time.Second),
|
||||||
target.ChangeInterruptOnError(true),
|
target.ChangeInterruptOnError(true),
|
||||||
target.ChangeSigningKey(&crypto.CryptoValue{
|
target.ChangeSigningKey(&crypto.CryptoValue{
|
||||||
@@ -529,7 +529,7 @@ func TestCommands_ChangeTarget(t *testing.T) {
|
|||||||
},
|
},
|
||||||
Name: gu.Ptr("name2"),
|
Name: gu.Ptr("name2"),
|
||||||
Endpoint: gu.Ptr("https://example2.com"),
|
Endpoint: gu.Ptr("https://example2.com"),
|
||||||
TargetType: gu.Ptr(domain.TargetTypeCall),
|
TargetType: gu.Ptr(target_domain.TargetTypeCall),
|
||||||
Timeout: gu.Ptr(10 * time.Second),
|
Timeout: gu.Ptr(10 * time.Second),
|
||||||
InterruptOnError: gu.Ptr(true),
|
InterruptOnError: gu.Ptr(true),
|
||||||
ExpirationSigningKey: true,
|
ExpirationSigningKey: true,
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ import (
|
|||||||
"github.com/zitadel/zitadel/internal/eventstore"
|
"github.com/zitadel/zitadel/internal/eventstore"
|
||||||
"github.com/zitadel/zitadel/internal/eventstore/repository"
|
"github.com/zitadel/zitadel/internal/eventstore/repository"
|
||||||
"github.com/zitadel/zitadel/internal/eventstore/repository/mock"
|
"github.com/zitadel/zitadel/internal/eventstore/repository/mock"
|
||||||
|
"github.com/zitadel/zitadel/internal/execution/target"
|
||||||
"github.com/zitadel/zitadel/internal/feature"
|
"github.com/zitadel/zitadel/internal/feature"
|
||||||
"github.com/zitadel/zitadel/internal/zerrors"
|
"github.com/zitadel/zitadel/internal/zerrors"
|
||||||
)
|
)
|
||||||
@@ -220,6 +221,10 @@ func (m *mockInstance) Features() feature.Features {
|
|||||||
return feature.Features{}
|
return feature.Features{}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (m *mockInstance) ExecutionRouter() target.Router {
|
||||||
|
return target.NewRouter(nil)
|
||||||
|
}
|
||||||
|
|
||||||
func newMockPermissionCheckAllowed() domain.PermissionCheck {
|
func newMockPermissionCheckAllowed() domain.PermissionCheck {
|
||||||
return func(ctx context.Context, permission, orgID, resourceID string) (err error) {
|
return func(ctx context.Context, permission, orgID, resourceID string) (err error) {
|
||||||
return nil
|
return nil
|
||||||
|
|||||||
@@ -1,13 +1,5 @@
|
|||||||
package domain
|
package domain
|
||||||
|
|
||||||
type TargetType uint
|
|
||||||
|
|
||||||
const (
|
|
||||||
TargetTypeWebhook TargetType = iota
|
|
||||||
TargetTypeCall
|
|
||||||
TargetTypeAsync
|
|
||||||
)
|
|
||||||
|
|
||||||
type TargetState int32
|
type TargetState int32
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
|||||||
@@ -11,4 +11,5 @@ type Config struct {
|
|||||||
Pusher Pusher
|
Pusher Pusher
|
||||||
Querier Querier
|
Querier Querier
|
||||||
Searcher Searcher
|
Searcher Searcher
|
||||||
|
Queue ExecutionQueue
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,62 @@
|
|||||||
|
// Code generated by MockGen. DO NOT EDIT.
|
||||||
|
// Source: github.com/zitadel/zitadel/internal/eventstore (interfaces: ExecutionQueue)
|
||||||
|
//
|
||||||
|
// Generated by this command:
|
||||||
|
//
|
||||||
|
// mockgen -package mock -destination ./mock/queue.mock.go github.com/zitadel/zitadel/internal/eventstore ExecutionQueue
|
||||||
|
//
|
||||||
|
|
||||||
|
// Package mock is a generated GoMock package.
|
||||||
|
package mock
|
||||||
|
|
||||||
|
import (
|
||||||
|
context "context"
|
||||||
|
sql "database/sql"
|
||||||
|
reflect "reflect"
|
||||||
|
|
||||||
|
river "github.com/riverqueue/river"
|
||||||
|
queue "github.com/zitadel/zitadel/internal/queue"
|
||||||
|
gomock "go.uber.org/mock/gomock"
|
||||||
|
)
|
||||||
|
|
||||||
|
// MockExecutionQueue is a mock of ExecutionQueue interface.
|
||||||
|
type MockExecutionQueue struct {
|
||||||
|
ctrl *gomock.Controller
|
||||||
|
recorder *MockExecutionQueueMockRecorder
|
||||||
|
}
|
||||||
|
|
||||||
|
// MockExecutionQueueMockRecorder is the mock recorder for MockExecutionQueue.
|
||||||
|
type MockExecutionQueueMockRecorder struct {
|
||||||
|
mock *MockExecutionQueue
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewMockExecutionQueue creates a new mock instance.
|
||||||
|
func NewMockExecutionQueue(ctrl *gomock.Controller) *MockExecutionQueue {
|
||||||
|
mock := &MockExecutionQueue{ctrl: ctrl}
|
||||||
|
mock.recorder = &MockExecutionQueueMockRecorder{mock}
|
||||||
|
return mock
|
||||||
|
}
|
||||||
|
|
||||||
|
// EXPECT returns an object that allows the caller to indicate expected use.
|
||||||
|
func (m *MockExecutionQueue) EXPECT() *MockExecutionQueueMockRecorder {
|
||||||
|
return m.recorder
|
||||||
|
}
|
||||||
|
|
||||||
|
// InsertManyFastTx mocks base method.
|
||||||
|
func (m *MockExecutionQueue) InsertManyFastTx(arg0 context.Context, arg1 *sql.Tx, arg2 []river.JobArgs, arg3 ...queue.InsertOpt) error {
|
||||||
|
m.ctrl.T.Helper()
|
||||||
|
varargs := []any{arg0, arg1, arg2}
|
||||||
|
for _, a := range arg3 {
|
||||||
|
varargs = append(varargs, a)
|
||||||
|
}
|
||||||
|
ret := m.ctrl.Call(m, "InsertManyFastTx", varargs...)
|
||||||
|
ret0, _ := ret[0].(error)
|
||||||
|
return ret0
|
||||||
|
}
|
||||||
|
|
||||||
|
// InsertManyFastTx indicates an expected call of InsertManyFastTx.
|
||||||
|
func (mr *MockExecutionQueueMockRecorder) InsertManyFastTx(arg0, arg1, arg2 any, arg3 ...any) *gomock.Call {
|
||||||
|
mr.mock.ctrl.T.Helper()
|
||||||
|
varargs := append([]any{arg0, arg1, arg2}, arg3...)
|
||||||
|
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "InsertManyFastTx", reflect.TypeOf((*MockExecutionQueue)(nil).InsertManyFastTx), varargs...)
|
||||||
|
}
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
package eventstore
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"database/sql"
|
||||||
|
|
||||||
|
"github.com/riverqueue/river"
|
||||||
|
|
||||||
|
"github.com/zitadel/zitadel/internal/queue"
|
||||||
|
)
|
||||||
|
|
||||||
|
//go:generate mockgen -package mock -destination ./mock/queue.mock.go github.com/zitadel/zitadel/internal/eventstore ExecutionQueue
|
||||||
|
|
||||||
|
type ExecutionQueue interface {
|
||||||
|
// InsertManyFastTx wraps [river.Client.InsertManyFastTx] to insert all jobs in
|
||||||
|
// a single `COPY FROM` execution, within an existing transaction.
|
||||||
|
//
|
||||||
|
// Opts are applied to each job before sending them to river.
|
||||||
|
InsertManyFastTx(ctx context.Context, tx *sql.Tx, args []river.JobArgs, opts ...queue.InsertOpt) error
|
||||||
|
}
|
||||||
@@ -33,6 +33,7 @@ var (
|
|||||||
|
|
||||||
type Eventstore struct {
|
type Eventstore struct {
|
||||||
client *database.DB
|
client *database.DB
|
||||||
|
queue eventstore.ExecutionQueue
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@@ -157,8 +158,14 @@ func (es *Eventstore) Client() *database.DB {
|
|||||||
return es.client
|
return es.client
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewEventstore(client *database.DB) *Eventstore {
|
func NewEventstore(client *database.DB, opts ...EventstoreOption) *Eventstore {
|
||||||
return &Eventstore{client: client}
|
es := &Eventstore{
|
||||||
|
client: client,
|
||||||
|
}
|
||||||
|
for _, opt := range opts {
|
||||||
|
opt(es)
|
||||||
|
}
|
||||||
|
return es
|
||||||
}
|
}
|
||||||
|
|
||||||
func (es *Eventstore) Health(ctx context.Context) error {
|
func (es *Eventstore) Health(ctx context.Context) error {
|
||||||
@@ -200,3 +207,11 @@ func (es *Eventstore) pushTx(ctx context.Context, client database.ContextQueryEx
|
|||||||
}
|
}
|
||||||
return tx, func(err error) error { return database.CloseTransaction(tx, err) }, nil
|
return tx, func(err error) error { return database.CloseTransaction(tx, err) }, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type EventstoreOption func(*Eventstore)
|
||||||
|
|
||||||
|
func WithExecutionQueueOption(queue eventstore.ExecutionQueue) EventstoreOption {
|
||||||
|
return func(es *Eventstore) {
|
||||||
|
es.queue = queue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -47,6 +47,10 @@ func (e *mockCommand) Fields() []*eventstore.FieldOperation {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func mockEvent(aggregate *eventstore.Aggregate, sequence uint64, payload Payload) eventstore.Event {
|
func mockEvent(aggregate *eventstore.Aggregate, sequence uint64, payload Payload) eventstore.Event {
|
||||||
|
return mockEventType(aggregate, sequence, payload, "event.type")
|
||||||
|
}
|
||||||
|
|
||||||
|
func mockEventType(aggregate *eventstore.Aggregate, sequence uint64, payload Payload, typ string) eventstore.Event {
|
||||||
return &event{
|
return &event{
|
||||||
command: &command{
|
command: &command{
|
||||||
InstanceID: aggregate.InstanceID,
|
InstanceID: aggregate.InstanceID,
|
||||||
@@ -55,7 +59,7 @@ func mockEvent(aggregate *eventstore.Aggregate, sequence uint64, payload Payload
|
|||||||
Owner: aggregate.ResourceOwner,
|
Owner: aggregate.ResourceOwner,
|
||||||
Creator: "creator",
|
Creator: "creator",
|
||||||
Revision: 1,
|
Revision: 1,
|
||||||
CommandType: "event.type",
|
CommandType: typ,
|
||||||
Payload: payload,
|
Payload: payload,
|
||||||
},
|
},
|
||||||
sequence: sequence,
|
sequence: sequence,
|
||||||
|
|||||||
@@ -6,11 +6,14 @@ import (
|
|||||||
_ "embed"
|
_ "embed"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
|
"github.com/riverqueue/river"
|
||||||
"github.com/zitadel/logging"
|
"github.com/zitadel/logging"
|
||||||
|
|
||||||
"github.com/zitadel/zitadel/internal/api/authz"
|
"github.com/zitadel/zitadel/internal/api/authz"
|
||||||
"github.com/zitadel/zitadel/internal/database"
|
"github.com/zitadel/zitadel/internal/database"
|
||||||
"github.com/zitadel/zitadel/internal/eventstore"
|
"github.com/zitadel/zitadel/internal/eventstore"
|
||||||
|
"github.com/zitadel/zitadel/internal/queue"
|
||||||
|
exec_repo "github.com/zitadel/zitadel/internal/repository/execution"
|
||||||
"github.com/zitadel/zitadel/internal/telemetry/tracing"
|
"github.com/zitadel/zitadel/internal/telemetry/tracing"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -76,6 +79,11 @@ func (es *Eventstore) writeCommands(ctx context.Context, client database.Context
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
err = es.queueExecutions(ctx, tx, events)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
return events, nil
|
return events, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -106,3 +114,54 @@ func writeEvents(ctx context.Context, tx database.Tx, commands []eventstore.Comm
|
|||||||
}
|
}
|
||||||
return events, nil
|
return events, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (es *Eventstore) queueExecutions(ctx context.Context, tx database.Tx, events []eventstore.Event) error {
|
||||||
|
if es.queue == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
sqlTx, ok := tx.(*sql.Tx)
|
||||||
|
if !ok {
|
||||||
|
types := make([]string, len(events))
|
||||||
|
for i, event := range events {
|
||||||
|
types[i] = string(event.Type())
|
||||||
|
}
|
||||||
|
logging.WithFields("event_types", types).Warningf("event executions skipped: wrong type of transaction %T", tx)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
jobArgs, err := eventsToJobArgs(ctx, events)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if len(jobArgs) == 0 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return es.queue.InsertManyFastTx(
|
||||||
|
ctx, sqlTx, jobArgs,
|
||||||
|
queue.WithQueueName(exec_repo.QueueName),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
func eventsToJobArgs(ctx context.Context, events []eventstore.Event) ([]river.JobArgs, error) {
|
||||||
|
if len(events) == 0 {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
router := authz.GetInstance(ctx).ExecutionRouter()
|
||||||
|
if router.IsZero() {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
jobArgs := make([]river.JobArgs, 0, len(events))
|
||||||
|
for _, event := range events {
|
||||||
|
targets, ok := router.GetEventBestMatch(fmt.Sprintf("event/%s", event.Type()))
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
req, err := exec_repo.NewRequest(event, targets)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
jobArgs = append(jobArgs, req)
|
||||||
|
}
|
||||||
|
return jobArgs, nil
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,15 +1,23 @@
|
|||||||
package eventstore
|
package eventstore
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
|
"database/sql"
|
||||||
_ "embed"
|
_ "embed"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"github.com/riverqueue/river"
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
|
"go.uber.org/mock/gomock"
|
||||||
|
|
||||||
|
"github.com/zitadel/zitadel/internal/api/authz"
|
||||||
"github.com/zitadel/zitadel/internal/database"
|
"github.com/zitadel/zitadel/internal/database"
|
||||||
"github.com/zitadel/zitadel/internal/database/postgres"
|
"github.com/zitadel/zitadel/internal/database/postgres"
|
||||||
"github.com/zitadel/zitadel/internal/eventstore"
|
"github.com/zitadel/zitadel/internal/eventstore"
|
||||||
|
"github.com/zitadel/zitadel/internal/eventstore/mock"
|
||||||
|
"github.com/zitadel/zitadel/internal/execution/target"
|
||||||
|
exec_repo "github.com/zitadel/zitadel/internal/repository/execution"
|
||||||
)
|
)
|
||||||
|
|
||||||
func Test_mapCommands(t *testing.T) {
|
func Test_mapCommands(t *testing.T) {
|
||||||
@@ -251,3 +259,159 @@ func Test_mapCommands(t *testing.T) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestEventstore_queueExecutions(t *testing.T) {
|
||||||
|
events := []eventstore.Event{
|
||||||
|
mockEventType(mockAggregate("TEST"), 1, nil, "ex.foo.bar"),
|
||||||
|
mockEventType(mockAggregate("TEST"), 2, nil, "ex.bar.foo"),
|
||||||
|
mockEventType(mockAggregate("TEST"), 3, nil, "ex.removed"),
|
||||||
|
}
|
||||||
|
type args struct {
|
||||||
|
ctx context.Context
|
||||||
|
tx database.Tx
|
||||||
|
events []eventstore.Event
|
||||||
|
}
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
queue func(t *testing.T) eventstore.ExecutionQueue
|
||||||
|
args args
|
||||||
|
wantErr bool
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "incorrect Tx type, noop",
|
||||||
|
queue: func(t *testing.T) eventstore.ExecutionQueue {
|
||||||
|
mQueue := mock.NewMockExecutionQueue(gomock.NewController(t))
|
||||||
|
return mQueue
|
||||||
|
},
|
||||||
|
args: args{
|
||||||
|
ctx: context.Background(),
|
||||||
|
tx: nil,
|
||||||
|
events: events,
|
||||||
|
},
|
||||||
|
wantErr: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "no events",
|
||||||
|
queue: func(t *testing.T) eventstore.ExecutionQueue {
|
||||||
|
mQueue := mock.NewMockExecutionQueue(gomock.NewController(t))
|
||||||
|
return mQueue
|
||||||
|
},
|
||||||
|
args: args{
|
||||||
|
ctx: context.Background(),
|
||||||
|
tx: &sql.Tx{},
|
||||||
|
events: []eventstore.Event{},
|
||||||
|
},
|
||||||
|
wantErr: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "no router in Ctx",
|
||||||
|
queue: func(t *testing.T) eventstore.ExecutionQueue {
|
||||||
|
mQueue := mock.NewMockExecutionQueue(gomock.NewController(t))
|
||||||
|
return mQueue
|
||||||
|
},
|
||||||
|
args: args{
|
||||||
|
ctx: context.Background(),
|
||||||
|
tx: &sql.Tx{},
|
||||||
|
events: events,
|
||||||
|
},
|
||||||
|
wantErr: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "not found in router",
|
||||||
|
queue: func(t *testing.T) eventstore.ExecutionQueue {
|
||||||
|
mQueue := mock.NewMockExecutionQueue(gomock.NewController(t))
|
||||||
|
return mQueue
|
||||||
|
},
|
||||||
|
args: args{
|
||||||
|
ctx: authz.WithExecutionRouter(
|
||||||
|
context.Background(),
|
||||||
|
target.NewRouter([]target.Target{
|
||||||
|
{
|
||||||
|
ExecutionID: "function/fooBar",
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
),
|
||||||
|
tx: &sql.Tx{},
|
||||||
|
events: events,
|
||||||
|
},
|
||||||
|
wantErr: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "event prefix",
|
||||||
|
queue: func(t *testing.T) eventstore.ExecutionQueue {
|
||||||
|
mQueue := mock.NewMockExecutionQueue(gomock.NewController(t))
|
||||||
|
mQueue.EXPECT().InsertManyFastTx(
|
||||||
|
gomock.Any(),
|
||||||
|
gomock.Any(),
|
||||||
|
[]river.JobArgs{
|
||||||
|
mustNewRequest(t, events[0], []target.Target{{ExecutionID: "event"}}),
|
||||||
|
mustNewRequest(t, events[1], []target.Target{{ExecutionID: "event"}}),
|
||||||
|
mustNewRequest(t, events[2], []target.Target{{ExecutionID: "event"}}),
|
||||||
|
},
|
||||||
|
gomock.Any(),
|
||||||
|
)
|
||||||
|
return mQueue
|
||||||
|
},
|
||||||
|
args: args{
|
||||||
|
ctx: authz.WithExecutionRouter(
|
||||||
|
context.Background(),
|
||||||
|
target.NewRouter([]target.Target{
|
||||||
|
{ExecutionID: "function/fooBar"},
|
||||||
|
{ExecutionID: "event"},
|
||||||
|
}),
|
||||||
|
),
|
||||||
|
tx: &sql.Tx{},
|
||||||
|
events: events,
|
||||||
|
},
|
||||||
|
wantErr: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "event wildcard and exact match",
|
||||||
|
queue: func(t *testing.T) eventstore.ExecutionQueue {
|
||||||
|
mQueue := mock.NewMockExecutionQueue(gomock.NewController(t))
|
||||||
|
mQueue.EXPECT().InsertManyFastTx(
|
||||||
|
gomock.Any(),
|
||||||
|
gomock.Any(),
|
||||||
|
[]river.JobArgs{
|
||||||
|
mustNewRequest(t, events[0], []target.Target{{ExecutionID: "event/ex.foo.*"}}),
|
||||||
|
mustNewRequest(t, events[2], []target.Target{{ExecutionID: "event/ex.removed"}}),
|
||||||
|
},
|
||||||
|
gomock.Any(),
|
||||||
|
)
|
||||||
|
return mQueue
|
||||||
|
},
|
||||||
|
args: args{
|
||||||
|
ctx: authz.WithExecutionRouter(
|
||||||
|
context.Background(),
|
||||||
|
target.NewRouter([]target.Target{
|
||||||
|
{ExecutionID: "function/fooBar"},
|
||||||
|
{ExecutionID: "event/ex.foo.*"},
|
||||||
|
{ExecutionID: "event/ex.removed"},
|
||||||
|
}),
|
||||||
|
),
|
||||||
|
tx: &sql.Tx{},
|
||||||
|
events: events,
|
||||||
|
},
|
||||||
|
wantErr: false,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
es := &Eventstore{
|
||||||
|
queue: tt.queue(t),
|
||||||
|
}
|
||||||
|
err := es.queueExecutions(tt.args.ctx, tt.args.tx, tt.args.events)
|
||||||
|
if tt.wantErr {
|
||||||
|
assert.Error(t, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
assert.NoError(t, err)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func mustNewRequest(t *testing.T, e eventstore.Event, targets []target.Target) *exec_repo.Request {
|
||||||
|
req, err := exec_repo.NewRequest(e, targets)
|
||||||
|
require.NoError(t, err, "exec_repo.NewRequest")
|
||||||
|
return req
|
||||||
|
}
|
||||||
|
|||||||
@@ -6,14 +6,15 @@ import (
|
|||||||
"encoding/json"
|
"encoding/json"
|
||||||
"io"
|
"io"
|
||||||
"net/http"
|
"net/http"
|
||||||
"strings"
|
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/zitadel/logging"
|
"github.com/zitadel/logging"
|
||||||
|
|
||||||
|
"github.com/zitadel/zitadel/internal/api/authz"
|
||||||
zhttp "github.com/zitadel/zitadel/internal/api/http"
|
zhttp "github.com/zitadel/zitadel/internal/api/http"
|
||||||
|
"github.com/zitadel/zitadel/internal/crypto"
|
||||||
"github.com/zitadel/zitadel/internal/domain"
|
"github.com/zitadel/zitadel/internal/domain"
|
||||||
"github.com/zitadel/zitadel/internal/query"
|
target_domain "github.com/zitadel/zitadel/internal/execution/target"
|
||||||
"github.com/zitadel/zitadel/internal/repository/execution"
|
"github.com/zitadel/zitadel/internal/repository/execution"
|
||||||
"github.com/zitadel/zitadel/internal/telemetry/tracing"
|
"github.com/zitadel/zitadel/internal/telemetry/tracing"
|
||||||
"github.com/zitadel/zitadel/internal/zerrors"
|
"github.com/zitadel/zitadel/internal/zerrors"
|
||||||
@@ -26,27 +27,19 @@ type ContextInfo interface {
|
|||||||
SetHTTPResponseBody([]byte) error
|
SetHTTPResponseBody([]byte) error
|
||||||
}
|
}
|
||||||
|
|
||||||
type Target interface {
|
|
||||||
GetTargetID() string
|
|
||||||
IsInterruptOnError() bool
|
|
||||||
GetEndpoint() string
|
|
||||||
GetTargetType() domain.TargetType
|
|
||||||
GetTimeout() time.Duration
|
|
||||||
GetSigningKey() string
|
|
||||||
}
|
|
||||||
|
|
||||||
// CallTargets call a list of targets in order with handling of error and responses
|
// CallTargets call a list of targets in order with handling of error and responses
|
||||||
func CallTargets(
|
func CallTargets(
|
||||||
ctx context.Context,
|
ctx context.Context,
|
||||||
targets []Target,
|
targets []target_domain.Target,
|
||||||
info ContextInfo,
|
info ContextInfo,
|
||||||
|
alg crypto.EncryptionAlgorithm,
|
||||||
) (_ interface{}, err error) {
|
) (_ interface{}, err error) {
|
||||||
ctx, span := tracing.NewSpan(ctx)
|
ctx, span := tracing.NewSpan(ctx)
|
||||||
defer func() { span.EndWithError(err) }()
|
defer func() { span.EndWithError(err) }()
|
||||||
|
|
||||||
for _, target := range targets {
|
for _, target := range targets {
|
||||||
// call the type of target
|
// call the type of target
|
||||||
resp, err := CallTarget(ctx, target, info)
|
resp, err := CallTarget(ctx, target, info, alg)
|
||||||
// handle error if interrupt is set
|
// handle error if interrupt is set
|
||||||
if err != nil && target.IsInterruptOnError() {
|
if err != nil && target.IsInterruptOnError() {
|
||||||
return nil, err
|
return nil, err
|
||||||
@@ -68,22 +61,28 @@ type ContextInfoRequest interface {
|
|||||||
// CallTarget call the desired type of target with handling of responses
|
// CallTarget call the desired type of target with handling of responses
|
||||||
func CallTarget(
|
func CallTarget(
|
||||||
ctx context.Context,
|
ctx context.Context,
|
||||||
target Target,
|
target target_domain.Target,
|
||||||
info ContextInfoRequest,
|
info ContextInfoRequest,
|
||||||
|
alg crypto.EncryptionAlgorithm,
|
||||||
) (res []byte, err error) {
|
) (res []byte, err error) {
|
||||||
ctx, span := tracing.NewSpan(ctx)
|
ctx, span := tracing.NewSpan(ctx)
|
||||||
defer func() { span.EndWithError(err) }()
|
defer func() { span.EndWithError(err) }()
|
||||||
|
|
||||||
|
signingKey, err := target.GetSigningKey(alg)
|
||||||
|
if err != nil {
|
||||||
|
return nil, zerrors.ThrowInternal(err, "EXEC-thiiCh5b", "Errors.Internal")
|
||||||
|
}
|
||||||
|
|
||||||
switch target.GetTargetType() {
|
switch target.GetTargetType() {
|
||||||
// get request, ignore response and return request and error for handling in list of targets
|
// get request, ignore response and return request and error for handling in list of targets
|
||||||
case domain.TargetTypeWebhook:
|
case target_domain.TargetTypeWebhook:
|
||||||
return nil, webhook(ctx, target.GetEndpoint(), target.GetTimeout(), info.GetHTTPRequestBody(), target.GetSigningKey())
|
return nil, webhook(ctx, target.GetEndpoint(), target.GetTimeout(), info.GetHTTPRequestBody(), signingKey)
|
||||||
// get request, return response and error
|
// get request, return response and error
|
||||||
case domain.TargetTypeCall:
|
case target_domain.TargetTypeCall:
|
||||||
return Call(ctx, target.GetEndpoint(), target.GetTimeout(), info.GetHTTPRequestBody(), target.GetSigningKey())
|
return Call(ctx, target.GetEndpoint(), target.GetTimeout(), info.GetHTTPRequestBody(), signingKey)
|
||||||
case domain.TargetTypeAsync:
|
case target_domain.TargetTypeAsync:
|
||||||
go func(ctx context.Context, target Target, info []byte) {
|
go func(ctx context.Context, target target_domain.Target, info []byte) {
|
||||||
if _, err := Call(ctx, target.GetEndpoint(), target.GetTimeout(), info, target.GetSigningKey()); err != nil {
|
if _, err := Call(ctx, target.GetEndpoint(), target.GetTimeout(), info, signingKey); err != nil {
|
||||||
logging.WithFields("target", target.GetTargetID()).OnError(err).Info(err)
|
logging.WithFields("target", target.GetTargetID()).OnError(err).Info(err)
|
||||||
}
|
}
|
||||||
}(context.WithoutCancel(ctx), target, info.GetHTTPRequestBody())
|
}(context.WithoutCancel(ctx), target, info.GetHTTPRequestBody())
|
||||||
@@ -157,58 +156,29 @@ type ErrorBody struct {
|
|||||||
ForwardedErrorMessage string `json:"forwardedErrorMessage,omitempty"`
|
ForwardedErrorMessage string `json:"forwardedErrorMessage,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type ExecutionTargetsQueries interface {
|
func QueryExecutionTargetsForRequest(
|
||||||
TargetsByExecutionID(ctx context.Context, ids []string) (execution []*query.ExecutionTarget, err error)
|
|
||||||
TargetsByExecutionIDs(ctx context.Context, ids1, ids2 []string) (execution []*query.ExecutionTarget, err error)
|
|
||||||
}
|
|
||||||
|
|
||||||
func QueryExecutionTargetsForRequestAndResponse(
|
|
||||||
ctx context.Context,
|
ctx context.Context,
|
||||||
queries ExecutionTargetsQueries,
|
|
||||||
fullMethod string,
|
fullMethod string,
|
||||||
) ([]Target, []Target) {
|
) []target_domain.Target {
|
||||||
ctx, span := tracing.NewSpan(ctx)
|
ctx, span := tracing.NewSpan(ctx)
|
||||||
defer span.End()
|
defer span.End()
|
||||||
|
|
||||||
targets, err := queries.TargetsByExecutionIDs(ctx,
|
requestTargets, _ := authz.GetInstance(ctx).ExecutionRouter().GetEventBestMatch(execution.ID(domain.ExecutionTypeRequest, fullMethod))
|
||||||
idsForFullMethod(fullMethod, domain.ExecutionTypeRequest),
|
return requestTargets
|
||||||
idsForFullMethod(fullMethod, domain.ExecutionTypeResponse),
|
|
||||||
)
|
|
||||||
requestTargets := make([]Target, 0, len(targets))
|
|
||||||
responseTargets := make([]Target, 0, len(targets))
|
|
||||||
if err != nil {
|
|
||||||
logging.WithFields("fullMethod", fullMethod).WithError(err).Info("unable to query targets")
|
|
||||||
return requestTargets, responseTargets
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, target := range targets {
|
|
||||||
if strings.HasPrefix(target.GetExecutionID(), execution.IDAll(domain.ExecutionTypeRequest)) {
|
|
||||||
requestTargets = append(requestTargets, target)
|
|
||||||
} else if strings.HasPrefix(target.GetExecutionID(), execution.IDAll(domain.ExecutionTypeResponse)) {
|
|
||||||
responseTargets = append(responseTargets, target)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return requestTargets, responseTargets
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func idsForFullMethod(fullMethod string, executionType domain.ExecutionType) []string {
|
func QueryExecutionTargetsForResponse(
|
||||||
return []string{execution.ID(executionType, fullMethod), execution.ID(executionType, serviceFromFullMethod(fullMethod)), execution.IDAll(executionType)}
|
ctx context.Context,
|
||||||
|
fullMethod string,
|
||||||
|
) []target_domain.Target {
|
||||||
|
ctx, span := tracing.NewSpan(ctx)
|
||||||
|
defer span.End()
|
||||||
|
|
||||||
|
responseTargets, _ := authz.GetInstance(ctx).ExecutionRouter().GetEventBestMatch(execution.ID(domain.ExecutionTypeResponse, fullMethod))
|
||||||
|
return responseTargets
|
||||||
}
|
}
|
||||||
|
|
||||||
func serviceFromFullMethod(s string) string {
|
func QueryExecutionTargetsForFunction(ctx context.Context, function string) []target_domain.Target {
|
||||||
parts := strings.Split(s, "/")
|
executionTargets, _ := authz.GetInstance(ctx).ExecutionRouter().GetEventBestMatch(function)
|
||||||
return parts[1]
|
return executionTargets
|
||||||
}
|
|
||||||
|
|
||||||
func QueryExecutionTargetsForFunction(ctx context.Context, query ExecutionTargetsQueries, function string) ([]Target, error) {
|
|
||||||
queriedActionsV2, err := query.TargetsByExecutionID(ctx, []string{function})
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
executionTargets := make([]Target, len(queriedActionsV2))
|
|
||||||
for i, action := range queriedActionsV2 {
|
|
||||||
executionTargets[i] = action
|
|
||||||
}
|
|
||||||
return executionTargets, nil
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,11 +13,13 @@ import (
|
|||||||
|
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
|
"go.uber.org/mock/gomock"
|
||||||
"google.golang.org/protobuf/types/known/structpb"
|
"google.golang.org/protobuf/types/known/structpb"
|
||||||
|
|
||||||
"github.com/zitadel/zitadel/internal/api/grpc/server/middleware"
|
"github.com/zitadel/zitadel/internal/api/grpc/server/middleware"
|
||||||
"github.com/zitadel/zitadel/internal/domain"
|
"github.com/zitadel/zitadel/internal/crypto"
|
||||||
"github.com/zitadel/zitadel/internal/execution"
|
"github.com/zitadel/zitadel/internal/execution"
|
||||||
|
target_domain "github.com/zitadel/zitadel/internal/execution/target"
|
||||||
"github.com/zitadel/zitadel/internal/zerrors"
|
"github.com/zitadel/zitadel/internal/zerrors"
|
||||||
"github.com/zitadel/zitadel/pkg/actions"
|
"github.com/zitadel/zitadel/pkg/actions"
|
||||||
)
|
)
|
||||||
@@ -132,7 +134,7 @@ func Test_CallTarget(t *testing.T) {
|
|||||||
ctx context.Context
|
ctx context.Context
|
||||||
info *middleware.ContextInfoRequest
|
info *middleware.ContextInfoRequest
|
||||||
server *callTestServer
|
server *callTestServer
|
||||||
target *mockTarget
|
target target_domain.Target
|
||||||
}
|
}
|
||||||
type res struct {
|
type res struct {
|
||||||
body []byte
|
body []byte
|
||||||
@@ -155,7 +157,7 @@ func Test_CallTarget(t *testing.T) {
|
|||||||
timeout: time.Second,
|
timeout: time.Second,
|
||||||
statusCode: http.StatusInternalServerError,
|
statusCode: http.StatusInternalServerError,
|
||||||
},
|
},
|
||||||
target: &mockTarget{
|
target: target_domain.Target{
|
||||||
TargetType: 4,
|
TargetType: 4,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -175,8 +177,8 @@ func Test_CallTarget(t *testing.T) {
|
|||||||
respondBody: []byte("{\"content\":\"request2\"}"),
|
respondBody: []byte("{\"content\":\"request2\"}"),
|
||||||
statusCode: http.StatusInternalServerError,
|
statusCode: http.StatusInternalServerError,
|
||||||
},
|
},
|
||||||
target: &mockTarget{
|
target: target_domain.Target{
|
||||||
TargetType: domain.TargetTypeWebhook,
|
TargetType: target_domain.TargetTypeWebhook,
|
||||||
Timeout: time.Minute,
|
Timeout: time.Minute,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -196,8 +198,8 @@ func Test_CallTarget(t *testing.T) {
|
|||||||
respondBody: []byte("{\"content\":\"request2\"}"),
|
respondBody: []byte("{\"content\":\"request2\"}"),
|
||||||
statusCode: http.StatusOK,
|
statusCode: http.StatusOK,
|
||||||
},
|
},
|
||||||
target: &mockTarget{
|
target: target_domain.Target{
|
||||||
TargetType: domain.TargetTypeWebhook,
|
TargetType: target_domain.TargetTypeWebhook,
|
||||||
Timeout: time.Minute,
|
Timeout: time.Minute,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -218,10 +220,14 @@ func Test_CallTarget(t *testing.T) {
|
|||||||
statusCode: http.StatusOK,
|
statusCode: http.StatusOK,
|
||||||
signingKey: "signingkey",
|
signingKey: "signingkey",
|
||||||
},
|
},
|
||||||
target: &mockTarget{
|
target: target_domain.Target{
|
||||||
TargetType: domain.TargetTypeWebhook,
|
TargetType: target_domain.TargetTypeWebhook,
|
||||||
Timeout: time.Minute,
|
Timeout: time.Minute,
|
||||||
SigningKey: "signingkey",
|
SigningKey: &crypto.CryptoValue{
|
||||||
|
Algorithm: "enc",
|
||||||
|
KeyID: "id",
|
||||||
|
Crypted: []byte("signingkey"),
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
res{
|
res{
|
||||||
@@ -240,8 +246,8 @@ func Test_CallTarget(t *testing.T) {
|
|||||||
respondBody: []byte("{\"content\":\"request2\"}"),
|
respondBody: []byte("{\"content\":\"request2\"}"),
|
||||||
statusCode: http.StatusInternalServerError,
|
statusCode: http.StatusInternalServerError,
|
||||||
},
|
},
|
||||||
target: &mockTarget{
|
target: target_domain.Target{
|
||||||
TargetType: domain.TargetTypeCall,
|
TargetType: target_domain.TargetTypeCall,
|
||||||
Timeout: time.Minute,
|
Timeout: time.Minute,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -261,8 +267,8 @@ func Test_CallTarget(t *testing.T) {
|
|||||||
respondBody: []byte("{\"content\":\"request2\"}"),
|
respondBody: []byte("{\"content\":\"request2\"}"),
|
||||||
statusCode: http.StatusOK,
|
statusCode: http.StatusOK,
|
||||||
},
|
},
|
||||||
target: &mockTarget{
|
target: target_domain.Target{
|
||||||
TargetType: domain.TargetTypeCall,
|
TargetType: target_domain.TargetTypeCall,
|
||||||
Timeout: time.Minute,
|
Timeout: time.Minute,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -283,10 +289,14 @@ func Test_CallTarget(t *testing.T) {
|
|||||||
statusCode: http.StatusOK,
|
statusCode: http.StatusOK,
|
||||||
signingKey: "signingkey",
|
signingKey: "signingkey",
|
||||||
},
|
},
|
||||||
target: &mockTarget{
|
target: target_domain.Target{
|
||||||
TargetType: domain.TargetTypeCall,
|
TargetType: target_domain.TargetTypeCall,
|
||||||
Timeout: time.Minute,
|
Timeout: time.Minute,
|
||||||
SigningKey: "signingkey",
|
SigningKey: &crypto.CryptoValue{
|
||||||
|
Algorithm: "enc",
|
||||||
|
KeyID: "id",
|
||||||
|
Crypted: []byte("signingkey"),
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
res{
|
res{
|
||||||
@@ -296,7 +306,7 @@ func Test_CallTarget(t *testing.T) {
|
|||||||
}
|
}
|
||||||
for _, tt := range tests {
|
for _, tt := range tests {
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
respBody, err := testServer(t, tt.args.server, testCallTarget(tt.args.ctx, tt.args.info, tt.args.target))
|
respBody, err := testServer(t, tt.args.server, testCallTarget(tt.args.ctx, tt.args.info, tt.args.target, crypto.CreateMockEncryptionAlg(gomock.NewController(t))))
|
||||||
if tt.res.wantErr {
|
if tt.res.wantErr {
|
||||||
assert.Error(t, err)
|
assert.Error(t, err)
|
||||||
} else {
|
} else {
|
||||||
@@ -312,7 +322,7 @@ func Test_CallTargets(t *testing.T) {
|
|||||||
ctx context.Context
|
ctx context.Context
|
||||||
info *middleware.ContextInfoRequest
|
info *middleware.ContextInfoRequest
|
||||||
servers []*callTestServer
|
servers []*callTestServer
|
||||||
targets []*mockTarget
|
targets []target_domain.Target
|
||||||
}
|
}
|
||||||
type res struct {
|
type res struct {
|
||||||
ret interface{}
|
ret interface{}
|
||||||
@@ -341,7 +351,7 @@ func Test_CallTargets(t *testing.T) {
|
|||||||
respondBody: requestContextInfoBody2,
|
respondBody: requestContextInfoBody2,
|
||||||
statusCode: http.StatusInternalServerError,
|
statusCode: http.StatusInternalServerError,
|
||||||
}},
|
}},
|
||||||
targets: []*mockTarget{
|
targets: []target_domain.Target{
|
||||||
{InterruptOnError: false},
|
{InterruptOnError: false},
|
||||||
{InterruptOnError: true},
|
{InterruptOnError: true},
|
||||||
},
|
},
|
||||||
@@ -368,7 +378,7 @@ func Test_CallTargets(t *testing.T) {
|
|||||||
respondBody: requestContextInfoBody2,
|
respondBody: requestContextInfoBody2,
|
||||||
statusCode: http.StatusInternalServerError,
|
statusCode: http.StatusInternalServerError,
|
||||||
}},
|
}},
|
||||||
targets: []*mockTarget{
|
targets: []target_domain.Target{
|
||||||
{InterruptOnError: false},
|
{InterruptOnError: false},
|
||||||
{InterruptOnError: false},
|
{InterruptOnError: false},
|
||||||
},
|
},
|
||||||
@@ -395,7 +405,7 @@ func Test_CallTargets(t *testing.T) {
|
|||||||
respondBody: []byte("just a string, not json"),
|
respondBody: []byte("just a string, not json"),
|
||||||
statusCode: http.StatusOK,
|
statusCode: http.StatusOK,
|
||||||
}},
|
}},
|
||||||
targets: []*mockTarget{
|
targets: []target_domain.Target{
|
||||||
{InterruptOnError: false},
|
{InterruptOnError: false},
|
||||||
{InterruptOnError: true},
|
{InterruptOnError: true},
|
||||||
},
|
},
|
||||||
@@ -422,7 +432,7 @@ func Test_CallTargets(t *testing.T) {
|
|||||||
respondBody: []byte("just a string, not json"),
|
respondBody: []byte("just a string, not json"),
|
||||||
statusCode: http.StatusOK,
|
statusCode: http.StatusOK,
|
||||||
}},
|
}},
|
||||||
targets: []*mockTarget{
|
targets: []target_domain.Target{
|
||||||
{InterruptOnError: false},
|
{InterruptOnError: false},
|
||||||
{InterruptOnError: false},
|
{InterruptOnError: false},
|
||||||
}},
|
}},
|
||||||
@@ -435,7 +445,7 @@ func Test_CallTargets(t *testing.T) {
|
|||||||
t.Run(tt.name, func(t *testing.T) {
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
respBody, err := testServers(t,
|
respBody, err := testServers(t,
|
||||||
tt.args.servers,
|
tt.args.servers,
|
||||||
testCallTargets(tt.args.ctx, tt.args.info, tt.args.targets),
|
testCallTargets(tt.args.ctx, tt.args.info, tt.args.targets, crypto.CreateMockEncryptionAlg(gomock.NewController(t))),
|
||||||
)
|
)
|
||||||
if tt.res.wantErr {
|
if tt.res.wantErr {
|
||||||
assert.Error(t, err)
|
assert.Error(t, err)
|
||||||
@@ -447,38 +457,6 @@ func Test_CallTargets(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var _ execution.Target = &mockTarget{}
|
|
||||||
|
|
||||||
type mockTarget struct {
|
|
||||||
InstanceID string
|
|
||||||
ExecutionID string
|
|
||||||
TargetID string
|
|
||||||
TargetType domain.TargetType
|
|
||||||
Endpoint string
|
|
||||||
Timeout time.Duration
|
|
||||||
InterruptOnError bool
|
|
||||||
SigningKey string
|
|
||||||
}
|
|
||||||
|
|
||||||
func (e *mockTarget) GetTargetID() string {
|
|
||||||
return e.TargetID
|
|
||||||
}
|
|
||||||
func (e *mockTarget) IsInterruptOnError() bool {
|
|
||||||
return e.InterruptOnError
|
|
||||||
}
|
|
||||||
func (e *mockTarget) GetEndpoint() string {
|
|
||||||
return e.Endpoint
|
|
||||||
}
|
|
||||||
func (e *mockTarget) GetTargetType() domain.TargetType {
|
|
||||||
return e.TargetType
|
|
||||||
}
|
|
||||||
func (e *mockTarget) GetTimeout() time.Duration {
|
|
||||||
return e.Timeout
|
|
||||||
}
|
|
||||||
func (e *mockTarget) GetSigningKey() string {
|
|
||||||
return e.SigningKey
|
|
||||||
}
|
|
||||||
|
|
||||||
type callTestServer struct {
|
type callTestServer struct {
|
||||||
method string
|
method string
|
||||||
expectBody []byte
|
expectBody []byte
|
||||||
@@ -527,7 +505,7 @@ func listen(
|
|||||||
time.Sleep(c.timeout)
|
time.Sleep(c.timeout)
|
||||||
|
|
||||||
w.Header().Set("Content-Type", "application/json")
|
w.Header().Set("Content-Type", "application/json")
|
||||||
if _, err := io.WriteString(w, string(c.respondBody)); err != nil {
|
if _, err := w.Write(c.respondBody); err != nil {
|
||||||
http.Error(w, "error", http.StatusInternalServerError)
|
http.Error(w, "error", http.StatusInternalServerError)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -554,25 +532,27 @@ func testCall(ctx context.Context, timeout time.Duration, body []byte, signingKe
|
|||||||
|
|
||||||
func testCallTarget(ctx context.Context,
|
func testCallTarget(ctx context.Context,
|
||||||
info *middleware.ContextInfoRequest,
|
info *middleware.ContextInfoRequest,
|
||||||
target *mockTarget,
|
target target_domain.Target,
|
||||||
|
alg crypto.EncryptionAlgorithm,
|
||||||
) func(string) ([]byte, error) {
|
) func(string) ([]byte, error) {
|
||||||
return func(url string) (r []byte, err error) {
|
return func(url string) (r []byte, err error) {
|
||||||
target.Endpoint = url
|
target.Endpoint = url
|
||||||
return execution.CallTarget(ctx, target, info)
|
return execution.CallTarget(ctx, target, info, alg)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func testCallTargets(ctx context.Context,
|
func testCallTargets(ctx context.Context,
|
||||||
info *middleware.ContextInfoRequest,
|
info *middleware.ContextInfoRequest,
|
||||||
target []*mockTarget,
|
target []target_domain.Target,
|
||||||
|
alg crypto.EncryptionAlgorithm,
|
||||||
) func([]string) (interface{}, error) {
|
) func([]string) (interface{}, error) {
|
||||||
return func(urls []string) (interface{}, error) {
|
return func(urls []string) (interface{}, error) {
|
||||||
targets := make([]execution.Target, len(target))
|
targets := make([]target_domain.Target, len(target))
|
||||||
for i, t := range target {
|
for i, t := range target {
|
||||||
t.Endpoint = urls[i]
|
t.Endpoint = urls[i]
|
||||||
targets[i] = t
|
targets[i] = t
|
||||||
}
|
}
|
||||||
return execution.CallTargets(ctx, targets, info)
|
return execution.CallTargets(ctx, targets, info, alg)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
package execution
|
package execution
|
||||||
|
|
||||||
//go:generate mockgen -package mock -destination ./mock/queries.mock.go github.com/zitadel/zitadel/internal/execution Queries
|
|
||||||
//go:generate mockgen -package mock -destination ./mock/queue.mock.go github.com/zitadel/zitadel/internal/execution Queue
|
//go:generate mockgen -package mock -destination ./mock/queue.mock.go github.com/zitadel/zitadel/internal/execution Queue
|
||||||
|
|||||||
@@ -1,159 +0,0 @@
|
|||||||
package execution
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"encoding/json"
|
|
||||||
"slices"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/riverqueue/river"
|
|
||||||
|
|
||||||
"github.com/zitadel/zitadel/internal/api/authz"
|
|
||||||
"github.com/zitadel/zitadel/internal/domain"
|
|
||||||
"github.com/zitadel/zitadel/internal/eventstore"
|
|
||||||
"github.com/zitadel/zitadel/internal/eventstore/handler/v2"
|
|
||||||
"github.com/zitadel/zitadel/internal/query"
|
|
||||||
"github.com/zitadel/zitadel/internal/queue"
|
|
||||||
exec_repo "github.com/zitadel/zitadel/internal/repository/execution"
|
|
||||||
)
|
|
||||||
|
|
||||||
const (
|
|
||||||
HandlerTable = "projections.execution_handler"
|
|
||||||
)
|
|
||||||
|
|
||||||
type Queue interface {
|
|
||||||
Insert(ctx context.Context, args river.JobArgs, opts ...queue.InsertOpt) error
|
|
||||||
}
|
|
||||||
|
|
||||||
type Queries interface {
|
|
||||||
TargetsByExecutionID(ctx context.Context, ids []string) (execution []*query.ExecutionTarget, err error)
|
|
||||||
InstanceByID(ctx context.Context, id string) (instance authz.Instance, err error)
|
|
||||||
}
|
|
||||||
|
|
||||||
type eventHandler struct {
|
|
||||||
eventTypes []string
|
|
||||||
aggregateTypeFromEventType func(typ eventstore.EventType) eventstore.AggregateType
|
|
||||||
query Queries
|
|
||||||
queue Queue
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewEventHandler(
|
|
||||||
ctx context.Context,
|
|
||||||
config handler.Config,
|
|
||||||
eventTypes []string,
|
|
||||||
aggregateTypeFromEventType func(typ eventstore.EventType) eventstore.AggregateType,
|
|
||||||
query Queries,
|
|
||||||
queue Queue,
|
|
||||||
) *handler.Handler {
|
|
||||||
return handler.NewHandler(ctx, &config, &eventHandler{
|
|
||||||
eventTypes: eventTypes,
|
|
||||||
aggregateTypeFromEventType: aggregateTypeFromEventType,
|
|
||||||
query: query,
|
|
||||||
queue: queue,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func (u *eventHandler) Name() string {
|
|
||||||
return HandlerTable
|
|
||||||
}
|
|
||||||
|
|
||||||
func (u *eventHandler) Reducers() []handler.AggregateReducer {
|
|
||||||
aggList := make(map[eventstore.AggregateType][]eventstore.EventType)
|
|
||||||
for _, eventType := range u.eventTypes {
|
|
||||||
aggType := u.aggregateTypeFromEventType(eventstore.EventType(eventType))
|
|
||||||
aggEventTypes := aggList[aggType]
|
|
||||||
if !slices.Contains(aggEventTypes, eventstore.EventType(eventType)) {
|
|
||||||
aggList[aggType] = append(aggList[aggType], eventstore.EventType(eventType))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
aggReducers := make([]handler.AggregateReducer, 0, len(aggList))
|
|
||||||
for aggType, aggEventTypes := range aggList {
|
|
||||||
eventReducers := make([]handler.EventReducer, len(aggEventTypes))
|
|
||||||
for j, eventType := range aggEventTypes {
|
|
||||||
eventReducers[j] = handler.EventReducer{
|
|
||||||
Event: eventType,
|
|
||||||
Reduce: u.reduce,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
aggReducers = append(aggReducers, handler.AggregateReducer{
|
|
||||||
Aggregate: aggType,
|
|
||||||
EventReducers: eventReducers,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
return aggReducers
|
|
||||||
}
|
|
||||||
|
|
||||||
// FilterGlobalEvents implements [handler.GlobalProjection]
|
|
||||||
func (u *eventHandler) FilterGlobalEvents() {}
|
|
||||||
|
|
||||||
func groupsFromEventType(s string) []string {
|
|
||||||
parts := strings.Split(s, ".")
|
|
||||||
groups := make([]string, len(parts))
|
|
||||||
for i := range parts {
|
|
||||||
groups[i] = strings.Join(parts[:i+1], ".")
|
|
||||||
if i < len(parts)-1 {
|
|
||||||
groups[i] += ".*"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
slices.Reverse(groups)
|
|
||||||
return groups
|
|
||||||
}
|
|
||||||
|
|
||||||
func idsForEventType(eventType string) []string {
|
|
||||||
ids := make([]string, 0)
|
|
||||||
for _, group := range groupsFromEventType(eventType) {
|
|
||||||
ids = append(ids,
|
|
||||||
exec_repo.ID(domain.ExecutionTypeEvent, group),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
return append(ids,
|
|
||||||
exec_repo.IDAll(domain.ExecutionTypeEvent),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (u *eventHandler) reduce(e eventstore.Event) (*handler.Statement, error) {
|
|
||||||
ctx := HandlerContext(context.Background(), e.Aggregate())
|
|
||||||
|
|
||||||
targets, err := u.query.TargetsByExecutionID(ctx, idsForEventType(string(e.Type())))
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
// no execution from worker necessary
|
|
||||||
if len(targets) == 0 {
|
|
||||||
return handler.NewNoOpStatement(e), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
return handler.NewStatement(e, func(ctx context.Context, ex handler.Executer, projectionName string) error {
|
|
||||||
ctx = HandlerContext(ctx, e.Aggregate())
|
|
||||||
req, err := NewRequest(e, targets)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return u.queue.Insert(ctx,
|
|
||||||
req,
|
|
||||||
queue.WithQueueName(exec_repo.QueueName),
|
|
||||||
)
|
|
||||||
}), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewRequest(e eventstore.Event, targets []*query.ExecutionTarget) (*exec_repo.Request, error) {
|
|
||||||
targetsData, err := json.Marshal(targets)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
eventData, err := json.Marshal(e)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return &exec_repo.Request{
|
|
||||||
Aggregate: e.Aggregate(),
|
|
||||||
Sequence: e.Sequence(),
|
|
||||||
EventType: e.Type(),
|
|
||||||
CreatedAt: e.CreatedAt(),
|
|
||||||
UserID: e.Creator(),
|
|
||||||
EventData: eventData,
|
|
||||||
TargetsData: targetsData,
|
|
||||||
}, nil
|
|
||||||
}
|
|
||||||
@@ -1,487 +0,0 @@
|
|||||||
package execution
|
|
||||||
|
|
||||||
import (
|
|
||||||
"database/sql"
|
|
||||||
"encoding/json"
|
|
||||||
"errors"
|
|
||||||
"testing"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/stretchr/testify/assert"
|
|
||||||
"go.uber.org/mock/gomock"
|
|
||||||
|
|
||||||
"github.com/zitadel/zitadel/internal/domain"
|
|
||||||
"github.com/zitadel/zitadel/internal/eventstore"
|
|
||||||
"github.com/zitadel/zitadel/internal/eventstore/repository"
|
|
||||||
"github.com/zitadel/zitadel/internal/execution/mock"
|
|
||||||
"github.com/zitadel/zitadel/internal/query"
|
|
||||||
"github.com/zitadel/zitadel/internal/repository/action"
|
|
||||||
execution_rp "github.com/zitadel/zitadel/internal/repository/execution"
|
|
||||||
"github.com/zitadel/zitadel/internal/repository/session"
|
|
||||||
"github.com/zitadel/zitadel/internal/repository/user"
|
|
||||||
"github.com/zitadel/zitadel/internal/zerrors"
|
|
||||||
)
|
|
||||||
|
|
||||||
func Test_EventExecution(t *testing.T) {
|
|
||||||
type args struct {
|
|
||||||
event eventstore.Event
|
|
||||||
targets []*query.ExecutionTarget
|
|
||||||
}
|
|
||||||
type res struct {
|
|
||||||
targets []Target
|
|
||||||
contextInfo *execution_rp.ContextInfoEvent
|
|
||||||
wantErr bool
|
|
||||||
}
|
|
||||||
tests := []struct {
|
|
||||||
name string
|
|
||||||
args args
|
|
||||||
res res
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
"session added, ok",
|
|
||||||
args{
|
|
||||||
event: &eventstore.BaseEvent{
|
|
||||||
Agg: &eventstore.Aggregate{
|
|
||||||
ID: "aggID",
|
|
||||||
Type: session.AggregateType,
|
|
||||||
ResourceOwner: "resourceOwner",
|
|
||||||
InstanceID: "instanceID",
|
|
||||||
Version: session.AggregateVersion,
|
|
||||||
},
|
|
||||||
EventType: session.AddedType,
|
|
||||||
Seq: 1,
|
|
||||||
Creation: time.Date(2024, 1, 1, 1, 1, 1, 1, time.UTC),
|
|
||||||
User: userID,
|
|
||||||
Data: []byte(`{"ID":"","Seq":1,"Pos":0,"Creation":"2024-01-01T01:01:01.000000001Z"}`),
|
|
||||||
},
|
|
||||||
targets: []*query.ExecutionTarget{{
|
|
||||||
InstanceID: instanceID,
|
|
||||||
ExecutionID: "executionID",
|
|
||||||
TargetID: "targetID",
|
|
||||||
TargetType: domain.TargetTypeWebhook,
|
|
||||||
Endpoint: "endpoint",
|
|
||||||
Timeout: time.Minute,
|
|
||||||
InterruptOnError: true,
|
|
||||||
SigningKey: "key",
|
|
||||||
}},
|
|
||||||
},
|
|
||||||
res{
|
|
||||||
targets: []Target{
|
|
||||||
&query.ExecutionTarget{
|
|
||||||
InstanceID: instanceID,
|
|
||||||
ExecutionID: "executionID",
|
|
||||||
TargetID: "targetID",
|
|
||||||
TargetType: domain.TargetTypeWebhook,
|
|
||||||
Endpoint: "endpoint",
|
|
||||||
Timeout: time.Minute,
|
|
||||||
InterruptOnError: true,
|
|
||||||
SigningKey: "key",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
contextInfo: &execution_rp.ContextInfoEvent{
|
|
||||||
AggregateID: "aggID",
|
|
||||||
AggregateType: "session",
|
|
||||||
ResourceOwner: "resourceOwner",
|
|
||||||
InstanceID: "instanceID",
|
|
||||||
Version: "v1",
|
|
||||||
Sequence: 1,
|
|
||||||
EventType: "session.added",
|
|
||||||
CreatedAt: time.Date(2024, 1, 1, 1, 1, 1, 1, time.UTC).Format(time.RFC3339Nano),
|
|
||||||
UserID: userID,
|
|
||||||
EventPayload: []byte(`{"ID":"","Seq":1,"Pos":0,"Creation":"2024-01-01T01:01:01.000000001Z"}`),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
for _, tt := range tests {
|
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
|
||||||
request, err := NewRequest(tt.args.event, tt.args.targets)
|
|
||||||
if tt.res.wantErr {
|
|
||||||
assert.Error(t, err)
|
|
||||||
assert.Nil(t, request)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
assert.NoError(t, err)
|
|
||||||
targets, err := TargetsFromRequest(request)
|
|
||||||
assert.NoError(t, err)
|
|
||||||
assert.Equal(t, tt.res.targets, targets)
|
|
||||||
assert.Equal(t, tt.res.contextInfo, execution_rp.ContextInfoFromRequest(request))
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func Test_groupsFromEventType(t *testing.T) {
|
|
||||||
type args struct {
|
|
||||||
eventType eventstore.EventType
|
|
||||||
}
|
|
||||||
type res struct {
|
|
||||||
groups []string
|
|
||||||
}
|
|
||||||
tests := []struct {
|
|
||||||
name string
|
|
||||||
args args
|
|
||||||
res res
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
"user human mfa init skipped, ok",
|
|
||||||
args{
|
|
||||||
eventType: user.HumanMFAInitSkippedType,
|
|
||||||
},
|
|
||||||
res{
|
|
||||||
groups: []string{
|
|
||||||
"user.human.mfa.init.skipped",
|
|
||||||
"user.human.mfa.init.*",
|
|
||||||
"user.human.mfa.*",
|
|
||||||
"user.human.*",
|
|
||||||
"user.*",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"session added, ok",
|
|
||||||
args{
|
|
||||||
eventType: session.AddedType,
|
|
||||||
},
|
|
||||||
res{
|
|
||||||
groups: []string{
|
|
||||||
"session.added",
|
|
||||||
"session.*",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"user added, ok",
|
|
||||||
args{
|
|
||||||
eventType: user.HumanAddedType,
|
|
||||||
},
|
|
||||||
res{
|
|
||||||
groups: []string{
|
|
||||||
"user.human.added",
|
|
||||||
"user.human.*",
|
|
||||||
"user.*",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"execution set, ok",
|
|
||||||
args{
|
|
||||||
eventType: execution_rp.SetEventV2Type,
|
|
||||||
},
|
|
||||||
res{
|
|
||||||
groups: []string{
|
|
||||||
"execution.v2.set",
|
|
||||||
"execution.v2.*",
|
|
||||||
"execution.*",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
for _, tt := range tests {
|
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
|
||||||
assert.Equal(t, tt.res.groups, groupsFromEventType(string(tt.args.eventType)))
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func Test_idsForEventType(t *testing.T) {
|
|
||||||
type args struct {
|
|
||||||
eventType eventstore.EventType
|
|
||||||
}
|
|
||||||
type res struct {
|
|
||||||
groups []string
|
|
||||||
}
|
|
||||||
tests := []struct {
|
|
||||||
name string
|
|
||||||
args args
|
|
||||||
res res
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
"session added, ok",
|
|
||||||
args{
|
|
||||||
eventType: session.AddedType,
|
|
||||||
},
|
|
||||||
res{
|
|
||||||
groups: []string{
|
|
||||||
"event/session.added",
|
|
||||||
"event/session.*",
|
|
||||||
"event",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"user added, ok",
|
|
||||||
args{
|
|
||||||
eventType: user.HumanAddedType,
|
|
||||||
},
|
|
||||||
res{
|
|
||||||
groups: []string{
|
|
||||||
"event/user.human.added",
|
|
||||||
"event/user.human.*",
|
|
||||||
"event/user.*",
|
|
||||||
"event",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"execution set, ok",
|
|
||||||
args{
|
|
||||||
eventType: execution_rp.SetEventV2Type,
|
|
||||||
},
|
|
||||||
res{
|
|
||||||
groups: []string{
|
|
||||||
"event/execution.v2.set",
|
|
||||||
"event/execution.v2.*",
|
|
||||||
"event/execution.*",
|
|
||||||
"event",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
for _, tt := range tests {
|
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
|
||||||
assert.Equal(t, tt.res.groups, idsForEventType(string(tt.args.eventType)))
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestActionProjection_reduces(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
name string
|
|
||||||
test func(*gomock.Controller, *mock.MockQueries, *mock.MockQueue) (fields, args, want)
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
name: "reduce, action, error",
|
|
||||||
test: func(ctrl *gomock.Controller, queries *mock.MockQueries, q *mock.MockQueue) (f fields, a args, w want) {
|
|
||||||
queries.EXPECT().TargetsByExecutionID(gomock.Any(), gomock.Any()).Return(nil, zerrors.ThrowInternal(nil, "QUERY-37ardr0pki", "Errors.Query.CloseRows"))
|
|
||||||
return fields{
|
|
||||||
queries: queries,
|
|
||||||
queue: q,
|
|
||||||
}, args{
|
|
||||||
event: &action.AddedEvent{
|
|
||||||
BaseEvent: *eventstore.BaseEventFromRepo(&repository.Event{
|
|
||||||
InstanceID: instanceID,
|
|
||||||
AggregateID: eventID,
|
|
||||||
ResourceOwner: sql.NullString{String: orgID},
|
|
||||||
CreationDate: time.Now().UTC(),
|
|
||||||
Typ: action.AddedEventType,
|
|
||||||
Data: []byte(eventData),
|
|
||||||
EditorUser: userID,
|
|
||||||
Seq: 1,
|
|
||||||
AggregateType: action.AggregateType,
|
|
||||||
Version: action.AggregateVersion,
|
|
||||||
}),
|
|
||||||
Name: "name",
|
|
||||||
Script: "name(){}",
|
|
||||||
Timeout: 3 * time.Second,
|
|
||||||
AllowedToFail: true,
|
|
||||||
},
|
|
||||||
mapper: action.AddedEventMapper,
|
|
||||||
}, want{
|
|
||||||
err: func(tt assert.TestingT, err error, i ...interface{}) bool {
|
|
||||||
return errors.Is(err, zerrors.ThrowInternal(nil, "QUERY-37ardr0pki", "Errors.Query.CloseRows"))
|
|
||||||
},
|
|
||||||
}
|
|
||||||
},
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
name: "reduce, action, none",
|
|
||||||
test: func(ctrl *gomock.Controller, queries *mock.MockQueries, q *mock.MockQueue) (f fields, a args, w want) {
|
|
||||||
queries.EXPECT().TargetsByExecutionID(gomock.Any(), gomock.Any()).Return([]*query.ExecutionTarget{}, nil)
|
|
||||||
return fields{
|
|
||||||
queries: queries,
|
|
||||||
queue: q,
|
|
||||||
}, args{
|
|
||||||
event: &action.AddedEvent{
|
|
||||||
BaseEvent: *eventstore.BaseEventFromRepo(&repository.Event{
|
|
||||||
InstanceID: instanceID,
|
|
||||||
AggregateID: eventID,
|
|
||||||
ResourceOwner: sql.NullString{String: orgID},
|
|
||||||
CreationDate: time.Now().UTC(),
|
|
||||||
Typ: action.AddedEventType,
|
|
||||||
Data: []byte(eventData),
|
|
||||||
EditorUser: userID,
|
|
||||||
Seq: 1,
|
|
||||||
AggregateType: action.AggregateType,
|
|
||||||
Version: action.AggregateVersion,
|
|
||||||
}),
|
|
||||||
Name: "name",
|
|
||||||
Script: "name(){}",
|
|
||||||
Timeout: 3 * time.Second,
|
|
||||||
AllowedToFail: true,
|
|
||||||
},
|
|
||||||
mapper: action.AddedEventMapper,
|
|
||||||
}, want{
|
|
||||||
noOperation: true,
|
|
||||||
}
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "reduce, action, single",
|
|
||||||
test: func(ctrl *gomock.Controller, queries *mock.MockQueries, q *mock.MockQueue) (f fields, a args, w want) {
|
|
||||||
targets := mockTargets(1)
|
|
||||||
queries.EXPECT().TargetsByExecutionID(gomock.Any(), gomock.Any()).Return(targets, nil)
|
|
||||||
createdAt := time.Now().UTC()
|
|
||||||
q.EXPECT().Insert(
|
|
||||||
gomock.Any(),
|
|
||||||
&execution_rp.Request{
|
|
||||||
Aggregate: &eventstore.Aggregate{
|
|
||||||
InstanceID: instanceID,
|
|
||||||
Type: action.AggregateType,
|
|
||||||
Version: action.AggregateVersion,
|
|
||||||
ID: eventID,
|
|
||||||
ResourceOwner: orgID,
|
|
||||||
},
|
|
||||||
Sequence: 1,
|
|
||||||
CreatedAt: createdAt,
|
|
||||||
EventType: action.AddedEventType,
|
|
||||||
UserID: userID,
|
|
||||||
EventData: []byte(eventData),
|
|
||||||
TargetsData: mockTargetsToBytes(targets),
|
|
||||||
},
|
|
||||||
gomock.Any(),
|
|
||||||
).Return(nil)
|
|
||||||
return fields{
|
|
||||||
queries: queries,
|
|
||||||
queue: q,
|
|
||||||
}, args{
|
|
||||||
event: &action.AddedEvent{
|
|
||||||
BaseEvent: *eventstore.BaseEventFromRepo(&repository.Event{
|
|
||||||
InstanceID: instanceID,
|
|
||||||
AggregateID: eventID,
|
|
||||||
ResourceOwner: sql.NullString{String: orgID},
|
|
||||||
CreationDate: createdAt,
|
|
||||||
Typ: action.AddedEventType,
|
|
||||||
Data: []byte(eventData),
|
|
||||||
EditorUser: userID,
|
|
||||||
Seq: 1,
|
|
||||||
AggregateType: action.AggregateType,
|
|
||||||
Version: action.AggregateVersion,
|
|
||||||
}),
|
|
||||||
Name: "name",
|
|
||||||
Script: "name(){}",
|
|
||||||
Timeout: 3 * time.Second,
|
|
||||||
AllowedToFail: true,
|
|
||||||
},
|
|
||||||
mapper: action.AddedEventMapper,
|
|
||||||
}, w
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "reduce, action, multiple",
|
|
||||||
test: func(ctrl *gomock.Controller, queries *mock.MockQueries, q *mock.MockQueue) (f fields, a args, w want) {
|
|
||||||
targets := mockTargets(3)
|
|
||||||
queries.EXPECT().TargetsByExecutionID(gomock.Any(), gomock.Any()).Return(targets, nil)
|
|
||||||
createdAt := time.Now().UTC()
|
|
||||||
q.EXPECT().Insert(
|
|
||||||
gomock.Any(),
|
|
||||||
&execution_rp.Request{
|
|
||||||
Aggregate: &eventstore.Aggregate{
|
|
||||||
InstanceID: instanceID,
|
|
||||||
Type: action.AggregateType,
|
|
||||||
Version: action.AggregateVersion,
|
|
||||||
ID: eventID,
|
|
||||||
ResourceOwner: orgID,
|
|
||||||
},
|
|
||||||
Sequence: 1,
|
|
||||||
CreatedAt: createdAt,
|
|
||||||
EventType: action.AddedEventType,
|
|
||||||
UserID: userID,
|
|
||||||
EventData: []byte(eventData),
|
|
||||||
TargetsData: mockTargetsToBytes(targets),
|
|
||||||
},
|
|
||||||
gomock.Any(),
|
|
||||||
).Return(nil)
|
|
||||||
return fields{
|
|
||||||
queries: queries,
|
|
||||||
queue: q,
|
|
||||||
}, args{
|
|
||||||
event: &action.AddedEvent{
|
|
||||||
BaseEvent: *eventstore.BaseEventFromRepo(&repository.Event{
|
|
||||||
InstanceID: instanceID,
|
|
||||||
AggregateID: eventID,
|
|
||||||
ResourceOwner: sql.NullString{String: orgID},
|
|
||||||
CreationDate: createdAt,
|
|
||||||
Typ: action.AddedEventType,
|
|
||||||
Data: []byte(eventData),
|
|
||||||
EditorUser: userID,
|
|
||||||
Seq: 1,
|
|
||||||
AggregateType: action.AggregateType,
|
|
||||||
Version: action.AggregateVersion,
|
|
||||||
}),
|
|
||||||
Name: "name",
|
|
||||||
Script: "name(){}",
|
|
||||||
Timeout: 3 * time.Second,
|
|
||||||
AllowedToFail: true,
|
|
||||||
},
|
|
||||||
mapper: action.AddedEventMapper,
|
|
||||||
}, w
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
for _, tt := range tests {
|
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
|
||||||
ctrl := gomock.NewController(t)
|
|
||||||
queries := mock.NewMockQueries(ctrl)
|
|
||||||
queue := mock.NewMockQueue(ctrl)
|
|
||||||
f, a, w := tt.test(ctrl, queries, queue)
|
|
||||||
|
|
||||||
event, err := a.mapper(a.event)
|
|
||||||
assert.NoError(t, err)
|
|
||||||
|
|
||||||
stmt, err := newEventExecutionsHandler(queries, f).reduce(event)
|
|
||||||
if w.err != nil {
|
|
||||||
w.err(t, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
assert.NoError(t, err)
|
|
||||||
|
|
||||||
if w.noOperation {
|
|
||||||
assert.Nil(t, stmt.Execute)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
err = stmt.Execute(t.Context(), nil, "")
|
|
||||||
if w.stmtErr != nil {
|
|
||||||
w.stmtErr(t, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
assert.NoError(t, err)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func mockTarget() *query.ExecutionTarget {
|
|
||||||
return &query.ExecutionTarget{
|
|
||||||
InstanceID: "instanceID",
|
|
||||||
ExecutionID: "executionID",
|
|
||||||
TargetID: "targetID",
|
|
||||||
TargetType: domain.TargetTypeWebhook,
|
|
||||||
Endpoint: "endpoint",
|
|
||||||
Timeout: time.Minute,
|
|
||||||
InterruptOnError: true,
|
|
||||||
SigningKey: "key",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func mockTargets(count int) []*query.ExecutionTarget {
|
|
||||||
var targets []*query.ExecutionTarget
|
|
||||||
if count > 0 {
|
|
||||||
targets = make([]*query.ExecutionTarget, count)
|
|
||||||
for i := range targets {
|
|
||||||
targets[i] = mockTarget()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return targets
|
|
||||||
}
|
|
||||||
|
|
||||||
func mockTargetsToBytes(targets []*query.ExecutionTarget) []byte {
|
|
||||||
data, _ := json.Marshal(targets)
|
|
||||||
return data
|
|
||||||
}
|
|
||||||
|
|
||||||
func newEventExecutionsHandler(queries *mock.MockQueries, f fields) *eventHandler {
|
|
||||||
return &eventHandler{
|
|
||||||
queue: f.queue,
|
|
||||||
query: queries,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,72 +0,0 @@
|
|||||||
// Code generated by MockGen. DO NOT EDIT.
|
|
||||||
// Source: github.com/zitadel/zitadel/internal/execution (interfaces: Queries)
|
|
||||||
//
|
|
||||||
// Generated by this command:
|
|
||||||
//
|
|
||||||
// mockgen -package mock -destination ./mock/queries.mock.go github.com/zitadel/zitadel/internal/execution Queries
|
|
||||||
//
|
|
||||||
|
|
||||||
// Package mock is a generated GoMock package.
|
|
||||||
package mock
|
|
||||||
|
|
||||||
import (
|
|
||||||
context "context"
|
|
||||||
reflect "reflect"
|
|
||||||
|
|
||||||
authz "github.com/zitadel/zitadel/internal/api/authz"
|
|
||||||
query "github.com/zitadel/zitadel/internal/query"
|
|
||||||
gomock "go.uber.org/mock/gomock"
|
|
||||||
)
|
|
||||||
|
|
||||||
// MockQueries is a mock of Queries interface.
|
|
||||||
type MockQueries struct {
|
|
||||||
ctrl *gomock.Controller
|
|
||||||
recorder *MockQueriesMockRecorder
|
|
||||||
}
|
|
||||||
|
|
||||||
// MockQueriesMockRecorder is the mock recorder for MockQueries.
|
|
||||||
type MockQueriesMockRecorder struct {
|
|
||||||
mock *MockQueries
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewMockQueries creates a new mock instance.
|
|
||||||
func NewMockQueries(ctrl *gomock.Controller) *MockQueries {
|
|
||||||
mock := &MockQueries{ctrl: ctrl}
|
|
||||||
mock.recorder = &MockQueriesMockRecorder{mock}
|
|
||||||
return mock
|
|
||||||
}
|
|
||||||
|
|
||||||
// EXPECT returns an object that allows the caller to indicate expected use.
|
|
||||||
func (m *MockQueries) EXPECT() *MockQueriesMockRecorder {
|
|
||||||
return m.recorder
|
|
||||||
}
|
|
||||||
|
|
||||||
// InstanceByID mocks base method.
|
|
||||||
func (m *MockQueries) InstanceByID(arg0 context.Context, arg1 string) (authz.Instance, error) {
|
|
||||||
m.ctrl.T.Helper()
|
|
||||||
ret := m.ctrl.Call(m, "InstanceByID", arg0, arg1)
|
|
||||||
ret0, _ := ret[0].(authz.Instance)
|
|
||||||
ret1, _ := ret[1].(error)
|
|
||||||
return ret0, ret1
|
|
||||||
}
|
|
||||||
|
|
||||||
// InstanceByID indicates an expected call of InstanceByID.
|
|
||||||
func (mr *MockQueriesMockRecorder) InstanceByID(arg0, arg1 any) *gomock.Call {
|
|
||||||
mr.mock.ctrl.T.Helper()
|
|
||||||
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "InstanceByID", reflect.TypeOf((*MockQueries)(nil).InstanceByID), arg0, arg1)
|
|
||||||
}
|
|
||||||
|
|
||||||
// TargetsByExecutionID mocks base method.
|
|
||||||
func (m *MockQueries) TargetsByExecutionID(arg0 context.Context, arg1 []string) ([]*query.ExecutionTarget, error) {
|
|
||||||
m.ctrl.T.Helper()
|
|
||||||
ret := m.ctrl.Call(m, "TargetsByExecutionID", arg0, arg1)
|
|
||||||
ret0, _ := ret[0].([]*query.ExecutionTarget)
|
|
||||||
ret1, _ := ret[1].(error)
|
|
||||||
return ret0, ret1
|
|
||||||
}
|
|
||||||
|
|
||||||
// TargetsByExecutionID indicates an expected call of TargetsByExecutionID.
|
|
||||||
func (mr *MockQueriesMockRecorder) TargetsByExecutionID(arg0, arg1 any) *gomock.Call {
|
|
||||||
mr.mock.ctrl.T.Helper()
|
|
||||||
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TargetsByExecutionID", reflect.TypeOf((*MockQueries)(nil).TargetsByExecutionID), arg0, arg1)
|
|
||||||
}
|
|
||||||
@@ -1,61 +0,0 @@
|
|||||||
// Code generated by MockGen. DO NOT EDIT.
|
|
||||||
// Source: github.com/zitadel/zitadel/internal/execution (interfaces: Queue)
|
|
||||||
//
|
|
||||||
// Generated by this command:
|
|
||||||
//
|
|
||||||
// mockgen -package mock -destination ./mock/queue.mock.go github.com/zitadel/zitadel/internal/execution Queue
|
|
||||||
//
|
|
||||||
|
|
||||||
// Package mock is a generated GoMock package.
|
|
||||||
package mock
|
|
||||||
|
|
||||||
import (
|
|
||||||
context "context"
|
|
||||||
reflect "reflect"
|
|
||||||
|
|
||||||
river "github.com/riverqueue/river"
|
|
||||||
queue "github.com/zitadel/zitadel/internal/queue"
|
|
||||||
gomock "go.uber.org/mock/gomock"
|
|
||||||
)
|
|
||||||
|
|
||||||
// MockQueue is a mock of Queue interface.
|
|
||||||
type MockQueue struct {
|
|
||||||
ctrl *gomock.Controller
|
|
||||||
recorder *MockQueueMockRecorder
|
|
||||||
}
|
|
||||||
|
|
||||||
// MockQueueMockRecorder is the mock recorder for MockQueue.
|
|
||||||
type MockQueueMockRecorder struct {
|
|
||||||
mock *MockQueue
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewMockQueue creates a new mock instance.
|
|
||||||
func NewMockQueue(ctrl *gomock.Controller) *MockQueue {
|
|
||||||
mock := &MockQueue{ctrl: ctrl}
|
|
||||||
mock.recorder = &MockQueueMockRecorder{mock}
|
|
||||||
return mock
|
|
||||||
}
|
|
||||||
|
|
||||||
// EXPECT returns an object that allows the caller to indicate expected use.
|
|
||||||
func (m *MockQueue) EXPECT() *MockQueueMockRecorder {
|
|
||||||
return m.recorder
|
|
||||||
}
|
|
||||||
|
|
||||||
// Insert mocks base method.
|
|
||||||
func (m *MockQueue) Insert(arg0 context.Context, arg1 river.JobArgs, arg2 ...queue.InsertOpt) error {
|
|
||||||
m.ctrl.T.Helper()
|
|
||||||
varargs := []any{arg0, arg1}
|
|
||||||
for _, a := range arg2 {
|
|
||||||
varargs = append(varargs, a)
|
|
||||||
}
|
|
||||||
ret := m.ctrl.Call(m, "Insert", varargs...)
|
|
||||||
ret0, _ := ret[0].(error)
|
|
||||||
return ret0
|
|
||||||
}
|
|
||||||
|
|
||||||
// Insert indicates an expected call of Insert.
|
|
||||||
func (mr *MockQueueMockRecorder) Insert(arg0, arg1 any, arg2 ...any) *gomock.Call {
|
|
||||||
mr.mock.ctrl.T.Helper()
|
|
||||||
varargs := append([]any{arg0, arg1}, arg2...)
|
|
||||||
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Insert", reflect.TypeOf((*MockQueue)(nil).Insert), varargs...)
|
|
||||||
}
|
|
||||||
@@ -3,10 +3,8 @@ package execution
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
|
||||||
"github.com/zitadel/zitadel/internal/eventstore"
|
"github.com/zitadel/zitadel/internal/crypto"
|
||||||
"github.com/zitadel/zitadel/internal/eventstore/handler/v2"
|
"github.com/zitadel/zitadel/internal/eventstore/handler/v2"
|
||||||
"github.com/zitadel/zitadel/internal/query"
|
|
||||||
"github.com/zitadel/zitadel/internal/query/projection"
|
|
||||||
"github.com/zitadel/zitadel/internal/queue"
|
"github.com/zitadel/zitadel/internal/queue"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -15,18 +13,12 @@ var (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func Register(
|
func Register(
|
||||||
ctx context.Context,
|
|
||||||
executionsCustomConfig projection.CustomConfig,
|
|
||||||
workerConfig WorkerConfig,
|
workerConfig WorkerConfig,
|
||||||
queries *query.Queries,
|
|
||||||
eventTypes []string,
|
|
||||||
queue *queue.Queue,
|
queue *queue.Queue,
|
||||||
|
targetEncAlg crypto.EncryptionAlgorithm,
|
||||||
) {
|
) {
|
||||||
queue.ShouldStart()
|
queue.ShouldStart()
|
||||||
projections = []*handler.Handler{
|
queue.AddWorkers(NewWorker(workerConfig, targetEncAlg))
|
||||||
NewEventHandler(ctx, projection.ApplyCustomConfig(executionsCustomConfig), eventTypes, eventstore.AggregateTypeFromEventType, queries, queue),
|
|
||||||
}
|
|
||||||
queue.AddWorkers(NewWorker(workerConfig))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func Start(ctx context.Context) {
|
func Start(ctx context.Context) {
|
||||||
|
|||||||
@@ -0,0 +1,69 @@
|
|||||||
|
package target
|
||||||
|
|
||||||
|
import (
|
||||||
|
"slices"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
type element struct {
|
||||||
|
ID string `json:"id"`
|
||||||
|
Targets []Target `json:"targets,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type Router []element
|
||||||
|
|
||||||
|
func NewRouter(targets []Target) Router {
|
||||||
|
m := make(map[string][]Target)
|
||||||
|
for _, t := range targets {
|
||||||
|
m[t.GetExecutionID()] = append(m[t.GetExecutionID()], t)
|
||||||
|
}
|
||||||
|
router := make(Router, 0, len(m))
|
||||||
|
for id, targets := range m {
|
||||||
|
router = append(router, element{
|
||||||
|
ID: id,
|
||||||
|
Targets: targets,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
slices.SortFunc(router, func(a, b element) int {
|
||||||
|
return strings.Compare(a.ID, b.ID)
|
||||||
|
})
|
||||||
|
return router
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get execution targets by exact match of the executionID
|
||||||
|
func (r Router) Get(executionID string) ([]Target, bool) {
|
||||||
|
i, ok := slices.BinarySearchFunc(r, executionID, func(a element, b string) int {
|
||||||
|
return strings.Compare(a.ID, b)
|
||||||
|
})
|
||||||
|
if ok {
|
||||||
|
return r[i].Targets, true
|
||||||
|
}
|
||||||
|
return nil, false
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetEventBestMatch returns the best matching execution targets for an event.
|
||||||
|
// The following match priority is used:
|
||||||
|
// 1. Exact match
|
||||||
|
// 2. Wildcard match
|
||||||
|
// 3. Prefix match ("event")
|
||||||
|
func (r Router) GetEventBestMatch(executionID string) ([]Target, bool) {
|
||||||
|
t, ok := r.Get(executionID)
|
||||||
|
if ok {
|
||||||
|
return t, true
|
||||||
|
}
|
||||||
|
var bestMatch element
|
||||||
|
for _, e := range r {
|
||||||
|
if e.ID == "event" && strings.HasPrefix(executionID, e.ID) {
|
||||||
|
bestMatch, ok = e, true
|
||||||
|
}
|
||||||
|
cut, has := strings.CutSuffix(e.ID, ".*")
|
||||||
|
if has && strings.HasPrefix(executionID, cut) {
|
||||||
|
bestMatch, ok = e, true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return bestMatch.Targets, ok
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r Router) IsZero() bool {
|
||||||
|
return len(r) == 0
|
||||||
|
}
|
||||||
@@ -0,0 +1,129 @@
|
|||||||
|
package target
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
eventGlobalTarget = Target{ExecutionID: "event", TargetID: "event_global"}
|
||||||
|
eventGroupTarget = Target{ExecutionID: "event/foo.*", TargetID: "event_group"}
|
||||||
|
eventMatchTarget = Target{ExecutionID: "event/foo.bar", TargetID: "event_specific"}
|
||||||
|
functionCallTarget1 = Target{ExecutionID: "function/Call", TargetID: "function_call_1"}
|
||||||
|
functionCallTarget2 = Target{ExecutionID: "function/Call", TargetID: "function_call_2"}
|
||||||
|
|
||||||
|
testTargets = []Target{eventGlobalTarget, eventGroupTarget, eventMatchTarget, functionCallTarget1, functionCallTarget2}
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestBinarySearchRouter_Get(t *testing.T) {
|
||||||
|
r := NewRouter(testTargets)
|
||||||
|
type args struct {
|
||||||
|
id string
|
||||||
|
}
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
args args
|
||||||
|
wantTargets []Target
|
||||||
|
wantOk bool
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "event global does not match exactly",
|
||||||
|
args: args{
|
||||||
|
id: "event/bar.foo",
|
||||||
|
},
|
||||||
|
wantTargets: nil,
|
||||||
|
wantOk: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "event group does not match exactly",
|
||||||
|
args: args{
|
||||||
|
id: "event/foo.bar.baz",
|
||||||
|
},
|
||||||
|
wantTargets: nil,
|
||||||
|
wantOk: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "event match",
|
||||||
|
args: args{
|
||||||
|
id: "event/foo.bar",
|
||||||
|
},
|
||||||
|
wantTargets: []Target{eventMatchTarget},
|
||||||
|
wantOk: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "function match",
|
||||||
|
args: args{
|
||||||
|
id: "function/Call",
|
||||||
|
},
|
||||||
|
wantTargets: []Target{functionCallTarget1, functionCallTarget2},
|
||||||
|
wantOk: true,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
got, ok := r.Get(tt.args.id)
|
||||||
|
assert.Equal(t, tt.wantTargets, got)
|
||||||
|
assert.Equal(t, tt.wantOk, ok)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestBinarySearchRouter_GetEventBestMatch(t *testing.T) {
|
||||||
|
type args struct {
|
||||||
|
id string
|
||||||
|
}
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
targets []Target
|
||||||
|
args args
|
||||||
|
wantTargets []Target
|
||||||
|
wantOk bool
|
||||||
|
}{
|
||||||
|
|
||||||
|
{
|
||||||
|
name: "event global match",
|
||||||
|
targets: testTargets,
|
||||||
|
args: args{
|
||||||
|
id: "event/bar.foo",
|
||||||
|
},
|
||||||
|
wantTargets: []Target{eventGlobalTarget},
|
||||||
|
wantOk: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "event group match",
|
||||||
|
targets: testTargets[1:],
|
||||||
|
args: args{
|
||||||
|
id: "event/foo.bar.baz",
|
||||||
|
},
|
||||||
|
wantTargets: []Target{eventGroupTarget},
|
||||||
|
wantOk: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "event match",
|
||||||
|
targets: testTargets,
|
||||||
|
args: args{
|
||||||
|
id: "event/foo.bar",
|
||||||
|
},
|
||||||
|
wantTargets: []Target{eventMatchTarget},
|
||||||
|
wantOk: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "function match",
|
||||||
|
targets: testTargets,
|
||||||
|
args: args{
|
||||||
|
id: "function/Call",
|
||||||
|
},
|
||||||
|
wantTargets: []Target{functionCallTarget1, functionCallTarget2},
|
||||||
|
wantOk: true,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
r := NewRouter(tt.targets)
|
||||||
|
got, ok := r.GetEventBestMatch(tt.args.id)
|
||||||
|
assert.Equal(t, tt.wantTargets, got)
|
||||||
|
assert.Equal(t, tt.wantOk, ok)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,50 @@
|
|||||||
|
package target
|
||||||
|
|
||||||
|
import (
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/zitadel/zitadel/internal/crypto"
|
||||||
|
)
|
||||||
|
|
||||||
|
type TargetType uint
|
||||||
|
|
||||||
|
const (
|
||||||
|
TargetTypeWebhook TargetType = iota
|
||||||
|
TargetTypeCall
|
||||||
|
TargetTypeAsync
|
||||||
|
)
|
||||||
|
|
||||||
|
type Target struct {
|
||||||
|
ExecutionID string `json:"execution_id,omitempty"`
|
||||||
|
TargetID string `json:"target_id,omitempty"`
|
||||||
|
TargetType TargetType `json:"target_type,omitempty"`
|
||||||
|
Endpoint string `json:"endpoint,omitempty"`
|
||||||
|
Timeout time.Duration `json:"timeout,omitempty"`
|
||||||
|
InterruptOnError bool `json:"interrupt_on_error,omitempty"`
|
||||||
|
SigningKey *crypto.CryptoValue `json:"signing_key,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (e *Target) GetExecutionID() string {
|
||||||
|
return e.ExecutionID
|
||||||
|
}
|
||||||
|
func (e *Target) GetTargetID() string {
|
||||||
|
return e.TargetID
|
||||||
|
}
|
||||||
|
func (e *Target) IsInterruptOnError() bool {
|
||||||
|
return e.InterruptOnError
|
||||||
|
}
|
||||||
|
func (e *Target) GetEndpoint() string {
|
||||||
|
return e.Endpoint
|
||||||
|
}
|
||||||
|
func (e *Target) GetTargetType() TargetType {
|
||||||
|
return e.TargetType
|
||||||
|
}
|
||||||
|
func (e *Target) GetTimeout() time.Duration {
|
||||||
|
return e.Timeout
|
||||||
|
}
|
||||||
|
func (e *Target) GetSigningKey(alg crypto.EncryptionAlgorithm) (string, error) {
|
||||||
|
if e.SigningKey == nil {
|
||||||
|
return "", nil
|
||||||
|
}
|
||||||
|
return crypto.DecryptString(e.SigningKey, alg)
|
||||||
|
}
|
||||||
@@ -9,7 +9,8 @@ import (
|
|||||||
|
|
||||||
"github.com/riverqueue/river"
|
"github.com/riverqueue/river"
|
||||||
|
|
||||||
"github.com/zitadel/zitadel/internal/query"
|
"github.com/zitadel/zitadel/internal/crypto"
|
||||||
|
target_domain "github.com/zitadel/zitadel/internal/execution/target"
|
||||||
exec_repo "github.com/zitadel/zitadel/internal/repository/execution"
|
exec_repo "github.com/zitadel/zitadel/internal/repository/execution"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -18,6 +19,8 @@ type Worker struct {
|
|||||||
|
|
||||||
config WorkerConfig
|
config WorkerConfig
|
||||||
now nowFunc
|
now nowFunc
|
||||||
|
|
||||||
|
targetEncAlg crypto.EncryptionAlgorithm
|
||||||
}
|
}
|
||||||
|
|
||||||
// Timeout implements the Timeout-function of [river.Worker].
|
// Timeout implements the Timeout-function of [river.Worker].
|
||||||
@@ -42,7 +45,7 @@ func (w *Worker) Work(ctx context.Context, job *river.Job[*exec_repo.Request]) e
|
|||||||
return river.JobCancel(fmt.Errorf("unable to unmarshal targets because %w", err))
|
return river.JobCancel(fmt.Errorf("unable to unmarshal targets because %w", err))
|
||||||
}
|
}
|
||||||
|
|
||||||
_, err = CallTargets(ctx, targets, exec_repo.ContextInfoFromRequest(job.Args))
|
_, err = CallTargets(ctx, targets, exec_repo.ContextInfoFromRequest(job.Args), w.targetEncAlg)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
// If there is an error returned from the targets, it means that the execution was interrupted
|
// If there is an error returned from the targets, it means that the execution was interrupted
|
||||||
return river.JobCancel(fmt.Errorf("interruption during call of targets because %w", err))
|
return river.JobCancel(fmt.Errorf("interruption during call of targets because %w", err))
|
||||||
@@ -61,10 +64,12 @@ type WorkerConfig struct {
|
|||||||
|
|
||||||
func NewWorker(
|
func NewWorker(
|
||||||
config WorkerConfig,
|
config WorkerConfig,
|
||||||
|
targetEncAlg crypto.EncryptionAlgorithm,
|
||||||
) *Worker {
|
) *Worker {
|
||||||
return &Worker{
|
return &Worker{
|
||||||
config: config,
|
config: config,
|
||||||
now: time.Now,
|
now: time.Now,
|
||||||
|
targetEncAlg: targetEncAlg,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -77,14 +82,10 @@ func (w *Worker) Register(workers *river.Workers, queues map[string]river.QueueC
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TargetsFromRequest(e *exec_repo.Request) ([]Target, error) {
|
func TargetsFromRequest(e *exec_repo.Request) ([]target_domain.Target, error) {
|
||||||
var execTargets []*query.ExecutionTarget
|
var targets []target_domain.Target
|
||||||
if err := json.Unmarshal(e.TargetsData, &execTargets); err != nil {
|
if err := json.Unmarshal(e.TargetsData, &targets); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
targets := make([]Target, len(execTargets))
|
|
||||||
for i, target := range execTargets {
|
|
||||||
targets[i] = target
|
|
||||||
}
|
|
||||||
return targets, nil
|
return targets, nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,35 +15,21 @@ import (
|
|||||||
|
|
||||||
"github.com/zitadel/zitadel/internal/api/authz"
|
"github.com/zitadel/zitadel/internal/api/authz"
|
||||||
"github.com/zitadel/zitadel/internal/eventstore"
|
"github.com/zitadel/zitadel/internal/eventstore"
|
||||||
"github.com/zitadel/zitadel/internal/execution/mock"
|
target_domain "github.com/zitadel/zitadel/internal/execution/target"
|
||||||
"github.com/zitadel/zitadel/internal/query"
|
|
||||||
"github.com/zitadel/zitadel/internal/repository/action"
|
"github.com/zitadel/zitadel/internal/repository/action"
|
||||||
exec_repo "github.com/zitadel/zitadel/internal/repository/execution"
|
exec_repo "github.com/zitadel/zitadel/internal/repository/execution"
|
||||||
"github.com/zitadel/zitadel/internal/repository/user"
|
"github.com/zitadel/zitadel/internal/repository/user"
|
||||||
"github.com/zitadel/zitadel/internal/zerrors"
|
"github.com/zitadel/zitadel/internal/zerrors"
|
||||||
)
|
)
|
||||||
|
|
||||||
type fields struct {
|
|
||||||
queries *mock.MockQueries
|
|
||||||
queue *mock.MockQueue
|
|
||||||
}
|
|
||||||
type fieldsWorker struct {
|
type fieldsWorker struct {
|
||||||
now nowFunc
|
now nowFunc
|
||||||
}
|
}
|
||||||
type args struct {
|
|
||||||
event eventstore.Event
|
|
||||||
mapper func(event eventstore.Event) (eventstore.Event, error)
|
|
||||||
}
|
|
||||||
type argsWorker struct {
|
type argsWorker struct {
|
||||||
job *river.Job[*exec_repo.Request]
|
job *river.Job[*exec_repo.Request]
|
||||||
}
|
}
|
||||||
type want struct {
|
|
||||||
noOperation bool
|
|
||||||
err assert.ErrorAssertionFunc
|
|
||||||
stmtErr assert.ErrorAssertionFunc
|
|
||||||
}
|
|
||||||
type wantWorker struct {
|
type wantWorker struct {
|
||||||
targets []*query.ExecutionTarget
|
targets []target_domain.Target
|
||||||
sendStatusCode int
|
sendStatusCode int
|
||||||
err assert.ErrorAssertionFunc
|
err assert.ErrorAssertionFunc
|
||||||
}
|
}
|
||||||
@@ -286,3 +272,25 @@ func Test_handleEventExecution(t *testing.T) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func mockTarget() target_domain.Target {
|
||||||
|
return target_domain.Target{
|
||||||
|
ExecutionID: "executionID",
|
||||||
|
TargetID: "targetID",
|
||||||
|
TargetType: target_domain.TargetTypeWebhook,
|
||||||
|
Endpoint: "endpoint",
|
||||||
|
Timeout: time.Minute,
|
||||||
|
InterruptOnError: true,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func mockTargets(count int) []target_domain.Target {
|
||||||
|
var targets []target_domain.Target
|
||||||
|
if count > 0 {
|
||||||
|
targets = make([]target_domain.Target, count)
|
||||||
|
for i := range targets {
|
||||||
|
targets[i] = mockTarget()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return targets
|
||||||
|
}
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ import (
|
|||||||
"google.golang.org/protobuf/types/known/timestamppb"
|
"google.golang.org/protobuf/types/known/timestamppb"
|
||||||
|
|
||||||
"github.com/zitadel/zitadel/internal/domain"
|
"github.com/zitadel/zitadel/internal/domain"
|
||||||
|
target_domain "github.com/zitadel/zitadel/internal/execution/target"
|
||||||
"github.com/zitadel/zitadel/internal/integration/scim"
|
"github.com/zitadel/zitadel/internal/integration/scim"
|
||||||
"github.com/zitadel/zitadel/pkg/grpc/action/v2"
|
"github.com/zitadel/zitadel/pkg/grpc/action/v2"
|
||||||
action_v2beta "github.com/zitadel/zitadel/pkg/grpc/action/v2beta"
|
action_v2beta "github.com/zitadel/zitadel/pkg/grpc/action/v2beta"
|
||||||
@@ -1064,7 +1065,7 @@ func (i *Instance) DeleteProjectGrantMembership(t *testing.T, ctx context.Contex
|
|||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (i *Instance) CreateTarget(ctx context.Context, t *testing.T, name, endpoint string, ty domain.TargetType, interrupt bool) *action.CreateTargetResponse {
|
func (i *Instance) CreateTarget(ctx context.Context, t *testing.T, name, endpoint string, ty target_domain.TargetType, interrupt bool) *action.CreateTargetResponse {
|
||||||
if name == "" {
|
if name == "" {
|
||||||
name = gofakeit.Name()
|
name = gofakeit.Name()
|
||||||
}
|
}
|
||||||
@@ -1074,19 +1075,19 @@ func (i *Instance) CreateTarget(ctx context.Context, t *testing.T, name, endpoin
|
|||||||
Timeout: durationpb.New(5 * time.Second),
|
Timeout: durationpb.New(5 * time.Second),
|
||||||
}
|
}
|
||||||
switch ty {
|
switch ty {
|
||||||
case domain.TargetTypeWebhook:
|
case target_domain.TargetTypeWebhook:
|
||||||
req.TargetType = &action.CreateTargetRequest_RestWebhook{
|
req.TargetType = &action.CreateTargetRequest_RestWebhook{
|
||||||
RestWebhook: &action.RESTWebhook{
|
RestWebhook: &action.RESTWebhook{
|
||||||
InterruptOnError: interrupt,
|
InterruptOnError: interrupt,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
case domain.TargetTypeCall:
|
case target_domain.TargetTypeCall:
|
||||||
req.TargetType = &action.CreateTargetRequest_RestCall{
|
req.TargetType = &action.CreateTargetRequest_RestCall{
|
||||||
RestCall: &action.RESTCall{
|
RestCall: &action.RESTCall{
|
||||||
InterruptOnError: interrupt,
|
InterruptOnError: interrupt,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
case domain.TargetTypeAsync:
|
case target_domain.TargetTypeAsync:
|
||||||
req.TargetType = &action.CreateTargetRequest_RestAsync{
|
req.TargetType = &action.CreateTargetRequest_RestAsync{
|
||||||
RestAsync: &action.RESTAsync{},
|
RestAsync: &action.RESTAsync{},
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,17 +8,13 @@ import (
|
|||||||
"encoding/json"
|
"encoding/json"
|
||||||
"errors"
|
"errors"
|
||||||
"slices"
|
"slices"
|
||||||
"time"
|
|
||||||
|
|
||||||
sq "github.com/Masterminds/squirrel"
|
sq "github.com/Masterminds/squirrel"
|
||||||
|
|
||||||
"github.com/zitadel/zitadel/internal/api/authz"
|
"github.com/zitadel/zitadel/internal/api/authz"
|
||||||
"github.com/zitadel/zitadel/internal/crypto"
|
|
||||||
"github.com/zitadel/zitadel/internal/database"
|
|
||||||
"github.com/zitadel/zitadel/internal/domain"
|
"github.com/zitadel/zitadel/internal/domain"
|
||||||
"github.com/zitadel/zitadel/internal/query/projection"
|
"github.com/zitadel/zitadel/internal/query/projection"
|
||||||
exec "github.com/zitadel/zitadel/internal/repository/execution"
|
exec "github.com/zitadel/zitadel/internal/repository/execution"
|
||||||
"github.com/zitadel/zitadel/internal/telemetry/tracing"
|
|
||||||
"github.com/zitadel/zitadel/internal/zerrors"
|
"github.com/zitadel/zitadel/internal/zerrors"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -65,10 +61,6 @@ var (
|
|||||||
var (
|
var (
|
||||||
//go:embed execution_targets.sql
|
//go:embed execution_targets.sql
|
||||||
executionTargetsQuery string
|
executionTargetsQuery string
|
||||||
//go:embed targets_by_execution_id.sql
|
|
||||||
TargetsByExecutionIDQuery string
|
|
||||||
//go:embed targets_by_execution_ids.sql
|
|
||||||
TargetsByExecutionIDsQuery string
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type Executions struct {
|
type Executions struct {
|
||||||
@@ -156,71 +148,6 @@ func targetItemJSONB(t domain.ExecutionTargetType, targetItem string) ([]byte, e
|
|||||||
return json.Marshal([]*executionTarget{target})
|
return json.Marshal([]*executionTarget{target})
|
||||||
}
|
}
|
||||||
|
|
||||||
// TargetsByExecutionID query list of targets for best match of a list of IDs, for example:
|
|
||||||
// [ "request/zitadel.action.v3alpha.ActionService/GetTargetByID",
|
|
||||||
// "request/zitadel.action.v3alpha.ActionService",
|
|
||||||
// "request" ]
|
|
||||||
func (q *Queries) TargetsByExecutionID(ctx context.Context, ids []string) (execution []*ExecutionTarget, err error) {
|
|
||||||
ctx, span := tracing.NewSpan(ctx)
|
|
||||||
defer func() { span.End() }()
|
|
||||||
|
|
||||||
instanceID := authz.GetInstance(ctx).InstanceID()
|
|
||||||
if instanceID == "" {
|
|
||||||
return nil, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
err = q.client.QueryContext(ctx,
|
|
||||||
func(rows *sql.Rows) error {
|
|
||||||
execution, err = scanExecutionTargets(rows)
|
|
||||||
return err
|
|
||||||
},
|
|
||||||
TargetsByExecutionIDQuery,
|
|
||||||
instanceID,
|
|
||||||
database.TextArray[string](ids),
|
|
||||||
)
|
|
||||||
for i := range execution {
|
|
||||||
if err := execution[i].decryptSigningKey(q.targetEncryptionAlgorithm); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return execution, err
|
|
||||||
}
|
|
||||||
|
|
||||||
// TargetsByExecutionIDs query list of targets for best matches of 2 separate lists of IDs, combined for performance, for example:
|
|
||||||
// [ "request/zitadel.action.v3alpha.ActionService/GetTargetByID",
|
|
||||||
// "request/zitadel.action.v3alpha.ActionService",
|
|
||||||
// "request" ]
|
|
||||||
// and
|
|
||||||
// [ "response/zitadel.action.v3alpha.ActionService/GetTargetByID",
|
|
||||||
// "response/zitadel.action.v3alpha.ActionService",
|
|
||||||
// "response" ]
|
|
||||||
func (q *Queries) TargetsByExecutionIDs(ctx context.Context, ids1, ids2 []string) (execution []*ExecutionTarget, err error) {
|
|
||||||
ctx, span := tracing.NewSpan(ctx)
|
|
||||||
defer func() { span.End() }()
|
|
||||||
|
|
||||||
instanceID := authz.GetInstance(ctx).InstanceID()
|
|
||||||
if instanceID == "" {
|
|
||||||
return nil, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
err = q.client.QueryContext(ctx,
|
|
||||||
func(rows *sql.Rows) error {
|
|
||||||
execution, err = scanExecutionTargets(rows)
|
|
||||||
return err
|
|
||||||
},
|
|
||||||
TargetsByExecutionIDsQuery,
|
|
||||||
instanceID,
|
|
||||||
database.TextArray[string](ids1),
|
|
||||||
database.TextArray[string](ids2),
|
|
||||||
)
|
|
||||||
for i := range execution {
|
|
||||||
if err := execution[i].decryptSigningKey(q.targetEncryptionAlgorithm); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return execution, err
|
|
||||||
}
|
|
||||||
|
|
||||||
func prepareExecutionQuery() (sq.SelectBuilder, func(row *sql.Row) (*Execution, error)) {
|
func prepareExecutionQuery() (sq.SelectBuilder, func(row *sql.Row) (*Execution, error)) {
|
||||||
return sq.Select(
|
return sq.Select(
|
||||||
ExecutionColumnInstanceID.identifier(),
|
ExecutionColumnInstanceID.identifier(),
|
||||||
@@ -358,99 +285,3 @@ func scanExecutions(rows *sql.Rows) (*Executions, error) {
|
|||||||
},
|
},
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
type ExecutionTarget struct {
|
|
||||||
InstanceID string
|
|
||||||
ExecutionID string
|
|
||||||
TargetID string
|
|
||||||
TargetType domain.TargetType
|
|
||||||
Endpoint string
|
|
||||||
Timeout time.Duration
|
|
||||||
InterruptOnError bool
|
|
||||||
signingKey *crypto.CryptoValue
|
|
||||||
SigningKey string
|
|
||||||
}
|
|
||||||
|
|
||||||
func (e *ExecutionTarget) GetExecutionID() string {
|
|
||||||
return e.ExecutionID
|
|
||||||
}
|
|
||||||
func (e *ExecutionTarget) GetTargetID() string {
|
|
||||||
return e.TargetID
|
|
||||||
}
|
|
||||||
func (e *ExecutionTarget) IsInterruptOnError() bool {
|
|
||||||
return e.InterruptOnError
|
|
||||||
}
|
|
||||||
func (e *ExecutionTarget) GetEndpoint() string {
|
|
||||||
return e.Endpoint
|
|
||||||
}
|
|
||||||
func (e *ExecutionTarget) GetTargetType() domain.TargetType {
|
|
||||||
return e.TargetType
|
|
||||||
}
|
|
||||||
func (e *ExecutionTarget) GetTimeout() time.Duration {
|
|
||||||
return e.Timeout
|
|
||||||
}
|
|
||||||
func (e *ExecutionTarget) GetSigningKey() string {
|
|
||||||
return e.SigningKey
|
|
||||||
}
|
|
||||||
|
|
||||||
func (t *ExecutionTarget) decryptSigningKey(alg crypto.EncryptionAlgorithm) error {
|
|
||||||
if t.signingKey == nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
keyValue, err := crypto.DecryptString(t.signingKey, alg)
|
|
||||||
if err != nil {
|
|
||||||
return zerrors.ThrowInternal(err, "QUERY-bxevy3YXwy", "Errors.Internal")
|
|
||||||
}
|
|
||||||
t.SigningKey = keyValue
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func scanExecutionTargets(rows *sql.Rows) ([]*ExecutionTarget, error) {
|
|
||||||
targets := make([]*ExecutionTarget, 0)
|
|
||||||
for rows.Next() {
|
|
||||||
target := new(ExecutionTarget)
|
|
||||||
|
|
||||||
var (
|
|
||||||
instanceID = &sql.NullString{}
|
|
||||||
executionID = &sql.NullString{}
|
|
||||||
targetID = &sql.NullString{}
|
|
||||||
targetType = &sql.NullInt32{}
|
|
||||||
endpoint = &sql.NullString{}
|
|
||||||
timeout = &sql.NullInt64{}
|
|
||||||
interruptOnError = &sql.NullBool{}
|
|
||||||
signingKey = &crypto.CryptoValue{}
|
|
||||||
)
|
|
||||||
|
|
||||||
err := rows.Scan(
|
|
||||||
executionID,
|
|
||||||
instanceID,
|
|
||||||
targetID,
|
|
||||||
targetType,
|
|
||||||
endpoint,
|
|
||||||
timeout,
|
|
||||||
interruptOnError,
|
|
||||||
signingKey,
|
|
||||||
)
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
target.InstanceID = instanceID.String
|
|
||||||
target.ExecutionID = executionID.String
|
|
||||||
target.TargetID = targetID.String
|
|
||||||
target.TargetType = domain.TargetType(targetType.Int32)
|
|
||||||
target.Endpoint = endpoint.String
|
|
||||||
target.Timeout = time.Duration(timeout.Int64)
|
|
||||||
target.InterruptOnError = interruptOnError.Bool
|
|
||||||
target.signingKey = signingKey
|
|
||||||
|
|
||||||
targets = append(targets, target)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := rows.Close(); err != nil {
|
|
||||||
return nil, zerrors.ThrowInternal(err, "QUERY-37ardr0pki", "Errors.Query.CloseRows")
|
|
||||||
}
|
|
||||||
|
|
||||||
return targets, nil
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
SELECT et.instance_id,
|
SELECT et.instance_id,
|
||||||
et.execution_id,
|
et.execution_id,
|
||||||
JSONB_AGG(
|
JSONB_AGG(
|
||||||
JSON_OBJECT(
|
JSON_BUILD_OBJECT(
|
||||||
'position' : et.position,
|
'position', et.position,
|
||||||
'include' : et.include,
|
'include', et.include,
|
||||||
'target' : et.target_id
|
'target', et.target_id
|
||||||
)
|
)
|
||||||
) as targets
|
) as targets
|
||||||
FROM projections.executions1_targets AS et
|
FROM projections.executions1_targets AS et
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ var (
|
|||||||
` COUNT(*) OVER ()` +
|
` COUNT(*) OVER ()` +
|
||||||
` FROM projections.executions1` +
|
` FROM projections.executions1` +
|
||||||
` JOIN (` +
|
` JOIN (` +
|
||||||
`SELECT et.instance_id, et.execution_id, JSONB_AGG( JSON_OBJECT( 'position' : et.position, 'include' : et.include, 'target' : et.target_id ) ) as targets` +
|
`SELECT et.instance_id, et.execution_id, JSONB_AGG( JSON_BUILD_OBJECT( 'position', et.position, 'include', et.include, 'target', et.target_id ) ) as targets` +
|
||||||
` FROM projections.executions1_targets AS et` +
|
` FROM projections.executions1_targets AS et` +
|
||||||
` INNER JOIN projections.targets2 AS t ON et.instance_id = t.instance_id AND et.target_id IS NOT NULL AND et.target_id = t.id` +
|
` INNER JOIN projections.targets2 AS t ON et.instance_id = t.instance_id AND et.target_id IS NOT NULL AND et.target_id = t.id` +
|
||||||
` GROUP BY et.instance_id, et.execution_id` +
|
` GROUP BY et.instance_id, et.execution_id` +
|
||||||
@@ -46,7 +46,7 @@ var (
|
|||||||
` execution_targets.targets` +
|
` execution_targets.targets` +
|
||||||
` FROM projections.executions1` +
|
` FROM projections.executions1` +
|
||||||
` JOIN (` +
|
` JOIN (` +
|
||||||
`SELECT et.instance_id, et.execution_id, JSONB_AGG( JSON_OBJECT( 'position' : et.position, 'include' : et.include, 'target' : et.target_id ) ) as targets` +
|
`SELECT et.instance_id, et.execution_id, JSONB_AGG( JSON_BUILD_OBJECT( 'position', et.position, 'include', et.include, 'target', et.target_id ) ) as targets` +
|
||||||
` FROM projections.executions1_targets AS et` +
|
` FROM projections.executions1_targets AS et` +
|
||||||
` INNER JOIN projections.targets2 AS t ON et.instance_id = t.instance_id AND et.target_id IS NOT NULL AND et.target_id = t.id` +
|
` INNER JOIN projections.targets2 AS t ON et.instance_id = t.instance_id AND et.target_id IS NOT NULL AND et.target_id = t.id` +
|
||||||
` GROUP BY et.instance_id, et.execution_id` +
|
` GROUP BY et.instance_id, et.execution_id` +
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import (
|
|||||||
"database/sql"
|
"database/sql"
|
||||||
|
|
||||||
sq "github.com/Masterminds/squirrel"
|
sq "github.com/Masterminds/squirrel"
|
||||||
|
"github.com/zitadel/logging"
|
||||||
|
|
||||||
"github.com/zitadel/zitadel/internal/api/authz"
|
"github.com/zitadel/zitadel/internal/api/authz"
|
||||||
"github.com/zitadel/zitadel/internal/database"
|
"github.com/zitadel/zitadel/internal/database"
|
||||||
@@ -24,6 +25,7 @@ func genericRowsQuery[R any](
|
|||||||
|
|
||||||
stmt, args, err := query.ToSql()
|
stmt, args, err := query.ToSql()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
logging.OnError(err).Warn("query: invalid request")
|
||||||
return rnil, zerrors.ThrowInvalidArgument(err, "QUERY-05wf2q36ji", "Errors.Query.InvalidRequest")
|
return rnil, zerrors.ThrowInvalidArgument(err, "QUERY-05wf2q36ji", "Errors.Query.InvalidRequest")
|
||||||
}
|
}
|
||||||
err = client.QueryContext(ctx, func(rows *sql.Rows) error {
|
err = client.QueryContext(ctx, func(rows *sql.Rows) error {
|
||||||
@@ -31,6 +33,7 @@ func genericRowsQuery[R any](
|
|||||||
return err
|
return err
|
||||||
}, stmt, args...)
|
}, stmt, args...)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
logging.OnError(err).Error("query: internal error")
|
||||||
return rnil, zerrors.ThrowInternal(err, "QUERY-y2u7vctrha", "Errors.Internal")
|
return rnil, zerrors.ThrowInternal(err, "QUERY-y2u7vctrha", "Errors.Internal")
|
||||||
}
|
}
|
||||||
return resp, err
|
return resp, err
|
||||||
@@ -50,6 +53,7 @@ func genericRowsQueryWithState[R Stateful](
|
|||||||
}
|
}
|
||||||
state, err := latestState(ctx, client, projection)
|
state, err := latestState(ctx, client, projection)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
logging.OnError(err).Error("query: latest state")
|
||||||
return rnil, err
|
return rnil, err
|
||||||
}
|
}
|
||||||
resp.SetState(state)
|
resp.SetState(state)
|
||||||
|
|||||||
+36
-15
@@ -15,10 +15,12 @@ import (
|
|||||||
"github.com/zitadel/logging"
|
"github.com/zitadel/logging"
|
||||||
"golang.org/x/text/language"
|
"golang.org/x/text/language"
|
||||||
|
|
||||||
|
"github.com/zitadel/zitadel/cmd/build"
|
||||||
"github.com/zitadel/zitadel/internal/api/authz"
|
"github.com/zitadel/zitadel/internal/api/authz"
|
||||||
"github.com/zitadel/zitadel/internal/database"
|
"github.com/zitadel/zitadel/internal/database"
|
||||||
"github.com/zitadel/zitadel/internal/eventstore"
|
"github.com/zitadel/zitadel/internal/eventstore"
|
||||||
"github.com/zitadel/zitadel/internal/eventstore/handler/v2"
|
"github.com/zitadel/zitadel/internal/eventstore/handler/v2"
|
||||||
|
target_domain "github.com/zitadel/zitadel/internal/execution/target"
|
||||||
"github.com/zitadel/zitadel/internal/feature"
|
"github.com/zitadel/zitadel/internal/feature"
|
||||||
"github.com/zitadel/zitadel/internal/query/projection"
|
"github.com/zitadel/zitadel/internal/query/projection"
|
||||||
"github.com/zitadel/zitadel/internal/telemetry/tracing"
|
"github.com/zitadel/zitadel/internal/telemetry/tracing"
|
||||||
@@ -216,7 +218,7 @@ func (q *Queries) InstanceByHost(ctx context.Context, instanceHost, publicHost s
|
|||||||
publicDomain := strings.Split(publicHost, ":")[0] // remove possible port
|
publicDomain := strings.Split(publicHost, ":")[0] // remove possible port
|
||||||
|
|
||||||
instance, ok := q.caches.instance.Get(ctx, instanceIndexByHost, instanceDomain)
|
instance, ok := q.caches.instance.Get(ctx, instanceIndexByHost, instanceDomain)
|
||||||
if ok {
|
if ok && instance.ZitadelVersion == build.Version() {
|
||||||
return instance, instance.checkDomain(instanceDomain, publicDomain)
|
return instance, instance.checkDomain(instanceDomain, publicDomain)
|
||||||
}
|
}
|
||||||
instance, scan := scanAuthzInstance()
|
instance, scan := scanAuthzInstance()
|
||||||
@@ -239,14 +241,16 @@ func (q *Queries) InstanceByID(ctx context.Context, id string) (_ authz.Instance
|
|||||||
}()
|
}()
|
||||||
|
|
||||||
instance, ok := q.caches.instance.Get(ctx, instanceIndexByID, id)
|
instance, ok := q.caches.instance.Get(ctx, instanceIndexByID, id)
|
||||||
if ok {
|
if ok && instance.ZitadelVersion == build.Version() {
|
||||||
return instance, nil
|
return instance, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
instance, scan := scanAuthzInstance()
|
instance, scan := scanAuthzInstance()
|
||||||
err = q.client.QueryRowContext(ctx, scan, instanceByIDQuery, id)
|
err = q.client.QueryRowContext(ctx, scan, instanceByIDQuery, id)
|
||||||
logging.OnError(err).WithField("instance_id", id).Warn("instance by ID")
|
logging.OnError(err).WithField("instance_id", id).Warn("instance by ID")
|
||||||
|
|
||||||
if err == nil {
|
if err == nil {
|
||||||
|
instance.ZitadelVersion = build.Version()
|
||||||
q.caches.instance.Set(ctx, instance)
|
q.caches.instance.Set(ctx, instance)
|
||||||
}
|
}
|
||||||
return instance, err
|
return instance, err
|
||||||
@@ -460,19 +464,21 @@ func prepareInstanceDomainQuery() (sq.SelectBuilder, func(*sql.Rows) (*Instance,
|
|||||||
}
|
}
|
||||||
|
|
||||||
type authzInstance struct {
|
type authzInstance struct {
|
||||||
ID string `json:"id,omitempty"`
|
ID string `json:"id,omitempty"`
|
||||||
IAMProjectID string `json:"iam_project_id,omitempty"`
|
IAMProjectID string `json:"iam_project_id,omitempty"`
|
||||||
ConsoleID string `json:"console_id,omitempty"`
|
ConsoleID string `json:"console_id,omitempty"`
|
||||||
ConsoleAppID string `json:"console_app_id,omitempty"`
|
ConsoleAppID string `json:"console_app_id,omitempty"`
|
||||||
DefaultLang language.Tag `json:"default_lang,omitempty"`
|
DefaultLang language.Tag `json:"default_lang,omitempty"`
|
||||||
DefaultOrgID string `json:"default_org_id,omitempty"`
|
DefaultOrgID string `json:"default_org_id,omitempty"`
|
||||||
CSP csp `json:"csp,omitempty"`
|
CSP csp `json:"csp,omitempty"`
|
||||||
Impersonation bool `json:"impersonation,omitempty"`
|
Impersonation bool `json:"impersonation,omitempty"`
|
||||||
IsBlocked *bool `json:"is_blocked,omitempty"`
|
IsBlocked *bool `json:"is_blocked,omitempty"`
|
||||||
LogRetention *time.Duration `json:"log_retention,omitempty"`
|
LogRetention *time.Duration `json:"log_retention,omitempty"`
|
||||||
Feature feature.Features `json:"feature,omitempty"`
|
Feature feature.Features `json:"feature,omitempty"`
|
||||||
ExternalDomains database.TextArray[string] `json:"external_domains,omitempty"`
|
ExternalDomains database.TextArray[string] `json:"external_domains,omitempty"`
|
||||||
TrustedDomains database.TextArray[string] `json:"trusted_domains,omitempty"`
|
TrustedDomains database.TextArray[string] `json:"trusted_domains,omitempty"`
|
||||||
|
ExecutionTargets target_domain.Router `json:"execution_targets,omitzero"`
|
||||||
|
ZitadelVersion string `json:"zitadel_version,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type csp struct {
|
type csp struct {
|
||||||
@@ -527,6 +533,10 @@ func (i *authzInstance) Features() feature.Features {
|
|||||||
return i.Feature
|
return i.Feature
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (i *authzInstance) ExecutionRouter() target_domain.Router {
|
||||||
|
return i.ExecutionTargets
|
||||||
|
}
|
||||||
|
|
||||||
var errPublicDomain = "public domain %q not trusted"
|
var errPublicDomain = "public domain %q not trusted"
|
||||||
|
|
||||||
func (i *authzInstance) checkDomain(instanceDomain, publicDomain string) error {
|
func (i *authzInstance) checkDomain(instanceDomain, publicDomain string) error {
|
||||||
@@ -562,6 +572,7 @@ func scanAuthzInstance() (*authzInstance, func(row *sql.Row) error) {
|
|||||||
auditLogRetention database.NullDuration
|
auditLogRetention database.NullDuration
|
||||||
block sql.NullBool
|
block sql.NullBool
|
||||||
features []byte
|
features []byte
|
||||||
|
executionTargetsBytes []byte
|
||||||
)
|
)
|
||||||
err := row.Scan(
|
err := row.Scan(
|
||||||
&instance.ID,
|
&instance.ID,
|
||||||
@@ -578,6 +589,7 @@ func scanAuthzInstance() (*authzInstance, func(row *sql.Row) error) {
|
|||||||
&features,
|
&features,
|
||||||
&instance.ExternalDomains,
|
&instance.ExternalDomains,
|
||||||
&instance.TrustedDomains,
|
&instance.TrustedDomains,
|
||||||
|
&executionTargetsBytes,
|
||||||
)
|
)
|
||||||
if errors.Is(err, sql.ErrNoRows) {
|
if errors.Is(err, sql.ErrNoRows) {
|
||||||
return zerrors.ThrowNotFound(nil, "QUERY-1kIjX", "Errors.IAM.NotFound")
|
return zerrors.ThrowNotFound(nil, "QUERY-1kIjX", "Errors.IAM.NotFound")
|
||||||
@@ -600,6 +612,13 @@ func scanAuthzInstance() (*authzInstance, func(row *sql.Row) error) {
|
|||||||
if err = json.Unmarshal(features, &instance.Feature); err != nil {
|
if err = json.Unmarshal(features, &instance.Feature); err != nil {
|
||||||
return zerrors.ThrowInternal(err, "QUERY-Po8ki", "Errors.Internal")
|
return zerrors.ThrowInternal(err, "QUERY-Po8ki", "Errors.Internal")
|
||||||
}
|
}
|
||||||
|
if len(executionTargetsBytes) > 0 {
|
||||||
|
var targets []target_domain.Target
|
||||||
|
if err := json.Unmarshal(executionTargetsBytes, &targets); err != nil {
|
||||||
|
return zerrors.ThrowInternal(err, "QUERY-aeKa2", "Errors.Internal")
|
||||||
|
}
|
||||||
|
instance.ExecutionTargets = target_domain.NewRouter(targets)
|
||||||
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -616,6 +635,8 @@ func (c *Caches) registerInstanceInvalidation() {
|
|||||||
invalidate = cacheInvalidationFunc(c.instance, instanceIndexByID, getResourceOwner)
|
invalidate = cacheInvalidationFunc(c.instance, instanceIndexByID, getResourceOwner)
|
||||||
projection.LimitsProjection.RegisterCacheInvalidation(invalidate)
|
projection.LimitsProjection.RegisterCacheInvalidation(invalidate)
|
||||||
projection.RestrictionsProjection.RegisterCacheInvalidation(invalidate)
|
projection.RestrictionsProjection.RegisterCacheInvalidation(invalidate)
|
||||||
|
projection.ExecutionProjection.RegisterCacheInvalidation(invalidate)
|
||||||
|
projection.TargetProjection.RegisterCacheInvalidation(invalidate)
|
||||||
|
|
||||||
// System feature update should invalidate all instances, so Truncate the cache.
|
// System feature update should invalidate all instances, so Truncate the cache.
|
||||||
projection.SystemFeatureProjection.RegisterCacheInvalidation(func(ctx context.Context, _ []*eventstore.Aggregate) {
|
projection.SystemFeatureProjection.RegisterCacheInvalidation(func(ctx context.Context, _ []*eventstore.Aggregate) {
|
||||||
|
|||||||
@@ -26,6 +26,29 @@ with domain as (
|
|||||||
from domain d
|
from domain d
|
||||||
join projections.instance_trusted_domains td on d.instance_id = td.instance_id
|
join projections.instance_trusted_domains td on d.instance_id = td.instance_id
|
||||||
group by td.instance_id
|
group by td.instance_id
|
||||||
|
), execution_targets as (
|
||||||
|
select instance_id, json_agg(x.execution_targets) as execution_targets from (
|
||||||
|
select e.instance_id, json_build_object(
|
||||||
|
'execution_id', et.execution_id,
|
||||||
|
'target_id', t.id,
|
||||||
|
'target_type', t.target_type,
|
||||||
|
'endpoint', t.endpoint,
|
||||||
|
'timeout', t.timeout,
|
||||||
|
'interrupt_on_error', t.interrupt_on_error,
|
||||||
|
'signing_key', t.signing_key
|
||||||
|
) as execution_targets
|
||||||
|
from domain d
|
||||||
|
join projections.executions1 e
|
||||||
|
on d.instance_id = e.instance_id
|
||||||
|
join projections.executions1_targets et
|
||||||
|
on e.instance_id = et.instance_id
|
||||||
|
and e.id = et.execution_id
|
||||||
|
join projections.targets2 t
|
||||||
|
on et.instance_id = t.instance_id
|
||||||
|
and et.target_id = t.id
|
||||||
|
order by et.position asc
|
||||||
|
) as x
|
||||||
|
group by instance_id
|
||||||
)
|
)
|
||||||
select
|
select
|
||||||
i.id,
|
i.id,
|
||||||
@@ -41,11 +64,13 @@ select
|
|||||||
l.block,
|
l.block,
|
||||||
f.features,
|
f.features,
|
||||||
ed.domains as external_domains,
|
ed.domains as external_domains,
|
||||||
td.domains as trusted_domains
|
td.domains as trusted_domains,
|
||||||
|
et.execution_targets
|
||||||
from domain d
|
from domain d
|
||||||
join projections.instances i on i.id = d.instance_id
|
join projections.instances i on i.id = d.instance_id
|
||||||
left join projections.security_policies2 s on i.id = s.instance_id
|
left join projections.security_policies2 s on i.id = s.instance_id
|
||||||
left join projections.limits l on i.id = l.instance_id
|
left join projections.limits l on i.id = l.instance_id
|
||||||
left join features f on i.id = f.instance_id
|
left join features f on i.id = f.instance_id
|
||||||
left join external_domains ed on i.id = ed.instance_id
|
left join external_domains ed on i.id = ed.instance_id
|
||||||
left join trusted_domains td on i.id = td.instance_id;
|
left join trusted_domains td on i.id = td.instance_id
|
||||||
|
left join execution_targets et on i.id = et.instance_id;
|
||||||
|
|||||||
@@ -17,6 +17,28 @@ with features as (
|
|||||||
from projections.instance_trusted_domains
|
from projections.instance_trusted_domains
|
||||||
where instance_id = $1
|
where instance_id = $1
|
||||||
group by instance_id
|
group by instance_id
|
||||||
|
), execution_targets as (
|
||||||
|
select instance_id, json_agg(x.execution_targets) as execution_targets from (
|
||||||
|
select e.instance_id, json_build_object(
|
||||||
|
'execution_id', et.execution_id,
|
||||||
|
'target_id', t.id,
|
||||||
|
'target_type', t.target_type,
|
||||||
|
'endpoint', t.endpoint,
|
||||||
|
'timeout', t.timeout,
|
||||||
|
'interrupt_on_error', t.interrupt_on_error,
|
||||||
|
'signing_key', t.signing_key
|
||||||
|
) as execution_targets
|
||||||
|
from projections.executions1 e
|
||||||
|
join projections.executions1_targets et
|
||||||
|
on e.instance_id = et.instance_id
|
||||||
|
and e.id = et.execution_id
|
||||||
|
join projections.targets2 t
|
||||||
|
on et.instance_id = t.instance_id
|
||||||
|
and et.target_id = t.id
|
||||||
|
where e.instance_id = $1
|
||||||
|
order by et.position asc
|
||||||
|
) as x
|
||||||
|
group by instance_id
|
||||||
)
|
)
|
||||||
select
|
select
|
||||||
i.id,
|
i.id,
|
||||||
@@ -32,11 +54,13 @@ select
|
|||||||
l.block,
|
l.block,
|
||||||
f.features,
|
f.features,
|
||||||
ed.domains as external_domains,
|
ed.domains as external_domains,
|
||||||
td.domains as trusted_domains
|
td.domains as trusted_domains,
|
||||||
|
et.execution_targets
|
||||||
from projections.instances i
|
from projections.instances i
|
||||||
left join projections.security_policies2 s on i.id = s.instance_id
|
left join projections.security_policies2 s on i.id = s.instance_id
|
||||||
left join projections.limits l on i.id = l.instance_id
|
left join projections.limits l on i.id = l.instance_id
|
||||||
left join features f on i.id = f.instance_id
|
left join features f on i.id = f.instance_id
|
||||||
left join external_domains ed on i.id = ed.instance_id
|
left join external_domains ed on i.id = ed.instance_id
|
||||||
left join trusted_domains td on i.id = td.instance_id
|
left join trusted_domains td on i.id = td.instance_id
|
||||||
|
left join execution_targets et on i.id = et.instance_id
|
||||||
where i.id = $1;
|
where i.id = $1;
|
||||||
|
|||||||
@@ -4,9 +4,9 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/zitadel/zitadel/internal/domain"
|
|
||||||
"github.com/zitadel/zitadel/internal/eventstore"
|
"github.com/zitadel/zitadel/internal/eventstore"
|
||||||
"github.com/zitadel/zitadel/internal/eventstore/handler/v2"
|
"github.com/zitadel/zitadel/internal/eventstore/handler/v2"
|
||||||
|
target_domain "github.com/zitadel/zitadel/internal/execution/target"
|
||||||
"github.com/zitadel/zitadel/internal/repository/instance"
|
"github.com/zitadel/zitadel/internal/repository/instance"
|
||||||
"github.com/zitadel/zitadel/internal/repository/target"
|
"github.com/zitadel/zitadel/internal/repository/target"
|
||||||
"github.com/zitadel/zitadel/internal/zerrors"
|
"github.com/zitadel/zitadel/internal/zerrors"
|
||||||
@@ -51,7 +51,7 @@ func TestTargetProjection_reduces(t *testing.T) {
|
|||||||
uint64(15),
|
uint64(15),
|
||||||
"name",
|
"name",
|
||||||
"https://example.com",
|
"https://example.com",
|
||||||
domain.TargetTypeWebhook,
|
target_domain.TargetTypeWebhook,
|
||||||
3 * time.Second,
|
3 * time.Second,
|
||||||
true,
|
true,
|
||||||
anyArg{},
|
anyArg{},
|
||||||
@@ -86,7 +86,7 @@ func TestTargetProjection_reduces(t *testing.T) {
|
|||||||
uint64(15),
|
uint64(15),
|
||||||
"ro-id",
|
"ro-id",
|
||||||
"name2",
|
"name2",
|
||||||
domain.TargetTypeWebhook,
|
target_domain.TargetTypeWebhook,
|
||||||
"https://example.com",
|
"https://example.com",
|
||||||
3 * time.Second,
|
3 * time.Second,
|
||||||
true,
|
true,
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import (
|
|||||||
"github.com/zitadel/zitadel/internal/api/authz"
|
"github.com/zitadel/zitadel/internal/api/authz"
|
||||||
"github.com/zitadel/zitadel/internal/crypto"
|
"github.com/zitadel/zitadel/internal/crypto"
|
||||||
"github.com/zitadel/zitadel/internal/domain"
|
"github.com/zitadel/zitadel/internal/domain"
|
||||||
|
target_domain "github.com/zitadel/zitadel/internal/execution/target"
|
||||||
"github.com/zitadel/zitadel/internal/query/projection"
|
"github.com/zitadel/zitadel/internal/query/projection"
|
||||||
"github.com/zitadel/zitadel/internal/zerrors"
|
"github.com/zitadel/zitadel/internal/zerrors"
|
||||||
)
|
)
|
||||||
@@ -79,7 +80,7 @@ type Target struct {
|
|||||||
domain.ObjectDetails
|
domain.ObjectDetails
|
||||||
|
|
||||||
Name string
|
Name string
|
||||||
TargetType domain.TargetType
|
TargetType target_domain.TargetType
|
||||||
Endpoint string
|
Endpoint string
|
||||||
Timeout time.Duration
|
Timeout time.Duration
|
||||||
InterruptOnError bool
|
InterruptOnError bool
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import (
|
|||||||
|
|
||||||
"github.com/zitadel/zitadel/internal/crypto"
|
"github.com/zitadel/zitadel/internal/crypto"
|
||||||
"github.com/zitadel/zitadel/internal/domain"
|
"github.com/zitadel/zitadel/internal/domain"
|
||||||
|
target_domain "github.com/zitadel/zitadel/internal/execution/target"
|
||||||
"github.com/zitadel/zitadel/internal/zerrors"
|
"github.com/zitadel/zitadel/internal/zerrors"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -103,7 +104,7 @@ func Test_TargetPrepares(t *testing.T) {
|
|||||||
testNow,
|
testNow,
|
||||||
"ro",
|
"ro",
|
||||||
"target-name",
|
"target-name",
|
||||||
domain.TargetTypeWebhook,
|
target_domain.TargetTypeWebhook,
|
||||||
1 * time.Second,
|
1 * time.Second,
|
||||||
"https://example.com",
|
"https://example.com",
|
||||||
true,
|
true,
|
||||||
@@ -130,7 +131,7 @@ func Test_TargetPrepares(t *testing.T) {
|
|||||||
ResourceOwner: "ro",
|
ResourceOwner: "ro",
|
||||||
},
|
},
|
||||||
Name: "target-name",
|
Name: "target-name",
|
||||||
TargetType: domain.TargetTypeWebhook,
|
TargetType: target_domain.TargetTypeWebhook,
|
||||||
Timeout: 1 * time.Second,
|
Timeout: 1 * time.Second,
|
||||||
Endpoint: "https://example.com",
|
Endpoint: "https://example.com",
|
||||||
InterruptOnError: true,
|
InterruptOnError: true,
|
||||||
@@ -158,7 +159,7 @@ func Test_TargetPrepares(t *testing.T) {
|
|||||||
testNow,
|
testNow,
|
||||||
"ro",
|
"ro",
|
||||||
"target-name1",
|
"target-name1",
|
||||||
domain.TargetTypeWebhook,
|
target_domain.TargetTypeWebhook,
|
||||||
1 * time.Second,
|
1 * time.Second,
|
||||||
"https://example.com",
|
"https://example.com",
|
||||||
true,
|
true,
|
||||||
@@ -175,7 +176,7 @@ func Test_TargetPrepares(t *testing.T) {
|
|||||||
testNow,
|
testNow,
|
||||||
"ro",
|
"ro",
|
||||||
"target-name2",
|
"target-name2",
|
||||||
domain.TargetTypeWebhook,
|
target_domain.TargetTypeWebhook,
|
||||||
1 * time.Second,
|
1 * time.Second,
|
||||||
"https://example.com",
|
"https://example.com",
|
||||||
false,
|
false,
|
||||||
@@ -192,7 +193,7 @@ func Test_TargetPrepares(t *testing.T) {
|
|||||||
testNow,
|
testNow,
|
||||||
"ro",
|
"ro",
|
||||||
"target-name3",
|
"target-name3",
|
||||||
domain.TargetTypeAsync,
|
target_domain.TargetTypeAsync,
|
||||||
1 * time.Second,
|
1 * time.Second,
|
||||||
"https://example.com",
|
"https://example.com",
|
||||||
false,
|
false,
|
||||||
@@ -219,7 +220,7 @@ func Test_TargetPrepares(t *testing.T) {
|
|||||||
ResourceOwner: "ro",
|
ResourceOwner: "ro",
|
||||||
},
|
},
|
||||||
Name: "target-name1",
|
Name: "target-name1",
|
||||||
TargetType: domain.TargetTypeWebhook,
|
TargetType: target_domain.TargetTypeWebhook,
|
||||||
Timeout: 1 * time.Second,
|
Timeout: 1 * time.Second,
|
||||||
Endpoint: "https://example.com",
|
Endpoint: "https://example.com",
|
||||||
InterruptOnError: true,
|
InterruptOnError: true,
|
||||||
@@ -238,7 +239,7 @@ func Test_TargetPrepares(t *testing.T) {
|
|||||||
ResourceOwner: "ro",
|
ResourceOwner: "ro",
|
||||||
},
|
},
|
||||||
Name: "target-name2",
|
Name: "target-name2",
|
||||||
TargetType: domain.TargetTypeWebhook,
|
TargetType: target_domain.TargetTypeWebhook,
|
||||||
Timeout: 1 * time.Second,
|
Timeout: 1 * time.Second,
|
||||||
Endpoint: "https://example.com",
|
Endpoint: "https://example.com",
|
||||||
InterruptOnError: false,
|
InterruptOnError: false,
|
||||||
@@ -257,7 +258,7 @@ func Test_TargetPrepares(t *testing.T) {
|
|||||||
ResourceOwner: "ro",
|
ResourceOwner: "ro",
|
||||||
},
|
},
|
||||||
Name: "target-name3",
|
Name: "target-name3",
|
||||||
TargetType: domain.TargetTypeAsync,
|
TargetType: target_domain.TargetTypeAsync,
|
||||||
Timeout: 1 * time.Second,
|
Timeout: 1 * time.Second,
|
||||||
Endpoint: "https://example.com",
|
Endpoint: "https://example.com",
|
||||||
InterruptOnError: false,
|
InterruptOnError: false,
|
||||||
@@ -319,7 +320,7 @@ func Test_TargetPrepares(t *testing.T) {
|
|||||||
testNow,
|
testNow,
|
||||||
"ro",
|
"ro",
|
||||||
"target-name",
|
"target-name",
|
||||||
domain.TargetTypeWebhook,
|
target_domain.TargetTypeWebhook,
|
||||||
1 * time.Second,
|
1 * time.Second,
|
||||||
"https://example.com",
|
"https://example.com",
|
||||||
true,
|
true,
|
||||||
@@ -340,7 +341,7 @@ func Test_TargetPrepares(t *testing.T) {
|
|||||||
ResourceOwner: "ro",
|
ResourceOwner: "ro",
|
||||||
},
|
},
|
||||||
Name: "target-name",
|
Name: "target-name",
|
||||||
TargetType: domain.TargetTypeWebhook,
|
TargetType: target_domain.TargetTypeWebhook,
|
||||||
Timeout: 1 * time.Second,
|
Timeout: 1 * time.Second,
|
||||||
Endpoint: "https://example.com",
|
Endpoint: "https://example.com",
|
||||||
InterruptOnError: true,
|
InterruptOnError: true,
|
||||||
|
|||||||
@@ -1,40 +0,0 @@
|
|||||||
WITH RECURSIVE
|
|
||||||
matched AS (SELECT *
|
|
||||||
FROM projections.executions1
|
|
||||||
WHERE instance_id = $1
|
|
||||||
AND id = ANY($2)
|
|
||||||
ORDER BY id DESC
|
|
||||||
LIMIT 1),
|
|
||||||
matched_targets_and_includes AS (SELECT pos.*
|
|
||||||
FROM matched m
|
|
||||||
JOIN
|
|
||||||
projections.executions1_targets pos
|
|
||||||
ON m.id = pos.execution_id
|
|
||||||
AND m.instance_id = pos.instance_id
|
|
||||||
ORDER BY execution_id,
|
|
||||||
position),
|
|
||||||
dissolved_execution_targets(execution_id, instance_id, position, "include", "target_id")
|
|
||||||
AS (SELECT execution_id
|
|
||||||
, instance_id
|
|
||||||
, ARRAY [position]
|
|
||||||
, "include"
|
|
||||||
, "target_id"
|
|
||||||
FROM matched_targets_and_includes
|
|
||||||
UNION ALL
|
|
||||||
SELECT e.execution_id
|
|
||||||
, p.instance_id
|
|
||||||
, e.position || p.position
|
|
||||||
, p."include"
|
|
||||||
, p."target_id"
|
|
||||||
FROM dissolved_execution_targets e
|
|
||||||
JOIN projections.executions1_targets p
|
|
||||||
ON e.instance_id = p.instance_id
|
|
||||||
AND e.include IS NOT NULL
|
|
||||||
AND e.include = p.execution_id)
|
|
||||||
select e.execution_id, e.instance_id, e.target_id, t.target_type, t.endpoint, t.timeout, t.interrupt_on_error, t.signing_key
|
|
||||||
FROM dissolved_execution_targets e
|
|
||||||
JOIN projections.targets2 t
|
|
||||||
ON e.instance_id = t.instance_id
|
|
||||||
AND e.target_id = t.id
|
|
||||||
WHERE "include" = ''
|
|
||||||
ORDER BY position DESC;
|
|
||||||
@@ -1,47 +0,0 @@
|
|||||||
WITH RECURSIVE
|
|
||||||
matched AS ((SELECT *
|
|
||||||
FROM projections.executions1
|
|
||||||
WHERE instance_id = $1
|
|
||||||
AND id = ANY($2)
|
|
||||||
ORDER BY id DESC
|
|
||||||
LIMIT 1)
|
|
||||||
UNION ALL
|
|
||||||
(SELECT *
|
|
||||||
FROM projections.executions1
|
|
||||||
WHERE instance_id = $1
|
|
||||||
AND id = ANY($3)
|
|
||||||
ORDER BY id DESC
|
|
||||||
LIMIT 1)),
|
|
||||||
matched_targets_and_includes AS (SELECT pos.*
|
|
||||||
FROM matched m
|
|
||||||
JOIN
|
|
||||||
projections.executions1_targets pos
|
|
||||||
ON m.id = pos.execution_id
|
|
||||||
AND m.instance_id = pos.instance_id
|
|
||||||
ORDER BY execution_id,
|
|
||||||
position),
|
|
||||||
dissolved_execution_targets(execution_id, instance_id, position, "include", "target_id")
|
|
||||||
AS (SELECT execution_id
|
|
||||||
, instance_id
|
|
||||||
, ARRAY [position]
|
|
||||||
, "include"
|
|
||||||
, "target_id"
|
|
||||||
FROM matched_targets_and_includes
|
|
||||||
UNION ALL
|
|
||||||
SELECT e.execution_id
|
|
||||||
, p.instance_id
|
|
||||||
, e.position || p.position
|
|
||||||
, p."include"
|
|
||||||
, p."target_id"
|
|
||||||
FROM dissolved_execution_targets e
|
|
||||||
JOIN projections.executions1_targets p
|
|
||||||
ON e.instance_id = p.instance_id
|
|
||||||
AND e.include IS NOT NULL
|
|
||||||
AND e.include = p.execution_id)
|
|
||||||
select e.execution_id, e.instance_id, e.target_id, t.target_type, t.endpoint, t.timeout, t.interrupt_on_error, t.signing_key
|
|
||||||
FROM dissolved_execution_targets e
|
|
||||||
JOIN projections.targets2 t
|
|
||||||
ON e.instance_id = t.instance_id
|
|
||||||
AND e.target_id = t.id
|
|
||||||
WHERE "include" = ''
|
|
||||||
ORDER BY position DESC;
|
|
||||||
@@ -2,27 +2,27 @@ package queue
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"database/sql"
|
||||||
|
|
||||||
"github.com/jackc/pgx/v5"
|
|
||||||
"github.com/riverqueue/river/riverdriver"
|
"github.com/riverqueue/river/riverdriver"
|
||||||
"github.com/riverqueue/river/riverdriver/riverpgxv5"
|
"github.com/riverqueue/river/riverdriver/riverdatabasesql"
|
||||||
"github.com/riverqueue/river/rivermigrate"
|
"github.com/riverqueue/river/rivermigrate"
|
||||||
|
|
||||||
"github.com/zitadel/zitadel/internal/database"
|
"github.com/zitadel/zitadel/internal/database"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Migrator struct {
|
type Migrator struct {
|
||||||
driver riverdriver.Driver[pgx.Tx]
|
driver riverdriver.Driver[*sql.Tx]
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewMigrator(client *database.DB) *Migrator {
|
func NewMigrator(client *database.DB) *Migrator {
|
||||||
return &Migrator{
|
return &Migrator{
|
||||||
driver: riverpgxv5.New(client.Pool),
|
driver: riverdatabasesql.New(client.DB),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *Migrator) Execute(ctx context.Context) error {
|
func (m *Migrator) Execute(ctx context.Context) error {
|
||||||
_, err := m.driver.GetExecutor().Exec(ctx, "CREATE SCHEMA IF NOT EXISTS "+schema)
|
err := m.driver.GetExecutor().Exec(ctx, "CREATE SCHEMA IF NOT EXISTS "+schema)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|||||||
+28
-7
@@ -2,11 +2,11 @@ package queue
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"database/sql"
|
||||||
|
|
||||||
"github.com/jackc/pgx/v5"
|
|
||||||
"github.com/riverqueue/river"
|
"github.com/riverqueue/river"
|
||||||
"github.com/riverqueue/river/riverdriver"
|
"github.com/riverqueue/river/riverdriver"
|
||||||
"github.com/riverqueue/river/riverdriver/riverpgxv5"
|
"github.com/riverqueue/river/riverdriver/riverdatabasesql"
|
||||||
"github.com/riverqueue/river/rivertype"
|
"github.com/riverqueue/river/rivertype"
|
||||||
"github.com/riverqueue/rivercontrib/otelriver"
|
"github.com/riverqueue/rivercontrib/otelriver"
|
||||||
"github.com/robfig/cron/v3"
|
"github.com/robfig/cron/v3"
|
||||||
@@ -19,8 +19,8 @@ import (
|
|||||||
// Queue abstracts the underlying queuing library
|
// Queue abstracts the underlying queuing library
|
||||||
// For more information see github.com/riverqueue/river
|
// For more information see github.com/riverqueue/river
|
||||||
type Queue struct {
|
type Queue struct {
|
||||||
driver riverdriver.Driver[pgx.Tx]
|
driver riverdriver.Driver[*sql.Tx]
|
||||||
client *river.Client[pgx.Tx]
|
client *river.Client[*sql.Tx]
|
||||||
|
|
||||||
config *river.Config
|
config *river.Config
|
||||||
shouldStart bool
|
shouldStart bool
|
||||||
@@ -35,7 +35,7 @@ func NewQueue(config *Config) (_ *Queue, err error) {
|
|||||||
MeterProvider: metrics.GetMetricsProvider(),
|
MeterProvider: metrics.GetMetricsProvider(),
|
||||||
})}
|
})}
|
||||||
return &Queue{
|
return &Queue{
|
||||||
driver: riverpgxv5.New(config.Client.Pool),
|
driver: riverdatabasesql.New(config.Client.DB),
|
||||||
config: &river.Config{
|
config: &river.Config{
|
||||||
Workers: river.NewWorkers(),
|
Workers: river.NewWorkers(),
|
||||||
Queues: make(map[string]river.QueueConfig),
|
Queues: make(map[string]river.QueueConfig),
|
||||||
@@ -111,12 +111,33 @@ func WithQueueName(name string) InsertOpt {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (q *Queue) Insert(ctx context.Context, args river.JobArgs, opts ...InsertOpt) error {
|
func (q *Queue) Insert(ctx context.Context, args river.JobArgs, opts ...InsertOpt) error {
|
||||||
|
_, err := q.client.Insert(ctx, args, applyInsertOpts(opts))
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// InsertManyFastTx wraps [river.Client.InsertManyFastTx] to insert all jobs in
|
||||||
|
// a single `COPY FROM` execution, within the existing transaction.
|
||||||
|
//
|
||||||
|
// Opts are applied to each job before sending them to river.
|
||||||
|
func (q *Queue) InsertManyFastTx(ctx context.Context, tx *sql.Tx, args []river.JobArgs, opts ...InsertOpt) error {
|
||||||
|
params := make([]river.InsertManyParams, len(args))
|
||||||
|
for i, arg := range args {
|
||||||
|
params[i] = river.InsertManyParams{
|
||||||
|
Args: arg,
|
||||||
|
InsertOpts: applyInsertOpts(opts),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
_, err := q.client.InsertManyFastTx(ctx, tx, params)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func applyInsertOpts(opts []InsertOpt) *river.InsertOpts {
|
||||||
options := new(river.InsertOpts)
|
options := new(river.InsertOpts)
|
||||||
for _, opt := range opts {
|
for _, opt := range opts {
|
||||||
opt(options)
|
opt(options)
|
||||||
}
|
}
|
||||||
_, err := q.client.Insert(ctx, args, options)
|
return options
|
||||||
return err
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type Worker interface {
|
type Worker interface {
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/zitadel/zitadel/internal/eventstore"
|
"github.com/zitadel/zitadel/internal/eventstore"
|
||||||
|
"github.com/zitadel/zitadel/internal/execution/target"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
@@ -21,6 +22,26 @@ type Request struct {
|
|||||||
TargetsData []byte `json:"targetsData"`
|
TargetsData []byte `json:"targetsData"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func NewRequest(e eventstore.Event, targets []target.Target) (*Request, error) {
|
||||||
|
targetsData, err := json.Marshal(targets)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
eventData, err := json.Marshal(e)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return &Request{
|
||||||
|
Aggregate: e.Aggregate(),
|
||||||
|
Sequence: e.Sequence(),
|
||||||
|
EventType: e.Type(),
|
||||||
|
CreatedAt: e.CreatedAt(),
|
||||||
|
UserID: e.Creator(),
|
||||||
|
EventData: eventData,
|
||||||
|
TargetsData: targetsData,
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
func (e *Request) Kind() string {
|
func (e *Request) Kind() string {
|
||||||
return "execution_request"
|
return "execution_request"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,8 +5,8 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/zitadel/zitadel/internal/crypto"
|
"github.com/zitadel/zitadel/internal/crypto"
|
||||||
"github.com/zitadel/zitadel/internal/domain"
|
|
||||||
"github.com/zitadel/zitadel/internal/eventstore"
|
"github.com/zitadel/zitadel/internal/eventstore"
|
||||||
|
target_domain "github.com/zitadel/zitadel/internal/execution/target"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
@@ -19,12 +19,12 @@ const (
|
|||||||
type AddedEvent struct {
|
type AddedEvent struct {
|
||||||
eventstore.BaseEvent `json:"-"`
|
eventstore.BaseEvent `json:"-"`
|
||||||
|
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
TargetType domain.TargetType `json:"targetType"`
|
TargetType target_domain.TargetType `json:"targetType"`
|
||||||
Endpoint string `json:"endpoint"`
|
Endpoint string `json:"endpoint"`
|
||||||
Timeout time.Duration `json:"timeout"`
|
Timeout time.Duration `json:"timeout"`
|
||||||
InterruptOnError bool `json:"interruptOnError"`
|
InterruptOnError bool `json:"interruptOnError"`
|
||||||
SigningKey *crypto.CryptoValue `json:"signingKey"`
|
SigningKey *crypto.CryptoValue `json:"signingKey"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (e *AddedEvent) SetBaseEvent(b *eventstore.BaseEvent) {
|
func (e *AddedEvent) SetBaseEvent(b *eventstore.BaseEvent) {
|
||||||
@@ -43,7 +43,7 @@ func NewAddedEvent(
|
|||||||
ctx context.Context,
|
ctx context.Context,
|
||||||
aggregate *eventstore.Aggregate,
|
aggregate *eventstore.Aggregate,
|
||||||
name string,
|
name string,
|
||||||
targetType domain.TargetType,
|
targetType target_domain.TargetType,
|
||||||
endpoint string,
|
endpoint string,
|
||||||
timeout time.Duration,
|
timeout time.Duration,
|
||||||
interruptOnError bool,
|
interruptOnError bool,
|
||||||
@@ -59,12 +59,12 @@ func NewAddedEvent(
|
|||||||
type ChangedEvent struct {
|
type ChangedEvent struct {
|
||||||
eventstore.BaseEvent `json:"-"`
|
eventstore.BaseEvent `json:"-"`
|
||||||
|
|
||||||
Name *string `json:"name,omitempty"`
|
Name *string `json:"name,omitempty"`
|
||||||
TargetType *domain.TargetType `json:"targetType,omitempty"`
|
TargetType *target_domain.TargetType `json:"targetType,omitempty"`
|
||||||
Endpoint *string `json:"endpoint,omitempty"`
|
Endpoint *string `json:"endpoint,omitempty"`
|
||||||
Timeout *time.Duration `json:"timeout,omitempty"`
|
Timeout *time.Duration `json:"timeout,omitempty"`
|
||||||
InterruptOnError *bool `json:"interruptOnError,omitempty"`
|
InterruptOnError *bool `json:"interruptOnError,omitempty"`
|
||||||
SigningKey *crypto.CryptoValue `json:"signingKey,omitempty"`
|
SigningKey *crypto.CryptoValue `json:"signingKey,omitempty"`
|
||||||
|
|
||||||
oldName string
|
oldName string
|
||||||
}
|
}
|
||||||
@@ -114,7 +114,7 @@ func ChangeName(oldName, name string) func(event *ChangedEvent) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func ChangeTargetType(targetType domain.TargetType) func(event *ChangedEvent) {
|
func ChangeTargetType(targetType target_domain.TargetType) func(event *ChangedEvent) {
|
||||||
return func(e *ChangedEvent) {
|
return func(e *ChangedEvent) {
|
||||||
e.TargetType = &targetType
|
e.TargetType = &targetType
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user