ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added BasePath to swagger endpoint

Browse Source 
Override environment variables urls
This commit is contained in:
Ramón Tomás 2017-09-13 16:19:27 +02:00
parent 5ac3df9943
commit 49c825d193
18 changed files with 79 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/ApplicationManifest.xml
View File

@ -18,6 +18,7 @@
<Parameter Name="OrderingApi_InstanceCount" DefaultValue="-1" />
<Parameter Name="CatalogApi_InstanceCount" DefaultValue="-1" />
<Parameter Name="BasketApi_InstanceCount" DefaultValue="-1" />
<Parameter Name="IdentityUrlExternal" DefaultValue="" />
</Parameters>
<!-- Import the ServiceManifest from the ServicePackage. The ServiceManifestName and ServiceManifestVersion
should match the Name and Version attributes of the ServiceManifest element defined in the
@ -33,7 +34,10 @@
</ServiceManifestImport>
<ServiceManifestImport>
<ServiceManifestRef ServiceManifestName="MarketingApiPkg" ServiceManifestVersion="1.0.0" />
<ConfigOverrides />
<!-- Override external urls depending on environment -->
<EnvironmentOverrides CodePackageRef="Code">
<EnvironmentVariable Name="IdentityUrlExternal" Value="[IdentityUrlExternal]"/>
</EnvironmentOverrides>
<Policies>
<ContainerHostPolicies CodePackageRef="Code">
<PortBinding ContainerPort="80" EndpointRef="MarketingApiTypeEndpoint"/>
@ -51,7 +55,9 @@
</ServiceManifestImport>
<ServiceManifestImport>
<ServiceManifestRef ServiceManifestName="LocationsApiPkg" ServiceManifestVersion="1.0.0" />
<ConfigOverrides />
<EnvironmentOverrides CodePackageRef="Code">
<EnvironmentVariable Name="IdentityUrlExternal" Value="[IdentityUrlExternal]"/>
</EnvironmentOverrides>
<Policies>
<ContainerHostPolicies CodePackageRef="Code">
<PortBinding ContainerPort="80" EndpointRef="LocationsApiTypeEndpoint"/>
@ -87,7 +93,9 @@
</ServiceManifestImport>
<ServiceManifestImport>
<ServiceManifestRef ServiceManifestName="OrderingApiPkg" ServiceManifestVersion="1.0.0" />
<ConfigOverrides />
<EnvironmentOverrides CodePackageRef="Code">
<EnvironmentVariable Name="IdentityUrlExternal" Value="[IdentityUrlExternal]"/>
</EnvironmentOverrides>
<Policies>
<ContainerHostPolicies CodePackageRef="Code">
<PortBinding ContainerPort="80" EndpointRef="OrderingApiTypeEndpoint"/>
@ -105,7 +113,9 @@
</ServiceManifestImport>
<ServiceManifestImport>
<ServiceManifestRef ServiceManifestName="BasketApiPkg" ServiceManifestVersion="1.0.0" />
<ConfigOverrides />
<EnvironmentOverrides CodePackageRef="Code">
<EnvironmentVariable Name="IdentityUrlExternal" Value="[IdentityUrlExternal]"/>
</EnvironmentOverrides>
<Policies>
<ContainerHostPolicies CodePackageRef="Code">
<PortBinding ContainerPort="80" EndpointRef="BasketApiTypeEndpoint"/>

2
ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/CatalogApiPkg/ServiceManifest.xml
View File

@ -23,7 +23,7 @@
<EnvironmentVariable Name="ASPNETCORE_ENVIRONMENT" Value="Development"/>
<EnvironmentVariable Name="ASPNETCORE_URLS" Value="http://0.0.0.0:80"/>
<EnvironmentVariable Name="ConnectionString" Value="Data Source=sqlserver.eshoponservicefabric,5433;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word"/>
<EnvironmentVariable Name="PicBaseUrl" Value="http://your_sf_dns:19081/eShopOnServiceFabric/CatalogApi/api/v1/catalog/items/[0]/pic/"/>
<EnvironmentVariable Name="PicBaseUrl" Value="http://catalogapi.eshoponservicefabric:5101/api/v1/catalog/items/[0]/pic/"/>
<EnvironmentVariable Name="AzureStorageAccountName" Value=""/>
<EnvironmentVariable Name="AzureStorageAccountKey" Value=""/>
<EnvironmentVariable Name="UseCustomizationData" Value="True"/>

