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>
62 lines
2.5 KiB
C#
62 lines
2.5 KiB
C#
using System;
|
|
using System.Runtime.InteropServices;
|
|
|
|
namespace ZB.MOM.WW.MxGateway.Worker.MxAccess;
|
|
|
|
/// <summary>Thrown when the worker fails to instantiate the MXAccess COM object.</summary>
|
|
public sealed class MxAccessCreationException : Exception
|
|
{
|
|
/// <summary>Initializes a new instance with diagnostic info from the inner exception.</summary>
|
|
/// <param name="innerException">The exception that caused the creation failure.</param>
|
|
public MxAccessCreationException(Exception innerException)
|
|
: base(
|
|
$"Failed to create MXAccess COM object {MxAccessInteropInfo.ComClassName} ({MxAccessInteropInfo.ProgId}).",
|
|
innerException)
|
|
{
|
|
AttemptedProgId = MxAccessInteropInfo.ProgId;
|
|
AttemptedClsid = MxAccessInteropInfo.Clsid;
|
|
AttemptedComClassName = MxAccessInteropInfo.ComClassName;
|
|
HResult = innerException.HResult;
|
|
}
|
|
|
|
/// <summary>The ProgID that was attempted during COM instantiation.</summary>
|
|
public string AttemptedProgId { get; }
|
|
|
|
/// <summary>The CLSID that was attempted during COM instantiation.</summary>
|
|
public string AttemptedClsid { get; }
|
|
|
|
/// <summary>The COM class name that was attempted during instantiation.</summary>
|
|
public string AttemptedComClassName { get; }
|
|
|
|
/// <summary>The captured HResult from the instantiation failure, or null if zero.</summary>
|
|
public int? CapturedHResult => HResult == 0 ? null : HResult;
|
|
|
|
/// <summary>Wraps an exception in MxAccessCreationException if it is not already.</summary>
|
|
/// <param name="exception">The exception to wrap.</param>
|
|
/// <returns>An MxAccessCreationException wrapping the input exception.</returns>
|
|
public static MxAccessCreationException From(Exception exception)
|
|
{
|
|
return exception is MxAccessCreationException creationException
|
|
? creationException
|
|
: new MxAccessCreationException(exception);
|
|
}
|
|
|
|
/// <summary>Extracts the HResult from an exception, handling MXAccess and COM exceptions specially.</summary>
|
|
/// <param name="exception">The exception to extract the HResult from.</param>
|
|
/// <returns>The HResult value, or null if zero.</returns>
|
|
public static int? ExtractHResult(Exception exception)
|
|
{
|
|
if (exception is MxAccessCreationException creationException)
|
|
{
|
|
return creationException.CapturedHResult;
|
|
}
|
|
|
|
if (exception is COMException comException)
|
|
{
|
|
return comException.HResult;
|
|
}
|
|
|
|
return exception.HResult == 0 ? null : exception.HResult;
|
|
}
|
|
}
|