Skip to content

Commit ccb9d0e

Browse files
sergey-shandarsergey-shandar
committed
No Resource Group.
1 parent 76129f3 commit ccb9d0e

File tree

11 files changed

+58
-114
lines changed

11 files changed

+58
-114
lines changed

‎experiments/Azure.Experiments/Azure.Experiments/Compute/ComputePolicy.cs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
1-
using Microsoft.Azure.Experiments.ResourceManager;
2-
using Microsoft.Azure.Management.Compute;
3-
using Microsoft.Azure.Management.Compute.Models;
4-
using Microsoft.Azure.Management.Network.Models;
5-
using Microsoft.Azure.Management.ResourceManager.Models;
1+
using Microsoft.Azure.Management.Compute;
62
using System;
73
using System.Threading.Tasks;
84

95
namespace Microsoft.Azure.Experiments.Compute
106
{
117
public static class ComputePolicy
128
{
13-
public static ResourcePolicy<ResourceName, Info> Create<Operations, Info>(
9+
public static ResourcePolicy<Info> Create<Operations, Info>(
1410
Func<IComputeManagementClient, Operations> getOperations,
1511
Func<Operations, ResourceName, Task<Info>> getAsync,
1612
Func<Operations, ResourceName, Info, Task<Info>> createOrUpdateAsync)

‎experiments/Azure.Experiments/Azure.Experiments/Compute/VirtualMachinePolicy.cs

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,22 @@
1-
using Microsoft.Azure.Experiments.ResourceManager;
2-
using Microsoft.Azure.Management.Compute;
1+
using Microsoft.Azure.Management.Compute;
32
using Microsoft.Azure.Management.Compute.Models;
43
using Microsoft.Azure.Management.Network.Models;
5-
using Microsoft.Azure.Management.ResourceManager.Models;
64

75
namespace Microsoft.Azure.Experiments.Compute
86
{
97
public static class VirtualMachinePolicy
108
{
11-
public static ResourcePolicy<ResourceName, VirtualMachine> Policy { get; }
9+
public static ResourcePolicy<VirtualMachine> Policy { get; }
1210
= ComputePolicy.Create(
1311
client => client.VirtualMachines,
1412
(operations, name) => operations.GetAsync(name.ResourceGroupName, name.Name),
1513
(operations, name, info)
1614
=> operations.CreateOrUpdateAsync(name.ResourceGroupName, name.Name, info));
1715

18-
public static ResourceConfig<ResourceName, VirtualMachine> CreateVirtualMachineConfig(
19-
this ResourceConfig<string, ResourceGroup> resourceGroup,
20-
string name,
21-
ResourceConfig<ResourceName, NetworkInterface> networkInterface)
22-
=> resourceGroup.CreateResourceConfig(
23-
Policy,
16+
public static ResourceConfig<VirtualMachine> CreateVirtualMachineConfig(
17+
this ResourceName name,
18+
ResourceConfig<NetworkInterface> networkInterface)
19+
=> Policy.CreateResourceConfig(
2420
name,
2521
_ => new VirtualMachine(),
2622
new[] { networkInterface });

‎experiments/Azure.Experiments/Azure.Experiments/Network/NetworkInterfacePolicy.cs

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,23 @@
1-
using Microsoft.Azure.Experiments.ResourceManager;
2-
using Microsoft.Azure.Management.Network;
1+
using Microsoft.Azure.Management.Network;
32
using Microsoft.Azure.Management.Network.Models;
4-
using Microsoft.Azure.Management.ResourceManager.Models;
53

64
namespace Microsoft.Azure.Experiments.Network
75
{
86
public static class NetworkInterfacePolicy
97
{
10-
public static ResourcePolicy<ResourceName, NetworkInterface> Policy { get; }
8+
public static ResourcePolicy<NetworkInterface> Policy { get; }
119
= NetworkPolicy.Create(
1210
client => client.NetworkInterfaces,
1311
(operations, name) => operations.GetAsync(name.ResourceGroupName, name.Name),
1412
(operations, name, info)
1513
=> operations.CreateOrUpdateAsync(name.ResourceGroupName, name.Name, info));
1614

17-
public static ResourceConfig<ResourceName, NetworkInterface> CreateNetworkInterfaceConfig(
18-
this ResourceConfig<string, ResourceGroup> resourceGroup,
19-
string name,
20-
ResourceConfig<ResourceName, VirtualNetwork> virtualNetwork,
21-
ResourceConfig<ResourceName, NetworkSecurityGroup> networkSecurityGroup,
22-
ResourceConfig<ResourceName, PublicIPAddress> publicIPAddress)
23-
=> resourceGroup.CreateResourceConfig(
24-
Policy,
15+
public static ResourceConfig<NetworkInterface> CreateNetworkInterfaceConfig(
16+
this ResourceName name,
17+
ResourceConfig<VirtualNetwork> virtualNetwork,
18+
ResourceConfig<NetworkSecurityGroup> networkSecurityGroup,
19+
ResourceConfig<PublicIPAddress> publicIPAddress)
20+
=> Policy.CreateResourceConfig(
2521
name,
2622
state => new NetworkInterface
2723
{

‎experiments/Azure.Experiments/Azure.Experiments/Network/NetworkPolicy.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace Microsoft.Azure.Experiments.Network
66
{
77
public static class NetworkPolicy
88
{
9-
public static ResourcePolicy<ResourceName, Info> Create<Operations, Info>(
9+
public static ResourcePolicy<Info> Create<Operations, Info>(
1010
Func<INetworkManagementClient, Operations> getOperations,
1111
Func<Operations, ResourceName, Task<Info>> getAsync,
1212
Func<Operations, ResourceName, Info, Task<Info>> createOrUpdateAsync)

‎experiments/Azure.Experiments/Azure.Experiments/Network/NetworkSecurityGroupPolicy.cs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
1-
using Microsoft.Azure.Experiments.ResourceManager;
2-
using Microsoft.Azure.Management.Network;
1+
using Microsoft.Azure.Management.Network;
32
using Microsoft.Azure.Management.Network.Models;
4-
using Microsoft.Azure.Management.ResourceManager.Models;
53

64
namespace Microsoft.Azure.Experiments.Network
75
{
86
public static class NetworkSecurityGroupPolicy
97
{
10-
public static ResourcePolicy<ResourceName, NetworkSecurityGroup> Policy { get; }
8+
public static ResourcePolicy<NetworkSecurityGroup> Policy { get; }
119
= NetworkPolicy.Create(
1210
client => client.NetworkSecurityGroups,
1311
(operations, name) => operations.GetAsync(name.ResourceGroupName, name.Name),
1412
(operations, name, info)
1513
=> operations.CreateOrUpdateAsync(name.ResourceGroupName, name.Name, info));
1614

17-
public static ResourceConfig<ResourceName, NetworkSecurityGroup> CreateNetworkSecurityGroupConfig(
18-
this ResourceConfig<string, ResourceGroup> resourceGroup,
19-
string name)
20-
=> resourceGroup.CreateResourceConfig(Policy, name, _ => new NetworkSecurityGroup());
15+
public static ResourceConfig<NetworkSecurityGroup> CreateNetworkSecurityGroupConfig(
16+
this ResourceName name)
17+
=> Policy.CreateResourceConfig(name, _ => new NetworkSecurityGroup());
2118
}
2219
}

‎experiments/Azure.Experiments/Azure.Experiments/Network/PublicIPAddressPolicy.cs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
1-
using Microsoft.Azure.Experiments.ResourceManager;
2-
using Microsoft.Azure.Management.Network;
1+
using Microsoft.Azure.Management.Network;
32
using Microsoft.Azure.Management.Network.Models;
4-
using Microsoft.Azure.Management.ResourceManager.Models;
53

64
namespace Microsoft.Azure.Experiments.Network
75
{
86
public static class PublicIPAddressPolicy
97
{
10-
public static ResourcePolicy<ResourceName, PublicIPAddress> Policy { get; }
8+
public static ResourcePolicy<PublicIPAddress> Policy { get; }
119
= NetworkPolicy.Create(
1210
client => client.PublicIPAddresses,
1311
(operations, name) => operations.GetAsync(name.ResourceGroupName, name.Name),
1412
(operations, name, info)
1513
=> operations.CreateOrUpdateAsync(name.ResourceGroupName, name.Name, info));
1614

17-
public static ResourceConfig<ResourceName, PublicIPAddress> CreatePublicIPAddressConfig(
18-
this ResourceConfig<string, ResourceGroup> resourceGroup,
19-
string name)
20-
=> resourceGroup.CreateResourceConfig(Policy, name, _ => new PublicIPAddress());
15+
public static ResourceConfig<PublicIPAddress> CreatePublicIPAddressConfig(
16+
this ResourceName name)
17+
=> Policy.CreateResourceConfig(name, _ => new PublicIPAddress());
2118
}
2219
}

‎experiments/Azure.Experiments/Azure.Experiments/Network/VirtualNetworkPolicy.cs

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,19 @@
1-
using Microsoft.Azure.Experiments.ResourceManager;
2-
using Microsoft.Azure.Management.Network;
1+
using Microsoft.Azure.Management.Network;
32
using Microsoft.Azure.Management.Network.Models;
4-
using Microsoft.Azure.Management.ResourceManager.Models;
53

64
namespace Microsoft.Azure.Experiments.Network
75
{
86
public static class VirtualNetworkPolicy
97
{
10-
public static ResourcePolicy<ResourceName, VirtualNetwork> Policy { get; }
8+
public static ResourcePolicy<VirtualNetwork> Policy { get; }
119
= NetworkPolicy.Create(
1210
client => client.VirtualNetworks,
1311
(operations, name) => operations.GetAsync(name.ResourceGroupName, name.Name),
1412
(operations, name, info)
1513
=> operations.CreateOrUpdateAsync(name.ResourceGroupName, name.Name, info));
1614

17-
public static ResourceConfig<ResourceName, VirtualNetwork> CreateVirtualNetworkConfig(
18-
this ResourceConfig<string, ResourceGroup> resourceGroup,
19-
string name)
20-
=> resourceGroup.CreateResourceConfig(
21-
Policy, name, _ => new VirtualNetwork());
15+
public static ResourceConfig<VirtualNetwork> CreateVirtualNetworkConfig(
16+
this ResourceName name)
17+
=> Policy.CreateResourceConfig(name, _ => new VirtualNetwork());
2218
}
2319
}

‎experiments/Azure.Experiments/Azure.Experiments/OperationsPolicy.cs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,28 @@ namespace Microsoft.Azure.Experiments
55
{
66
public static class OperationsPolicy
77
{
8-
public static OperationsPolicy<Client, Name, Info> Create<Client, Name, Info>(
9-
Func<Client, Name, Task<Info>> getAsync,
10-
Func<Client, Name, Info, Task<Info>> createOrUpdateAsync)
11-
=> new OperationsPolicy<Client, Name, Info>(getAsync, createOrUpdateAsync);
8+
public static OperationsPolicy<Client, Info> Create<Client, Info>(
9+
Func<Client, ResourceName, Task<Info>> getAsync,
10+
Func<Client, ResourceName, Info, Task<Info>> createOrUpdateAsync)
11+
=> new OperationsPolicy<Client, Info>(getAsync, createOrUpdateAsync);
1212
}
1313

14-
public sealed class OperationsPolicy<Client, Name, Info>
14+
public sealed class OperationsPolicy<Client, Info>
1515
{
16-
public Func<Client, Name, Task<Info>> GetAsync { get; }
16+
public Func<Client, ResourceName, Task<Info>> GetAsync { get; }
1717

18-
public Func<Client, Name, Info, Task<Info>> CreateOrUpdateAsync { get; }
18+
public Func<Client, ResourceName, Info, Task<Info>> CreateOrUpdateAsync { get; }
1919

2020
public OperationsPolicy(
21-
Func<Client, Name, Task<Info>> getAsync,
22-
Func<Client, Name, Info, Task<Info>> createOrUpdateAsync)
21+
Func<Client, ResourceName, Task<Info>> getAsync,
22+
Func<Client, ResourceName, Info, Task<Info>> createOrUpdateAsync)
2323
{
2424
GetAsync = getAsync;
2525
CreateOrUpdateAsync = createOrUpdateAsync;
2626
}
2727

28-
public OperationsPolicy<NewClient, Name, Info> Transform<NewClient>(Func<NewClient, Client> get)
29-
=> OperationsPolicy.Create<NewClient, Name, Info>(
28+
public OperationsPolicy<NewClient, Info> Transform<NewClient>(Func<NewClient, Client> get)
29+
=> OperationsPolicy.Create<NewClient, Info>(
3030
(client, name) => GetAsync(get(client), name),
3131
(client, name, info) => CreateOrUpdateAsync(get(client), name, info));
3232
}

‎experiments/Azure.Experiments/Azure.Experiments/ResourceConfig.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,29 +13,29 @@ public interface IResourceConfig<Info> : IResourceConfig
1313

1414
public static class ResourceConfig
1515
{
16-
public static ResourceConfig<Name, Info> CreateResourceConfig<Name, Info>(
17-
this ResourcePolicy<Name, Info> policy,
18-
Name name,
16+
public static ResourceConfig<Info> CreateResourceConfig<Info>(
17+
this ResourcePolicy<Info> policy,
18+
ResourceName name,
1919
Func<IState, Info> info,
2020
IEnumerable<IResourceConfig> dependencies = null)
2121
where Info : class
22-
=> new ResourceConfig<Name, Info>(policy, name, info, dependencies.EmptyIfNull());
22+
=> new ResourceConfig<Info>(policy, name, info, dependencies.EmptyIfNull());
2323
}
2424

25-
public sealed class ResourceConfig<TName, Info> : IResourceConfig<Info>
25+
public sealed class ResourceConfig<Info> : IResourceConfig<Info>
2626
where Info : class
2727
{
28-
public ResourcePolicy<TName, Info> Policy { get; }
28+
public ResourcePolicy<Info> Policy { get; }
2929

30-
public TName Name { get; }
30+
public ResourceName Name { get; }
3131

3232
public Func<IState, Info> CreateInfo { get; }
3333

3434
public IEnumerable<IResourceConfig> Dependencies { get; }
3535

3636
public ResourceConfig(
37-
ResourcePolicy<TName, Info> policy,
38-
TName name,
37+
ResourcePolicy<Info> policy,
38+
ResourceName name,
3939
Func<IState, Info> createInfo,
4040
IEnumerable<IResourceConfig> dependencies)
4141
{

‎experiments/Azure.Experiments/Azure.Experiments/ResourceManager/ResourceGroupPolicy.cs

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

‎experiments/Azure.Experiments/Azure.Experiments/ResourcePolicy.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,29 @@ namespace Microsoft.Azure.Experiments
44
{
55
public static class ResourcePolicy
66
{
7-
public static ResourcePolicy<Name, Info> CreateResourcePolicy<Client, Name, Info>(
8-
this OperationsPolicy<Client, Name, Info> operationsPolicy,
7+
public static ResourcePolicy<Info> CreateResourcePolicy<Client, Info>(
8+
this OperationsPolicy<Client, Info> operationsPolicy,
99
Func<Info, string> getLocation,
1010
Action<Info, string> setLocation)
1111
where Client : class, IDisposable
1212
where Info : class
13-
=> new ResourcePolicy<Name, Info>(
13+
=> new ResourcePolicy<Info>(
1414
operationsPolicy.Transform<IClient>(c => c.GetClient<Client>()),
1515
getLocation,
1616
setLocation);
1717
}
1818

19-
public sealed class ResourcePolicy<Name, Info>
19+
public sealed class ResourcePolicy<Info>
2020
where Info : class
2121
{
22-
public OperationsPolicy<IClient, Name, Info> OperationsPolicy { get; }
22+
public OperationsPolicy<IClient, Info> OperationsPolicy { get; }
2323

2424
public Func<Info, string> GetLocation { get; }
2525

2626
public Action<Info, string> SetLocation { get; }
2727

2828
public ResourcePolicy(
29-
OperationsPolicy<IClient, Name, Info> operationsPolicy,
29+
OperationsPolicy<IClient, Info> operationsPolicy,
3030
Func<Info, string> getLocation,
3131
Action<Info, string> setLocation)
3232
{

0 commit comments

Comments
 (0)