2
ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/LocationsApiPkg/ServiceManifest.xml
View File

@ -25,7 +25,7 @@
<EnvironmentVariable Name="ConnectionString" Value="mongodb://mongodb.eshoponservicefabric"/>
<EnvironmentVariable Name="Database" Value="LocationsDb"/>
<EnvironmentVariable Name="identityUrl" Value="http://identityapi.eshoponservicefabric:5105"/>
<EnvironmentVariable Name="IdentityUrlExternal" Value="http://your_sf_dns:5105"/>
<EnvironmentVariable Name="IdentityUrlExternal" Value=""/>
<EnvironmentVariable Name="EventBusConnection" Value="rabbitmq.eshoponservicefabric"/>
<EnvironmentVariable Name="AzureServiceBusEnabled" Value="False"/>
<EnvironmentVariable Name="EventBusUserName" Value="admin"/>

2
ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/MarketingApiPkg/ServiceManifest.xml
View File

@ -23,7 +23,7 @@
<EnvironmentVariable Name="ASPNETCORE_ENVIRONMENT" Value="Development"/>
<EnvironmentVariable Name="ASPNETCORE_URLS" Value="http://0.0.0.0:80"/>
<EnvironmentVariable Name="ConnectionString" Value="Data Source=sqlserver.eshoponservicefabric,5433;Database=Microsoft.eShopOnContainers.Services.MarketingDb;User Id=sa;Password=Pass@word"/>
<EnvironmentVariable Name="IdentityUrlExternal" Value="http://your_sf_dns:5105"/>
<EnvironmentVariable Name="IdentityUrlExternal" Value=""/>
<EnvironmentVariable Name="EventBusConnection" Value="rabbitmq.eshoponservicefabric"/>
<EnvironmentVariable Name="AzureServiceBusEnabled" Value="False"/>
<EnvironmentVariable Name="CampaignDetailFunctionUri" Value=""/>

2
ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/OrderingApiPkg/ServiceManifest.xml
View File

@ -24,7 +24,7 @@
<EnvironmentVariable Name="ASPNETCORE_URLS" Value="http://0.0.0.0:80"/>
<EnvironmentVariable Name="ConnectionString" Value="Data Source=sqlserver.eshoponservicefabric,5433;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word"/>
<EnvironmentVariable Name="identityUrl" Value="http://identityapi.eshoponservicefabric:5105"/>
<EnvironmentVariable Name="IdentityUrlExternal" Value="http://your_sf_dns:5105"/>
<EnvironmentVariable Name="IdentityUrlExternal" Value=""/>
<EnvironmentVariable Name="EventBusConnection" Value="rabbitmq.eshoponservicefabric"/>
<EnvironmentVariable Name="AzureServiceBusEnabled" Value="False"/>
<EnvironmentVariable Name="UseCustomizationData" Value="True"/>

1
ServiceFabric/eShopOnServiceFabric/ApplicationParameters/Cloud.xml
View File

@ -12,5 +12,6 @@
<Parameter Name="OrderingApi_InstanceCount" Value="-1" />
<Parameter Name="CatalogApi_InstanceCount" Value="-1" />
<Parameter Name="BasketApi_InstanceCount" Value="-1" />
<Parameter Name="IdentityUrlExternal" Value="http://your_sf_dns:5105" />
</Parameters>
</Application>

18
ServiceFabric/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationPackageRoot/ApplicationManifest.xml
View File

