From 3b55384a236778700d62d6ba2120fa01b04a8a88 Mon Sep 17 00:00:00 2001 From: bquantump <53361486+bquantump@users.noreply.github.com> Date: Mon, 1 Mar 2021 13:05:00 -0800 Subject: [PATCH 1/8] 5584 --- .../Proto.Client/network/SubnetContainer.cs | 8 ++++---- sdk/resourcemanager/Proto.Client/src/Program.cs | 2 +- .../Proto.Client/src/Scenarios/GetByContainers.cs | 5 ++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/sdk/resourcemanager/Proto.Client/network/SubnetContainer.cs b/sdk/resourcemanager/Proto.Client/network/SubnetContainer.cs index 51da32cf51e44..6566d5a1ed2c1 100644 --- a/sdk/resourcemanager/Proto.Client/network/SubnetContainer.cs +++ b/sdk/resourcemanager/Proto.Client/network/SubnetContainer.cs @@ -90,9 +90,9 @@ public SubnetBuilder Construct(string subnetCidr, NetworkSecurityGroupData group /// /// A token to allow the caller to cancel the call to the service. The default value is . /// A collection of resource operations that may take multiple service requests to iterate over. - public Pageable List(CancellationToken cancellationToken = default) + public Pageable List(CancellationToken cancellationToken = default) { - return new PhWrappingPageable( + return new PhWrappingPageable( Operations.List(Id.ResourceGroup, Id.Name, cancellationToken), convertor()); } @@ -102,9 +102,9 @@ public Pageable List(CancellationToken cancellationToken = def /// /// A token to allow the caller to cancel the call to the service. The default value is . /// An async collection of resource operations that may take multiple service requests to iterate over. - public AsyncPageable ListAsync(CancellationToken cancellationToken = default) + public AsyncPageable ListAsync(CancellationToken cancellationToken = default) { - return new PhWrappingAsyncPageable( + return new PhWrappingAsyncPageable( Operations.ListAsync(Id.ResourceGroup, Id.Name, cancellationToken), convertor()); } diff --git a/sdk/resourcemanager/Proto.Client/src/Program.cs b/sdk/resourcemanager/Proto.Client/src/Program.cs index 1e4f6ee5de7a0..a8968d46bc111 100644 --- a/sdk/resourcemanager/Proto.Client/src/Program.cs +++ b/sdk/resourcemanager/Proto.Client/src/Program.cs @@ -10,7 +10,7 @@ static void Main(string[] args) Scenario scenario = null; try { - scenario = ScenarioFactory.GetScenario(Scenarios.CreateSingleVmExample); + scenario = ScenarioFactory.GetScenario(Scenarios.GetByContainers); scenario.Execute(); } finally diff --git a/sdk/resourcemanager/Proto.Client/src/Scenarios/GetByContainers.cs b/sdk/resourcemanager/Proto.Client/src/Scenarios/GetByContainers.cs index 6358e890ab3da..602c535c52d16 100644 --- a/sdk/resourcemanager/Proto.Client/src/Scenarios/GetByContainers.cs +++ b/sdk/resourcemanager/Proto.Client/src/Scenarios/GetByContainers.cs @@ -28,9 +28,8 @@ public override void Execute() Debug.Assert(virtualNetwork.Value.Data.Name.Equals(response.Data.Id.Name)); foreach (var subnetResponse in response.GetSubnetContainer().List()) { - var actualSubnet = subnetResponse.Get(); - var subnets = response.GetSubnetContainer().Get(actualSubnet.Value.Data.Name); - Debug.Assert(subnets.Value.Data.Name.Equals(actualSubnet.Value.Data.Name)); + var subnets = response.GetSubnetContainer().Get(subnetResponse.Data.Name); + Debug.Assert(subnets.Value.Data.Name.Equals(subnetResponse.Data.Name)); } } Console.WriteLine("\nDone all asserts passed ..."); From 1c98db2cd5c45fe75dca76d48d91286c9d8194fe Mon Sep 17 00:00:00 2001 From: bquantump <53361486+bquantump@users.noreply.github.com> Date: Mon, 1 Mar 2021 13:09:28 -0800 Subject: [PATCH 2/8] Update async test --- sdk/resourcemanager/Proto.Client/src/Program.cs | 2 +- .../Proto.Client/src/Scenarios/GetByContainerAsync.cs | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/sdk/resourcemanager/Proto.Client/src/Program.cs b/sdk/resourcemanager/Proto.Client/src/Program.cs index a8968d46bc111..380b481f7f9cc 100644 --- a/sdk/resourcemanager/Proto.Client/src/Program.cs +++ b/sdk/resourcemanager/Proto.Client/src/Program.cs @@ -10,7 +10,7 @@ static void Main(string[] args) Scenario scenario = null; try { - scenario = ScenarioFactory.GetScenario(Scenarios.GetByContainers); + scenario = ScenarioFactory.GetScenario(Scenarios.GetByContainersAsync); scenario.Execute(); } finally diff --git a/sdk/resourcemanager/Proto.Client/src/Scenarios/GetByContainerAsync.cs b/sdk/resourcemanager/Proto.Client/src/Scenarios/GetByContainerAsync.cs index 13c50526d4e50..638b89da02b69 100644 --- a/sdk/resourcemanager/Proto.Client/src/Scenarios/GetByContainerAsync.cs +++ b/sdk/resourcemanager/Proto.Client/src/Scenarios/GetByContainerAsync.cs @@ -33,9 +33,8 @@ private async Task ExecuteAsync() Debug.Assert(virtualNetwork.Value.Data.Name.Equals(response.Data.Id.Name)); await foreach (var subnetResponse in response.GetSubnetContainer().ListAsync()) { - var actualSubnet = await subnetResponse.GetAsync(); - var subnets = await response.GetSubnetContainer().GetAsync(actualSubnet.Value.Data.Name); - Debug.Assert(subnets.Value.Data.Name.Equals(actualSubnet.Value.Data.Name)); + var subnets = await response.GetSubnetContainer().GetAsync(subnetResponse.Data.Name); + Debug.Assert(subnets.Value.Data.Name.Equals(subnetResponse.Data.Name)); } } Console.WriteLine("\nDone all asserts passed ..."); From 80248ea4f9f7c19c600029dbc3e1d8f9687b4faf Mon Sep 17 00:00:00 2001 From: bquantump <53361486+bquantump@users.noreply.github.com> Date: Mon, 1 Mar 2021 14:54:24 -0800 Subject: [PATCH 3/8] Test --- .../Proto.Client/authorization/Proto.Authorization.csproj | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdk/resourcemanager/Proto.Client/authorization/Proto.Authorization.csproj b/sdk/resourcemanager/Proto.Client/authorization/Proto.Authorization.csproj index 2027a495657b5..210de48f7daa6 100644 --- a/sdk/resourcemanager/Proto.Client/authorization/Proto.Authorization.csproj +++ b/sdk/resourcemanager/Proto.Client/authorization/Proto.Authorization.csproj @@ -13,7 +13,10 @@ - + + true + true + From 5b25146d8fbc047a3802c7234c0f58bcd0e1fb0e Mon Sep 17 00:00:00 2001 From: bquantump <53361486+bquantump@users.noreply.github.com> Date: Mon, 1 Mar 2021 15:35:15 -0800 Subject: [PATCH 4/8] WIP: test --- .../Azure.ResourceManager.Authorization.csproj | 1 + .../Azure.ResourceManager.Authorization/autorest.md | 11 ----------- 2 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 sdk/resourcemanager/Proto.Client/authorization/Azure.ResourceManager.Authorization/autorest.md diff --git a/sdk/resourcemanager/Proto.Client/authorization/Azure.ResourceManager.Authorization/Azure.ResourceManager.Authorization.csproj b/sdk/resourcemanager/Proto.Client/authorization/Azure.ResourceManager.Authorization/Azure.ResourceManager.Authorization.csproj index 00a1e88b84232..a13135cdfd3ef 100644 --- a/sdk/resourcemanager/Proto.Client/authorization/Azure.ResourceManager.Authorization/Azure.ResourceManager.Authorization.csproj +++ b/sdk/resourcemanager/Proto.Client/authorization/Azure.ResourceManager.Authorization/Azure.ResourceManager.Authorization.csproj @@ -4,6 +4,7 @@ Azure.ResourceManager.Authorization Azure Resource Manager client SDK for Azure resource provider Microsoft.Authorization azure;management;arm;resource manager;authorization + true diff --git a/sdk/resourcemanager/Proto.Client/authorization/Azure.ResourceManager.Authorization/autorest.md b/sdk/resourcemanager/Proto.Client/authorization/Azure.ResourceManager.Authorization/autorest.md deleted file mode 100644 index face655375676..0000000000000 --- a/sdk/resourcemanager/Proto.Client/authorization/Azure.ResourceManager.Authorization/autorest.md +++ /dev/null @@ -1,11 +0,0 @@ -# Generated code configuration - -Run `dotnet build /t:GenerateCode` to generate code. - -``` yaml - -azure-arm: true -require: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/f0a0a9f0ab2278885f9349ef03bf02d4790f28ec/specification/authorization/resource-manager/readme.md - - -``` \ No newline at end of file From 06f2b43c5c20d765ae04551d7d8c3406af88bebc Mon Sep 17 00:00:00 2001 From: bquantump <53361486+bquantump@users.noreply.github.com> Date: Mon, 1 Mar 2021 15:46:25 -0800 Subject: [PATCH 5/8] Update Proto.Authorization.csproj --- .../Proto.Client/authorization/Proto.Authorization.csproj | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sdk/resourcemanager/Proto.Client/authorization/Proto.Authorization.csproj b/sdk/resourcemanager/Proto.Client/authorization/Proto.Authorization.csproj index 210de48f7daa6..f9cce10b99bcf 100644 --- a/sdk/resourcemanager/Proto.Client/authorization/Proto.Authorization.csproj +++ b/sdk/resourcemanager/Proto.Client/authorization/Proto.Authorization.csproj @@ -13,10 +13,7 @@ - - true - true - + From 6ea0433676fd9ca1e6c19522ef38d1b7acc953db Mon Sep 17 00:00:00 2001 From: bquantump <53361486+bquantump@users.noreply.github.com> Date: Mon, 1 Mar 2021 16:02:36 -0800 Subject: [PATCH 6/8] Update Proto.Authorization.csproj From 1127007cb60e91206e232706afe298394d95e376 Mon Sep 17 00:00:00 2001 From: bquantump <53361486+bquantump@users.noreply.github.com> Date: Mon, 1 Mar 2021 16:03:15 -0800 Subject: [PATCH 7/8] Update Proto.Authorization.csproj --- .../Proto.Client/authorization/Proto.Authorization.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk/resourcemanager/Proto.Client/authorization/Proto.Authorization.csproj b/sdk/resourcemanager/Proto.Client/authorization/Proto.Authorization.csproj index f9cce10b99bcf..985122efa0ff7 100644 --- a/sdk/resourcemanager/Proto.Client/authorization/Proto.Authorization.csproj +++ b/sdk/resourcemanager/Proto.Client/authorization/Proto.Authorization.csproj @@ -13,7 +13,6 @@ - From f0623728918190a0a1cab4e012b4ab1380767ac2 Mon Sep 17 00:00:00 2001 From: bquantump <53361486+bquantump@users.noreply.github.com> Date: Mon, 1 Mar 2021 16:04:20 -0800 Subject: [PATCH 8/8] Update Proto.Authorization.csproj --- .../Proto.Client/authorization/Proto.Authorization.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/resourcemanager/Proto.Client/authorization/Proto.Authorization.csproj b/sdk/resourcemanager/Proto.Client/authorization/Proto.Authorization.csproj index 985122efa0ff7..2027a495657b5 100644 --- a/sdk/resourcemanager/Proto.Client/authorization/Proto.Authorization.csproj +++ b/sdk/resourcemanager/Proto.Client/authorization/Proto.Authorization.csproj @@ -13,6 +13,7 @@ +