Merge branch '220322-refactor-target-type-2' into 'master'

Add target_type column to AuditEvent

See merge request gitlab-org/gitlab!39461

changelogs/unreleased/220322-refactor-target-type-2.yml

+---
+title: Add target_type to audit_events
+merge_request: 39461
+author:
+type: added

db/post_migrate/20200810100921_add_target_type_to_audit_event.rb

+# frozen_string_literal: true
+
+class AddTargetTypeToAuditEvent < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::SchemaHelpers
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+  SOURCE_TABLE_NAME = 'audit_events'
+  PARTITIONED_TABLE_NAME = 'audit_events_part_5fc467ac26'
+  TRIGGER_FUNCTION_NAME = 'table_sync_function_2be879775d'
+
+  def up
+    with_lock_retries do
+      # rubocop:disable Migration/AddLimitToTextColumns
+      add_column('audit_events', :target_type, :text)
+      add_column('audit_events_part_5fc467ac26', :target_type, :text)
+      # rubocop:enable Migration/AddLimitToTextColumns
+
+      create_trigger_function(TRIGGER_FUNCTION_NAME, replace: true) do
+        <<~SQL
+          IF (TG_OP = 'DELETE') THEN
+            DELETE FROM #{PARTITIONED_TABLE_NAME} where id = OLD.id;
+          ELSIF (TG_OP = 'UPDATE') THEN
+            UPDATE #{PARTITIONED_TABLE_NAME}
+            SET author_id = NEW.author_id,
+              type = NEW.type,
+              entity_id = NEW.entity_id,
+              entity_type = NEW.entity_type,
+              details = NEW.details,
+              ip_address = NEW.ip_address,
+              author_name = NEW.author_name,
+              entity_path = NEW.entity_path,
+              target_details = NEW.target_details,
+              target_type = NEW.target_type,
+              created_at = NEW.created_at
+            WHERE #{PARTITIONED_TABLE_NAME}.id = NEW.id;
+          ELSIF (TG_OP = 'INSERT') THEN
+            INSERT INTO #{PARTITIONED_TABLE_NAME} (id,
+              author_id,
+              type,
+              entity_id,
+              entity_type,
+              details,
+              ip_address,
+              author_name,
+              entity_path,
+              target_details,
+              target_type,
+              created_at)
+            VALUES (NEW.id,
+              NEW.author_id,
+              NEW.type,
+              NEW.entity_id,
+              NEW.entity_type,
+              NEW.details,
+              NEW.ip_address,
+              NEW.author_name,
+              NEW.entity_path,
+              NEW.target_details,
+              NEW.target_type,
+              NEW.created_at);
+          END IF;
+          RETURN NULL;
+        SQL
+      end
+    end
+  end
+
+  def down
+    with_lock_retries do
+      remove_column SOURCE_TABLE_NAME, :target_type
+
+      create_trigger_function(TRIGGER_FUNCTION_NAME, replace: true) do
+        <<~SQL
+          IF (TG_OP = 'DELETE') THEN
+            DELETE FROM #{PARTITIONED_TABLE_NAME} where id = OLD.id;
+          ELSIF (TG_OP = 'UPDATE') THEN
+            UPDATE #{PARTITIONED_TABLE_NAME}
+            SET author_id = NEW.author_id,
+              type = NEW.type,
+              entity_id = NEW.entity_id,
+              entity_type = NEW.entity_type,
+              details = NEW.details,
+              ip_address = NEW.ip_address,
+              author_name = NEW.author_name,
+              entity_path = NEW.entity_path,
+              target_details = NEW.target_details,
+              created_at = NEW.created_at
+            WHERE #{PARTITIONED_TABLE_NAME}.id = NEW.id;
+          ELSIF (TG_OP = 'INSERT') THEN
+            INSERT INTO #{PARTITIONED_TABLE_NAME} (id,
+              author_id,
+              type,
+              entity_id,
+              entity_type,
+              details,
+              ip_address,
+              author_name,
+              entity_path,
+              target_details,
+              created_at)
+            VALUES (NEW.id,
+              NEW.author_id,
+              NEW.type,
+              NEW.entity_id,
+              NEW.entity_type,
+              NEW.details,
+              NEW.ip_address,
+              NEW.author_name,
+              NEW.entity_path,
+              NEW.target_details,
+              NEW.created_at);
+          END IF;
+          RETURN NULL;
+        SQL
+      end
+
+      remove_column PARTITIONED_TABLE_NAME, :target_type
+    end
+  end
+end