@ -6,13 +6,29 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Parameters>
<Parameter Name="IdentityApi_InstanceCount" DefaultValue="-1" />
<Parameter Name="SpaClient" DefaultValue="" />
<Parameter Name="XamarinCallback" DefaultValue="" />
<Parameter Name="MvcClient" DefaultValue="" />
<Parameter Name="LocationApiClient" DefaultValue="" />
<Parameter Name="MarketingApiClient" DefaultValue="" />
<Parameter Name="BasketApiClient" DefaultValue="" />
<Parameter Name="OrderingApiClient" DefaultValue="" />
</Parameters>
<!-- Import the ServiceManifest from the ServicePackage. The ServiceManifestName and ServiceManifestVersion
should match the Name and Version attributes of the ServiceManifest element defined in the
ServiceManifest.xml file. -->
<ServiceManifestImport>
<ServiceManifestRef ServiceManifestName="IdentityApiPkg" ServiceManifestVersion="1.0.0" />
<ConfigOverrides />
<!-- Override external urls depending on environment -->
<EnvironmentOverrides CodePackageRef="Code">
<EnvironmentVariable Name="SpaClient" Value="[SpaClient]"/>
<EnvironmentVariable Name="XamarinCallback" Value="[XamarinCallback]"/>
<EnvironmentVariable Name="MvcClient" Value="[MvcClient]"/>
<EnvironmentVariable Name="LocationApiClient" Value="[LocationApiClient]"/>
<EnvironmentVariable Name="MarketingApiClient" Value="[MarketingApiClient]"/>
<EnvironmentVariable Name="BasketApiClient" Value="[BasketApiClient]"/>
<EnvironmentVariable Name="OrderingApiClient" Value="[OrderingApiClient]"/>
</EnvironmentOverrides>
<Policies>
<ContainerHostPolicies CodePackageRef="Code">
<PortBinding ContainerPort="80" EndpointRef="IdentityApiTypeEndpoint"/>

10
ServiceFabric/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationPackageRoot/IdentityApiPkg/ServiceManifest.xml
View File

@ -19,21 +19,21 @@
</ContainerHost>
</EntryPoint>
<!-- Pass environment variables to your container: -->
<EnvironmentVariables>
<EnvironmentVariable Name="ASPNETCORE_ENVIRONMENT" Value="Development"/>
<EnvironmentVariable Name="ASPNETCORE_URLS" Value="http://0.0.0.0:80"/>
<EnvironmentVariable Name="SpaClient" Value="http://your_sf_dns:5104"/>
<EnvironmentVariable Name="XamarinCallback" Value="http://your_sf_dns:5105/xamarincallback"/>
<EnvironmentVariable Name="SpaClient" Value=""/>
<EnvironmentVariable Name="XamarinCallback" Value=""/>
<EnvironmentVariable Name="ConnectionString" Value="Data Source=sqlserver.eshoponservicefabric,5433;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word"/>
<EnvironmentVariable Name="MvcClient" Value="http://your_sf_dns:5100"/>
<EnvironmentVariable Name="MvcClient" Value=""/>
<EnvironmentVariable Name="LocationApiClient" Value=""/>
<EnvironmentVariable Name="MarketingApiClient" Value=""/>
<EnvironmentVariable Name="BasketApiClient" Value=""/>
<EnvironmentVariable Name="OrderingApiClient" Value=""/>
<EnvironmentVariable Name="UseCustomizationData" Value="True"/>
</EnvironmentVariables>
</CodePackage>
<!-- Config package is the contents of the Config directoy under PackageRoot that contains an

9
ServiceFabric/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationParameters/Cloud.xml
View File

