From 458f9ac0356c2b2498956f7e9d5309025c642d7f Mon Sep 17 00:00:00 2001 From: David Jimenez Date: Mon, 23 Sep 2024 13:40:59 -0600 Subject: [PATCH 1/7] Version upgrade for OpenIddict.EntityFrameworkCore and Microsoft.EntityFrameworkCore. --- .../Admin/00003-EditApiAuthTables.sql | 18 ++++++++++++++++++ .../Admin/00003-EditApiAuthTables.sql | 16 ++++++++++++++++ .../EdFi.Ods.AdminApi/EdFi.Ods.AdminApi.csproj | 4 ++-- 3 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 Application/EdFi.Ods.AdminApi/Artifacts/MsSql/Structure/Admin/00003-EditApiAuthTables.sql create mode 100644 Application/EdFi.Ods.AdminApi/Artifacts/PgSql/Structure/Admin/00003-EditApiAuthTables.sql diff --git a/Application/EdFi.Ods.AdminApi/Artifacts/MsSql/Structure/Admin/00003-EditApiAuthTables.sql b/Application/EdFi.Ods.AdminApi/Artifacts/MsSql/Structure/Admin/00003-EditApiAuthTables.sql new file mode 100644 index 000000000..90a1d92ad --- /dev/null +++ b/Application/EdFi.Ods.AdminApi/Artifacts/MsSql/Structure/Admin/00003-EditApiAuthTables.sql @@ -0,0 +1,18 @@ +-- SPDX-License-Identifier: Apache-2.0 +-- Licensed to the Ed-Fi Alliance under one or more agreements. +-- The Ed-Fi Alliance licenses this file to you under the Apache License, Version 2.0. +-- See the LICENSE and NOTICES files in the project root for more information. + +IF EXISTS (SELECT 1 FROM [INFORMATION_SCHEMA].[TABLES] WHERE TABLE_SCHEMA = 'adminapi' and TABLE_NAME = 'Applications') +BEGIN + ALTER TABLE adminapi.Applications + ADD + [ApplicationType] NVARCHAR(MAX) NULL, + [JsonWebKeySet] NVARCHAR(MAX) NULL, + [Settings] NVARCHAR(MAX) NULL; +END + +IF EXISTS (SELECT 1 FROM [INFORMATION_SCHEMA].[TABLES] WHERE TABLE_SCHEMA = 'adminapi' and TABLE_NAME = 'Applications') +BEGIN + EXEC sp_rename 'adminapi.Applications.Type', 'ClientType', 'COLUMN'; +END diff --git a/Application/EdFi.Ods.AdminApi/Artifacts/PgSql/Structure/Admin/00003-EditApiAuthTables.sql b/Application/EdFi.Ods.AdminApi/Artifacts/PgSql/Structure/Admin/00003-EditApiAuthTables.sql new file mode 100644 index 000000000..105c1e12e --- /dev/null +++ b/Application/EdFi.Ods.AdminApi/Artifacts/PgSql/Structure/Admin/00003-EditApiAuthTables.sql @@ -0,0 +1,16 @@ +-- SPDX-License-Identifier: Apache-2.0 +-- Licensed to the Ed-Fi Alliance under one or more agreements. +-- The Ed-Fi Alliance licenses this file to you under the Apache License, Version 2.0. +-- See the LICENSE and NOTICES files in the project root for more information. + +ALTER TABLE adminapi.Applications + ADD COLUMN + ApplicationType VARCHAR NULL, + ADD COLUMN + JsonWebKeySet VARCHAR NULL, + ADD COLUMN + Settings VARCHAR NULL; + + +ALTER TABLE adminapi.Applications + RENAME COLUMN Type TO ClientType; diff --git a/Application/EdFi.Ods.AdminApi/EdFi.Ods.AdminApi.csproj b/Application/EdFi.Ods.AdminApi/EdFi.Ods.AdminApi.csproj index 893c9098c..b9850657e 100644 --- a/Application/EdFi.Ods.AdminApi/EdFi.Ods.AdminApi.csproj +++ b/Application/EdFi.Ods.AdminApi/EdFi.Ods.AdminApi.csproj @@ -36,11 +36,11 @@ - + - + From 16a0b32efb7090cfc822718b15ba0b5874a112ea Mon Sep 17 00:00:00 2001 From: David Jimenez Date: Tue, 24 Sep 2024 09:35:14 -0600 Subject: [PATCH 2/7] Packages updates. --- Application/EdFi.Ods.AdminApi/EdFi.Ods.AdminApi.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/EdFi.Ods.AdminApi/EdFi.Ods.AdminApi.csproj b/Application/EdFi.Ods.AdminApi/EdFi.Ods.AdminApi.csproj index b9850657e..ac933da35 100644 --- a/Application/EdFi.Ods.AdminApi/EdFi.Ods.AdminApi.csproj +++ b/Application/EdFi.Ods.AdminApi/EdFi.Ods.AdminApi.csproj @@ -35,13 +35,13 @@ - + - + From 2eb9cafc9ec7c4395c5b494ccad1fc1731f4cb19 Mon Sep 17 00:00:00 2001 From: David Jimenez Date: Tue, 24 Sep 2024 13:04:25 -0600 Subject: [PATCH 3/7] Version number update --- Application/EdFi.Ods.AdminApi/EdFi.Ods.AdminApi.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/EdFi.Ods.AdminApi/EdFi.Ods.AdminApi.csproj b/Application/EdFi.Ods.AdminApi/EdFi.Ods.AdminApi.csproj index ac933da35..824f218b1 100644 --- a/Application/EdFi.Ods.AdminApi/EdFi.Ods.AdminApi.csproj +++ b/Application/EdFi.Ods.AdminApi/EdFi.Ods.AdminApi.csproj @@ -35,7 +35,7 @@ - + From 316d2bcd3261b678bc51f92c7e0580c8aeb37e1c Mon Sep 17 00:00:00 2001 From: David Jimenez Date: Thu, 26 Sep 2024 12:22:47 -0600 Subject: [PATCH 4/7] Trying to fix e2e tests. --- Docker/dbadmin.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Docker/dbadmin.Dockerfile b/Docker/dbadmin.Dockerfile index 4e5c3a87f..077c30f11 100644 --- a/Docker/dbadmin.Dockerfile +++ b/Docker/dbadmin.Dockerfile @@ -22,7 +22,7 @@ FROM base AS setup USER root RUN dos2unix /docker-entrypoint-initdb.d/3-run-adminapi-migrations.sh && \ dos2unix /tmp/AdminApiScripts/PgSql/* && \ - chmod -R 600 /tmp/AdminApiScripts/PgSql/* + chmod -R 700 /tmp/AdminApiScripts/PgSql/* USER postgres EXPOSE 5432 From aba3292cb5165a258049e3b387035d5c3bddd9b1 Mon Sep 17 00:00:00 2001 From: David Jimenez Date: Thu, 26 Sep 2024 12:39:19 -0600 Subject: [PATCH 5/7] Trying to fix e2e tests. --- .../PgSql/Structure/Admin/00003-EditApiAuthTables.sql | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Application/EdFi.Ods.AdminApi/Artifacts/PgSql/Structure/Admin/00003-EditApiAuthTables.sql b/Application/EdFi.Ods.AdminApi/Artifacts/PgSql/Structure/Admin/00003-EditApiAuthTables.sql index 105c1e12e..c4075c1ce 100644 --- a/Application/EdFi.Ods.AdminApi/Artifacts/PgSql/Structure/Admin/00003-EditApiAuthTables.sql +++ b/Application/EdFi.Ods.AdminApi/Artifacts/PgSql/Structure/Admin/00003-EditApiAuthTables.sql @@ -5,12 +5,15 @@ ALTER TABLE adminapi.Applications ADD COLUMN - ApplicationType VARCHAR NULL, + ApplicationType VARCHAR NULL; + +ALTER TABLE adminapi.Applications ADD COLUMN - JsonWebKeySet VARCHAR NULL, + JsonWebKeySet VARCHAR NULL; + +ALTER TABLE adminapi.Applications ADD COLUMN Settings VARCHAR NULL; - ALTER TABLE adminapi.Applications RENAME COLUMN Type TO ClientType; From df419f8ba9ff6158b7840fe107cbca5a35cfc51e Mon Sep 17 00:00:00 2001 From: David Jimenez Date: Thu, 26 Sep 2024 14:02:17 -0600 Subject: [PATCH 6/7] Trying to fix e2e tests. --- Docker/dbadmin.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Docker/dbadmin.Dockerfile b/Docker/dbadmin.Dockerfile index 077c30f11..3d38c67f4 100644 --- a/Docker/dbadmin.Dockerfile +++ b/Docker/dbadmin.Dockerfile @@ -22,7 +22,7 @@ FROM base AS setup USER root RUN dos2unix /docker-entrypoint-initdb.d/3-run-adminapi-migrations.sh && \ dos2unix /tmp/AdminApiScripts/PgSql/* && \ - chmod -R 700 /tmp/AdminApiScripts/PgSql/* + chmod -R 777 /tmp/AdminApiScripts/PgSql/* USER postgres EXPOSE 5432 From 17000a992b9cbd9bcd4dcbc930ac6ee85ce2e185 Mon Sep 17 00:00:00 2001 From: David Jimenez Date: Thu, 26 Sep 2024 14:06:03 -0600 Subject: [PATCH 7/7] Undoing previous change --- .../PgSql/Structure/Admin/00003-EditApiAuthTables.sql | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Application/EdFi.Ods.AdminApi/Artifacts/PgSql/Structure/Admin/00003-EditApiAuthTables.sql b/Application/EdFi.Ods.AdminApi/Artifacts/PgSql/Structure/Admin/00003-EditApiAuthTables.sql index c4075c1ce..05484a5eb 100644 --- a/Application/EdFi.Ods.AdminApi/Artifacts/PgSql/Structure/Admin/00003-EditApiAuthTables.sql +++ b/Application/EdFi.Ods.AdminApi/Artifacts/PgSql/Structure/Admin/00003-EditApiAuthTables.sql @@ -5,13 +5,9 @@ ALTER TABLE adminapi.Applications ADD COLUMN - ApplicationType VARCHAR NULL; - -ALTER TABLE adminapi.Applications + ApplicationType VARCHAR NULL, ADD COLUMN - JsonWebKeySet VARCHAR NULL; - -ALTER TABLE adminapi.Applications + JsonWebKeySet VARCHAR NULL, ADD COLUMN Settings VARCHAR NULL;