Joseph Doherty
dc9c0c950c
Apply the ZB.MOM.WW. prefix to all gateway-side projects, folders,
.csproj/.sln contents, C# namespaces, using directives, generated proto
C# (csharp_namespace + checked-in generated files), InternalsVisibleTo
attributes, project-name string literals (LoadProject, .sln lookups,
worker exe paths, staticwebassets manifest), and the install/script/doc
references that point at any of the above. Migrate the solution from
.sln to .slnx via `dotnet sln migrate` and delete the old file.
External-runtime identifiers are intentionally NOT prefixed so external
configuration keeps working:
- GatewayMetrics.cs MeterName ("MxGateway.Server")
- DashboardAuthenticationDefaults Scheme/Policy ("MxGateway.Dashboard")
- GatewayRequestLoggingMiddleware logger category ("MxGateway.Request")
- StaRuntime thread name ("MxGateway.Worker.STA")
- appsettings.json root section "MxGateway" + env-var prefix
MxGateway__... and secret-name MxGateway:ApiKeyPepper
- C:\ProgramData\MxGateway\ data dir paths
Also fixes two tests that were not rename-related but became visible
while validating the rename:
- WorkerLiveMxAccessSmokeTests.ShutDownAsync: cancellation that the
gateway service correctly maps to RpcException(Cancelled) per gRPC
convention was being misclassified as a stream fault. Added a sibling
catch on RpcException with StatusCode.Cancelled.
- IntegrationTestEnvironment.ResolveRepositoryRoot: extracted IsRepositoryRoot
and made it accept either a .git marker OR a .sln/.slnx next to src/
so the worker-exe walker works in non-git working copies.
clients/proto/proto-inputs.json's protoRoot updated to point at
src/ZB.MOM.WW.MxGateway.Contracts/Protos.
Verified by `dotnet build` and a full `dotnet test` of the .slnx with
MXGATEWAY_RUN_LIVE_{MXACCESS,LDAP,GALAXY}_TESTS=1:
Tests: 472/472 pass
Worker.Tests: 280/280 pass (4 dev-rig [Fact(Skip=...)] skipped)
IntegrationTests: 18/18 pass
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
97 lines
2.7 KiB
PowerShell
97 lines
2.7 KiB
PowerShell
[CmdletBinding()]
|
|
param(
|
|
[switch]$Check
|
|
)
|
|
|
|
Set-StrictMode -Version Latest
|
|
$ErrorActionPreference = "Stop"
|
|
|
|
$repoRoot = Resolve-Path (Join-Path $PSScriptRoot "..")
|
|
$protoRoot = Join-Path $repoRoot "src/ZB.MOM.WW.MxGateway.Contracts/Protos"
|
|
$manifestPath = Join-Path $repoRoot "clients/proto/proto-inputs.json"
|
|
$descriptorPath = Join-Path $repoRoot "clients/proto/descriptors/mxaccessgw-client-v1.protoset"
|
|
|
|
function Resolve-Protoc {
|
|
$pathCommand = Get-Command "protoc.exe" -ErrorAction SilentlyContinue
|
|
if ($null -ne $pathCommand) {
|
|
return $pathCommand.Source
|
|
}
|
|
|
|
$documentedPath = Join-Path $env:LOCALAPPDATA "Microsoft/WinGet/Packages/Google.Protobuf_Microsoft.Winget.Source_8wekyb3d8bbwe/bin/protoc.exe"
|
|
if (Test-Path $documentedPath) {
|
|
return $documentedPath
|
|
}
|
|
|
|
throw "Could not find protoc.exe. See docs/ToolchainLinks.md for the documented protobuf toolchain path."
|
|
}
|
|
|
|
function Ensure-Directory {
|
|
param([string]$Path)
|
|
|
|
if (-not (Test-Path $Path)) {
|
|
New-Item -ItemType Directory -Path $Path | Out-Null
|
|
}
|
|
}
|
|
|
|
function Compare-FileBytes {
|
|
param(
|
|
[string]$ExpectedPath,
|
|
[string]$ActualPath
|
|
)
|
|
|
|
if (-not (Test-Path $ExpectedPath)) {
|
|
return $false
|
|
}
|
|
|
|
$expected = [System.IO.File]::ReadAllBytes($ExpectedPath)
|
|
$actual = [System.IO.File]::ReadAllBytes($ActualPath)
|
|
if ($expected.Length -ne $actual.Length) {
|
|
return $false
|
|
}
|
|
|
|
for ($index = 0; $index -lt $expected.Length; $index++) {
|
|
if ($expected[$index] -ne $actual[$index]) {
|
|
return $false
|
|
}
|
|
}
|
|
|
|
return $true
|
|
}
|
|
|
|
$manifest = Get-Content -Raw $manifestPath | ConvertFrom-Json
|
|
|
|
Ensure-Directory (Split-Path $descriptorPath -Parent)
|
|
foreach ($output in $manifest.generatedOutputs.PSObject.Properties.Value) {
|
|
Ensure-Directory (Join-Path $repoRoot $output)
|
|
}
|
|
|
|
$protoc = Resolve-Protoc
|
|
$outputPath = $descriptorPath
|
|
if ($Check) {
|
|
$outputPath = Join-Path ([System.IO.Path]::GetTempPath()) ("mxaccessgw-client-v1-" + [System.Guid]::NewGuid().ToString("N") + ".protoset")
|
|
}
|
|
|
|
try {
|
|
& $protoc `
|
|
"--proto_path=$protoRoot" `
|
|
"--include_imports" `
|
|
"--include_source_info" `
|
|
"--descriptor_set_out=$outputPath" `
|
|
"mxaccess_gateway.proto" `
|
|
"mxaccess_worker.proto" `
|
|
"galaxy_repository.proto"
|
|
|
|
if ($LASTEXITCODE -ne 0) {
|
|
throw "protoc failed with exit code $LASTEXITCODE."
|
|
}
|
|
|
|
if ($Check -and -not (Compare-FileBytes -ExpectedPath $descriptorPath -ActualPath $outputPath)) {
|
|
throw "Client proto descriptor is stale. Run scripts/publish-client-proto-inputs.ps1 and commit the updated descriptor."
|
|
}
|
|
}
|
|
finally {
|
|
if ($Check -and (Test-Path $outputPath)) {
|
|
Remove-Item -LiteralPath $outputPath
|
|
}
|
|
}
|