Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions .github/workflows/on-dms-pullrequest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions src/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
<PackageVersion Include="Dapper" Version="2.1.35" />
<PackageVersion Include="dbup-core" Version="5.0.87" />
<PackageVersion Include="dbup-postgresql" Version="5.0.40" />
<PackageVersion Include="EdFi.DataStandard52.ApiSchema" Version="1.0.211" />
<PackageVersion Include="EdFi.Homograph.ApiSchema" Version="1.0.211" />
<PackageVersion Include="EdFi.Sample.ApiSchema" Version="1.0.211" />
<PackageVersion Include="EdFi.TPDM.ApiSchema" Version="1.0.211" />
<PackageVersion Include="EdFi.DataStandard52.ApiSchema" Version="1.0.202" />
<PackageVersion Include="EdFi.Homograph.ApiSchema" Version="1.0.202" />
<PackageVersion Include="EdFi.Sample.ApiSchema" Version="1.0.202" />
<PackageVersion Include="EdFi.TPDM.ApiSchema" Version="1.0.202" />
<PackageVersion Include="Keycloak.Net.Core" Version="1.0.29" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.8" />
<PackageVersion Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
Expand Down
8 changes: 4 additions & 4 deletions src/dms/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
}

Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
}
Expand Down
Loading