@ -2,5 +2,12 @@
<Application Name="fabric:/eShopOnServiceFabricIdSrv" xmlns="http://schemas.microsoft.com/2011/01/fabric" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Parameters>
<Parameter Name="IdentityApi_InstanceCount" Value="-1" />
<Parameter Name="SpaClient" Value="http://your_sf_dns:5104" />
<Parameter Name="XamarinCallback" Value="http://your_sf_dns:5105/xamarincallback" />
<Parameter Name="MvcClient" Value="http://your_sf_dns:5100" />
<Parameter Name="LocationApiClient" Value="http://your_sf_dns:19081/eShopOnServiceFabric/LocationsApi" />
<Parameter Name="MarketingApiClient" Value="http://your_sf_dns:19081/eShopOnServiceFabric/MarketingApi" />
<Parameter Name="BasketApiClient" Value="http://your_sf_dns:19081/eShopOnServiceFabric/BasketApi" />
<Parameter Name="OrderingApiClient" Value="http://your_sf_dns:19081/eShopOnServiceFabric/OrderingApi" />
</Parameters>
</Application>
</Application>

6
ServiceFabric/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationPackageRoot/ApplicationManifest.xml
View File

@ -6,13 +6,17 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Parameters>
<Parameter Name="WebMVC_InstanceCount" DefaultValue="-1" />
<Parameter Name="IdentityUrl" DefaultValue="" />
</Parameters>
<!-- Import the ServiceManifest from the ServicePackage. The ServiceManifestName and ServiceManifestVersion
should match the Name and Version attributes of the ServiceManifest element defined in the
ServiceManifest.xml file. -->
<ServiceManifestImport>
<ServiceManifestRef ServiceManifestName="WebMVCPkg" ServiceManifestVersion="1.0.0" />
<ConfigOverrides />
<!-- Override external urls depending on environment -->
<EnvironmentOverrides CodePackageRef="Code">
<EnvironmentVariable Name="IdentityUrl" Value="[IdentityUrl]"/>
</EnvironmentOverrides>
<Policies>
<ContainerHostPolicies CodePackageRef="Code">
<PortBinding ContainerPort="80" EndpointRef="WebMVCTypeEndpoint"/>

2
ServiceFabric/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationPackageRoot/WebMVCPkg/ServiceManifest.xml
View File

@ -25,7 +25,7 @@
<EnvironmentVariable Name="CatalogUrl" Value="http://catalogapi.eshoponservicefabric:5101"/>
<EnvironmentVariable Name="OrderingUrl" Value="http://orderingapi.eshoponservicefabric:5102"/>
<EnvironmentVariable Name="BasketUrl" Value="http://basketapi.eshoponservicefabric:5103"/>
<EnvironmentVariable Name="IdentityUrl" Value="http://your_sf_dns:5105"/>
<EnvironmentVariable Name="IdentityUrl" Value=""/>
<EnvironmentVariable Name="MarketingUrl" Value="http://marketingapi.eshoponservicefabric:5110"/>
</EnvironmentVariables>
</CodePackage>

1
ServiceFabric/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationParameters/Cloud.xml
View File

@ -2,5 +2,6 @@
<Application Name="fabric:/eShopOnServiceFabricWebMVC" xmlns="http://schemas.microsoft.com/2011/01/fabric" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Parameters>
<Parameter Name="WebMVC_InstanceCount" Value="-1" />
<Parameter Name="IdentityUrl" Value="http://your_sf_dns:5105" />
</Parameters>
</Application>

14
ServiceFabric/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/ApplicationManifest.xml
View File

@ -6,13 +6,25 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Parameters>
<Parameter Name="WebSPA_InstanceCount" DefaultValue="-1" />
<Parameter Name="CatalogUrl" DefaultValue="" />
<Parameter Name="OrderingUrl" DefaultValue="" />
<Parameter Name="BasketUrl" DefaultValue="" />
<Parameter Name="MarketingUrl" DefaultValue="" />
<Parameter Name="IdentityUrl" DefaultValue="" />
</Parameters>
<!-- Import the ServiceManifest from the ServicePackage. The ServiceManifestName and ServiceManifestVersion
should match the Name and Version attributes of the ServiceManifest element defined in the
ServiceManifest.xml file. -->
<ServiceManifestImport>
<ServiceManifestRef ServiceManifestName="WebSPAPkg" ServiceManifestVersion="1.0.0" />
<ConfigOverrides />
<!-- Override external urls depending on environment -->
<EnvironmentOverrides CodePackageRef="Code">
<EnvironmentVariable Name="CatalogUrl" Value="[CatalogUrl]"/>
<EnvironmentVariable Name="OrderingUrl" Value="[OrderingUrl]"/>
<EnvironmentVariable Name="BasketUrl" Value="[BasketUrl]"/>
<EnvironmentVariable Name="MarketingUrl" Value="[MarketingUrl]"/>
<EnvironmentVariable Name="IdentityUrl" Value="[IdentityUrl]"/>
</EnvironmentOverrides>
<Policies>
<ContainerHostPolicies CodePackageRef="Code">
<PortBinding ContainerPort="80" EndpointRef="WebSPATypeEndpoint"/>

