From 951af2df6153fd86806c5a99ddc5ee42b5f810cc Mon Sep 17 00:00:00 2001 From: Johnny Brenes <103782746+JBrenesSimpat@users.noreply.github.com> Date: Tue, 27 May 2025 15:08:09 -0600 Subject: [PATCH 1/5] Update on-dms-pullrequest.yml --- .github/workflows/on-dms-pullrequest.yml | 25 ++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/.github/workflows/on-dms-pullrequest.yml b/.github/workflows/on-dms-pullrequest.yml index a57c307c62..a9f540b470 100644 --- a/.github/workflows/on-dms-pullrequest.yml +++ b/.github/workflows/on-dms-pullrequest.yml @@ -178,6 +178,31 @@ jobs: path-replace-backslashes: 'true' reporter: dotnet-trx + - name: Download OpenAPI specs + run: | + mkdir specs + Invoke-WebRequest -Uri "http://localhost:8080/metadata/specifications/resources-spec.json" -OutFile "specs/resources-spec.json" + Invoke-WebRequest -Uri "http://localhost:8080/metadata/specifications/descriptors-spec.json" -OutFile "specs/descriptors-spec.json" + Invoke-WebRequest -Uri "http://localhost:8080/metadata/specifications/discovery-spec.json" -OutFile "specs/discovery-spec.json" + + - name: Validate Resources Spec + uses: swaggerexpert/swagger-editor-validate@54b85e2f5c1fcdee85308dd57cad8c8ec19d3970 + with: + definition-file: specs/resources-spec.json + continue-on-error: true + + - name: Validate Descriptors Spec + uses: swaggerexpert/swagger-editor-validate@54b85e2f5c1fcdee85308dd57cad8c8ec19d3970 + with: + definition-file: specs/descriptors-spec.json + continue-on-error: true + + - name: Validate Discovery Spec + uses: swaggerexpert/swagger-editor-validate@54b85e2f5c1fcdee85308dd57cad8c8ec19d3970 + with: + definition-file: specs/discovery-spec.json + continue-on-error: true + event_file: name: Upload Event File runs-on: ubuntu-latest From a8262ecf866d95c1fe8237199fcab6a73d1357d2 Mon Sep 17 00:00:00 2001 From: Johnny Brenes Date: Tue, 27 May 2025 15:14:49 -0600 Subject: [PATCH 2/5] format test --- .../core/EdFi.DataManagementService.Core/UtilityService.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/dms/core/EdFi.DataManagementService.Core/UtilityService.cs b/src/dms/core/EdFi.DataManagementService.Core/UtilityService.cs index 5406b7cc31..a298bce6e6 100644 --- a/src/dms/core/EdFi.DataManagementService.Core/UtilityService.cs +++ b/src/dms/core/EdFi.DataManagementService.Core/UtilityService.cs @@ -27,7 +27,8 @@ public static partial class UtilityService public static partial Regex MinifyRegex(); //Use to avoid HTML escaping in output message that we construct - public static readonly JsonSerializerOptions SerializerOptions = - new() { Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping }; + public static readonly JsonSerializerOptions SerializerOptions = new() + { + Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping, + }; } - From 645989a2bb219a7f2be85d6dc929ea9a883cf5d2 Mon Sep 17 00:00:00 2001 From: Johnny Brenes <103782746+JBrenesSimpat@users.noreply.github.com> Date: Wed, 28 May 2025 14:53:58 -0600 Subject: [PATCH 3/5] Update Program.cs --- .../Program.cs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/dms/frontend/EdFi.DataManagementService.Frontend.AspNetCore/Program.cs b/src/dms/frontend/EdFi.DataManagementService.Frontend.AspNetCore/Program.cs index 2f667fdc47..d3ffdfd020 100644 --- a/src/dms/frontend/EdFi.DataManagementService.Frontend.AspNetCore/Program.cs +++ b/src/dms/frontend/EdFi.DataManagementService.Frontend.AspNetCore/Program.cs @@ -107,11 +107,7 @@ async Task RetrieveAndCacheClaimSets(WebApplication app) } catch (Exception ex) { - // Aim to cache the claim set list during the application's startup - // process. However, if caching fails for any reason, we do not prevent - // DMS from loading. This approach is intended to optimize the process - // of loading claims set list from Configuration service without - // impacting the application's availability. + app.Logger.LogCritical(ex, "Retrieving and caching required claim sets failure"); } } From 05189cc604530c99bcaeeb1e2abc7cf9c567186d Mon Sep 17 00:00:00 2001 From: Johnny Brenes <103782746+JBrenesSimpat@users.noreply.github.com> Date: Wed, 28 May 2025 15:11:53 -0600 Subject: [PATCH 4/5] Update Directory.Packages.props --- src/Directory.Packages.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 0ebd50f13b..44f4e4a6f7 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -9,10 +9,10 @@ - - - - + + + + From 7a1c2e845044e3b66acd4ef4ad333cc72a351086 Mon Sep 17 00:00:00 2001 From: Johnny Brenes <103782746+JBrenesSimpat@users.noreply.github.com> Date: Wed, 28 May 2025 15:30:21 -0600 Subject: [PATCH 5/5] Update Dockerfile --- src/dms/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/dms/Dockerfile b/src/dms/Dockerfile index 4098d58c8c..20769bc507 100644 --- a/src/dms/Dockerfile +++ b/src/dms/Dockerfile @@ -53,13 +53,13 @@ FROM runtimebase AS setup ENV ASPNETCORE_HTTP_PORTS=8080 ENV CORE_PACKAGE=EdFi.DataStandard52.ApiSchema -ENV CORE_PACKAGE_VERSION=1.0.211 +ENV CORE_PACKAGE_VERSION=1.0.202 ENV TPDM_PACKAGE=EdFi.TPDM.ApiSchema -ENV TPDM_PACKAGE_VERSION=1.0.211 +ENV TPDM_PACKAGE_VERSION=1.0.202 ENV SAMPLE_PACKAGE=EdFi.Sample.ApiSchema -ENV SAMPLE_PACKAGE_VERSION=1.0.211 +ENV SAMPLE_PACKAGE_VERSION=1.0.202 ENV HOMOGRAPH_PACKAGE=EdFi.Homograph.ApiSchema -ENV HOMOGRAPH_PACKAGE_VERSION=1.0.211 +ENV HOMOGRAPH_PACKAGE_VERSION=1.0.202 ENV START_YEAR=1991 ENV END_YEAR=2037 ENV CURRENT_SCHOOL_YEAR=2025