From a8ee18e177f6a960cdc0580fed56ba0cd3b6f46a Mon Sep 17 00:00:00 2001 From: Damian Debkowski Date: Mon, 9 Jan 2023 14:00:28 -0800 Subject: [PATCH] fix(db): target address relabel migration id (#2769) --- .../oss/postgres/16/04_wh_credential_dimension.up.sql | 2 +- .../oss/postgres/26/03_wh_network_address_dimensions.up.sql | 2 +- internal/db/schema/migrations/oss/postgres/44/03_targets.up.sql | 2 +- .../db/schema/migrations/oss/postgres/44/04_sessions.up.sql | 2 +- .../postgres/56/02_add_data_key_foreign_key_references.up.sql | 2 +- .../postgres/59/01_target_ingress_egress_worker_filters.up.sql | 2 +- .../schema/migrations/oss/postgres/{70 => 60}/01_targets.up.sql | 0 .../migrations/oss/postgres/{70 => 60}/02_sessions.up.sql | 0 .../migrations/oss/postgres/{70 => 60}/03_wh_sessions.up.sql | 0 9 files changed, 6 insertions(+), 6 deletions(-) rename internal/db/schema/migrations/oss/postgres/{70 => 60}/01_targets.up.sql (100%) rename internal/db/schema/migrations/oss/postgres/{70 => 60}/02_sessions.up.sql (100%) rename internal/db/schema/migrations/oss/postgres/{70 => 60}/03_wh_sessions.up.sql (100%) diff --git a/internal/db/schema/migrations/oss/postgres/16/04_wh_credential_dimension.up.sql b/internal/db/schema/migrations/oss/postgres/16/04_wh_credential_dimension.up.sql index 1c702f82c1..f623e83f9c 100644 --- a/internal/db/schema/migrations/oss/postgres/16/04_wh_credential_dimension.up.sql +++ b/internal/db/schema/migrations/oss/postgres/16/04_wh_credential_dimension.up.sql @@ -10,7 +10,7 @@ begin; alter column credential_group_key drop default; -- replaces function from 15/01_wh_rename_key_columns.up.sql - -- replaced function in 70/03_wh_sessions.up.sql + -- replaced function in 60/03_wh_sessions.up.sql drop trigger wh_insert_session on session; drop function wh_insert_session; diff --git a/internal/db/schema/migrations/oss/postgres/26/03_wh_network_address_dimensions.up.sql b/internal/db/schema/migrations/oss/postgres/26/03_wh_network_address_dimensions.up.sql index 5ef8e23184..6d65dfefa1 100644 --- a/internal/db/schema/migrations/oss/postgres/26/03_wh_network_address_dimensions.up.sql +++ b/internal/db/schema/migrations/oss/postgres/26/03_wh_network_address_dimensions.up.sql @@ -70,7 +70,7 @@ begin; -- replaces function from 15/02_wh_rename_key_columns.up.sql - -- replaced function in 70/03_wh_sessions.up.sql + -- replaced function in 60/03_wh_sessions.up.sql -- adds the network address key to the host dimension table. drop function wh_upsert_host; create function wh_upsert_host(p_host_id wt_public_id, p_host_set_id wt_public_id, p_target_id wt_public_id) returns wh_dim_key diff --git a/internal/db/schema/migrations/oss/postgres/44/03_targets.up.sql b/internal/db/schema/migrations/oss/postgres/44/03_targets.up.sql index 20a63251fb..59c323a530 100644 --- a/internal/db/schema/migrations/oss/postgres/44/03_targets.up.sql +++ b/internal/db/schema/migrations/oss/postgres/44/03_targets.up.sql @@ -82,7 +82,7 @@ begin; -- warehouse -- Replaces whx_host_dimension_source defined in 26/02_wh_network_address_dimensions.up.sql. - -- Replaced view in 70/03_wh_sessions.up.sql + -- Replaced view in 60/03_wh_sessions.up.sql drop view whx_host_dimension_source; create view whx_host_dimension_source as select -- id is the first column in the target view diff --git a/internal/db/schema/migrations/oss/postgres/44/04_sessions.up.sql b/internal/db/schema/migrations/oss/postgres/44/04_sessions.up.sql index 5b154c730c..99bed5d31f 100644 --- a/internal/db/schema/migrations/oss/postgres/44/04_sessions.up.sql +++ b/internal/db/schema/migrations/oss/postgres/44/04_sessions.up.sql @@ -35,7 +35,7 @@ begin; $$ language plpgsql; -- Replaces trigger from 01/50_session.up.sql - -- Replaced trigger in 70/02_sessions.up.sql + -- Replaced trigger in 60/02_sessions.up.sql create or replace function insert_session() returns trigger as $$ begin diff --git a/internal/db/schema/migrations/oss/postgres/56/02_add_data_key_foreign_key_references.up.sql b/internal/db/schema/migrations/oss/postgres/56/02_add_data_key_foreign_key_references.up.sql index 699a77d179..430918693c 100644 --- a/internal/db/schema/migrations/oss/postgres/56/02_add_data_key_foreign_key_references.up.sql +++ b/internal/db/schema/migrations/oss/postgres/56/02_add_data_key_foreign_key_references.up.sql @@ -32,7 +32,7 @@ begin; on update cascade; -- Replaces trigger from 44/04_session.up.sql - -- Replaced in 70/02_sessions.up.sql + -- Replaced in 60/02_sessions.up.sql -- Adding a foreign key reference to the kms key means we have -- to set the key_id to null when the scope_id is set to null, -- otherwise we can't delete scopes with sessions, since deleting diff --git a/internal/db/schema/migrations/oss/postgres/59/01_target_ingress_egress_worker_filters.up.sql b/internal/db/schema/migrations/oss/postgres/59/01_target_ingress_egress_worker_filters.up.sql index 347364f832..66e48202a1 100644 --- a/internal/db/schema/migrations/oss/postgres/59/01_target_ingress_egress_worker_filters.up.sql +++ b/internal/db/schema/migrations/oss/postgres/59/01_target_ingress_egress_worker_filters.up.sql @@ -86,7 +86,7 @@ select public_id, from target_tcp; -- Replaces view from 56/06_add_session_private_key_column.up.sql --- Replaced in 70/02_sessions.up.sql +-- Replaced in 60/02_sessions.up.sql drop view session_list; create view session_list as select diff --git a/internal/db/schema/migrations/oss/postgres/70/01_targets.up.sql b/internal/db/schema/migrations/oss/postgres/60/01_targets.up.sql similarity index 100% rename from internal/db/schema/migrations/oss/postgres/70/01_targets.up.sql rename to internal/db/schema/migrations/oss/postgres/60/01_targets.up.sql diff --git a/internal/db/schema/migrations/oss/postgres/70/02_sessions.up.sql b/internal/db/schema/migrations/oss/postgres/60/02_sessions.up.sql similarity index 100% rename from internal/db/schema/migrations/oss/postgres/70/02_sessions.up.sql rename to internal/db/schema/migrations/oss/postgres/60/02_sessions.up.sql diff --git a/internal/db/schema/migrations/oss/postgres/70/03_wh_sessions.up.sql b/internal/db/schema/migrations/oss/postgres/60/03_wh_sessions.up.sql similarity index 100% rename from internal/db/schema/migrations/oss/postgres/70/03_wh_sessions.up.sql rename to internal/db/schema/migrations/oss/postgres/60/03_wh_sessions.up.sql