7
ServiceFabric/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationParameters/Cloud.xml
View File

@ -2,5 +2,10 @@
<Application Name="fabric:/eShopOnServiceFabricWebSPA" xmlns="http://schemas.microsoft.com/2011/01/fabric" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Parameters>
<Parameter Name="WebSPA_InstanceCount" Value="-1" />
<Parameter Name="CatalogUrl" Value="http://your_sf_dns:19081/eShopOnServiceFabric/CatalogApi" />
<Parameter Name="OrderingUrl" Value="http://your_sf_dns:19081/eShopOnServiceFabric/OrderingApi" />
<Parameter Name="BasketUrl" Value="http://your_sf_dns:19081/eShopOnServiceFabric/BasketApi" />
<Parameter Name="MarketingUrl" Value="http://your_sf_dns:19081/eShopOnServiceFabric/MarketingApi" />
<Parameter Name="IdentityUrl" Value="http://your_sf_dns:5105" />
</Parameters>
</Application>
</Application>

2
src/Services/Basket/Basket.API/Startup.cs
View File

@ -185,7 +185,7 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API
app.UseSwagger()
.UseSwaggerUI(c =>
{
c.SwaggerEndpoint("/swagger/v1/swagger.json", "My API V1");
c.SwaggerEndpoint($"{ (!string.IsNullOrEmpty(pathBase) ? pathBase : string.Empty) }/swagger/v1/swagger.json", "My API V1");
c.ConfigureOAuth2("basketswaggerui", "", "", "Basket Swagger UI");
});

2
src/Services/Location/Locations.API/Startup.cs
View File

@ -156,7 +156,7 @@ namespace Microsoft.eShopOnContainers.Services.Locations.API
app.UseSwagger()
.UseSwaggerUI(c =>
{
c.SwaggerEndpoint("/swagger/v1/swagger.json", "My API V1");
c.SwaggerEndpoint($"{ (!string.IsNullOrEmpty(pathBase) ? pathBase : string.Empty) }/swagger/v1/swagger.json", "My API V1");
c.ConfigureOAuth2("locationsswaggerui", "", "", "Locations Swagger UI");
});

2
src/Services/Marketing/Marketing.API/Startup.cs
View File

@ -188,7 +188,7 @@
app.UseSwagger()
.UseSwaggerUI(c =>
{
c.SwaggerEndpoint("/swagger/v1/swagger.json", "My API V1");
c.SwaggerEndpoint($"{ (!string.IsNullOrEmpty(pathBase) ? pathBase : string.Empty) }/swagger/v1/swagger.json", "My API V1");
c.ConfigureOAuth2("marketingswaggerui", "", "", "Marketing Swagger UI");
});

2
src/Services/Payment/Payment.API/Startup.cs
View File

@ -103,7 +103,7 @@ namespace Payment.API
app.UseSwagger()
.UseSwaggerUI(c =>
{
c.SwaggerEndpoint("/swagger/v1/swagger.json", "My API V1");
c.SwaggerEndpoint($"{ (!string.IsNullOrEmpty(pathBase) ? pathBase : string.Empty) }/swagger/v1/swagger.json", "My API V1");
});
ConfigureEventBus(app);