update tests and extension methods

Author: Mike Blair

FractalDataWorks.DeveloperKit.slnx

@@ -209,6 +209,7 @@
     <Project Path="src/FractalDataWorks.Operations/FractalDataWorks.Operations.csproj" />
     <Project Path="src/FractalDataWorks.Processors.Abstractions/FractalDataWorks.Processors.Abstractions.csproj" />
     <Project Path="src/FractalDataWorks.Registration.SourceGenerators/FractalDataWorks.Registration.SourceGenerators.csproj" />
+    <Project Path="src/FractalDataWorks.Calculations.Endpoints/FractalDataWorks.Calculations.Endpoints.csproj" />
     <Project Path="src/FractalDataWorks.Conventions.Analyzers/FractalDataWorks.Conventions.Analyzers.csproj" />
     <Project Path="src/FractalDataWorks.Conventions.CodeFixes/FractalDataWorks.Conventions.CodeFixes.csproj" />
     <Project Path="src/FractalDataWorks.Conventions.FileSplitter/FractalDataWorks.Conventions.FileSplitter.csproj" />
@@ -219,6 +220,8 @@
     <Project Path="src/FractalDataWorks.Schema.Ddl/FractalDataWorks.Schema.Ddl.csproj" />
     <Project Path="src/FractalDataWorks.Schema.Endpoints/FractalDataWorks.Schema.Endpoints.csproj" />
     <Project Path="src/FractalDataWorks.Security.Hashing/FractalDataWorks.Security.Hashing.csproj" />
+    <Project Path="src/FractalDataWorks.Services.Authentication.Clients/FractalDataWorks.Services.Authentication.Clients.csproj" />
+    <Project Path="src/FractalDataWorks.Services.Authentication.Endpoints/FractalDataWorks.Services.Authentication.Endpoints.csproj" />
     <Project Path="src/FractalDataWorks.Services.Authentication.Sql/FractalDataWorks.Services.Authentication.Sql.csproj" />
     <Project Path="src/FractalDataWorks.Services.Authorization.Endpoints/FractalDataWorks.Services.Authorization.Endpoints.csproj" />
     <Project Path="src/FractalDataWorks.Services.Authorization/FractalDataWorks.Services.Authorization.csproj" />

ReferenceSolutions/.gitlab-ci.yml

@@ -0,0 +1,34 @@
+stages:
+  - deploy
+
+variables:
+  DOTNET_CLI_HOME: "/tmp/dotnet-cli"
+  DOTNET_NOLOGO: "true"
+  DEPLOY_DIR: "/opt/fdw"
+
+deploy:
+  stage: deploy
+  tags:
+    - shell
+  script:
+    - echo "=== Building all services ==="
+    - dotnet publish ApiSolution/src/Reference.Api/Reference.Api.csproj -c Release -o build/api
+    - dotnet publish EtlServer/src/Reference.Etl.Server/Reference.Etl.Server.csproj -c Release -o build/etl
+    - dotnet publish SchedulerServer/src/Reference.Scheduler.Server/Reference.Scheduler.Server.csproj -c Release -o build/scheduler
+    - dotnet publish ManagementUI/src/Reference.Management.UI/Reference.Management.UI.csproj -c Release -o build/ui
+    - echo "=== Stopping services ==="
+    - sudo systemctl stop fdw-api fdw-etl fdw-scheduler fdw-ui || true
+    - echo "=== Deploying ==="
+    - rsync -a --delete build/api/ $DEPLOY_DIR/api/
+    - rsync -a --delete build/etl/ $DEPLOY_DIR/etl/
+    - rsync -a --delete build/scheduler/ $DEPLOY_DIR/scheduler/
+    - rsync -a --delete build/ui/ $DEPLOY_DIR/ui/
+    - echo "=== Starting services ==="
+    - sudo systemctl start fdw-api fdw-etl fdw-scheduler fdw-ui
+    - sleep 3
+    - systemctl is-active fdw-api fdw-etl fdw-scheduler fdw-ui
+  only:
+    - develop
+  environment:
+    name: development
+    url: https://fdw.cyberdynedevelopment.dev

ReferenceSolutions/ApiSolution/Directory.Packages.props

@@ -10,7 +10,7 @@
   -->
   <PropertyGroup>
     <!-- FractalDataWorks version - pinned for stable builds -->
-    <FdwVersion>0.7.0-rc.13.g9b5f33c298</FdwVersion>
+    <FdwVersion>0.7.0-rc.14</FdwVersion>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
 

ReferenceSolutions/ApiSolution/Dockerfile

