Skip to content

Commit 3ca12a1

Browse files
m-nashm-nash
authored
refactor resourceIdentifier (Azure#25625)
* finalize changes for RI and Loc objects * revert location changes to isolate resourceidentifier * more cleanup on resource identifier add meaningful error messages * update api * seal the resource identifier class * update api after seal * coupld minor comment clean up and added sort test for CompareTo * update snippets * update cdn tests / samples * temp manual fixes to get alpha version release * update compute tests temp * temp add rootresourceid for back compat * update api after adding back rootresourceid * update version to latest * undo temp changes * update core to use proj ref and use new property * update tests to use explicit ctor for RI * update deviceupdate * update eventhubs tests * update servicebus * switch to proj ref in servicebus test project
1 parent c135867 commit 3ca12a1

File tree

76 files changed

+352
-448
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+352
-448
lines changed

‎common/ManagementTestShared/Redesign/ManagementRecordedTestBase.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ protected void CleanupResourceGroups()
120120
{
121121
try
122122
{
123-
_cleanupClient.GetManagementGroup(mgmtGroupId).Delete(waitForCompletion: _waitForCleanup);
123+
_cleanupClient.GetManagementGroup(new ResourceIdentifier(mgmtGroupId)).Delete(waitForCompletion: _waitForCleanup);
124124
}
125125
catch (RequestFailedException e) when (e.Status == 404 || e.Status == 403)
126126
{
@@ -213,7 +213,7 @@ public void OneTimeCleanupResourceGroups()
213213
});
214214
Parallel.ForEach(OneTimeManagementGroupCleanupPolicy.ManagementGroupsCreated, mgmtGroupId =>
215215
{
216-
_cleanupClient.GetManagementGroup(mgmtGroupId).Delete(waitForCompletion: _waitForCleanup);
216+
_cleanupClient.GetManagementGroup(new ResourceIdentifier(mgmtGroupId)).Delete(waitForCompletion: _waitForCleanup);
217217
});
218218
}
219219

‎eng/Packages.Data.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
All should have PrivateAssets="All" set so they don't become package dependencies
147147
-->
148148
<ItemGroup>
149-
<PackageReference Update="Microsoft.Azure.AutoRest.CSharp" Version="3.0.0-beta.20211209.1" PrivateAssets="All" />
149+
<PackageReference Update="Microsoft.Azure.AutoRest.CSharp" Version="3.0.0-beta.20211208.5" PrivateAssets="All" />
150150
<PackageReference Update="Azure.ClientSdk.Analyzers" Version="0.1.1-dev.20210903.4" PrivateAssets="All" />
151151
<PackageReference Update="coverlet.collector" Version="1.3.0" PrivateAssets="All" />
152152
<PackageReference Update="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.1" PrivateAssets="All" />

‎sdk/cdn/Azure.ResourceManager.Cdn/samples/Sample1_ManagingCdnOriginGroups.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ string originGroupName = "myOriginGroup";
6262
var input3 = new CdnOriginGroupData();
6363
input3.Origins.Add(new WritableSubResource
6464
{
65-
Id = $"{endpoint.Id}/origins/myOrigin"
65+
Id = new ResourceIdentifier($"{endpoint.Id}/origins/myOrigin")
6666
});
6767
CdnOriginGroupCreateOperation lro3 = await endpoint.GetCdnOriginGroups().CreateOrUpdateAsync(originGroupName, input3);
6868
CdnOriginGroup originGroup = lro3.Value;