db/post_migrate/20200810101029_add_text_limit_to_audit_event_target_type.rb

+# frozen_string_literal: true
+
+class AddTextLimitToAuditEventTargetType < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+  DOWNTIME = false
+  SOURCE_TABLE_NAME = 'audit_events'
+  PARTITIONED_TABLE_NAME = 'audit_events_part_5fc467ac26'
+
+  disable_ddl_transaction!
+
+  def up
+    add_text_limit(SOURCE_TABLE_NAME, :target_type, 255)
+    add_text_limit(PARTITIONED_TABLE_NAME, :target_type, 255)
+  end
+
+  def down
+    remove_text_limit(SOURCE_TABLE_NAME, :target_type)
+    remove_text_limit(PARTITIONED_TABLE_NAME, :target_type)
+  end
+end

db/schema_migrations/20200810100921

+fe96df46a5f360cafe8f9816c6dfc2d00afdcf458fb38ace37ce59999dba2413
\ No newline at end of file

db/schema_migrations/20200810101029

+8bb03ea2ded957a41aa1efd60a9908a3c597aaaade9190f8f1515bfd2ab9a282
\ No newline at end of file

db/structure.sql

@@ -29,6 +29,7 @@ ELSIF (TG_OP = 'UPDATE') THEN
     author_name = NEW.author_name,
     entity_path = NEW.entity_path,
     target_details = NEW.target_details,
+    target_type = NEW.target_type,
     created_at = NEW.created_at
   WHERE audit_events_part_5fc467ac26.id = NEW.id;
 ELSIF (TG_OP = 'INSERT') THEN
@@ -42,6 +43,7 @@ ELSIF (TG_OP = 'INSERT') THEN
     author_name,
     entity_path,
     target_details,
+    target_type,
     created_at)
   VALUES (NEW.id,
     NEW.author_id,
@@ -53,6 +55,7 @@ ELSIF (TG_OP = 'INSERT') THEN
     NEW.author_name,
     NEW.entity_path,
     NEW.target_details,
+    NEW.target_type,
     NEW.created_at);
 END IF;
 RETURN NULL;
@@ -74,8 +77,10 @@ CREATE TABLE public.audit_events_part_5fc467ac26 (
     entity_path text,
     target_details text,
     created_at timestamp without time zone NOT NULL,
+    target_type text,
     CONSTRAINT check_492aaa021d CHECK ((char_length(entity_path) <= 5500)),
     CONSTRAINT check_83ff8406e2 CHECK ((char_length(author_name) <= 255)),
+    CONSTRAINT check_97a8c868e7 CHECK ((char_length(target_type) <= 255)),
     CONSTRAINT check_d493ec90b5 CHECK ((char_length(target_details) <= 5500))
 )
 PARTITION BY RANGE (created_at);
@@ -9470,7 +9475,9 @@ CREATE TABLE public.audit_events (
     author_name text,
     entity_path text,
     target_details text,
+    target_type text,
     CONSTRAINT check_492aaa021d CHECK ((char_length(entity_path) <= 5500)),
+    CONSTRAINT check_82294106dd CHECK ((char_length(target_type) <= 255)),
     CONSTRAINT check_83ff8406e2 CHECK ((char_length(author_name) <= 255)),
     CONSTRAINT check_d493ec90b5 CHECK ((char_length(target_details) <= 5500))
 );