GetResourceDependencies()

Author: sergey-shandar

src/ResourceManager/Common/Commands.Common.Strategies/Commands.Common.Strategies.csproj

@@ -67,6 +67,8 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="IResourceConfig.cs" />
+    <Compile Include="IResourceConfigVisitor.cs" />
     <Compile Include="StateOperationContext.cs" />
     <Compile Include="Compute\ComputeStrategy.cs" />
     <Compile Include="Compute\VirtualMachineStrategy.cs" />

src/ResourceManager/Common/Commands.Common.Strategies/GetStateExtensions.cs

@@ -1,13 +1,19 @@
-using Microsoft.Rest.Azure;
-using System.Linq;
-using System.Net;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
 namespace Microsoft.Azure.Commands.Common.Strategies
 {
     public static class GetStateExtensions
     {
+        /// <summary>
+        /// Returns a current Azure state for the given resource (config).
+        /// </summary>
+        /// <typeparam name="TModel"></typeparam>
+        /// <param name="config"></param>
+        /// <param name="client"></param>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
         public static async Task<IState> GetStateAsync<TModel>(
             this IEntityConfig<TModel> config,
             IClient client,

src/ResourceManager/Common/Commands.Common.Strategies/IResourceConfig.cs

@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+
+namespace Microsoft.Azure.Commands.Common.Strategies
+{
+    public interface IResourceConfig : IEntityConfig
+    {
+        string ResourceGroupName { get; }
+
+        IEnumerable<IEntityConfig> Dependencies { get; }
+
+        TResult Accept<TContext, TResult>(
+            IResourceConfigVisitor<TContext, TResult> visitor, TContext context);
+    }
+}

src/ResourceManager/Common/Commands.Common.Strategies/IResourceConfigVisitor.cs

@@ -0,0 +1,8 @@
+namespace Microsoft.Azure.Commands.Common.Strategies
+{
+    public interface IResourceConfigVisitor<TContext, TResult>
+    {
+        TResult Visit<TModel>(ResourceConfig<TModel> config, TContext context)
+            where TModel : class;
+    }
+}

src/ResourceManager/Common/Commands.Common.Strategies/ResourceConfig.cs

@@ -4,13 +4,6 @@
 
 namespace Microsoft.Azure.Commands.Common.Strategies
 {
-    public interface IResourceConfig : IEntityConfig
-    {
-        string ResourceGroupName { get; }
-
-        IEnumerable<IEntityConfig> Dependencies { get; }
-    }
-
     public sealed class ResourceConfig<TModel> : IEntityConfig<TModel>, IResourceConfig
         where TModel : class
     {
@@ -52,12 +45,16 @@ public IEnumerable<string> GetId(string subscription)
                 }
                 .Concat(Strategy.GetId(Name));
 
-        Result IEntityConfig.Accept<Context, Result>(
-            IEntityConfigVisitor<Context, Result> visitor, Context context)
+        TResult IEntityConfig.Accept<TContext, TResult>(
+            IEntityConfigVisitor<TContext, TResult> visitor, TContext context)
+            => visitor.Visit(this, context);
+
+        TResult IEntityConfig<TModel>.Accept<TContext, TResult>(
+            IEntityConfigVisitor<TModel, TContext, TResult> visitor, TContext context)
             => visitor.Visit(this, context);
 
-        Result IEntityConfig<TModel>.Accept<Context, Result>(
-            IEntityConfigVisitor<TModel, Context, Result> visitor, Context context)
+        TResult IResourceConfig.Accept<TContext, TResult>(
+            IResourceConfigVisitor<TContext, TResult> visitor, TContext context)
             => visitor.Visit(this, context);
     }
 }

src/ResourceManager/Common/Commands.Common.Strategies/ResourceConfigExtensions.cs

@@ -70,5 +70,9 @@ public static Task<TModel> CreateOrUpdateAsync<TModel>(
                     config.Name,
                     model,
                     cancellationToken));
+
+        public static IEnumerable<IResourceConfig> GetResourceDependencies(
+            this IResourceConfig config)
+            => config.Dependencies.Select(d => d.Resource);
     }
 }

src/ResourceManager/Common/Commands.Common.Strategies/TargetDependencies.cs

@@ -7,9 +7,6 @@ public static class TargetDependencies
     {
         public static IEnumerable<IResourceConfig> GetTargetDependencies(
             this IResourceConfig config, IState target)
-            => config
-                .Dependencies
-                .Select(d => d.Resource)
-                .Where(target.Contains);
+            => config.GetResourceDependencies().Where(target.Contains);
     }
 }

src/ResourceManager/Common/Commands.Common.Strategies/UpdateStateExtensions.cs

@@ -43,7 +43,9 @@ await _OperationContext.GetOrAdd(
                         async () =>
                         {
                             // wait for all dependencies
-                            var tasks = config.Dependencies.Select(UpdateStateAsyncDispatch);                            
+                            var tasks = config
+                                .GetResourceDependencies()
+                                .Select(UpdateStateAsyncDispatch);
                             await Task.WhenAll(tasks);
                             // call the CreateOrUpdateAsync function for the resource.
                             return await config.CreateOrUpdateAsync(
@@ -54,26 +56,14 @@ await _OperationContext.GetOrAdd(
                 }
             }
 
-            public Task UpdateStateAsync<TModel, TParentModel>(
-                NestedResourceConfig<TModel, TParentModel> config)
-                where TModel : class
-                where TParentModel : class
-                => UpdateStateAsyncDispatch(config.Parent);
-
-            public Task UpdateStateAsyncDispatch(IEntityConfig config)
+            public Task UpdateStateAsyncDispatch(IResourceConfig config)
                 => config.Accept(new UpdateStateAsyncVisitor(), this);
         }
 
-        sealed class UpdateStateAsyncVisitor : IEntityConfigVisitor<Context, Task>
+        sealed class UpdateStateAsyncVisitor : IResourceConfigVisitor<Context, Task>
         {
-            public Task Visit<TModel>(ResourceConfig<TModel> config, Context context)
-                where TModel : class
-                => context.UpdateStateAsync(config);
-
-            public Task Visit<TModel, TParentModel>(
-                NestedResourceConfig<TModel, TParentModel> config, Context context)
+            public Task Visit<TModel>(ResourceConfig<TModel> config, Context context) 
                 where TModel : class
-                where TParentModel : class
                 => context.UpdateStateAsync(config);
         }
     }