Refactor butler-audit config

CHANGELOG.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ### Changed
+- Refactor butler-audit config.
 - Merge package and application "butler" config.
 
 ## [0.13.0] - 2021-09-28

config/butler.php

@@ -10,10 +10,6 @@
 
         'driver' => env('BUTLER_AUDIT_DRIVER', 'log'),
 
-        'default_initiator_resolver' => false,
-
-        'extend_bus_dispatcher' => true,
-
     ],
 
     'guru' => [

src/ServiceProvider.php

@@ -24,7 +24,7 @@ public function register()
 
         $this->configureTimezone();
 
-        $this->configureAuditInitiator();
+        $this->configureAudit();
 
         $this->configureHealth();
 
@@ -99,8 +99,13 @@ protected function configureTimezone()
         date_default_timezone_set(config('app.timezone'));
     }
 
-    protected function configureAuditInitiator()
+    protected function configureAudit()
     {
+        if (! $this->app->configurationIsCached()) {
+            config(['butler.audit.default_initiator_resolver' => false]);
+            config(['butler.audit.extend_bus_dispatcher' => true]);
+        }
+
         $resolver = $this->app->runningInConsole()
             ? fn () => ['console', ['hostname' => gethostname()]]
             : function () {

tests/ServiceProviderTest.php

@@ -105,7 +105,13 @@ public function test_can_override_timezone()
         $this->assertEquals('Europe/Stockholm', Carbon::now()->getTimezone());
     }
 
-    public function test_audit_initiator_resolver_resolves_console()
+    public function test_configureAudit_configures_audit()
+    {
+        $this->assertFalse(config('butler.audit.default_initiator_resolver'));
+        $this->assertTrue(config('butler.audit.extend_bus_dispatcher'));
+    }
+
+    public function test_configureAudit_sets_initiator_resolver_for_console()
     {
         Auditor::fake();
 
@@ -116,7 +122,7 @@ public function test_audit_initiator_resolver_resolves_console()
             && $data->hasInitiatorContext('hostname', gethostname()));
     }
 
-    public function test_audit_initiator_resolver_resolves_authenticated_user()
+    public function test_configureAudit_sets_initiator_resolver_for_authenticated_user()
     {
         putenv('APP_RUNNING_IN_CONSOLE=false');
 
@@ -135,7 +141,7 @@ public function test_audit_initiator_resolver_resolves_authenticated_user()
             && $data->hasInitiatorContext('tokenName', 'my token'));
     }
 
-    public function test_audit_initiator_resolver_resolves_unauthenticated_user()
+    public function test_configureAudit_sets_initiator_resolver_for_unauthenticated_user()
     {
         putenv('APP_RUNNING_IN_CONSOLE=false');