Merge branch 'dev'

Author: ramon-tomas-c

cli-windows/build-bits.ps1

@@ -14,7 +14,11 @@ $projectPaths =
     @{Path="$rootPath\src\Services\Identity\Identity.API";Prj="Identity.API.csproj"},
     @{Path="$rootPath\src\Services\Catalog\Catalog.API";Prj="Catalog.API.csproj"},
     @{Path="$rootPath\src\Services\Ordering\Ordering.API";Prj="Ordering.API.csproj"},
-    @{Path="$rootPath\src\Services\Basket\Basket.API";Prj="Basket.API.csproj"}
+    @{Path="$rootPath\src\Services\Basket\Basket.API";Prj="Basket.API.csproj"},
+    @{Path="$rootPath\src\Services\GracePeriod\GracePeriodManager";Prj="GracePeriodManager.csproj"},
+    @{Path="$rootPath\src\Services\Location\Locations.API";Prj="Locations.API.csproj"},
+    @{Path="$rootPath\src\Services\Marketing\Marketing.API";Prj="Marketing.API.csproj"},
+    @{Path="$rootPath\src\Services\Payment\Payment.API";Prj="Payment.API.csproj"},
     @{Path="$rootPath\src\Web\WebStatus";Prj="WebStatus.csproj"}
 
 $projectPaths | foreach {

docker-compose.override.yml

@@ -7,12 +7,6 @@ version: '2.1'
 # An external IP or DNS name has to be used (instead localhost and the 10.0.75.1 IP) when testing the Web apps and the Xamarin apps from remote machines/devices using the same WiFi, for instance.
 
 services:
-  graceperiodmanager:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-      - ASPNETCORE_URLS=http://0.0.0.0:80
-      - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word
-      - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
 
   basket.api:
     environment:
@@ -83,6 +77,13 @@ services:
     ports:
       - "5110:80"
 
+  graceperiodmanager:
+    environment:
+      - ASPNETCORE_ENVIRONMENT=Development
+      - ASPNETCORE_URLS=http://0.0.0.0:80
+      - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word
+      - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
+
   webspa:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development

docker-compose.prod.yml

@@ -12,12 +12,6 @@ version: '2.1'
 # docker-compose -f docker-compose.yml -f docker-compose.prod.yml up -d
 
 services:
-  graceperiodmanager:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Production
-      - ASPNETCORE_URLS=http://0.0.0.0:80
-      - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word
-      - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
 
   basket.api:
     environment:
@@ -81,6 +75,13 @@ services:
     ports:
       - "5110:80"
 
+  graceperiodmanager:
+    environment:
+      - ASPNETCORE_ENVIRONMENT=Production
+      - ASPNETCORE_URLS=http://0.0.0.0:80
+      - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word
+      - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
+
   webspa:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production

docker-compose.yml

@@ -1,14 +1,6 @@
 version: '2.1'
 
 services:
-  graceperiodmanager:
-    image: eshop/graceperiodmanager:${TAG:-latest}
-    build:
-      context: ./src/Services/GracePeriod/GracePeriodManager
-      dockerfile: Dockerfile
-    depends_on:
-      - sql.data
-      - rabbitmq
 
   basket.api:
     image: eshop/basket.api:${TAG:-latest}
@@ -57,6 +49,15 @@ services:
       - identity.api
       - rabbitmq
 
+  graceperiodmanager:
+    image: eshop/graceperiodmanager:${TAG:-latest}
+    build:
+      context: ./src/Services/GracePeriod/GracePeriodManager
+      dockerfile: Dockerfile
+    depends_on:
+      - sql.data
+      - rabbitmq
+
   webspa:
     image: eshop/webspa:${TAG:-latest}
     build:

k8s/conf_cloud.yml

@@ -30,6 +30,7 @@ data:
 # GracePeriodManager entries
   GracePeriodTime: "5"  # Grace period duration (time when you can cancel order) in minutes
   GracePeriodCheckUpdateTime: "60000"   # Interval time to check new Order status (in milliseconds)
+  GracePeriodManagerBus: CONNECTION_STRING (NAME OF RABBITMQ CONTAINER OR Endpoint=sb://XXXX in case of using Azure)
 # Global entries
   UseAzureServiceBus: "TRUE" IF USE AZURE SB ("FALSE" FOR USING RABBITMQ)
   keystore: REDIS CONNECTION STRING FOR KEYSTORE

k8s/conf_local.yml

@@ -23,5 +23,6 @@ data:
   PaymentBus: rabbitmq
   GracePeriodTime: "1"
   GracePeriodCheckUpdateTime: "60000"
+  GracePeriodManagerBus: rabbitmq
   UseAzureServiceBus: "False"
   keystore: keystore-data

k8s/deploy.ps1

@@ -63,7 +63,7 @@ if ($buildImages) {
     docker-compose -p .. -f ../docker-compose.yml build    
 
     Write-Host "Pushing images to $registry/$dockerOrg..." -ForegroundColor Yellow
-    $services = ("basket.api", "catalog.api", "identity.api", "ordering.api", "marketing.api","payment.api","locations.api", "webmvc", "webspa", "webstatus")
+    $services = ("basket.api", "catalog.api", "identity.api", "ordering.api", "marketing.api","payment.api","locations.api", "webmvc", "webspa", "webstatus", "graceperiodmanager")
 
     foreach ($service in $services) {
         $imageFqdn = if ($useDockerHub)  {"$dockerOrg/${service}"} else {"$registry/$dockerOrg/${service}"}
@@ -136,7 +136,7 @@ ExecKube -cmd 'create configmap urls `
     --from-literal=BasketHealthCheckUrl=http://basket/hc `
     --from-literal=CatalogUrl=http://$($externalDns)/catalog-api `
     --from-literal=CatalogHealthCheckUrl=http://catalog/hc `
-	--from-literal=PicBaseUrl=http://$($externalDns)/catalog-api/api/v1/pic/ `
+	--from-literal=PicBaseUrl=http://$($externalDns)/catalog-api/api/v1/catalog/items/[0]/pic/ `
     --from-literal=IdentityUrl=http://$($externalDns)/identity `
     --from-literal=IdentityHealthCheckUrl=http://identity/hc `
     --from-literal=OrderingUrl=http://ordering `
@@ -147,10 +147,12 @@ ExecKube -cmd 'create configmap urls `
     --from-literal=MvcClientCatalogUrl=http://catalog `
     --from-literal=MvcClientBasketUrl=http://basket `
     --from-literal=WebSpaHealthCheckUrl=http://webspa/hc `
+    --from-literal=MarketingHealthCheckUrl=http://marketing/hc `
     --from-literal=SpaClientOrderingExternalUrl=http://$($externalDns)/ordering-api `
     --from-literal=SpaClientCatalogExternalUrl=http://$($externalDns)/catalog-api `
     --from-literal=SpaClientBasketExternalUrl=http://$($externalDns)/basket-api `
     --from-literal=SpaClientIdentityExternalUrl=http://$($externalDns)/identity `
+    --from-literal=LocationsHealthCheckUrl=http://locations/hc `
     --from-literal=SpaClientExternalUrl=http://$($externalDns)'
 
 ExecKube -cmd 'label configmap urls app=eshop'
@@ -180,6 +182,7 @@ ExecKube -cmd 'set image deployments/payment payment=${registryPath}${dockerOrg}
 ExecKube -cmd 'set image deployments/webmvc webmvc=${registryPath}${dockerOrg}/webmvc:$imageTag'
 ExecKube -cmd 'set image deployments/webstatus webstatus=${registryPath}${dockerOrg}/webstatus:$imageTag'
 ExecKube -cmd 'set image deployments/webspa webspa=${registryPath}${dockerOrg}/webspa:$imageTag'
+ExecKube -cmd 'set image deployments/graceperiodmanager graceperiodmanager=${registryPath}${dockerOrg}/graceperiodmanager:$imageTag'
 
 Write-Host "Execute rollout..." -ForegroundColor Yellow
 ExecKube -cmd 'rollout resume deployments/basket'
@@ -192,6 +195,7 @@ ExecKube -cmd 'rollout resume deployments/payment'
 ExecKube -cmd 'rollout resume deployments/webmvc'
 ExecKube -cmd 'rollout resume deployments/webstatus'
 ExecKube -cmd 'rollout resume deployments/webspa'
+ExecKube -cmd 'rollout resume deployments/graceperiodmanager'
 
 Write-Host "WebSPA is exposed at http://$externalDns, WebMVC at http://$externalDns/webmvc, WebStatus at http://$externalDns/webstatus" -ForegroundColor Yellow
 

k8s/deployments.yaml

@@ -74,7 +74,7 @@ spec:
         - name: AzureStorageEnabled
           valueFrom:
            configMapKeyRef:
-             name: urls
+             name: externalcfg
              key: CatalogAzureStorageEnabled
         - name: EventBusConnection
           valueFrom:
@@ -185,8 +185,8 @@ spec:
   template:
     metadata:
       labels:
-        app: graceperiodmanager
-        component: ordering
+        app: eshop
+        component: graceperiodmanager
     spec:
       containers:
       - name: graceperiodmanager
@@ -455,6 +455,16 @@ spec:
            configMapKeyRef:
              name: urls
              key: OrderingHealthCheckUrl
+        - name: LocationsUrl
+          valueFrom:
+           configMapKeyRef:
+             name: urls
+             key: LocationsHealthCheckUrl
+        - name: MarketingUrl
+          valueFrom:
+           configMapKeyRef:
+             name: urls
+             key: MarketingHealthCheckUrl
         - name: mvc
           valueFrom:
            configMapKeyRef:
@@ -541,6 +551,11 @@ spec:
            configMapKeyRef:
              name: urls
              key: OrderingHealthCheckUrl
+        - name: MarketingUrlHC
+          valueFrom:
+           configMapKeyRef:
+             name: urls
+             key: MarketingHealthCheckUrl
         ports:
         - containerPort: 80
       imagePullSecrets:

src/BuildingBlocks/Resilience/Resilience.Http/ResilientHttpClient.cs

@@ -81,6 +81,14 @@ public Task<string> GetStringAsync(string uri, string authorizationToken = null,
 
                 var response = await _client.SendAsync(requestMessage);
 
+                // raise exception if HttpResponseCode 500 
+                // needed for circuit breaker to track fails
+
+                if (response.StatusCode == HttpStatusCode.InternalServerError)
+                {
+                    throw new HttpRequestException();
+                }
+
                 return await response.Content.ReadAsStringAsync();
             });
         }

src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj

@@ -290,11 +290,6 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System.ComponentModel.Annotations">
-      <HintPath>..\..\..\..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETPortable\v4.6\Profile\Profile44\System.ComponentModel.Annotations.dll</HintPath>
-    </Reference>
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Views\CampaignDetailsView.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>