Merge branch 'dev'

k8s/README.k8s.md

@@ -58,6 +58,12 @@ The script accepts following parameters:
 + `deployInfrastructure`: If `true` infrastructure containers (rabbitmq, mongo, redis, sql) will be deployed in k8s. If `false` those containers (and its related deployments and services in k8s) won't be deployed.
 + `dockerOrg`: Name of the organization in the registry where the images are (or will be pushed). Default value is `eshop` (which has images provided by Microsoft)
 
+**Important:** If you **don't pass the `-buildBits $true` the script won't build and publish the projects** to their `obj/Docker/publish` folder. If any project is not published, you'll be receiving errors like:
+
+```
+ERROR: Service 'xxxxxxx' failed to build: COPY failed: stat /var/lib/docker/tmp/docker-builder123456789/obj/Docker/publish: no such file or directory
+```
+
 ### Typical usages of the script:
 
 Build all projects, and deploy all them in k8s including infrastructure containers in a organization called `foo` in Docker Hub. Images will be tagged with my current git branch and containers will use the configuration set in `conf_local.yml` file:
@@ -76,4 +82,4 @@ Deploy k8s using public images that Microsoft provides:
 
 ```
 ./deploy.ps1 -buildImages $false -configFile conf_local.yml -imageTag master
-```
+```

src/Services/Ordering/Ordering.API/Application/Behaviors/LoggingBehavior.cs

@@ -0,0 +1,23 @@
+using MediatR;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Ordering.API.Infrastructure.Behaviors
+{
+    public class LoggingBehavior<TRequest, TResponse> : IPipelineBehavior<TRequest, TResponse>
+    {
+        private readonly ILogger<LoggingBehavior<TRequest, TResponse>> _logger;
+        public LoggingBehavior(ILogger<LoggingBehavior<TRequest, TResponse>> logger) => _logger = logger;
+
+        public async Task<TResponse> Handle(TRequest request, RequestHandlerDelegate<TResponse> next)
+        {
+            _logger.LogInformation($"Handling {typeof(TRequest).Name}");
+            var response = await next();
+            _logger.LogInformation($"Handled {typeof(TResponse).Name}");
+            return response;
+        }
+    }
+}

src/Services/Ordering/Ordering.API/Application/Behaviors/ValidatorBehavior.cs

@@ -1,33 +1,23 @@
 using FluentValidation;
 using MediatR;
+using Microsoft.Extensions.Logging;
 using Ordering.Domain.Exceptions;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Ordering.API.Application.Decorators
+namespace Ordering.API.Infrastructure.Behaviors
 {
-    public class ValidatorDecorator<TRequest, TResponse>
+    public class ValidatorBehavior<TRequest, TResponse> : IPipelineBehavior<TRequest, TResponse>
-        : IAsyncRequestHandler<TRequest, TResponse>
-         where TRequest : IRequest<TResponse>
     {
-        private readonly IAsyncRequestHandler<TRequest, TResponse> _inner;
         private readonly IValidator<TRequest>[] _validators;
+        public ValidatorBehavior(IValidator<TRequest>[] validators) => _validators = validators;
 
-
+        public async Task<TResponse> Handle(TRequest request, RequestHandlerDelegate<TResponse> next)
-        public ValidatorDecorator(
-            IAsyncRequestHandler<TRequest, TResponse> inner,
-            IValidator<TRequest>[] validators)
-        {
-            _inner = inner;
-            _validators = validators;
-        }
-
-        public async Task<TResponse> Handle(TRequest message)
         {
             var failures = _validators
-                .Select(v => v.Validate(message))
+                .Select(v => v.Validate(request))
                 .SelectMany(result => result.Errors)
                 .Where(error => error != null)
                 .ToList();
@@ -37,9 +27,8 @@ namespace Ordering.API.Application.Decorators
                 throw new OrderingDomainException(
                     $"Command Validation Errors for type {typeof(TRequest).Name}", new ValidationException("Validation exception", failures));
             }
-            
-            var response = await _inner.Handle(message);
 
+            var response = await next();
             return response;
         }
     }

src/Services/Ordering/Ordering.API/Application/Decorators/LogDecorator.cs

@@ -1,34 +0,0 @@
-namespace Microsoft.eShopOnContainers.Services.Ordering.API.Application.Decorators
-{
-    using Extensions.Logging;
-    using MediatR;
-    using System.Threading.Tasks;
-
-    public class LogDecorator<TRequest, TResponse>
-        : IAsyncRequestHandler<TRequest, TResponse>
-         where TRequest : IRequest<TResponse>
-    {
-        private readonly IAsyncRequestHandler<TRequest, TResponse> _inner;
-        private readonly ILogger<LogDecorator<TRequest, TResponse>> _logger;
-
-       
-        public LogDecorator(
-            IAsyncRequestHandler<TRequest, TResponse> inner,
-            ILogger<LogDecorator<TRequest, TResponse>> logger)
-        {
-            _inner = inner;
-            _logger = logger;
-        }
-
-        public async Task<TResponse> Handle(TRequest message)
-        {
-            _logger.LogInformation($"Executing command {_inner.GetType().FullName}");
-
-            var response = await _inner.Handle(message);
-
-            _logger.LogInformation($"Command executed successfully {_inner.GetType().FullName}");
-
-            return response;
-        }
-    }
-}

src/Services/Ordering/Ordering.API/Infrastructure/AutofacModules/MediatorModule.cs

@@ -3,11 +3,9 @@ using Autofac.Core;
 using FluentValidation;
 using MediatR;
 using Microsoft.eShopOnContainers.Services.Ordering.API.Application.Commands;
-using Microsoft.eShopOnContainers.Services.Ordering.API.Application.Decorators;
-using Ordering.API.Application.Decorators;
 using Ordering.API.Application.DomainEventHandlers.OrderStartedEvent;
 using Ordering.API.Application.Validations;
-using Ordering.Domain.Events;
+using Ordering.API.Infrastructure.Behaviors;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
@@ -33,7 +31,7 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.API.Infrastructure.Autof
                     .Where(i => i.IsClosedTypeOf(typeof(IAsyncNotificationHandler<>)))
                     .Select(i => new KeyedService("IAsyncNotificationHandler", i)))
                     .AsImplementedInterfaces();
-                    
+
 
             builder
                 .RegisterAssemblyTypes(typeof(CreateOrderCommandValidator).GetTypeInfo().Assembly)
@@ -45,25 +43,22 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.API.Infrastructure.Autof
             {
                 var componentContext = context.Resolve<IComponentContext>();
                 return t => { object o; return componentContext.TryResolve(t, out o) ? o : null; };
-            });          
+            });
 
             builder.Register<MultiInstanceFactory>(context =>
             {
                 var componentContext = context.Resolve<IComponentContext>();
 
-                return t => (IEnumerable<object>)componentContext.Resolve(typeof(IEnumerable<>).MakeGenericType(t));
+                return t =>
+                {
+                    var resolved = (IEnumerable<object>)componentContext.Resolve(typeof(IEnumerable<>).MakeGenericType(t));
+                    return resolved;
+                };
             });
 
-            
+            builder.RegisterGeneric(typeof(LoggingBehavior<,>)).As(typeof(IPipelineBehavior<,>));
+            builder.RegisterGeneric(typeof(ValidatorBehavior<,>)).As(typeof(IPipelineBehavior<,>));
 
-            builder.RegisterGenericDecorator(typeof(LogDecorator<,>),
-                    typeof(IAsyncRequestHandler<,>),
-                    "IAsyncRequestHandler")
-                    .Keyed("handlerDecorator", typeof(IAsyncRequestHandler<,>));
-
-            builder.RegisterGenericDecorator(typeof(ValidatorDecorator<,>),
-                    typeof(IAsyncRequestHandler<,>),
-                    fromKey: "handlerDecorator");
         }
     }
 }

src/Web/WebSPA/package.json

@@ -46,12 +46,12 @@
     "zone.js": "^0.8.4"
   },
   "devDependencies": {
-    "@angular/cli": "1.0.0",
+    "@angular/cli": "^1.3.0",
     "@angular/compiler-cli": "^4.0.0",
-    "@types/jasmine": "2.5.38",
-    "@types/node": "~6.0.60",
     "@types/core-js": "0.9.34",
     "@types/hammerjs": "2.0.33",
+    "@types/jasmine": "2.5.38",
+    "@types/node": "~6.0.60",
     "@types/protractor": "1.5.20",
     "@types/selenium-webdriver": "2.44.26",
     "codelyzer": "~2.0.0",