Skip to content

Commit 8ab3881

Browse files
authored
Rename modelfactory for Arm (#50862)
* Rename modelfactory for Arm * skip resource-manager generation for azure generator
1 parent 0ce763a commit 8ab3881

File tree

16 files changed

+7
-1365
lines changed

16 files changed

+7
-1365
lines changed

eng/packages/http-client-csharp/eng/scripts/Generate.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ $failingSpecs = @(
8484
Join-Path 'http' 'azure' 'resource-manager' 'non-resource'
8585
Join-Path 'http' 'azure' 'resource-manager' 'operation-templates'
8686
Join-Path 'http' 'azure' 'resource-manager' 'resources'
87+
Join-Path 'http' 'azure' 'resource-manager' 'large-header'
8788

8889
)
8990

eng/packages/http-client-csharp/generator/Azure.Generator/src/Properties/launchSettings.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,6 @@
5050
"commandName": "Executable",
5151
"executablePath": "dotnet"
5252
},
53-
"http-azure-resource-manager-large-header": {
54-
"commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.TypeSpec.Generator.dll $(SolutionDir)/TestProjects/Spector/http/azure/resource-manager/large-header -g AzureStubGenerator",
55-
"commandName": "Executable",
56-
"executablePath": "dotnet"
57-
},
5853
"http-azure-special-headers-client-request-id": {
5954
"commandLineArgs": "$(SolutionDir)/../dist/generator/Microsoft.TypeSpec.Generator.dll $(SolutionDir)/TestProjects/Spector/http/azure/special-headers/client-request-id -g AzureStubGenerator",
6055
"commandName": "Executable",

eng/packages/http-client-csharp/generator/Azure.Generator/src/Utilities/TypeNameUtilities.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ namespace Azure.Generator.Utilities
88
internal static class TypeNameUtilities
99
{
1010
private const string AzurePackageNamespacePrefix = "Azure.";
11+
private const string AzureResourceManagerPackageNamespacePrefix = "Azure.ResourceManager.";
1112

1213
/// <summary>
1314
/// Returns the name of the RP from the package name using the following:
@@ -19,6 +20,10 @@ public static string GetResourceProviderName()
1920
{
2021
var packageName = AzureClientGenerator.Instance.Configuration.PackageName;
2122
var segments = packageName.Split('.');
23+
if (packageName.StartsWith(AzureResourceManagerPackageNamespacePrefix))
24+
{
25+
return $"Arm{string.Join("", segments.Skip(2))}";
26+
}
2227
if (packageName.StartsWith(AzurePackageNamespacePrefix))
2328
{
2429
if (segments.Length > 2)

eng/packages/http-client-csharp/generator/Azure.Generator/test/Visitors/ModelFactoryRenamerVisitorTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void MgmtPlaneModelFactoryIsNamedCorrectly()
4040
var modelFactory = plugin.Object.OutputLibrary.TypeProviders.OfType<ModelFactoryProvider>().SingleOrDefault();
4141

4242
Assert.IsNotNull(modelFactory);
43-
Assert.AreEqual("SomeServiceModelFactory", modelFactory!.Type.Name);
43+
Assert.AreEqual("ArmSomeServiceModelFactory", modelFactory!.Type.Name);
4444
}
4545

4646
[Test]

eng/packages/http-client-csharp/generator/TestProjects/Spector/http/azure/resource-manager/large-header/Azure.ResourceManager.LargeHeader.sln

Lines changed: 0 additions & 48 deletions
This file was deleted.

eng/packages/http-client-csharp/generator/TestProjects/Spector/http/azure/resource-manager/large-header/Configuration.json

Lines changed: 0 additions & 10 deletions
This file was deleted.

eng/packages/http-client-csharp/generator/TestProjects/Spector/http/azure/resource-manager/large-header/src/Azure.ResourceManager.LargeHeader.csproj

Lines changed: 0 additions & 41 deletions
This file was deleted.

eng/packages/http-client-csharp/generator/TestProjects/Spector/http/azure/resource-manager/large-header/src/Generated/CancelResult.Serialization.cs

Lines changed: 0 additions & 39 deletions
This file was deleted.

eng/packages/http-client-csharp/generator/TestProjects/Spector/http/azure/resource-manager/large-header/src/Generated/CancelResult.cs

Lines changed: 0 additions & 14 deletions
This file was deleted.

eng/packages/http-client-csharp/generator/TestProjects/Spector/http/azure/resource-manager/large-header/src/Generated/LargeHeaderClient.cs

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)