@@ -1,60 +1,42 @@
 # ApiSolution Dockerfile
 # Build context: ReferenceSolutions/ (parent directory)
-#   docker build -f ApiSolution/Dockerfile .
-#
-# Requires cross-solution references:
-#   - SharedPackages/src/Reference.Authentication/
-#   - ManagementUI/src/Reference.Management.Contracts/
-
-FROM mcr.microsoft.com/dotnet/sdk:10.0-preview AS build
+FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
+ARG GITLAB_TOKEN
+ENV GITLAB_TOKEN=${GITLAB_TOKEN}
+COPY docker-certs/cloudflare-origin-rsa.crt /usr/local/share/ca-certificates/
+COPY docker-certs/cloudflare-origin-ecc.crt /usr/local/share/ca-certificates/
+RUN update-ca-certificates
 WORKDIR /src
-
 # Copy nuget configuration and package management
 COPY ApiSolution/nuget.config ApiSolution/
 COPY ApiSolution/Directory.Packages.props ApiSolution/
-
 # Copy solution file
 COPY ApiSolution/ApiSolution.slnx ApiSolution/
-
-# Copy project files for restore (main project)
+# Copy project files for restore
 COPY ApiSolution/src/Reference.Api/Reference.Api.csproj ApiSolution/src/Reference.Api/
-
 # Copy cross-solution project references
-COPY SharedPackages/src/Reference.Authentication/Reference.Authentication.csproj SharedPackages/src/Reference.Authentication/
-COPY SharedPackages/Directory.Packages.props SharedPackages/
 COPY ManagementUI/src/Reference.Management.Contracts/Reference.Management.Contracts.csproj ManagementUI/src/Reference.Management.Contracts/
 COPY ManagementUI/Directory.Build.props ManagementUI/
 COPY ManagementUI/Directory.Packages.props ManagementUI/
-
-# Restore with NuGet packages from nuget.org only (LocalFdw packages are pre-built)
-# Override LocalNugetFolder to a dummy path so restore only uses nuget.org
-RUN dotnet restore ApiSolution/src/Reference.Api/Reference.Api.csproj \
-    -p:LocalNugetFolder=/tmp/empty-nuget
-
+# Copy internal-nuget for Reference.* packages
+COPY internal-nuget/ internal-nuget/
+# Restore
+RUN dotnet restore ApiSolution/src/Reference.Api/Reference.Api.csproj
 # Copy all source files
 COPY ApiSolution/src/ ApiSolution/src/
-COPY SharedPackages/src/Reference.Authentication/ SharedPackages/src/Reference.Authentication/
 COPY ManagementUI/src/Reference.Management.Contracts/ ManagementUI/src/Reference.Management.Contracts/
-
 # Publish
 RUN dotnet publish ApiSolution/src/Reference.Api/Reference.Api.csproj \
     -c Release \
     -o /app/publish \
-    --no-restore \
-    -p:LocalNugetFolder=/tmp/empty-nuget
-
+    --no-restore
 # Runtime stage
-FROM mcr.microsoft.com/dotnet/aspnet:10.0-preview AS runtime
+FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS runtime
 WORKDIR /app
-
-# Security: run as non-root
 RUN groupadd -r fdw && useradd -r -g fdw -s /sbin/nologin fdw
 USER fdw
-
 COPY --from=build /app/publish .
-
 EXPOSE 5001
 HEALTHCHECK --interval=30s --timeout=5s --retries=3 \
     CMD curl -sf http://localhost:5000/health || exit 1
-
 ENTRYPOINT ["dotnet", "Reference.Api.dll"]

ReferenceSolutions/ApiSolution/docker/mssql/entrypoint.sh

@@ -58,7 +58,7 @@ if [ -f /init/ControlDb.dacpac ]; then
         /TargetPassword:"$MSSQL_SA_PASSWORD" \
         /TargetTrustServerCertificate:True \
         /p:BlockOnPossibleDataLoss=False \
-        /p:AllowIncompatiblePlatform=True
+        /p:AllowIncompatiblePlatform=True || echo "WARNING: Dacpac deployment had errors (continuing)"
 
     echo "Dacpac deployment completed successfully."
 else

ReferenceSolutions/ApiSolution/nuget.config

@@ -3,16 +3,24 @@
   <packageSources>
     <clear />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-    <add key="LocalFdw" value="%LocalNugetFolder%" />
+    <add key="GitLabFdw" value="https://gitlab.cyberdynedevelopment.dev/api/v4/projects/1/packages/nuget/index.json" />
+    <add key="Internal" value="../internal-nuget" />
   </packageSources>
-
   <packageSourceMapping>
