Merge branch 'ff-simple-audit-events' into 'master'

Create Audit Events for Feature Flag Strategy Changes

See merge request gitlab-org/gitlab-ee!14652

ee/app/services/feature_flags/base_service.rb

@@ -34,7 +34,8 @@ module FeatureFlags
 
     def created_scope_message(scope)
       "Created rule <strong>#{scope.environment_scope}</strong> "\
-      "and set it as <strong>#{scope.active ? "active" : "inactive"}</strong>."
+      "and set it as <strong>#{scope.active ? "active" : "inactive"}</strong> "\
+      "with strategies <strong>#{scope.strategies}</strong>."
     end
   end
 end

ee/app/services/feature_flags/update_service.rb

@@ -4,7 +4,8 @@ module FeatureFlags
   class UpdateService < FeatureFlags::BaseService
     AUDITABLE_SCOPE_ATTRIBUTES_HUMAN_NAMES = {
       'active' => 'active state',
-      'environment_scope' => 'environment scope'
+      'environment_scope' => 'environment scope',
+      'strategies' => 'strategies'
     }.freeze
 
     def execute(feature_flag)

ee/changelogs/unreleased/ff-simple-audit-events.yml

+---
+title: Audit strategies for feature flag scopes
+merge_request: 14652
+author:
+type: added

ee/spec/services/feature_flags/create_service_spec.rb

@@ -47,10 +47,12 @@ describe FeatureFlags::CreateService do
       end
 
       it 'creates audit event' do
-        expected_message = "Created feature flag <strong>feature_flag</strong> "\
-                           "with description <strong>\"description\"</strong>. "\
-                           "Created rule <strong>*</strong> and set it as <strong>active</strong>. "\
-                           "Created rule <strong>production</strong> and set it as <strong>inactive</strong>."
+        expected_message = 'Created feature flag <strong>feature_flag</strong> '\
+                           'with description <strong>"description"</strong>. '\
+                           'Created rule <strong>*</strong> and set it as <strong>active</strong> '\
+                           'with strategies <strong>[{"name"=>"default", "parameters"=>{}}]</strong>. '\
+                           'Created rule <strong>production</strong> and set it as <strong>inactive</strong> '\
+                           'with strategies <strong>[{"name"=>"default", "parameters"=>{}}]</strong>.'
 
         expect { subject }.to change { AuditEvent.count }.by(1)
         expect(AuditEvent.last.present.action).to eq(expected_message)

ee/spec/services/feature_flags/update_service_spec.rb

@@ -159,10 +159,12 @@ describe FeatureFlags::UpdateService do
       end
 
       it 'creates audit event with new scope' do
+        expected = 'Created rule <strong>review</strong> and set it as <strong>active</strong> '\
+                   'with strategies <strong>[{"name"=>"default", "parameters"=>{}}]</strong>.'
+
         subject
-        expect(audit_event_message).to(
-          include("Created rule <strong>review</strong> and set it as <strong>active</strong>.")
-        )
+
+        expect(audit_event_message).to include(expected)
       end
 
       context 'when scope can not be created' do
@@ -181,5 +183,37 @@ describe FeatureFlags::UpdateService do
         end
       end
     end
+
+    context 'when the strategy is changed' do
+      let(:scope) do
+        create(:operations_feature_flag_scope,
+               feature_flag: feature_flag,
+               environment_scope: 'sandbox',
+               strategies: [{ name: "default", parameters: {} }])
+      end
+
+      let(:params) do
+        {
+          scopes_attributes: [{
+            id: scope.id,
+            environment_scope: 'sandbox',
+            strategies: [{
+              name: 'gradualRolloutUserId',
+              parameters: {
+                groupId: 'mygroup',
+                percentage: "40"
+              }
+            }]
+          }]
+        }
+      end
+
+      it 'creates an audit event' do
+        expected = %r{Updated rule <strong>sandbox</strong> strategies from <strong>.*</strong> to <strong>.*</strong>.}
+
+        expect { subject }.to change { AuditEvent.count }.by(1)
+        expect(audit_event_message).to match(expected)
+      end
+    end
   end
 end