diff --git a/.env.example b/.env.example index a95925960..3714c23f6 100644 --- a/.env.example +++ b/.env.example @@ -346,19 +346,6 @@ # Default: # ACTIONLOG_WORKFLOW_FUNCTIONS_ENABLED= -############################################################################### -# Enables actionlog for compose record create, update, and delete. which is disabled by default. -# -# [IMPORTANT] -# ==== -# This is temp fix for now, it will be removed completely in future release. -# Once new env var will be introduced for actionlog policy, which will enable more control over action log policies. -# ==== -# -# Type: bool -# Default: -# ACTIONLOG_COMPOSE_RECORD_ENABLED= - ############################################################################### ############################################################################### # API Gateway diff --git a/app/options/actionLog.cue b/app/options/actionLog.cue index e41880df3..8784387e7 100644 --- a/app/options/actionLog.cue +++ b/app/options/actionLog.cue @@ -18,20 +18,6 @@ actionLog: schema.#optionsGroup & { workflow_functions_enabled: { type: "bool" } - compose_record_enabled: { - type: "bool" - defaultGoExpr: "false" - description: """ - Enables actionlog for compose record create, update, and delete. which is disabled by default. - - [IMPORTANT] - ==== - This is temp fix for now, it will be removed completely in future release. - Once new env var will be introduced for actionlog policy, which will enable more control over action log policies. - ==== - - """ - } } title: "Actionlog" } diff --git a/compose/service/service.go b/compose/service/service.go index 169f0d08e..4fc2a7c63 100644 --- a/compose/service/service.go +++ b/compose/service/service.go @@ -112,19 +112,6 @@ func Initialize(ctx context.Context, log *zap.Logger, s store.Storer, c Config) tee = logger.MakeDebugLogger() } - // Record log policy update - if !c.ActionLog.ComposeRecordEnabled { - policy = actionlog.NewPolicyAll( - policy, - - actionlog.NewPolicyAll( - actionlog.NewPolicyMatchResource("compose:record"), - actionlog.NewPolicyMatchAction("create", "update", "delete"), - actionlog.NewPolicyMatchSeverity(actionlog.Emergency), - ), - ) - } - DefaultActionlog = actionlog.NewService(DefaultStore, log, tee, policy) } diff --git a/pkg/options/options.gen.go b/pkg/options/options.gen.go index 947d16ad0..81992e2b7 100644 --- a/pkg/options/options.gen.go +++ b/pkg/options/options.gen.go @@ -79,7 +79,6 @@ type ( Enabled bool `env:"ACTIONLOG_ENABLED"` Debug bool `env:"ACTIONLOG_DEBUG"` WorkflowFunctionsEnabled bool `env:"ACTIONLOG_WORKFLOW_FUNCTIONS_ENABLED"` - ComposeRecordEnabled bool `env:"ACTIONLOG_COMPOSE_RECORD_ENABLED"` } ApigwOpt struct { @@ -456,8 +455,7 @@ func SMTP() (o *SMTPOpt) { // This function is auto-generated func ActionLog() (o *ActionLogOpt) { o = &ActionLogOpt{ - Enabled: true, - ComposeRecordEnabled: false, + Enabled: true, } // Custom defaults