-    <packageSource key="LocalFdw">
+    <packageSource key="GitLabFdw">
       <package pattern="FractalDataWorks.*" />
+    </packageSource>
+    <packageSource key="Internal">
       <package pattern="Reference.*" />
     </packageSource>
     <packageSource key="nuget.org">
       <package pattern="*" />
     </packageSource>
   </packageSourceMapping>
+  <packageSourceCredentials>
+    <GitLabFdw>
+      <add key="Username" value="gitlab+deploy-token-2" />
+      <add key="ClearTextPassword" value="gldt-Q9WhLtz5Vj1NRYy1LV7y" />
+    </GitLabFdw>
+  </packageSourceCredentials>
 </configuration>

ReferenceSolutions/ApiSolution/src/Reference.Api/Configuration/CorsOptions.cs

@@ -3,10 +3,7 @@
 using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
-using FastEndpoints;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.RateLimiting;
+using FractalDataWorks.Web.RestEndpoints.Security;
 
 namespace Reference.Api.Endpoints;
 
@@ -45,19 +42,25 @@ public sealed class AdminDataResponse
 /// An admin endpoint requiring the Admin role and using the highest rate limit policy.
 /// Uses the "Admin" rate limit policy (10000 req/min).
 /// </summary>
-public sealed class AdminDataEndpoint : EndpointWithoutRequest<AdminDataResponse>
+public sealed class AdminDataEndpoint : AdminEndpointBase<AdminDataResponse>
 {
     /// <inheritdoc />
-    public override void Configure()
+    protected override string Route => "/admin/data";
+
+    /// <inheritdoc />
+    protected override string EndpointSummary => "Get admin data with highest rate limit";
+
+    /// <inheritdoc />
+    protected override string EndpointDescription => "An admin endpoint requiring the Admin role with highest rate limit policy (10000 req/min)";
+
+    /// <inheritdoc />
+    protected override string? EndpointTag => "Security Examples";
+
+    /// <inheritdoc />
+    protected override void ConfigureEndpoint()
     {
-        Get("/admin/data");
-        Policies("fdw:configurations:write");
-        Options(x => x.RequireRateLimiting("Admin"));
-        Description(x => x.WithTags("Security Examples"));
         Summary(s =>
         {
-            s.Summary = "Get admin data with highest rate limit";
-            s.Description = "An admin endpoint requiring the Admin role with highest rate limit policy (10000 req/min)";
             s.Response<AdminDataResponse>(200, "Success");
             s.Response(401, "Unauthorized");
             s.Response(403, "Forbidden - Admin role required");

ReferenceSolutions/ApiSolution/src/Reference.Api/Endpoints/AdminDataEndpoint.cs

@@ -1,12 +1,7 @@
 using System;
-using System.Linq;
-using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
-using FastEndpoints;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.RateLimiting;
+using FractalDataWorks.Web.RestEndpoints.Security;
 
 namespace Reference.Api.Endpoints;
 
@@ -40,19 +35,25 @@ public sealed class AuthenticatedDataResponse
 /// An authenticated endpoint demonstrating higher rate limits for authenticated users.
 /// Uses the "Authenticated" rate limit policy (500 req/min).
 /// </summary>
-public sealed class AuthenticatedDataEndpoint : EndpointWithoutRequest<AuthenticatedDataResponse>
+public sealed class AuthenticatedDataEndpoint : AuthenticatedEndpointBase<AuthenticatedDataResponse>
 {
     /// <inheritdoc />
-    public override void Configure()
+    protected override string Route => "/authenticated/data";
+
+    /// <inheritdoc />
+    protected override string EndpointSummary => "Get authenticated data with higher rate limit";
+
+    /// <inheritdoc />
+    protected override string EndpointDescription => "An authenticated endpoint demonstrating higher rate limits for authenticated users (500 req/min)";
+
+    /// <inheritdoc />
+    protected override string? EndpointTag => "Security Examples";
+
+    /// <inheritdoc />
+    protected override void ConfigureEndpoint()
     {
-        Get("/authenticated/data");
-        // No AllowAnonymous() - requires authentication
-        Options(x => x.RequireRateLimiting("Authenticated"));
-        Description(x => x.WithTags("Security Examples"));
         Summary(s =>
         {
-            s.Summary = "Get authenticated data with higher rate limit";
-            s.Description = "An authenticated endpoint demonstrating higher rate limits for authenticated users (500 req/min)";
             s.Response<AuthenticatedDataResponse>(200, "Success");
             s.Response(401, "Unauthorized");
             s.Response(429, "Rate limit exceeded");