-
+
diff --git a/src/_build/ReadMe.md b/src/_build/ReadMe.md
deleted file mode 100644
index 536add60b..000000000
--- a/src/_build/ReadMe.md
+++ /dev/null
@@ -1 +0,0 @@
-`Please define why we are using this here.`
diff --git a/src/_build/dependencies.props b/src/_build/dependencies.props
deleted file mode 100644
index ee22d5ccb..000000000
--- a/src/_build/dependencies.props
+++ /dev/null
@@ -1,129 +0,0 @@
-
-
- netstandard2.1
- netcoreapp3.0
- 15.8.0
- preview
-
-
-
- 2.1.1
- 2.1.1
-
-
-
- 2.9.406
-
-
-
- 0.1.22-pre3
- 0.1.22-pre3
- 3.9.1
- 1.22.0
- 2.23.0
- 0.1.22-pre2
-
- 2.2.0
- 2.2.0
- 2.2.0
- 2.2.0
- 2.2.0
- 2.2.0
- 2.2.3
- 2.2.22
- 2.2.2
- 4.2.1
- 4.9.2
- 2.6.375
- 1.50.7
- 7.5.0
- 3.0.0-preview3.4
- 3.0.0-preview3.4
- 3.0.0-preview3.4
- 3.0.0-preview3.4
- 3.0.0-preview3.4
- 5.1.0
- 5.1.0
- 2.2.1
- 2.6.1
- 1.0.2
- 5.2.7
- 3.0.0-preview8.19405.7
- 3.0.0-preview8.19405.7
- 3.0.0-preview8.19405.7
- 3.0.0-preview4-19123-01
- 3.0.0-preview4-19123-01
- 2.2.0-preview2-35157
- 3.0.0-preview8.19405.7
- 2.2.0
- 1.0.0
- 3.0.0-preview4-19123-01
- 3.0.0-preview4-19123-01
- 2.2.0
- 3.0.0-preview8.19405.7
- 3.0.0-preview4-19123-01
- 3.0.0-preview4-19123-01
- 3.0.0-preview8.19405.7
- 3.0.0-preview6.19307.2
- 3.0.0-preview4-19123-01
- 3.0.0-alpha1-10670
- 3.0.0-alpha1-34847
- 3.0.0-preview8.19405.7
- 3.0.0
- 15.9.20
- 4.5.0
- 3.0.0-preview5.19227.1
- 3.0.0-preview8.19405.11
- 3.0.0-preview5.19227.1
- 3.0.0-preview8.19405.11
- 3.0.0-preview5.19227.1
- 3.0.0-preview8.19405.11
- 3.0.0-preview8.19405.11
- 3.0.0-preview8.19405.4
- 2.2.0
- 2.2.0
- 3.0.0-preview8.19405.4
- 2.2.0
- 2.2.0
- 3.0.0-preview8.19405.7
- 3.0.0-preview8.19405.4
- 2.2.0
- 16.0.1
- 3.0.0-preview8.19405.3
- 1.0.2105168
- 1.7.9
- 3.0.0-preview6-19319-03
- 1.0.172
- 2.9.0-beta2
- 2.9.0-beta2
- 2.9.0-beta2
- 4.10.1
- 12.0.2
- 12.0.1
- 6.0.1
- 5.0.1
- 3.0.0-dev-00053
- 2.1.3
- 3.1.1-dev-00209
- 3.1.1
- 4.2.1
- 4.0.0
- 1.2.6
- 5.0.0-rc2
- 4.7.0-preview8.19405.3
- 4.3.0
- 4.5.1
- 4.3.0
- 4.5.0
- 2.4.0
- 2.4.0
-
-
-
- https://github.com/dotnet-architecture/eShopOnContainers/blob/master/LICENSE
- https://github.com/dotnet-architecture/eShopOnContainers
- https://github.com/dotnet-architecture/eShopOnContainers
- Microsoft
-
-
-
\ No newline at end of file
diff --git a/src/csproj-files.txt b/src/csproj-files.txt
deleted file mode 100644
index 6dc3532d9..000000000
--- a/src/csproj-files.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-COPY src/ApiGateways/ApiGw-Base/*.csproj /src/src/ApiGateways/ApiGw-Base/
-COPY src/ApiGateways/Mobile.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator/
-COPY src/ApiGateways/Web.Bff.Shopping/aggregator/*.csproj /src/src/ApiGateways/Web.Bff.Shopping/aggregator/
-COPY src/BuildingBlocks/EventBus/CommandBus/*.csproj /src/src/BuildingBlocks/EventBus/CommandBus/
-COPY src/BuildingBlocks/EventBus/EventBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBus/
-COPY src/BuildingBlocks/EventBus/EventBus.Tests/*.csproj /src/src/BuildingBlocks/EventBus/EventBus.Tests/
-COPY src/BuildingBlocks/EventBus/EventBusRabbitMQ/*.csproj /src/src/BuildingBlocks/EventBus/EventBusRabbitMQ/
-COPY src/BuildingBlocks/EventBus/EventBusServiceBus/*.csproj /src/src/BuildingBlocks/EventBus/EventBusServiceBus/
-COPY src/BuildingBlocks/EventBus/IntegrationEventLogEF/*.csproj /src/src/BuildingBlocks/EventBus/IntegrationEventLogEF/
-COPY src/BuildingBlocks/WebHostCustomization/WebHost.Customization/*.csproj /src/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/
-COPY src/Services/Basket/Basket.API/*.csproj /src/src/Services/Basket/Basket.API/
-COPY src/Services/Basket/Basket.FunctionalTests/*.csproj /src/src/Services/Basket/Basket.FunctionalTests/
-COPY src/Services/Basket/Basket.UnitTests/*.csproj /src/src/Services/Basket/Basket.UnitTests/
-COPY src/Services/Catalog/Catalog.API/*.csproj /src/src/Services/Catalog/Catalog.API/
-COPY src/Services/Catalog/Catalog.FunctionalTests/*.csproj /src/src/Services/Catalog/Catalog.FunctionalTests/
-COPY src/Services/Catalog/Catalog.UnitTests/*.csproj /src/src/Services/Catalog/Catalog.UnitTests/
-COPY src/Services/Identity/Identity.API/*.csproj /src/src/Services/Identity/Identity.API/
-COPY src/Services/Location/Locations.API/*.csproj /src/src/Services/Location/Locations.API/
-COPY src/Services/Location/Locations.FunctionalTests/*.csproj /src/src/Services/Location/Locations.FunctionalTests/
-COPY src/Services/Marketing/Marketing.API/*.csproj /src/src/Services/Marketing/Marketing.API/
-COPY src/Services/Marketing/Marketing.FunctionalTests/*.csproj /src/src/Services/Marketing/Marketing.FunctionalTests/
-COPY src/Services/Ordering/Ordering.API/*.csproj /src/src/Services/Ordering/Ordering.API/
-COPY src/Services/Ordering/Ordering.BackgroundTasks/*.csproj /src/src/Services/Ordering/Ordering.BackgroundTasks/
-COPY src/Services/Ordering/Ordering.Domain/*.csproj /src/src/Services/Ordering/Ordering.Domain/
-COPY src/Services/Ordering/Ordering.FunctionalTests/*.csproj /src/src/Services/Ordering/Ordering.FunctionalTests/
-COPY src/Services/Ordering/Ordering.Infrastructure/*.csproj /src/src/Services/Ordering/Ordering.Infrastructure/
-COPY src/Services/Ordering/Ordering.SignalrHub/*.csproj /src/src/Services/Ordering/Ordering.SignalrHub/
-COPY src/Services/Ordering/Ordering.UnitTests/*.csproj /src/src/Services/Ordering/Ordering.UnitTests/
-COPY src/Services/Payment/Payment.API/*.csproj /src/src/Services/Payment/Payment.API/
-COPY src/Services/Webhooks/Webhooks.API/*.csproj /src/src/Services/Webhooks/Webhooks.API/
-COPY src/Web/WebhookClient/*.csproj /src/src/Web/WebhookClient/
-COPY src/Web/WebMVC/*.csproj /src/src/Web/WebMVC/
-COPY src/Web/WebSPA/*.csproj /src/src/Web/WebSPA/
-COPY src/Web/WebStatus/*.csproj /src/src/Web/WebStatus/
diff --git a/src/docker-compose-tests.override.yml b/src/docker-compose-tests.override.yml
index cee5c6623..35e8170da 100644
--- a/src/docker-compose-tests.override.yml
+++ b/src/docker-compose-tests.override.yml
@@ -4,7 +4,7 @@ services:
rabbitmq-test:
ports:
- "15672:15672"
- - "5672:5672"
+ - "5672:5672"
basket-data-test:
ports:
@@ -27,7 +27,7 @@ services:
- ASPNETCORE_URLS=http://0.0.0.0:80
- SpaClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5104
- XamarinCallback=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105/xamarincallback
- - ConnectionString=${ESHOP_AZURE_IDENTITY_DB:-Server=sql-data-test;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word}
+ - ConnectionString=${ESHOP_AZURE_IDENTITY_DB:-Server=sql-data-test;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word}
- MvcClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5100
- LocationApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5109
- MarketingApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5110
@@ -35,7 +35,7 @@ services:
- OrderingApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5102
- MobileShoppingAggClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5120
- WebShoppingAggClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5121
- - UseCustomizationData=True
+ - UseCustomizationData=True
- ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
- OrchestratorType=${ORCHESTRATOR_TYPE}
ports:
@@ -179,7 +179,7 @@ services:
- dotnet
- test
- --logger
- - trx;LogFileName=/tests/ordering-unit-test-results.xml
+ - trx;LogFileName=/tests/ordering-unit-test-results.xml
marketing-api-test:
environment:
diff --git a/src/docker-compose-tests.yml b/src/docker-compose-tests.yml
index 440e3e5c0..13f1ddf46 100644
--- a/src/docker-compose-tests.yml
+++ b/src/docker-compose-tests.yml
@@ -1,18 +1,18 @@
version: '3.4'
services:
- rabbitmq-test:
- image: rabbitmq:3-management-alpine
-
- basket-data-test:
- image: redis:alpine
-
sql-data-test:
image: microsoft/mssql-server-linux:2017-latest
nosql-data-test:
image: mongo
+ basket-data-test:
+ image: redis:alpine
+
+ rabbitmq-test:
+ image: rabbitmq:3-management-alpine
+
identity-api-test:
image: ${REGISTRY:-eshop}/identity-api-test:${TAG:-latest}
build:
@@ -31,7 +31,7 @@ services:
- basket-data-test
- identity-api-test
- rabbitmq-test
- volumes:
+ volumes:
- ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
basket-api-unit-test:
@@ -44,7 +44,7 @@ services:
- basket-data-test
- identity-api-test
- rabbitmq-test
- volumes:
+ volumes:
- ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
catalog-api-test:
@@ -56,7 +56,7 @@ services:
depends_on:
- sql-data-test
- rabbitmq-test
- volumes:
+ volumes:
- ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
catalog-api-unit-test:
@@ -68,7 +68,7 @@ services:
depends_on:
- sql-data-test
- rabbitmq-test
- volumes:
+ volumes:
- ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
ordering-api-test:
@@ -80,7 +80,7 @@ services:
depends_on:
- sql-data-test
- rabbitmq-test
- volumes:
+ volumes:
- ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
ordering-api-unit-test:
@@ -92,8 +92,8 @@ services:
depends_on:
- sql-data-test
- rabbitmq-test
- volumes:
- - ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
+ volumes:
+ - ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
marketing-api-test:
image: ${REGISTRY:-eshop}/marketing-api-test:${TAG:-latest}
@@ -106,7 +106,7 @@ services:
- nosql-data-test
- identity-api-test
- rabbitmq-test
- volumes:
+ volumes:
- ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
payment-api-test:
@@ -126,5 +126,5 @@ services:
depends_on:
- nosql-data-test
- rabbitmq-test
- volumes:
+ volumes:
- ${BUILD_ARTIFACTSTAGINGDIRECTORY:-./tests-results/}:/tests
\ No newline at end of file
diff --git a/src/docker-compose.prod.yml b/src/docker-compose.prod.yml
index 7548a4154..afc9314d9 100644
--- a/src/docker-compose.prod.yml
+++ b/src/docker-compose.prod.yml
@@ -1,20 +1,20 @@
version: '3.4'
-# The Production docker-compose file has to have the external/real IPs or DNS names for the services
-# The ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP environment variable is taken, by default, from the ".env" file defined like:
+# The Production docker-compose file has to have the external/real IPs or DNS names for the services
+# The ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP environment variable is taken, by default, from the ".env" file defined like:
# ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP=192.168.88.248
# but values present in the environment vars at runtime will always override those defined inside the .env file
# An external IP or DNS name has to be used when testing the Web apps and the Xamarin apps from remote machines/devices using the same WiFi, for instance.
#
# IMPORTANT: Note that this compose file uses ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP instead of ESHOP_EXTERNAL_DNS_NAME_OR_IP
-# Set ASPNETCORE_ENVIRONMENT= Development or Production, depending if you want to show up errors while testing.
+# Set ASPNETCORE_ENVIRONMENT= Development or Production, depending if you want to show up errors while testing.
#
# You need to start it with the following CLI command:
# docker-compose -f docker-compose.yml -f docker-compose.prod.yml up
services:
-
+
basket-api:
environment:
- ASPNETCORE_ENVIRONMENT=Development
@@ -24,24 +24,24 @@ services:
- IdentityUrlExternal=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105
- EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
- EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
- - EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}
+ - EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}
- AzureServiceBusEnabled=False
- ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
- OrchestratorType=${ORCHESTRATOR_TYPE}
- UseLoadTest=${USE_LOADTEST:-False}
ports:
- - "80" # The API Gateway redirects and access through the internal port (80).
+ - "80" # The API Gateway redirects and access through the internal port (80).
catalog-api:
environment:
- ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_URLS=http://0.0.0.0:80
- ConnectionString=${ESHOP_AZURE_CATALOG_DB:-Server=sqldata;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word}
- - PicBaseUrl=${ESHOP_AZURE_STORAGE_CATALOG_URL:-http://localhost:5101/api/v1/catalog/items/[0]/pic/} #Local: You need to open your local dev-machine firewall at range 5100-5110.
+ - PicBaseUrl=${ESHOP_AZURE_STORAGE_CATALOG_URL:-http://localhost:5101/api/v1/catalog/items/[0]/pic/} #Local: You need to open your local dev-machine firewall at range 5100-5110.
- EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
- EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
- - EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}
+ - EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}
- AzureStorageAccountName=${ESHOP_AZURE_STORAGE_CATALOG_NAME}
- AzureStorageAccountKey=${ESHOP_AZURE_STORAGE_CATALOG_KEY}
- UseCustomizationData=True
@@ -50,7 +50,7 @@ services:
- ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
- OrchestratorType=${ORCHESTRATOR_TYPE}
ports:
- - "80" # The API Gateway redirects and access through the internal port (80).
+ - "80" # The API Gateway redirects and access through the internal port (80).
identity-api:
environment:
@@ -58,19 +58,19 @@ services:
- ASPNETCORE_URLS=http://0.0.0.0:80
- SpaClient=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5104
- XamarinCallback=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105/xamarincallback #localhost do not work for UWP login, so we have to use "external" IP always
- - ConnectionString=${ESHOP_AZURE_IDENTITY_DB:-Server=sqldata;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word}
- - MvcClient=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5100 #Local: You need to open your local dev-machine firewall at range 5100-5110.
+ - ConnectionString=${ESHOP_AZURE_IDENTITY_DB:-Server=sqldata;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word}
+ - MvcClient=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5100 #Local: You need to open your local dev-machine firewall at range 5100-5110.
- LocationApiClient=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5109
- MarketingApiClient=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5110
- BasketApiClient=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5103
- OrderingApiClient=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5102
- MobileShoppingAggClient=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5120
- WebShoppingAggClient=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5121
- - UseCustomizationData=True
+ - UseCustomizationData=True
- ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
- OrchestratorType=${ORCHESTRATOR_TYPE}
ports:
- - "5105:80"
+ - "5105:80"
ordering-api:
environment:
@@ -81,7 +81,7 @@ services:
- IdentityUrlExternal=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105
- EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
- EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
- - EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}
+ - EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}
- UseCustomizationData=True
- AzureServiceBusEnabled=False
- CheckUpdateTime=30000
@@ -98,7 +98,7 @@ services:
- ConnectionString=${ESHOP_AZURE_ORDERING_DB:-Server=sqldata;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word}
- EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
- EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
- - EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}
+ - EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}
- UseCustomizationData=True
- AzureServiceBusEnabled=False
- CheckUpdateTime=30000
@@ -118,7 +118,7 @@ services:
- MongoDatabase=MarketingDb
- EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
- EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
- - EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}
+ - EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}
- identityUrl=http://identity-api #Local: You need to open your local dev-machine firewall at range 5100-5110.
- IdentityUrlExternal=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105
- CampaignDetailFunctionUri=${ESHOP_AZUREFUNC_CAMPAIGN_DETAILS_URI}
@@ -137,12 +137,12 @@ services:
environment:
- ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_URLS=http://0.0.0.0:80
- - IdentityUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105.
+ - IdentityUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105.
- PurchaseUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5202
- - MarketingUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5203
+ - MarketingUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5203
- CatalogUrlHC=http://catalog-api/hc
- OrderingUrlHC=http://ordering-api/hc
- - IdentityUrlHC=http://identity-api/hc #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser.
+ - IdentityUrlHC=http://identity-api/hc #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser.
- BasketUrlHC=http://basket-api/hc
- MarketingUrlHC=http://marketing-api/hc
- PaymentUrlHC=http://payment-api/hc
@@ -150,7 +150,7 @@ services:
- ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
- OrchestratorType=${ORCHESTRATOR_TYPE}
ports:
- - "5104:80"
+ - "5104:80"
webmvc:
environment:
@@ -158,10 +158,10 @@ services:
- ASPNETCORE_URLS=http://0.0.0.0:80
- PurchaseUrl=http://webshoppingapigw
- IdentityUrl=http://10.0.75.1:5105 # Local Mac: Use http://docker.for.mac.localhost:5105 || Local Windows: Use 10.0.75.1 in a "Docker for Windows" environment, if using "localhost" from browser. || #Remote access: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP} if using external IP or DNS name from browser.
- - MarketingUrl=http://webmarketingapigw
+ - MarketingUrl=http://webmarketingapigw
- CatalogUrlHC=http://catalog-api/hc
- OrderingUrlHC=http://ordering-api/hc
- - IdentityUrlHC=http://identity-api/hc #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser.
+ - IdentityUrlHC=http://identity-api/hc #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser.
- BasketUrlHC=http://basket-api/hc
- MarketingUrlHC=http://marketing-api/hc
- PaymentUrlHC=http://payment-api/hc
@@ -196,7 +196,7 @@ services:
- ASPNETCORE_URLS=http://0.0.0.0:80
- EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
- EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
- - EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}
+ - EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}
- AzureServiceBusEnabled=False
- ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
- OrchestratorType=${ORCHESTRATOR_TYPE}
@@ -209,11 +209,11 @@ services:
- ASPNETCORE_URLS=http://0.0.0.0:80
- ConnectionString=${ESHOP_AZURE_COSMOSDB:-mongodb://nosqldata}
- Database=LocationsDb
- - identityUrl=http://identity-api #Local: You need to open your local dev-machine firewall at range 5100-5110.
+ - identityUrl=http://identity-api #Local: You need to open your local dev-machine firewall at range 5100-5110.
- IdentityUrlExternal=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105
- EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
- EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
- - EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}
+ - EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}
- AzureServiceBusEnabled=False
- ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
- OrchestratorType=${ORCHESTRATOR_TYPE}
@@ -235,7 +235,7 @@ services:
basket.data:
ports:
- "6379:6379" # Important: In a production environment your should remove the external port
-
+
rabbitmq:
ports:
- "15672:15672" # Important: In a production environment your should remove the external port
@@ -246,17 +246,17 @@ services:
- ASPNETCORE_ENVIRONMENT=Development
- IdentityUrl=http://identity-api #Local: You need to open your local dev-machine firewall at range 5100-5110.
ports:
- - "5200:80" # Important: In a production environment your should remove the external port (5200) kept here for microservice debugging purposes.
+ - "5200:80" # Important: In a production environment your should remove the external port (5200) kept here for microservice debugging purposes.
# The API Gateway redirects and access through the internal port (80).
volumes:
- ./ApiGateways/Mobile.Bff.Shopping/apigw:/app/configuration
-
+
mobilemarketingapigw:
environment:
- ASPNETCORE_ENVIRONMENT=Development
- IdentityUrl=http://identity-api #Local: You need to open your local dev-machine firewall at range 5100-5110.
ports:
- - "5201:80" # Important: In a production environment your should remove the external port (5201) kept here for microservice debugging purposes.
+ - "5201:80" # Important: In a production environment your should remove the external port (5201) kept here for microservice debugging purposes.
# The API Gateway redirects and access through the internal port (80).
volumes:
- ./ApiGateways/Mobile.Bff.Marketing/apigw:/app/configuration
@@ -266,7 +266,7 @@ services:
- ASPNETCORE_ENVIRONMENT=Development
- IdentityUrl=http://identity-api #Local: You need to open your local dev-machine firewall at range 5100-5110.
ports:
- - "5202:80" # Important: In a production environment your should remove the external port (5202) kept here for microservice debugging purposes.
+ - "5202:80" # Important: In a production environment your should remove the external port (5202) kept here for microservice debugging purposes.
# The API Gateway redirects and access through the internal port (80).
volumes:
- ./ApiGateways/Web.Bff.Shopping/apigw:/app/configuration
@@ -276,7 +276,7 @@ services:
- ASPNETCORE_ENVIRONMENT=Development
- IdentityUrl=http://identity-api #Local: You need to open your local dev-machine firewall at range 5100-5110.
ports:
- - "5203:80" # Important: In a production environment your should remove the external port (5203) kept here for microservice debugging purposes.
+ - "5203:80" # Important: In a production environment your should remove the external port (5203) kept here for microservice debugging purposes.
# The API Gateway redirects and access through the internal port (80).
volumes:
- ./ApiGateways/Web.Bff.Marketing/apigw:/app/configuration
@@ -289,7 +289,7 @@ services:
- urls__orders=http://ordering-api
- urls__identity=http://identity-api #Local: You need to open your local dev-machine firewall at range 5100-5110.
ports:
- - "80" # Important: In a production environment your should remove the external port (5120) kept here for microservice debugging purposes.
+ - "80" # Important: In a production environment your should remove the external port (5120) kept here for microservice debugging purposes.
# The API Gateway redirects and access through the internal port (80).
webshoppingagg:
@@ -300,6 +300,6 @@ services:
- urls__orders=http://ordering-api
- urls__identity=http://identity-api #Local: You need to open your local dev-machine firewall at range 5100-5110.
ports:
- - "80" # Important: In a production environment your should remove the external port (5121) kept here for microservice debugging purposes.
+ - "80" # Important: In a production environment your should remove the external port (5121) kept here for microservice debugging purposes.
# The API Gateway redirects and access through the internal port (80).
diff --git a/src/docker-compose.yml b/src/docker-compose.yml
index 97245790f..65edc42f9 100644
--- a/src/docker-compose.yml
+++ b/src/docker-compose.yml
@@ -21,7 +21,7 @@ services:
image: ${REGISTRY:-eshop}/identity.api:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
- dockerfile: Services/Identity/Identity.API/Dockerfile
+ dockerfile: Services/Identity/Identity.API/Dockerfile
depends_on:
- sqldata
@@ -29,7 +29,7 @@ services:
image: ${REGISTRY:-eshop}/basket.api:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
- dockerfile: Services/Basket/Basket.API/Dockerfile
+ dockerfile: Services/Basket/Basket.API/Dockerfile
depends_on:
- basketdata
- identity-api
@@ -48,7 +48,7 @@ services:
image: ${REGISTRY:-eshop}/ordering.api:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
- dockerfile: Services/Ordering/Ordering.API/Dockerfile
+ dockerfile: Services/Ordering/Ordering.API/Dockerfile
depends_on:
- sqldata
- rabbitmq
@@ -57,7 +57,7 @@ services:
image: ${REGISTRY:-eshop}/ordering.backgroundtasks:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
- dockerfile: Services/Ordering/Ordering.BackgroundTasks/Dockerfile
+ dockerfile: Services/Ordering/Ordering.BackgroundTasks/Dockerfile
depends_on:
- sqldata
- rabbitmq
@@ -66,7 +66,7 @@ services:
image: ${REGISTRY:-eshop}/marketing.api:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
- dockerfile: Services/Marketing/Marketing.API/Dockerfile
+ dockerfile: Services/Marketing/Marketing.API/Dockerfile
depends_on:
- sqldata
- nosqldata
@@ -79,7 +79,7 @@ services:
context: .
dockerfile: Services/Payment/Payment.API/Dockerfile
depends_on:
- - rabbitmq
+ - rabbitmq
locations-api:
image: ${REGISTRY:-eshop}/locations.api:${PLATFORM:-linux}-${TAG:-latest}
@@ -96,7 +96,7 @@ services:
context: .
dockerfile: Services/Webhooks/Webhooks.API/Dockerfile
depends_on:
- - sqldata
+ - sqldata
mobileshoppingapigw:
image: envoyproxy/envoy:v1.11.1
@@ -159,7 +159,7 @@ services:
image: ${REGISTRY:-eshop}/webspa:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
- dockerfile: Web/WebSPA/Dockerfile
+ dockerfile: Web/WebSPA/Dockerfile
args:
NODE_IMAGE: ${NODE_IMAGE:-node:8.11}
# depends_on:
@@ -171,7 +171,7 @@ services:
image: ${REGISTRY:-eshop}/webmvc:${PLATFORM:-linux}-${TAG:-latest}
build:
context: .
- dockerfile: Web/WebMVC/Dockerfile
+ dockerfile: Web/WebMVC/Dockerfile
depends_on:
- webshoppingagg
- webshoppingapigw
@@ -183,7 +183,7 @@ services:
context: .
dockerfile: Web/WebhookClient/Dockerfile
depends_on:
- - webhooks-api
+ - webhooks-api
webshoppingapigw:
image: envoyproxy/envoy:v1.11.1
diff --git a/src/eShopOnContainers-ServicesAndWebApps.sln b/src/eShopOnContainers-ServicesAndWebApps.sln
index c41d22d92..3a1dec68a 100644
--- a/src/eShopOnContainers-ServicesAndWebApps.sln
+++ b/src/eShopOnContainers-ServicesAndWebApps.sln
@@ -24,9 +24,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Basket", "Basket", "{BF3EF4
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Ordering", "Ordering", "{0BD0DB92-2D98-44D9-9AC0-C59186D59B0B}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{A857AD10-40FF-4303-BEC2-FF1C58D5735E}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A857AD10-40FF-4303-BEC2-FF1C58D5735E}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ServicesTests", "ServicesTests", "{EF0337F2-ED00-4643-89FD-EE10863F1870}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ServiceTests", "ServiceTests", "{EF0337F2-ED00-4643-89FD-EE10863F1870}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Identity", "Identity", "{24CD3B53-141E-4A07-9B0D-796641E1CF78}"
EndProject
@@ -116,7 +116,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ordering.FunctionalTests",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Marketing.FunctionalTests", "Services\Marketing\Marketing.FunctionalTests\Marketing.FunctionalTests.csproj", "{94176D9B-9CAA-4762-8D12-1621E240EE34}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Application.FunctionalTests", "test\ServicesTests\Application.FunctionalTests\Application.FunctionalTests.csproj", "{639BB197-D112-47A7-A44A-471DDB0FA1AE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Application.FunctionalTests", "Tests\Services\Application.FunctionalTests\Application.FunctionalTests.csproj", "{639BB197-D112-47A7-A44A-471DDB0FA1AE}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2751AC5C-D148-4D7A-AE8F-149B47C9A82D}"
EndProject
@@ -138,7 +138,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Webhooks.API", "Services\We
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebhookClient", "Web\WebhookClient\WebhookClient.csproj", "{766D7E92-6AF0-476C-ADD5-282BF4D8C576}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Devspace.Support", "Devspace.Support", "{68F5041D-51F2-4630-94B6-B49789F5E51A}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Devspaces.Support", "Devspaces.Support", "{68F5041D-51F2-4630-94B6-B49789F5E51A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Devspaces.Support", "BuildingBlocks\Devspaces.Support\Devspaces.Support.csproj", "{56C2EF0B-6BF2-41D9-BE07-6E6D08D06B35}"
EndProject
diff --git a/src/package-lock.json b/src/package-lock.json
deleted file mode 100644
index ba627e674..000000000
--- a/src/package-lock.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "requires": true,
- "lockfileVersion": 1,
- "dependencies": {
- "@aspnet/signalr": {
- "version": "1.0.0-preview1-update1",
- "resolved": "https://registry.npmjs.org/@aspnet/signalr/-/signalr-1.0.0-preview1-update1.tgz",
- "integrity": "sha512-TGFCoLa2svN37Ew5ue0kGFxbkmQzq2I9N5TMLFBWRrpTYF4txlE3yPX0EaPt/NToKBaK1A+VK8Q+1MGSYtnqUw=="
- }
- }
-}
diff --git a/src/run-test-infrastructure.ps1 b/src/run-test-infrastructure.ps1
new file mode 100644
index 000000000..156289511
--- /dev/null
+++ b/src/run-test-infrastructure.ps1
@@ -0,0 +1 @@
+docker-compose -f .\docker-compose-tests.yml -f .\docker-compose-tests.override.yml up sql-data-test nosql-data-test basket-data-test rabbitmq-test identity-api-test payment-api-test
diff --git a/src/scripts/restore-packages b/src/scripts/restore-packages
deleted file mode 100644
index 58bb10c62..000000000
--- a/src/scripts/restore-packages
+++ /dev/null
@@ -1 +0,0 @@
-echo RESTORING ALL PACKAGES...; for f in /src/csproj-files/*.csproj; do dotnet restore $f; done
\ No newline at end of file
diff --git a/src/scripts/restore-packages.cmd b/src/scripts/restore-packages.cmd
deleted file mode 100644
index 9f3a8434e..000000000
--- a/src/scripts/restore-packages.cmd
+++ /dev/null
@@ -1 +0,0 @@
-for %%p in (csproj-files\*.csproj) do dotnet restore %%p
diff --git a/test/docker-compose-tests.override.yml b/test/docker-compose-tests.override.yml
deleted file mode 100644
index 27308ec75..000000000
--- a/test/docker-compose-tests.override.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-version: '3'
-
-services:
- redis.data:
- ports:
- - "6379:6379"
- rabbitmq:
- ports:
- - "15672:15672"
- - "5672:5672"
- sql.data:
- environment:
- - SA_PASSWORD=Pass@word
- - ACCEPT_EULA=Y
- ports:
- - "5433:1433"
- nosql.data:
- ports:
- - "27017:27017" # Important: In a production environment your should remove the external por
-
diff --git a/test/docker-compose-tests.yml b/test/docker-compose-tests.yml
deleted file mode 100644
index 113aca9ed..000000000
--- a/test/docker-compose-tests.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-version: '3'
-services:
- redis.data:
- image: redis:alpine
- rabbitmq:
- image: rabbitmq:3-management-alpine
- sql.data:
- image: microsoft/mssql-server-linux:2017-latest
- nosql.data:
- image: mongo
\ No newline at end of file
diff --git a/test/img/compose-up-powershell-infrastructure-containers.PNG b/test/img/compose-up-powershell-infrastructure-containers.PNG
deleted file mode 100644
index e5fbfe25a..000000000
Binary files a/test/img/compose-up-powershell-infrastructure-containers.PNG and /dev/null differ
diff --git a/test/img/functionaltests-catalog-running.PNG b/test/img/functionaltests-catalog-running.PNG
deleted file mode 100644
index 98d7a34f3..000000000
Binary files a/test/img/functionaltests-catalog-running.PNG and /dev/null differ
diff --git a/test/img/functionaltestsview.PNG b/test/img/functionaltestsview.PNG
deleted file mode 100644
index 713b315b0..000000000
Binary files a/test/img/functionaltestsview.PNG and /dev/null differ
diff --git a/test/img/global-application-functional-tests-running.PNG b/test/img/global-application-functional-tests-running.PNG
deleted file mode 100644
index 9290e4f0d..000000000
Binary files a/test/img/global-application-functional-tests-running.PNG and /dev/null differ
diff --git a/test/img/integrationtestsview.PNG b/test/img/integrationtestsview.PNG
deleted file mode 100644
index be8a44978..000000000
Binary files a/test/img/integrationtestsview.PNG and /dev/null differ
diff --git a/test/img/orderingservicetests.PNG b/test/img/orderingservicetests.PNG
deleted file mode 100644
index fd0f2d529..000000000
Binary files a/test/img/orderingservicetests.PNG and /dev/null differ
diff --git a/test/img/services-functional-tests-folder.PNG b/test/img/services-functional-tests-folder.PNG
deleted file mode 100644
index b4efe946b..000000000
Binary files a/test/img/services-functional-tests-folder.PNG and /dev/null differ
diff --git a/test/img/unittestsrunning.PNG b/test/img/unittestsrunning.PNG
deleted file mode 100644
index a0c280775..000000000
Binary files a/test/img/unittestsrunning.PNG and /dev/null differ
diff --git a/test/img/unittestsview.PNG b/test/img/unittestsview.PNG
deleted file mode 100644
index 141c7879c..000000000
Binary files a/test/img/unittestsview.PNG and /dev/null differ
diff --git a/test/readme.md b/test/readme.md
deleted file mode 100644
index 37337c180..000000000
--- a/test/readme.md
+++ /dev/null
@@ -1,128 +0,0 @@
-# Running Tests for eShopOnContainers
-
-The tests in eShopOnContainers are structured in the following structure, per type:
-
-- Tests per microservice
- - Unit Tests
- - Functional/Integration Tests
-
-- Global application tests
- - Microservices Functional/Integration Tests across the whole application
-
-# Unit and Functional tests per microservice
-
-Within each microservice's folder there are multiple tests (Unit Tests and Functional Tests) available to validate its behaviour.
-The test projects are positioned within each microservice's physical folder because that helps on the goal of maintaining maximum development autonomy per microservice. Doing it this way and in a more advance scenario, you could even move each microservice to a different GitHub repo per microservice, along with its test projects.
-
-For instance, this is the way you see the project folders for the *Ordering* microservice, where you also have the *Ordering.FunctionalTests* y *Ordering.UnitTests* within that folder structure.
-
-
-
-
-
-## Running Unit Tests for specific microservices
-
-In order to run the Unit Tests for any microservice, you just need to select the tests with [*Test Explorer* in Visual Studio](https://docs.microsoft.com/en-us/visualstudio/test/run-unit-tests-with-test-explorer) (or use your preferred tool) and run the tests.
-
-For instance, you can filter and see just the Unit Test projects by typing *"UnitTest"* in the filter edit box within **Test Explorer**:
-
-
-
-
-
-Then you can run all or selected tests, like in the following image:
-
-
-
-
-
-These Unit Tests have no any dependency with any external infrastructure or any other microservice and that's why you don't need to spin-up additional infrastructure (Database server or additional containers).
-
-
-## Running Functional/Integration Tests for specific microservices
-
-In this case, the Functional Tests do have dependencies with additional infrastructure. For instance, they might have dependencies with the microservices's database in the SQL Server container, the messaging broker (RabbitMQ container), etc.
-
-Therefore, in order to run the Functional Tests you first need to have the needed infrastructure, in this case to spin-up the infrastructure containers.
-
-In order to facilitate how you can have the infrastructure containers up and running, you have certain docker-compose files you can use with `docker-compose up`. These files are available here:
-
-https://github.com/dotnet-architecture/eShopOnContainers/tree/feature/orgtestprojects/test
-
-If you edit the docker-compose-tests.yml you can see that it just have info about the infrastructure containers to spin up:
-
-```
-docker-compose-tests.yml
-
-version: '3'
-services:
- redis.data:
- image: redis:alpine
- rabbitmq:
- image: rabbitmq:3-management-alpine
- sql.data:
- image: microsoft/mssql-server-linux:2017-latest
- nosql.data:
- image: mongo
-```
-
-Here is how you start the infrastructure containers with "docker-compose up" in PowerShell or any Command-Line window:
-
-> docker-compose -f .\docker-compose-tests.yml -f .\docker-compose-tests.override.yml up
-
-
-
-
-
-Each Functional Test project uses a [TestServer](https://docs.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.testhost.testserver?view=aspnetcore-2.1) configured with the required infrastructure which should be available thanks to the previous "docker-compose up", so the Functional Tests can be run.
-
-> For more info about **TestServer** and *Functional Tests* and *Integration Tests*, see the article [Integration tests in ASP.NET Core](https://docs.microsoft.com/aspnet/core/test/integration-tests?view=aspnetcore-2.1).
-
-In order to filter and see the Functional Tests to run, type *"Functional"* in **Test Explorer**.
-
-
-
-
-
-You can, for instance, run the Functional Tests for the Catalog Microservice, which, under the covers, are accessing to the SQL Server container that should be running in Docker:
-
-
-
-
-
-
-# Running Services Integration Tests (Tests across the whole application)
-
-So far, we've been focusing on isolated Unit Tests or Functional Tests that were related to single/isolated microservices, although taking into account the infrastructure for the functional tests per microservice.
-
-However, in a microservice-based application you also need how the multiple microservices interact with the whole application. For instance, you might raise an event from one microservice by publishing it on the Event Bus (based on RabbitMQ) and test/validate that you received that same event into another microservice because it was subscribed to it.
-
-These global Functional/Integration tests for the services need to be placed in a common place instead within specific microservice's folders, as it needs to deal with multiple microservices.
-
-That common place is the **"test/ServiceTests/FunctionalTests"** folder and it has those multiple integration tests for the whole application.
-
-
-
-
-
-In order to run these application services tests, you can filter, like in the following image.
-
-
-
-
-
-Then, making sure that you have the infrastructure containers up and running (thanks to the previous `docker-compose up` command, already explained), select and run the desired global application functional tests, as in the following image:
-
-
-
-
-
-
-
-
-## Load Testing
-
-Load Testing for eShopOnContainers is described in [this document](ServicesTests/LoadTest/readme.md)
-
-
-