Skip to content

Commit 50662be

Browse files
authored
Rename mgmt to management (Azure#49051)
1 parent 9c62645 commit 50662be

File tree

14 files changed

+47
-47
lines changed

14 files changed

+47
-47
lines changed

eng/packages/http-client-csharp-mgmt/emitter/src/emitter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const singleton = "Azure.ResourceManager.@singleton";
2323
const resourceMetadata = "Azure.ClientGenerator.Core.@resourceSchema";
2424

2525
export async function $onEmit(context: EmitContext<CSharpEmitterOptions>) {
26-
context.options["generator-name"] ??= "MgmtClientGenerator";
26+
context.options["generator-name"] ??= "ManagementClientGenerator";
2727
context.options["update-code-model"] = updateCodeModel;
2828
context.options["emitter-extension-path"] ??= import.meta.url;
2929
context.options["sdk-context-options"] ??= azureSDKContextOptions;
Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,33 +13,33 @@ namespace Azure.Generator.Management
1313
/// The Azure management client generator to generate the Azure management client SDK.
1414
/// </summary>
1515
[Export(typeof(CodeModelGenerator))]
16-
[ExportMetadata(GeneratorMetadataName, nameof(MgmtClientGenerator))]
17-
public class MgmtClientGenerator : AzureClientGenerator
16+
[ExportMetadata(GeneratorMetadataName, nameof(ManagementClientGenerator))]
17+
public class ManagementClientGenerator : AzureClientGenerator
1818
{
19-
private static MgmtClientGenerator? _instance;
20-
internal static MgmtClientGenerator Instance => _instance ?? throw new InvalidOperationException("MgmtClientGenerator is not loaded.");
19+
private static ManagementClientGenerator? _instance;
20+
internal static ManagementClientGenerator Instance => _instance ?? throw new InvalidOperationException("ManagementClientGenerator is not loaded.");
2121

2222
/// <summary>
2323
/// The Azure management client generator to generate the Azure management client SDK.
2424
/// </summary>
2525
/// <param name="context"></param>
2626
[ImportingConstructor]
27-
public MgmtClientGenerator(GeneratorContext context) : base(context)
27+
public ManagementClientGenerator(GeneratorContext context) : base(context)
2828
{
29-
TypeFactory = new MgmtTypeFactory();
30-
InputLibrary = new MgmtInputLibrary(Configuration.OutputDirectory);
29+
TypeFactory = new ManagementTypeFactory();
30+
InputLibrary = new ManagementInputLibrary(Configuration.OutputDirectory);
3131
_instance = this;
3232
}
3333

3434
/// <inheritdoc/>
35-
public override MgmtInputLibrary InputLibrary { get; }
35+
public override ManagementInputLibrary InputLibrary { get; }
3636

37-
private MgmtOutputLibrary? _azureOutputLibrary;
37+
private ManagementOutputLibrary? _azureOutputLibrary;
3838
/// <inheritdoc/>
39-
public override MgmtOutputLibrary OutputLibrary => _azureOutputLibrary ??= new();
39+
public override ManagementOutputLibrary OutputLibrary => _azureOutputLibrary ??= new();
4040

4141
/// <inheritdoc/>
42-
public override MgmtTypeFactory TypeFactory { get; }
42+
public override ManagementTypeFactory TypeFactory { get; }
4343

4444
/// <summary>
4545
/// Customize the generation output for Azure client SDK.

eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Mgmt/src/MgmtInputLibrary.cs renamed to eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Mgmt/src/ManagementInputLibrary.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
namespace Azure.Generator.Management
99
{
1010
/// <inheritdoc/>
11-
public class MgmtInputLibrary : InputLibrary
11+
public class ManagementInputLibrary : InputLibrary
1212
{
1313
private IReadOnlyDictionary<string, InputModelType>? _inputModelsByCrossLanguageDefinitionId = null;
1414
private IReadOnlyDictionary<string, InputModelType> InputModelsByCrossLanguageDefinitionId => _inputModelsByCrossLanguageDefinitionId ??= InputNamespace.Models.DistinctBy(x => x.CrossLanguageDefinitionId).ToDictionary(m => m.CrossLanguageDefinitionId, m => m);
1515

1616
/// <inheritdoc/>
17-
public MgmtInputLibrary(string configPath) : base(configPath)
17+
public ManagementInputLibrary(string configPath) : base(configPath)
1818
{
1919
}
2020

eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Mgmt/src/MgmtOutputLibrary.cs renamed to eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Mgmt/src/ManagementOutputLibrary.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@
1010
namespace Azure.Generator.Management
1111
{
1212
/// <inheritdoc/>
13-
public class MgmtOutputLibrary : AzureOutputLibrary
13+
public class ManagementOutputLibrary : AzureOutputLibrary
1414
{
15-
private MgmtLongRunningOperationProvider? _armOperation;
16-
internal MgmtLongRunningOperationProvider ArmOperation => _armOperation ??= new MgmtLongRunningOperationProvider(false);
15+
private ManagementLongRunningOperationProvider? _armOperation;
16+
internal ManagementLongRunningOperationProvider ArmOperation => _armOperation ??= new ManagementLongRunningOperationProvider(false);
1717

18-
private MgmtLongRunningOperationProvider? _genericArmOperation;
19-
internal MgmtLongRunningOperationProvider GenericArmOperation => _genericArmOperation ??= new MgmtLongRunningOperationProvider(true);
18+
private ManagementLongRunningOperationProvider? _genericArmOperation;
19+
internal ManagementLongRunningOperationProvider GenericArmOperation => _genericArmOperation ??= new ManagementLongRunningOperationProvider(true);
2020

2121
private IReadOnlyList<ResourceClientProvider> BuildResources()
2222
{
2323
var result = new List<ResourceClientProvider>();
24-
foreach (var client in MgmtClientGenerator.Instance.InputLibrary.InputNamespace.Clients)
24+
foreach (var client in ManagementClientGenerator.Instance.InputLibrary.InputNamespace.Clients)
2525
{
2626
// A resource client should contain the decorator "Azure.ResourceManager.@resourceMetadata"
2727
var resourceMetadata = client.Decorators.FirstOrDefault(d => d.Name.Equals(KnownDecorators.ResourceMetadata));
@@ -30,7 +30,7 @@ private IReadOnlyList<ResourceClientProvider> BuildResources()
3030
continue;
3131
}
3232
var resource = new ResourceClientProvider(client);
33-
MgmtClientGenerator.Instance.AddTypeToKeep(resource.Name);
33+
ManagementClientGenerator.Instance.AddTypeToKeep(resource.Name);
3434
result.Add(resource);
3535
}
3636
return result;

eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Mgmt/src/MgmtTypeFactory.cs renamed to eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Mgmt/src/ManagementTypeFactory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
namespace Azure.Generator.Management
1212
{
1313
/// <inheritdoc/>
14-
public class MgmtTypeFactory : AzureTypeFactory
14+
public class ManagementTypeFactory : AzureTypeFactory
1515
{
1616
/// <inheritdoc/>
1717
public override IClientPipelineApi ClientPipelineApi => MgmtHttpPipelineProvider.Instance;
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
namespace Azure.Generator.Management.Providers
2121
{
22-
internal class MgmtLongRunningOperationProvider : TypeProvider
22+
internal class ManagementLongRunningOperationProvider : TypeProvider
2323
{
2424
private class Template<T> { }
2525
private readonly CSharpType _t = typeof(Template<>).GetGenericArguments()[0];
@@ -30,7 +30,7 @@ private class Template<T> { }
3030
private FieldProvider _nextLinkOperationField;
3131
private FieldProvider _operationIdField;
3232

33-
public MgmtLongRunningOperationProvider(bool isGeneric)
33+
public ManagementLongRunningOperationProvider(bool isGeneric)
3434
{
3535
_isGeneric = isGeneric;
3636
_operationField = new FieldProvider(FieldModifiers.Private | FieldModifiers.ReadOnly, isGeneric ? new CSharpType(typeof(OperationInternal<>), _t) : typeof(OperationInternal), "_operation", this);
@@ -39,7 +39,7 @@ public MgmtLongRunningOperationProvider(bool isGeneric)
3939
_operationIdField = new FieldProvider(FieldModifiers.Private | FieldModifiers.ReadOnly, typeof(string), "_operationId", this);
4040
}
4141

42-
private readonly string _serviceName = MgmtClientGenerator.Instance.InputLibrary.InputNamespace.Name.Split('.').Last();
42+
private readonly string _serviceName = ManagementClientGenerator.Instance.InputLibrary.InputNamespace.Name.Split('.').Last();
4343
protected override string BuildName() => $"{_serviceName}ArmOperation";
4444

4545
protected override CSharpType[] GetTypeArguments() => _isGeneric ? new CSharpType[] { _t } : base.GetTypeArguments();

eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Mgmt/src/Providers/ResourceClientProvider.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@ public ResourceClientProvider(InputClient inputClient)
4848
_isSingleton = _isSingleton = resourceMetadata.Arguments?.TryGetValue("isSingleton", out var isSingleton) == true ? isSingleton.ToObjectFromJson<string>() == "true" : false;
4949
var resourceType = resourceMetadata.Arguments?[KnownDecorators.ResourceType].ToObjectFromJson<string>()!;
5050
_resourcetypeField = new FieldProvider(FieldModifiers.Public | FieldModifiers.Static | FieldModifiers.ReadOnly, typeof(ResourceType), "ResourceType", this, description: $"Gets the resource type for the operations.", initializationValue: Literal(resourceType));
51-
var resourceModel = MgmtClientGenerator.Instance.InputLibrary.GetModelByCrossLanguageDefinitionId(codeModelId)!;
51+
var resourceModel = ManagementClientGenerator.Instance.InputLibrary.GetModelByCrossLanguageDefinitionId(codeModelId)!;
5252
SpecName = resourceModel.Name;
5353

5454
// We should be able to assume that all operations in the resource client are for the same resource
5555
var requestPath = new RequestPath(inputClient.Operations.First().Path);
5656
_resourceOperations = inputClient.Operations;
57-
ResourceData = MgmtClientGenerator.Instance.TypeFactory.CreateModel(resourceModel)!;
58-
_clientProvider = MgmtClientGenerator.Instance.TypeFactory.CreateClient(inputClient)!;
57+
ResourceData = ManagementClientGenerator.Instance.TypeFactory.CreateModel(resourceModel)!;
58+
_clientProvider = ManagementClientGenerator.Instance.TypeFactory.CreateClient(inputClient)!;
5959

6060
_contextualParameters = GetContextualParameters(requestPath);
6161

@@ -269,7 +269,7 @@ private CSharpType GetOperationMethodReturnType(bool isAsync, bool isLongRunning
269269
if (isLongRunningOperation)
270270
{
271271
var response = operationResponses.FirstOrDefault(r => !r.IsErrorResponse);
272-
var responseBodyType = response?.BodyType is null ? null : MgmtClientGenerator.Instance.TypeFactory.CreateCSharpType(response.BodyType);
272+
var responseBodyType = response?.BodyType is null ? null : ManagementClientGenerator.Instance.TypeFactory.CreateCSharpType(response.BodyType);
273273
if (responseBodyType is null)
274274
{
275275
return isAsync ? new CSharpType(typeof(Task<>), typeof(ArmOperation)) : typeof(ArmOperation);
@@ -309,7 +309,7 @@ private TryStatement BuildOperationMethodTryStatement(MethodProvider convenience
309309

310310
if (isLongRunning)
311311
{
312-
var armOperationType = !isGeneric ? MgmtClientGenerator.Instance.OutputLibrary.ArmOperation.Type : MgmtClientGenerator.Instance.OutputLibrary.GenericArmOperation.Type.MakeGenericType([Type]);
312+
var armOperationType = !isGeneric ? ManagementClientGenerator.Instance.OutputLibrary.ArmOperation.Type : ManagementClientGenerator.Instance.OutputLibrary.GenericArmOperation.Type.MakeGenericType([Type]);
313313
ValueExpression[] armOperationArguments = [_clientDiagonosticsField, This.Property("Pipeline"), messageVariable.Property("Request"), isGeneric ? responseVariable.Invoke("GetRawResponse") : responseVariable, Static(typeof(OperationFinalStateVia)).Property(((OperationFinalStateVia)operation.LongRunning!.FinalStateVia).ToString())];
314314
var operationDeclaration = Declare("operation", armOperationType, New.Instance(armOperationType, isGeneric ? [New.Instance(Source.Type, This.Property("Client")), .. armOperationArguments] : armOperationArguments), out var operationVariable);
315315

eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Mgmt/test/Azure.Generator.Mgmt.Tests/Azure.Generator.Mgmt.Tests.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<Compile Remove="Providers\TestData\MgmtLongRunningOperationProviderTests\Verify_Generic_LROProviderGeneration.cs" />
9-
<Compile Remove="Providers\TestData\MgmtLongRunningOperationProviderTests\Verify_NonGeneric_LROProviderGeneration.cs" />
8+
<Compile Remove="Providers\TestData\ManagementLongRunningOperationProviderTests\Verify_Generic_LROProviderGeneration.cs" />
9+
<Compile Remove="Providers\TestData\ManagementLongRunningOperationProviderTests\Verify_NonGeneric_LROProviderGeneration.cs" />
1010
<Compile Remove="Providers\TestData\OperationSourceProviderTests\Verify_CreateResult.cs" />
1111
<Compile Remove="Providers\TestData\OperationSourceProviderTests\Verify_CreateResultAsync.cs" />
1212
<Compile Remove="Providers\TestData\ResourceClientProviderTests\Verify_AsyncOperationMethod.cs" />
@@ -24,10 +24,10 @@
2424
</ItemGroup>
2525

2626
<ItemGroup>
27-
<None Include="Providers\TestData\MgmtLongRunningOperationProviderTests\Verify_Generic_LROProviderGeneration.cs">
27+
<None Include="Providers\TestData\ManagementLongRunningOperationProviderTests\Verify_Generic_LROProviderGeneration.cs">
2828
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2929
</None>
30-
<None Include="Providers\TestData\MgmtLongRunningOperationProviderTests\Verify_NonGeneric_LROProviderGeneration.cs">
30+
<None Include="Providers\TestData\ManagementLongRunningOperationProviderTests\Verify_NonGeneric_LROProviderGeneration.cs">
3131
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
3232
</None>
3333
<None Include="Providers\TestData\OperationSourceProviderTests\Verify_CreateResult.cs">
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@
99

1010
namespace Azure.Generator.Management.Tests.Providers
1111
{
12-
internal class MgmtLongRunningOperationProviderTests
12+
internal class ManagementLongRunningOperationProviderTests
1313
{
1414
[SetUp]
1515
public void SetUp()
1616
{
17-
MgmtMockHelpers.LoadMockPlugin();
17+
ManagementMockHelpers.LoadMockPlugin();
1818
}
1919

2020
[TestCase]
2121
public void Verify_NonGeneric_LROProviderGeneration()
2222
{
23-
var nonGenericLROProvider = new MgmtLongRunningOperationProvider(false);
23+
var nonGenericLROProvider = new ManagementLongRunningOperationProvider(false);
2424
var codeFile = new TypeProviderWriter(nonGenericLROProvider).Write();
2525
var result = codeFile.Content;
2626

@@ -32,7 +32,7 @@ public void Verify_NonGeneric_LROProviderGeneration()
3232
[TestCase]
3333
public void Verify_Generic_LROProviderGeneration()
3434
{
35-
var genericLROProvider = new MgmtLongRunningOperationProvider(true);
35+
var genericLROProvider = new ManagementLongRunningOperationProvider(true);
3636
var codeFile = new TypeProviderWriter(genericLROProvider).Write();
3737
var result = codeFile.Content;
3838

eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Mgmt/test/Azure.Generator.Mgmt.Tests/Providers/OperationSourceProviderTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ private static MethodProvider GetOperationSourceProviderMethodByName(string meth
6464
private static OperationSourceProvider GetOperationSourceProvider()
6565
{
6666
var (client, models) = InputResourceData.ClientWithResource();
67-
var plugin = MgmtMockHelpers.LoadMockPlugin(inputModels: () => models, clients: () => [client]);
67+
var plugin = ManagementMockHelpers.LoadMockPlugin(inputModels: () => models, clients: () => [client]);
6868
var operationSourceProvider = plugin.Object.OutputLibrary.TypeProviders.FirstOrDefault(p => p is OperationSourceProvider) as OperationSourceProvider;
6969
Assert.NotNull(operationSourceProvider);
7070
return operationSourceProvider!;

0 commit comments

Comments
 (0)