[http-client-csharp] split srv-driven cadl ranch directory (#5277)

This PR restructures the generated output for the `http/resiliency/srv-driven` clients following the pattern established in #5273.
microsoft · Dec 6, 2024 · 234d686 · 234d686
1 parent 6fc2484
commit 234d686
Show file tree

Hide file tree

Showing 19 changed files with 77 additions and 55 deletions.
diff --git a/packages/http-client-csharp/eng/scripts/Generate.ps1 b/packages/http-client-csharp/eng/scripts/Generate.ps1
@@ -101,6 +101,14 @@ foreach ($directory in $directories) {
         continue
     }
 
+    # srv-driven contains two separate specs, for two separate clients. We need to generate both.
+    if ($folders.Contains("srv-driven")) {
+        Generate-Srv-Driven $directory.FullName $generationDir -generateStub $stubbed
+        $cadlRanchLaunchProjects.Add($($folders -join "-") + "-v1", $("TestProjects/CadlRanch/$($subPath.Replace([System.IO.Path]::DirectorySeparatorChar, '/'))") + "/v1")
+        $cadlRanchLaunchProjects.Add($($folders -join "-") + "-v2", $("TestProjects/CadlRanch/$($subPath.Replace([System.IO.Path]::DirectorySeparatorChar, '/'))") + "/v2")
+        continue
+    }
+
     $cadlRanchLaunchProjects.Add(($folders -join "-"), ("TestProjects/CadlRanch/$($subPath.Replace([System.IO.Path]::DirectorySeparatorChar, '/'))"))
     if ($LaunchOnly) {
         continue
@@ -114,11 +122,6 @@ foreach ($directory in $directories) {
         exit $LASTEXITCODE
     }
 
-    # srv-driven contains two separate specs, for two separate clients. We need to generate both.
-    if ($folders.Contains("srv-driven")) {
-        Generate-Srv-Driven $directory.FullName $generationDir -generateStub $stubbed
-    }
-
     # TODO need to build but depends on https://github.com/Azure/autorest.csharp/issues/4463
 }
 

diff --git a/packages/http-client-csharp/eng/scripts/Generation.psm1 b/packages/http-client-csharp/eng/scripts/Generation.psm1
@@ -91,14 +91,27 @@ function Generate-Srv-Driven {
       [bool]$createOutputDirIfNotExist = $true
     )
 
-    $specFilePath = $(Join-Path $specFilePath "old.tsp")
-    $outputDir = $(Join-Path $outputDir "v1")
-    if ($createOutputDirIfNotExist -and -not (Test-Path $outputDir)) {
-        New-Item -ItemType Directory -Path $outputDir | Out-Null
+    $v1Dir = $(Join-Path $outputDir "v1")
+    if ($createOutputDirIfNotExist -and -not (Test-Path $v1Dir)) {
+        New-Item -ItemType Directory -Path $v1Dir | Out-Null
     }
 
-    Write-Host "Generating http\resiliency\srv-driven\v1" -ForegroundColor Cyan
-    Invoke (Get-TspCommand $specFilePath $outputDir -generateStub $generateStub -namespaceOverride "Resiliency.ServiceDriven.V1")
+    $v2Dir = $(Join-Path $outputDir "v2")
+    if ($createOutputDirIfNotExist -and -not (Test-Path $v2Dir)) {
+        New-Item -ItemType Directory -Path $v2Dir | Out-Null
+    }
+
+    ## get the last two directories of the output directory and add V1/V2 to disambiguate the namespaces
+    $namespaceRoot = $(($outputDir.Split([System.IO.Path]::DirectorySeparatorChar)[-2..-1] | `
+        ForEach-Object { $_.Substring(0,1).ToUpper() + $_.Substring(1) }) -replace '-(\p{L})', { $_.Groups[1].Value.ToUpper() } -replace '\W', '' -join ".")
+    $v1NamespaceOverride = $namespaceRoot + ".V1" 
+    $v2NamespaceOverride = $namespaceRoot + ".V2"
+
+    $v1SpecFilePath = $(Join-Path $specFilePath "old.tsp")
+    $v2SpecFilePath = $(Join-Path $specFilePath "main.tsp")
+
+    Invoke (Get-TspCommand $v1SpecFilePath $v1Dir -generateStub $generateStub -namespaceOverride $v1NamespaceOverride)
+    Invoke (Get-TspCommand $v2SpecFilePath $v2Dir -generateStub $generateStub -namespaceOverride $v2NamespaceOverride)
 
     # exit if the generation failed
     if ($LASTEXITCODE -ne 0) {

diff --git a/packages/http-client-csharp/eng/scripts/Get-CadlRanch-Coverage.ps1 b/packages/http-client-csharp/eng/scripts/Get-CadlRanch-Coverage.ps1
@@ -46,17 +46,20 @@ foreach ($directory in $directories) {
         continue
     }
 
+    if ($subPath.Contains("srv-driven")) {
+        if ($subPath.Contains("v1")) {
+            # this will generate v1 and v2 so we only need to call it once for one of the versions
+            Generate-Srv-Driven ($(Join-Path $specsDirectory $subPath) | Split-Path) $($outputDir | Split-Path) -createOutputDirIfNotExist $false
+        }
+        continue
+    }
+
     $command = Get-TspCommand $specFile $outputDir
     Invoke $command
     # exit if the generation failed
     if ($LASTEXITCODE -ne 0) {
         exit $LASTEXITCODE
     }
-
-    # srv-driven contains two separate specs, for two separate clients. We need to generate both.
-    if ($subPath.Contains('srv-driven')) {
-        Generate-Srv-Driven $(Join-Path $specsDirectory $subPath) $outputDir -createOutputDirIfNotExist $false
-    }
 }
 
 # test all

diff --git a/packages/http-client-csharp/eng/scripts/Test-CadlRanch.ps1 b/packages/http-client-csharp/eng/scripts/Test-CadlRanch.ps1
@@ -32,10 +32,6 @@ foreach ($directory in $directories) {
     if (-not (Compare-Paths $subPath $filter)) {
         continue
     }
-
-    if ($subPath.Contains($(Join-Path 'srv-driven' 'v1'))) {
-        continue
-    }
 
     $testPath = "$cadlRanchRoot.Tests"
     $testFilter = "TestProjects.CadlRanch.Tests"
@@ -67,21 +63,21 @@ foreach ($directory in $directories) {
             Generate-Versioning ($(Join-Path $specsDirectory $subPath) | Split-Path) $($outputDir | Split-Path) -createOutputDirIfNotExist $false
         }
     }
+    elseif ($subPath.Contains("srv-driven")) {
+        if ($subPath.Contains("v1")) {
+            Generate-Srv-Driven ($(Join-Path $specsDirectory $subPath) | Split-Path) $($outputDir | Split-Path) -createOutputDirIfNotExist $false
+        }
+    }
     else {
         $command = Get-TspCommand $specFile $outputDir
         Invoke $command
     }
-    
+
     # exit if the generation failed
     if ($LASTEXITCODE -ne 0) {
         exit $LASTEXITCODE
     }
 
-    # srv-driven contains two separate specs, for two separate clients. We need to generate both.
-    if ($subPath.Contains("srv-driven")) {
-        Generate-Srv-Driven $(Join-Path $specsDirectory $subPath) $outputDir -createOutputDirIfNotExist $false
-    }
-
     Write-Host "Testing $subPath" -ForegroundColor Cyan
     $command  = "dotnet test $cadlRanchCsproj --filter `"FullyQualifiedName~$testFilter`""
     Invoke $command

diff --git a/...ttp-client-csharp/generator/Microsoft.Generator.CSharp/src/Properties/launchSettings.json b/...ttp-client-csharp/generator/Microsoft.Generator.CSharp/src/Properties/launchSettings.json
@@ -120,8 +120,13 @@
       "commandName": "Executable",
       "executablePath": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.exe"
     },
-    "http-resiliency-srv-driven": {
-      "commandLineArgs": "$(SolutionDir)/TestProjects/CadlRanch/http/resiliency/srv-driven -p StubLibraryPlugin",
+    "http-resiliency-srv-driven-v1": {
+      "commandLineArgs": "$(SolutionDir)/TestProjects/CadlRanch/http/resiliency/srv-driven/v1 -p StubLibraryPlugin",
+      "commandName": "Executable",
+      "executablePath": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.exe"
+    },
+    "http-resiliency-srv-driven-v2": {
+      "commandLineArgs": "$(SolutionDir)/TestProjects/CadlRanch/http/resiliency/srv-driven/v2 -p StubLibraryPlugin",
       "commandName": "Executable",
       "executablePath": "$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.exe"
     },

diff --git a/...Resiliency/SrvDriven/SrvDrivenTests.V1.cs → ...siliency/SrvDriven/V1/SrvDrivenV1Tests.cs b/...Resiliency/SrvDriven/SrvDrivenTests.V1.cs → ...siliency/SrvDriven/V1/SrvDrivenV1Tests.cs
@@ -2,16 +2,19 @@
 // Licensed under the MIT License.
 
 using NUnit.Framework;
-using Resiliency.ServiceDriven.V1;
+using Resiliency.SrvDriven.V1;
 using System.Threading.Tasks;
 
-namespace TestProjects.CadlRanch.Tests.Http.Resiliency.SrvDriven
+namespace TestProjects.CadlRanch.Tests.Http.Resiliency.SrvDriven.V1
 {
     /// <summary>
     /// Contains tests for the service-driven resiliency V1 client.
     /// </summary>
-    public partial class SrvDrivenTests : CadlRanchTestBase
+    public partial class SrvDrivenV2Tests : CadlRanchTestBase
     {
+        private const string ServiceDeploymentV1 = "v1";
+        private const string ServiceDeploymentV2 = "v2";
+
         // This test validates the v1 client behavior when both the service deployment and api version are set to V1.
         [CadlRanchTest]
         public Task AddOptionalParamFromNone_V1Client_V1Service_WithApiVersionV1() => Test(async (host) =>

diff --git a/...tp/Resiliency/SrvDriven/SrvDrivenTests.cs → ...siliency/SrvDriven/V2/SrvDrivenV2Tests.cs b/...tp/Resiliency/SrvDriven/SrvDrivenTests.cs → ...siliency/SrvDriven/V2/SrvDrivenV2Tests.cs
@@ -3,13 +3,12 @@
 
 using NUnit.Framework;
 using System.Threading.Tasks;
-using Resiliency.ServiceDriven;
+using Resiliency.SrvDriven.V2;
 
-namespace TestProjects.CadlRanch.Tests.Http.Resiliency.SrvDriven
+namespace TestProjects.CadlRanch.Tests.Http.Resiliency.SrvDriven.V2
 {
-    public partial class SrvDrivenTests : CadlRanchTestBase
+    public partial class SrvDrivenV2Tests : CadlRanchTestBase
     {
-        private const string ServiceDeploymentV1 = "v1";
         private const string ServiceDeploymentV2 = "v2";
 
         [CadlRanchTest]

diff --git a/...ent-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/Configuration.json b/...ent-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/Configuration.json
diff --git a/...-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v1/Configuration.json b/...-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v1/Configuration.json
@@ -1,6 +1,6 @@
 {
   "output-folder": ".",
-  "namespace": "Resiliency.ServiceDriven.V1",
-  "library-name": "Resiliency.ServiceDriven.V1",
+  "namespace": "Resiliency.SrvDriven.V1",
+  "library-name": "Resiliency.SrvDriven.V1",
   "use-model-reader-writer": true
 }
diff --git a/...y/srv-driven/Resiliency.ServiceDriven.sln → ...srv-driven/v1/Resiliency.SrvDriven.V1.sln b/...y/srv-driven/Resiliency.ServiceDriven.sln → ...srv-driven/v1/Resiliency.SrvDriven.V1.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29709.97
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Resiliency.ServiceDriven", "src\Resiliency.ServiceDriven.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Resiliency.SrvDriven.V1", "src\Resiliency.SrvDriven.V1.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/...ts/CadlRanch/http/resiliency/srv-driven/v1/src/Generated/ResiliencyServiceDrivenClient.cs b/...ts/CadlRanch/http/resiliency/srv-driven/v1/src/Generated/ResiliencyServiceDrivenClient.cs
@@ -8,7 +8,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Resiliency.ServiceDriven.V1
+namespace Resiliency.SrvDriven.V1
 {
     public partial class ResiliencyServiceDrivenClient
     {

diff --git a/...Ranch/http/resiliency/srv-driven/v1/src/Generated/ResiliencyServiceDrivenClientOptions.cs b/...Ranch/http/resiliency/srv-driven/v1/src/Generated/ResiliencyServiceDrivenClientOptions.cs
@@ -4,7 +4,7 @@
 
 using System.ClientModel.Primitives;
 
-namespace Resiliency.ServiceDriven.V1
+namespace Resiliency.SrvDriven.V1
 {
     public partial class ResiliencyServiceDrivenClientOptions : ClientPipelineOptions
     {

diff --git a/...riven/src/Resiliency.ServiceDriven.csproj → ...ven/v1/src/Resiliency.SrvDriven.V1.csproj b/...riven/src/Resiliency.ServiceDriven.csproj → ...ven/v1/src/Resiliency.SrvDriven.V1.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Description>This is the Resiliency.ServiceDriven client library for developing .NET applications with rich experience.</Description>
-    <AssemblyTitle>SDK Code Generation Resiliency.ServiceDriven</AssemblyTitle>
+    <Description>This is the Resiliency.SrvDriven.V1 client library for developing .NET applications with rich experience.</Description>
+    <AssemblyTitle>SDK Code Generation Resiliency.SrvDriven.V1</AssemblyTitle>
     <Version>1.0.0-beta.1</Version>
-    <PackageTags>Resiliency.ServiceDriven</PackageTags>
+    <PackageTags>Resiliency.SrvDriven.V1</PackageTags>
     <TargetFramework>netstandard2.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

diff --git a/...-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v2/Configuration.json b/...-csharp/generator/TestProjects/CadlRanch/http/resiliency/srv-driven/v2/Configuration.json
@@ -0,0 +1,6 @@
+{
+  "output-folder": ".",
+  "namespace": "Resiliency.SrvDriven.V2",
+  "library-name": "Resiliency.SrvDriven.V2",
+  "use-model-reader-writer": true
+}
diff --git a/...driven/v1/Resiliency.ServiceDriven.V1.sln → ...srv-driven/v2/Resiliency.SrvDriven.V2.sln b/...driven/v1/Resiliency.ServiceDriven.V1.sln → ...srv-driven/v2/Resiliency.SrvDriven.V2.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29709.97
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Resiliency.ServiceDriven.V1", "src\Resiliency.ServiceDriven.V1.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Resiliency.SrvDriven.V2", "src\Resiliency.SrvDriven.V2.csproj", "{28FF4005-4467-4E36-92E7-DEA27DEB1519}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/...enerated/ResiliencyServiceDrivenClient.cs → ...enerated/ResiliencyServiceDrivenClient.cs b/...enerated/ResiliencyServiceDrivenClient.cs → ...enerated/ResiliencyServiceDrivenClient.cs
@@ -8,7 +8,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Resiliency.ServiceDriven
+namespace Resiliency.SrvDriven.V2
 {
     public partial class ResiliencyServiceDrivenClient
     {

diff --git a/...d/ResiliencyServiceDrivenClientOptions.cs → ...d/ResiliencyServiceDrivenClientOptions.cs b/...d/ResiliencyServiceDrivenClientOptions.cs → ...d/ResiliencyServiceDrivenClientOptions.cs
@@ -4,7 +4,7 @@
 
 using System.ClientModel.Primitives;
 
-namespace Resiliency.ServiceDriven
+namespace Resiliency.SrvDriven.V2
 {
     public partial class ResiliencyServiceDrivenClientOptions : ClientPipelineOptions
     {

diff --git a/...v1/src/Resiliency.ServiceDriven.V1.csproj → ...ven/v2/src/Resiliency.SrvDriven.V2.csproj b/...v1/src/Resiliency.ServiceDriven.V1.csproj → ...ven/v2/src/Resiliency.SrvDriven.V2.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Description>This is the Resiliency.ServiceDriven.V1 client library for developing .NET applications with rich experience.</Description>
-    <AssemblyTitle>SDK Code Generation Resiliency.ServiceDriven.V1</AssemblyTitle>
+    <Description>This is the Resiliency.SrvDriven.V2 client library for developing .NET applications with rich experience.</Description>
+    <AssemblyTitle>SDK Code Generation Resiliency.SrvDriven.V2</AssemblyTitle>
     <Version>1.0.0-beta.1</Version>
-    <PackageTags>Resiliency.ServiceDriven.V1</PackageTags>
+    <PackageTags>Resiliency.SrvDriven.V2</PackageTags>
     <TargetFramework>netstandard2.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

diff --git a/...p/resiliency/srv-driven/tspCodeModel.json → ...esiliency/srv-driven/v2/tspCodeModel.json b/...p/resiliency/srv-driven/tspCodeModel.json → ...esiliency/srv-driven/v2/tspCodeModel.json