‎sdk/cdn/Azure.ResourceManager.Cdn/tests/CdnManagementTestBase.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,13 @@ protected async Task<CdnEndpoint> CreateCdnEndpointWithOriginGroup(Profile profi
7171
DeepCreatedOriginGroup deepCreatedOriginGroup = ResourceDataHelper.CreateDeepCreatedOriginGroup();
7272
deepCreatedOriginGroup.Origins.Add(new WritableSubResource
7373
{
74-
Id = $"{profile.Id}/endpoints/{endpointName}/origins/{deepCreatedOrigin.Name}"
74+
Id = new ResourceIdentifier($"{profile.Id}/endpoints/{endpointName}/origins/{deepCreatedOrigin.Name}")
7575
});
7676
input.Origins.Add(deepCreatedOrigin);
7777
input.OriginGroups.Add(deepCreatedOriginGroup);
7878
input.DefaultOriginGroup = new EndpointPropertiesUpdateParametersDefaultOriginGroup
7979
{
80-
Id = $"{profile.Id}/endpoints/{endpointName}/originGroups/{deepCreatedOriginGroup.Name}"
80+
Id = new ResourceIdentifier($"{profile.Id}/endpoints/{endpointName}/originGroups/{deepCreatedOriginGroup.Name}")
8181
};
8282
var lro = await profile.GetCdnEndpoints().CreateOrUpdateAsync(endpointName, input);
8383
return lro.Value;
@@ -109,7 +109,7 @@ protected async Task<CdnOriginGroup> CreateCdnOriginGroup(CdnEndpoint endpoint,
109109
CdnOriginGroupData input = ResourceDataHelper.CreateOriginGroupData();
110110
input.Origins.Add(new WritableSubResource
111111
{
112-
Id = $"{endpoint.Id}/origins/{originName}"
112+
Id = new ResourceIdentifier($"{endpoint.Id}/origins/{originName}")
113113
});
114114
var lro = await endpoint.GetCdnOriginGroups().CreateOrUpdateAsync(originGroupName, input);
115115
return lro.Value;

‎sdk/cdn/Azure.ResourceManager.Cdn/tests/Helper/ResourceDataHelper.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public static class ResourceDataHelper
9090
},
9191
AzureDnsZone = new WritableSubResource
9292
{
93-
Id = "/subscriptions/f3d94233-a9aa-4241-ac82-2dfb63ce637a/resourceGroups/cdntest/providers/Microsoft.Network/dnszones/azuretest.net"
93+
Id = new ResourceIdentifier("/subscriptions/f3d94233-a9aa-4241-ac82-2dfb63ce637a/resourceGroups/cdntest/providers/Microsoft.Network/dnszones/azuretest.net")
9494
}
9595
};
9696

