From 85f676aa2f87a218138af0e01e92a8d0c31906c1 Mon Sep 17 00:00:00 2001 From: Jeff Cumpsty Date: Fri, 13 Feb 2026 10:26:05 +0000 Subject: [PATCH 1/3] Staging (#118) * Update permissions in deploy.yml to allow writing for GitHub releases * Add job name to staging-to-main workflow for clarity --- .github/workflows/staging-to-main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/staging-to-main.yml b/.github/workflows/staging-to-main.yml index b9ba05b..96920b7 100644 --- a/.github/workflows/staging-to-main.yml +++ b/.github/workflows/staging-to-main.yml @@ -12,6 +12,7 @@ permissions: jobs: check-source-branch: + name: staging-to-main-only runs-on: ubuntu-latest steps: - name: Fail if PR is not from staging From 92d3c174797f3efd7b59ad89e01a8d9f7e030365 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Feb 2026 04:24:11 +0000 Subject: [PATCH 2/3] chore: Bump Swashbuckle.AspNetCore from 10.1.2 to 10.1.3 --- updated-dependencies: - dependency-name: Swashbuckle.AspNetCore dependency-version: 10.1.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- OpenReferralApi/OpenReferralApi.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenReferralApi/OpenReferralApi.csproj b/OpenReferralApi/OpenReferralApi.csproj index b406d47..dd2f6d8 100644 --- a/OpenReferralApi/OpenReferralApi.csproj +++ b/OpenReferralApi/OpenReferralApi.csproj @@ -30,7 +30,7 @@ - + From 5ac3391ab2df0a84a0039b553e6b4e4a3cc4e61b Mon Sep 17 00:00:00 2001 From: Jeff Cumpsty Date: Mon, 16 Feb 2026 21:28:02 +0000 Subject: [PATCH 3/3] Staging (#125) * Update permissions in deploy.yml to allow writing for GitHub releases * Add job name to staging-to-main workflow for clarity * Sanitize URLs in logging for schema loading and error handling (#124) * Update staging-to-main workflow to allow dependabot merges and modify .gitignore to include log files (#132) * Update .gitignore to ignore all log files in the logs directory (#134) --- .github/workflows/staging-to-main.yml | 2 +- .gitignore | 3 ++- OpenReferralApi.Core/Services/SchemaResolverService.cs | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/staging-to-main.yml b/.github/workflows/staging-to-main.yml index 96920b7..288e115 100644 --- a/.github/workflows/staging-to-main.yml +++ b/.github/workflows/staging-to-main.yml @@ -16,7 +16,7 @@ jobs: 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 }}" diff --git a/.gitignore b/.gitignore index db1e784..545192c 100644 --- a/.gitignore +++ b/.gitignore @@ -65,4 +65,5 @@ OpenReferralApi.sln.DotSettings.user results*.json # AI-generated documentation -docs/ \ No newline at end of file +docs/ +logs/ diff --git a/OpenReferralApi.Core/Services/SchemaResolverService.cs b/OpenReferralApi.Core/Services/SchemaResolverService.cs index 390b5a9..7b78364 100644 --- a/OpenReferralApi.Core/Services/SchemaResolverService.cs +++ b/OpenReferralApi.Core/Services/SchemaResolverService.cs @@ -661,7 +661,7 @@ public async Task 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); } @@ -673,7 +673,7 @@ public async Task 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; } }