Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 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
3 changes: 2 additions & 1 deletion .github/workflows/staging-to-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@ permissions:

jobs:
check-source-branch:
name: staging-to-main-only
runs-on: ubuntu-latest
steps:
- name: Fail if PR is not from staging
if: github.head_ref != 'staging'
if: github.head_ref != 'staging' && github.actor != 'dependabot[bot]'
run: |
echo "Error: Merges into 'main' are only allowed from the 'staging' branch."
echo "Current source branch: ${{ github.head_ref }}"
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,5 @@ OpenReferralApi.sln.DotSettings.user
results*.json

# AI-generated documentation
docs/
docs/
logs/
4 changes: 2 additions & 2 deletions OpenReferralApi.Core/Services/SchemaResolverService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,7 @@ public async Task<JSchema> CreateSchemaFromJsonAsync(string schemaJson, string?
// Set base URI for any remaining reference resolution if provided
if (!string.IsNullOrEmpty(documentUri))
{
_logger.LogDebug("Loading schema with base URI: {DocumentUri}", documentUri);
_logger.LogDebug("Loading schema with base URI: {DocumentUri}", SanitizeUrlForLogging(documentUri));
settings.BaseUri = new Uri(documentUri);
}

Expand All @@ -673,7 +673,7 @@ public async Task<JSchema> CreateSchemaFromJsonAsync(string schemaJson, string?
}
catch (Exception ex)
{
_logger.LogError(ex, "Failed to create JSON schema from JSON with resolver. DocumentUri: {DocumentUri}", documentUri ?? "none");
_logger.LogError(ex, "Failed to create JSON schema from JSON with resolver. DocumentUri: {DocumentUri}", documentUri != null ? SanitizeUrlForLogging(documentUri) : "none");
throw;
}
}
Expand Down
2 changes: 1 addition & 1 deletion OpenReferralApi/OpenReferralApi.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.15.0" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.2" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.3" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.15.0" />
</ItemGroup>

Expand Down
Loading