From 9c7782081e7214daf695b67b8ea04da2092235b0 Mon Sep 17 00:00:00 2001 From: lauraMon Date: Wed, 25 May 2022 15:30:50 +0200 Subject: [PATCH 1/2] Adds raw column to all ci variable tables Changelog: added --- ...20525123825_add_raw_to_ci_pipeline_variables.rb | 9 +++++++++ ...20220525123851_add_raw_to_ci_group_variables.rb | 7 +++++++ ...20525123914_add_raw_to_ci_instance_variables.rb | 7 +++++++ .../20220525123940_add_raw_to_ci_job_variables.rb | 7 +++++++ ...04_add_raw_to_ci_pipeline_schedule_variables.rb | 7 +++++++ .../20220525124125_add_raw_to_ci_variables.rb | 7 +++++++ db/schema_migrations/20220525123825 | 1 + db/schema_migrations/20220525123851 | 1 + db/schema_migrations/20220525123914 | 1 + db/schema_migrations/20220525123940 | 1 + db/schema_migrations/20220525124104 | 1 + db/schema_migrations/20220525124125 | 1 + db/structure.sql | 14 ++++++++++---- 13 files changed, 60 insertions(+), 4 deletions(-) create mode 100644 db/migrate/20220525123825_add_raw_to_ci_pipeline_variables.rb create mode 100644 db/migrate/20220525123851_add_raw_to_ci_group_variables.rb create mode 100644 db/migrate/20220525123914_add_raw_to_ci_instance_variables.rb create mode 100644 db/migrate/20220525123940_add_raw_to_ci_job_variables.rb create mode 100644 db/migrate/20220525124104_add_raw_to_ci_pipeline_schedule_variables.rb create mode 100644 db/migrate/20220525124125_add_raw_to_ci_variables.rb create mode 100644 db/schema_migrations/20220525123825 create mode 100644 db/schema_migrations/20220525123851 create mode 100644 db/schema_migrations/20220525123914 create mode 100644 db/schema_migrations/20220525123940 create mode 100644 db/schema_migrations/20220525124104 create mode 100644 db/schema_migrations/20220525124125 diff --git a/db/migrate/20220525123825_add_raw_to_ci_pipeline_variables.rb b/db/migrate/20220525123825_add_raw_to_ci_pipeline_variables.rb new file mode 100644 index 00000000000000..258b46316434a4 --- /dev/null +++ b/db/migrate/20220525123825_add_raw_to_ci_pipeline_variables.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class AddRawToCiPipelineVariables < Gitlab::Database::Migration[2.0] + enable_lock_retries! + + def change + add_column :ci_pipeline_variables, :raw, :boolean, null: false, default: true + end +end diff --git a/db/migrate/20220525123851_add_raw_to_ci_group_variables.rb b/db/migrate/20220525123851_add_raw_to_ci_group_variables.rb new file mode 100644 index 00000000000000..2467312627046c --- /dev/null +++ b/db/migrate/20220525123851_add_raw_to_ci_group_variables.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +class AddRawToCiGroupVariables < Gitlab::Database::Migration[2.0] + def change + add_column :ci_group_variables, :raw, :boolean, null: false, default: true + end +end diff --git a/db/migrate/20220525123914_add_raw_to_ci_instance_variables.rb b/db/migrate/20220525123914_add_raw_to_ci_instance_variables.rb new file mode 100644 index 00000000000000..7595882790cefa --- /dev/null +++ b/db/migrate/20220525123914_add_raw_to_ci_instance_variables.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +class AddRawToCiInstanceVariables < Gitlab::Database::Migration[2.0] + def change + add_column :ci_instance_variables, :raw, :boolean, null: false, default: true + end +end diff --git a/db/migrate/20220525123940_add_raw_to_ci_job_variables.rb b/db/migrate/20220525123940_add_raw_to_ci_job_variables.rb new file mode 100644 index 00000000000000..2e43b3e2cd9c2f --- /dev/null +++ b/db/migrate/20220525123940_add_raw_to_ci_job_variables.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +class AddRawToCiJobVariables < Gitlab::Database::Migration[2.0] + def change + add_column :ci_job_variables, :raw, :boolean, null: false, default: true + end +end diff --git a/db/migrate/20220525124104_add_raw_to_ci_pipeline_schedule_variables.rb b/db/migrate/20220525124104_add_raw_to_ci_pipeline_schedule_variables.rb new file mode 100644 index 00000000000000..5817aadf841f1d --- /dev/null +++ b/db/migrate/20220525124104_add_raw_to_ci_pipeline_schedule_variables.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +class AddRawToCiPipelineScheduleVariables < Gitlab::Database::Migration[2.0] + def change + add_column :ci_pipeline_schedule_variables, :raw, :boolean, null: false, default: true + end +end diff --git a/db/migrate/20220525124125_add_raw_to_ci_variables.rb b/db/migrate/20220525124125_add_raw_to_ci_variables.rb new file mode 100644 index 00000000000000..dbd1f6b3712ea0 --- /dev/null +++ b/db/migrate/20220525124125_add_raw_to_ci_variables.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +class AddRawToCiVariables < Gitlab::Database::Migration[2.0] + def change + add_column :ci_variables, :raw, :boolean, null: false, default: true + end +end diff --git a/db/schema_migrations/20220525123825 b/db/schema_migrations/20220525123825 new file mode 100644 index 00000000000000..47d4bc2c8a3f29 --- /dev/null +++ b/db/schema_migrations/20220525123825 @@ -0,0 +1 @@ +8a30ec71e2c28929e0a7ebf744941246e460c37745e60dcd9f13a94b7d005772 \ No newline at end of file diff --git a/db/schema_migrations/20220525123851 b/db/schema_migrations/20220525123851 new file mode 100644 index 00000000000000..fd16775f784657 --- /dev/null +++ b/db/schema_migrations/20220525123851 @@ -0,0 +1 @@ +f6fcea6f6beef6c2d4848bd4bc11f0854acc9e19771438778f763171e0eaa3c7 \ No newline at end of file diff --git a/db/schema_migrations/20220525123914 b/db/schema_migrations/20220525123914 new file mode 100644 index 00000000000000..564ceb0dbe2133 --- /dev/null +++ b/db/schema_migrations/20220525123914 @@ -0,0 +1 @@ +504e43ab17c644707c65e396b8aa88a11472372a9c3b8d2b9ef88b9de978b0c3 \ No newline at end of file diff --git a/db/schema_migrations/20220525123940 b/db/schema_migrations/20220525123940 new file mode 100644 index 00000000000000..7bb5b59824787d --- /dev/null +++ b/db/schema_migrations/20220525123940 @@ -0,0 +1 @@ +7ddd1f03efe86f45b6105c6b0816e28e318e9de219dcd38801a11451745ae5f9 \ No newline at end of file diff --git a/db/schema_migrations/20220525124104 b/db/schema_migrations/20220525124104 new file mode 100644 index 00000000000000..229fb6ae2a643c --- /dev/null +++ b/db/schema_migrations/20220525124104 @@ -0,0 +1 @@ +8c1ccabb6d2b3054398a015836bb9fe06f28936625f7a8220b4c58000a891b8a \ No newline at end of file diff --git a/db/schema_migrations/20220525124125 b/db/schema_migrations/20220525124125 new file mode 100644 index 00000000000000..8ccc434a7aceac --- /dev/null +++ b/db/schema_migrations/20220525124125 @@ -0,0 +1 @@ +5e9f67479903590d5118e04811bc3c4aacf92fd11b90efa011975d4292dd0207 \ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index 5f7a15891d9dad..37f6e08cc74eb2 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -12534,6 +12534,7 @@ CREATE TABLE ci_group_variables ( masked boolean DEFAULT false NOT NULL, variable_type smallint DEFAULT 1 NOT NULL, environment_scope text DEFAULT '*'::text NOT NULL, + raw boolean DEFAULT true NOT NULL, CONSTRAINT check_dfe009485a CHECK ((char_length(environment_scope) <= 255)) ); @@ -12554,6 +12555,7 @@ CREATE TABLE ci_instance_variables ( key text NOT NULL, encrypted_value text, encrypted_value_iv text, + raw boolean DEFAULT true NOT NULL, CONSTRAINT check_07a45a5bcb CHECK ((char_length(encrypted_value_iv) <= 255)), CONSTRAINT check_5aede12208 CHECK ((char_length(key) <= 255)), CONSTRAINT check_956afd70f1 CHECK ((char_length(encrypted_value) <= 13579)) @@ -12642,7 +12644,8 @@ CREATE TABLE ci_job_variables ( encrypted_value_iv character varying, job_id bigint NOT NULL, variable_type smallint DEFAULT 1 NOT NULL, - source smallint DEFAULT 0 NOT NULL + source smallint DEFAULT 0 NOT NULL, + raw boolean DEFAULT true NOT NULL ); CREATE SEQUENCE ci_job_variables_id_seq @@ -12808,7 +12811,8 @@ CREATE TABLE ci_pipeline_schedule_variables ( pipeline_schedule_id integer NOT NULL, created_at timestamp with time zone, updated_at timestamp with time zone, - variable_type smallint DEFAULT 1 NOT NULL + variable_type smallint DEFAULT 1 NOT NULL, + raw boolean DEFAULT true NOT NULL ); CREATE SEQUENCE ci_pipeline_schedule_variables_id_seq @@ -12851,7 +12855,8 @@ CREATE TABLE ci_pipeline_variables ( encrypted_value_salt character varying, encrypted_value_iv character varying, pipeline_id integer NOT NULL, - variable_type smallint DEFAULT 1 NOT NULL + variable_type smallint DEFAULT 1 NOT NULL, + raw boolean DEFAULT true NOT NULL ); CREATE SEQUENCE ci_pipeline_variables_id_seq @@ -13292,7 +13297,8 @@ CREATE TABLE ci_variables ( protected boolean DEFAULT false NOT NULL, environment_scope character varying DEFAULT '*'::character varying NOT NULL, masked boolean DEFAULT false NOT NULL, - variable_type smallint DEFAULT 1 NOT NULL + variable_type smallint DEFAULT 1 NOT NULL, + raw boolean DEFAULT true NOT NULL ); CREATE SEQUENCE ci_variables_id_seq -- GitLab From c1b34614dd3f738db7f4fe0fd3b62b1a320de8ed Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 1 Jun 2022 12:49:27 +0000 Subject: [PATCH 2/2] Apply 5 suggestion(s) to 5 file(s) --- db/migrate/20220525123851_add_raw_to_ci_group_variables.rb | 2 ++ db/migrate/20220525123914_add_raw_to_ci_instance_variables.rb | 2 ++ db/migrate/20220525123940_add_raw_to_ci_job_variables.rb | 2 ++ .../20220525124104_add_raw_to_ci_pipeline_schedule_variables.rb | 2 ++ db/migrate/20220525124125_add_raw_to_ci_variables.rb | 2 ++ 5 files changed, 10 insertions(+) diff --git a/db/migrate/20220525123851_add_raw_to_ci_group_variables.rb b/db/migrate/20220525123851_add_raw_to_ci_group_variables.rb index 2467312627046c..9eae210d8c35ce 100644 --- a/db/migrate/20220525123851_add_raw_to_ci_group_variables.rb +++ b/db/migrate/20220525123851_add_raw_to_ci_group_variables.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true class AddRawToCiGroupVariables < Gitlab::Database::Migration[2.0] + enable_lock_retries! + def change add_column :ci_group_variables, :raw, :boolean, null: false, default: true end diff --git a/db/migrate/20220525123914_add_raw_to_ci_instance_variables.rb b/db/migrate/20220525123914_add_raw_to_ci_instance_variables.rb index 7595882790cefa..71674b48e39d13 100644 --- a/db/migrate/20220525123914_add_raw_to_ci_instance_variables.rb +++ b/db/migrate/20220525123914_add_raw_to_ci_instance_variables.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true class AddRawToCiInstanceVariables < Gitlab::Database::Migration[2.0] + enable_lock_retries! + def change add_column :ci_instance_variables, :raw, :boolean, null: false, default: true end diff --git a/db/migrate/20220525123940_add_raw_to_ci_job_variables.rb b/db/migrate/20220525123940_add_raw_to_ci_job_variables.rb index 2e43b3e2cd9c2f..abd1f1eb2111bc 100644 --- a/db/migrate/20220525123940_add_raw_to_ci_job_variables.rb +++ b/db/migrate/20220525123940_add_raw_to_ci_job_variables.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true class AddRawToCiJobVariables < Gitlab::Database::Migration[2.0] + enable_lock_retries! + def change add_column :ci_job_variables, :raw, :boolean, null: false, default: true end diff --git a/db/migrate/20220525124104_add_raw_to_ci_pipeline_schedule_variables.rb b/db/migrate/20220525124104_add_raw_to_ci_pipeline_schedule_variables.rb index 5817aadf841f1d..c7a3b832552e20 100644 --- a/db/migrate/20220525124104_add_raw_to_ci_pipeline_schedule_variables.rb +++ b/db/migrate/20220525124104_add_raw_to_ci_pipeline_schedule_variables.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true class AddRawToCiPipelineScheduleVariables < Gitlab::Database::Migration[2.0] + enable_lock_retries! + def change add_column :ci_pipeline_schedule_variables, :raw, :boolean, null: false, default: true end diff --git a/db/migrate/20220525124125_add_raw_to_ci_variables.rb b/db/migrate/20220525124125_add_raw_to_ci_variables.rb index dbd1f6b3712ea0..168cd107d1c414 100644 --- a/db/migrate/20220525124125_add_raw_to_ci_variables.rb +++ b/db/migrate/20220525124125_add_raw_to_ci_variables.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true class AddRawToCiVariables < Gitlab::Database::Migration[2.0] + enable_lock_retries! + def change add_column :ci_variables, :raw, :boolean, null: false, default: true end -- GitLab