@@ -127,7 +127,7 @@ public static class ResourceDataHelper
127127
{
128128
WafPolicy = new WritableSubResource
129129
{
130-
Id = "/subscriptions/f3d94233-a9aa-4241-ac82-2dfb63ce637a/resourceGroups/CdnTest/providers/Microsoft.Network/frontdoorWebApplicationFirewallPolicies/testAFDWaf"
130+
Id = new ResourceIdentifier("/subscriptions/f3d94233-a9aa-4241-ac82-2dfb63ce637a/resourceGroups/CdnTest/providers/Microsoft.Network/frontdoorWebApplicationFirewallPolicies/testAFDWaf")
131131
}
132132
}
133133
};
@@ -136,7 +136,7 @@ public static class ResourceDataHelper
136136
{
137137
Parameters = new CustomerCertificateParameters(new WritableSubResource
138138
{
139-
Id = "/subscriptions/87082bb7-c39f-42d2-83b6-4980444c7397/resourceGroups/CdnTest/providers/Microsoft.KeyVault/vaults/testKV4AFD/certificates/testCert"
139+
Id = new ResourceIdentifier("/subscriptions/87082bb7-c39f-42d2-83b6-4980444c7397/resourceGroups/CdnTest/providers/Microsoft.KeyVault/vaults/testKV4AFD/certificates/testCert")
140140
})
141141
{
142142
UseLatestVersion = true

‎sdk/cdn/Azure.ResourceManager.Cdn/tests/Samples/Sample1_ManagingCdnOriginGroups.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public async Task CreateOriginGroups()
4949
var input3 = new CdnOriginGroupData();
5050
input3.Origins.Add(new WritableSubResource
5151
{
52-
Id = $"{endpoint.Id}/origins/myOrigin"
52+
Id = new ResourceIdentifier($"{endpoint.Id}/origins/myOrigin")
5353
});
5454
CdnOriginGroupCreateOperation lro3 = await endpoint.GetCdnOriginGroups().CreateOrUpdateAsync(originGroupName, input3);
5555
CdnOriginGroup originGroup = lro3.Value;

‎sdk/cdn/Azure.ResourceManager.Cdn/tests/Scenario/AfdSecurityPolicyOperationsTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public async Task Update()
5555
{
5656
WafPolicy = new WritableSubResource
5757
{
58-
Id = "/subscriptions/f3d94233-a9aa-4241-ac82-2dfb63ce637a/resourceGroups/CdnTest/providers/Microsoft.Network/frontdoorWebApplicationFirewallPolicies/testAFDWaf"
58+
Id = new ResourceIdentifier("/subscriptions/f3d94233-a9aa-4241-ac82-2dfb63ce637a/resourceGroups/CdnTest/providers/Microsoft.Network/frontdoorWebApplicationFirewallPolicies/testAFDWaf")
5959
}
6060
}
6161
};

‎sdk/compute/Azure.ResourceManager.Compute/tests/Scenario/VirtualMachineTestBase.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ protected async Task<GenericResource> CreateVirtualNetwork()
3333
{
3434
var vnetName = Recording.GenerateAssetName("testVNet-");
3535
var subnetName = Recording.GenerateAssetName("testSubnet-");
36-
ResourceIdentifier vnetId = $"{_resourceGroup.Id}/providers/Microsoft.Network/virtualNetworks/{vnetName}";
36+
ResourceIdentifier vnetId = new ResourceIdentifier($"{_resourceGroup.Id}/providers/Microsoft.Network/virtualNetworks/{vnetName}");
3737
var addressSpaces = new Dictionary<string, object>()
3838
{
3939
{ "addressPrefixes", new List<string>() { "10.0.0.0/16" } }
@@ -64,15 +64,15 @@ protected ResourceIdentifier GetSubnetId(GenericResource vnet)
6464
var properties = vnet.Data.Properties as IDictionary<string, object>;
6565
var subnets = properties["subnets"] as IEnumerable<object>;
6666
var subnet = subnets.First() as IDictionary<string, object>;
67-
return subnet["id"] as string;
67+
return new ResourceIdentifier(subnet["id"] as string);
6868
}
6969

7070
// WEIRD: second level resources cannot use GenericResourceCollection to create.
7171
// Exception thrown: System.InvalidOperationException : An invalid resource id was given /subscriptions/db1ab6f0-4769-4b27-930e-01e2ef9c123c/resourceGroups/testRG-4544/providers/Microsoft.Network/virtualNetworks/testVNet-9796/subnets/testSubnet-1786
7272
private async Task<GenericResource> CreateSubnet(ResourceIdentifier vnetId)
7373
{
7474
var subnetName = Recording.GenerateAssetName("testSubnet-");
75-
ResourceIdentifier subnetId = $"{vnetId}/subnets/{subnetName}";
75+
ResourceIdentifier subnetId = new ResourceIdentifier($"{vnetId}/subnets/{subnetName}");
7676
var input = new GenericResourceData(DefaultLocation)
7777
{
7878
Properties = new Dictionary<string, object>()
@@ -87,7 +87,7 @@ private async Task<GenericResource> CreateSubnet(ResourceIdentifier vnetId)
8787
private async Task<GenericResource> CreateNetworkInterface(ResourceIdentifier subnetId)
8888
{
8989
var nicName = Recording.GenerateAssetName("testNic-");
90-
ResourceIdentifier nicId = $"{_resourceGroup.Id}/providers/Microsoft.Network/networkInterfaces/{nicName}";
90+
ResourceIdentifier nicId = new ResourceIdentifier($"{_resourceGroup.Id}/providers/Microsoft.Network/networkInterfaces/{nicName}");
9191
var input = new GenericResourceData(DefaultLocation)
9292
{
9393
Properties = new Dictionary<string, object>()

‎sdk/core/Azure.Core/tests/Azure.Core.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</ItemGroup>
1919
<ItemGroup>
2020
<ProjectReference Include="$(AzureCoreTestFramework)" />
21-
<PackageReference Include="Azure.ResourceManager" />
21+
<ProjectReference Include="..\..\..\resourcemanager\Azure.ResourceManager\src\Azure.ResourceManager.csproj" />
2222
<ProjectReference Include="..\src\Azure.Core.csproj" />
2323
<ProjectReference Include="..\..\Microsoft.Azure.Core.NewtonsoftJson\src\Microsoft.Azure.Core.NewtonsoftJson.csproj" />
2424
<PackageReference Include="Azure.Security.KeyVault.Secrets" />

‎sdk/core/Azure.Core/tests/TestClients/TestResource.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class TestResource : ArmResource
1515
{
1616
private DiagnosticScopeFactory _diagnostic = new DiagnosticScopeFactory("Azure.Clients", "Microsoft.Azure.Core.Cool.Tests", true);
1717

18-
protected override ResourceType ValidResourceType => ResourceIdentifier.RootResourceIdentifier.ResourceType;
18+
protected override ResourceType ValidResourceType => ResourceIdentifier.Root.ResourceType;
1919

2020
public virtual TestResource GetAnotherOperations()
2121
{

0 commit comments

Comments
 (0)