mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-11 21:37:32 +00:00
feat(api): feature flags (#7356)
* feat(api): feature API proto definitions * update proto based on discussion with @livio-a * cleanup old feature flag stuff * authz instance queries * align defaults * projection definitions * define commands and event reducers * implement system and instance setter APIs * api getter implementation * unit test repository package * command unit tests * unit test Get queries * grpc converter unit tests * migrate the V1 features * migrate oidc to dynamic features * projection unit test * fix instance by host * fix instance by id data type in sql * fix linting errors * add system projection test * fix behavior inversion * resolve proto file comments * rename SystemDefaultLoginInstanceEventType to SystemLoginDefaultOrgEventType so it's consistent with the instance level event * use write models and conditional set events * system features integration tests * instance features integration tests * error on empty request * documentation entry * typo in feature.proto * fix start unit tests * solve linting error on key case switch * remove system defaults after discussion with @eliobischof * fix system feature projection * resolve comments in defaults.yaml --------- Co-authored-by: Livio Spring <livio.a@gmail.com>
This commit is contained in:
@@ -5,6 +5,8 @@ import (
|
||||
"time"
|
||||
|
||||
"golang.org/x/text/language"
|
||||
|
||||
"github.com/zitadel/zitadel/internal/feature"
|
||||
)
|
||||
|
||||
var (
|
||||
@@ -23,6 +25,7 @@ type Instance interface {
|
||||
SecurityPolicyAllowedOrigins() []string
|
||||
Block() *bool
|
||||
AuditLogRetention() *time.Duration
|
||||
Features() feature.Features
|
||||
}
|
||||
|
||||
type InstanceVerifier interface {
|
||||
@@ -37,6 +40,7 @@ type instance struct {
|
||||
appID string
|
||||
clientID string
|
||||
orgID string
|
||||
features feature.Features
|
||||
}
|
||||
|
||||
func (i *instance) Block() *bool {
|
||||
@@ -83,6 +87,10 @@ func (i *instance) SecurityPolicyAllowedOrigins() []string {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (i *instance) Features() feature.Features {
|
||||
return i.features
|
||||
}
|
||||
|
||||
func GetInstance(ctx context.Context) Instance {
|
||||
instance, ok := ctx.Value(instanceKey).(Instance)
|
||||
if !ok {
|
||||
@@ -91,6 +99,10 @@ func GetInstance(ctx context.Context) Instance {
|
||||
return instance
|
||||
}
|
||||
|
||||
func GetFeatures(ctx context.Context) feature.Features {
|
||||
return GetInstance(ctx).Features()
|
||||
}
|
||||
|
||||
func WithInstance(ctx context.Context, instance Instance) context.Context {
|
||||
return context.WithValue(ctx, instanceKey, instance)
|
||||
}
|
||||
@@ -120,3 +132,12 @@ func WithConsole(ctx context.Context, projectID, appID string) context.Context {
|
||||
//i.clientID = clientID
|
||||
return context.WithValue(ctx, instanceKey, i)
|
||||
}
|
||||
|
||||
func WithFeatures(ctx context.Context, f feature.Features) context.Context {
|
||||
i, ok := ctx.Value(instanceKey).(*instance)
|
||||
if !ok {
|
||||
i = new(instance)
|
||||
}
|
||||
i.features = f
|
||||
return context.WithValue(ctx, instanceKey, i)
|
||||
}
|
||||
|
@@ -7,6 +7,8 @@ import (
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
"golang.org/x/text/language"
|
||||
|
||||
"github.com/zitadel/zitadel/internal/feature"
|
||||
)
|
||||
|
||||
func Test_Instance(t *testing.T) {
|
||||
@@ -17,6 +19,7 @@ func Test_Instance(t *testing.T) {
|
||||
instanceID string
|
||||
projectID string
|
||||
consoleID string
|
||||
features feature.Features
|
||||
}
|
||||
tests := []struct {
|
||||
name string
|
||||
@@ -56,6 +59,19 @@ func Test_Instance(t *testing.T) {
|
||||
consoleID: "consoleID",
|
||||
},
|
||||
},
|
||||
{
|
||||
"WithFeatures",
|
||||
args{
|
||||
WithFeatures(context.Background(), feature.Features{
|
||||
LoginDefaultOrg: true,
|
||||
}),
|
||||
},
|
||||
res{
|
||||
features: feature.Features{
|
||||
LoginDefaultOrg: true,
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
@@ -63,6 +79,7 @@ func Test_Instance(t *testing.T) {
|
||||
assert.Equal(t, tt.res.instanceID, got.InstanceID())
|
||||
assert.Equal(t, tt.res.projectID, got.ProjectID())
|
||||
assert.Equal(t, tt.res.consoleID, got.ConsoleClientID())
|
||||
assert.Equal(t, tt.res.features, got.Features())
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -112,3 +129,7 @@ func (m *mockInstance) RequestedHost() string {
|
||||
func (m *mockInstance) SecurityPolicyAllowedOrigins() []string {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *mockInstance) Features() feature.Features {
|
||||
return feature.Features{}
|
||||
}
|
||||
|
Reference in New Issue
Block a user