Added SuffixPath attr to service endpoints

Added SetBasePath env. var setting to services
vszhou · Sep 8, 2017 · de9b655 · de9b655
1 parent 2cad76c
commit de9b655
Show file tree

Hide file tree

Showing 12 changed files with 35 additions and 28 deletions.
diff --git a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/ApplicationManifest.xml b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/ApplicationManifest.xml
@@ -37,7 +37,7 @@
     <ConfigOverrides />
     <Policies>
     <ContainerHostPolicies CodePackageRef="Code">
-      <PortBinding ContainerPort="5110" EndpointRef="MarketingApiTypeEndpoint"/>
+      <PortBinding ContainerPort="80" EndpointRef="MarketingApiTypeEndpoint"/>
     </ContainerHostPolicies>
       </Policies>
   </ServiceManifestImport>
@@ -55,7 +55,7 @@
     <ConfigOverrides />
     <Policies>
       <ContainerHostPolicies CodePackageRef="Code">
-        <PortBinding ContainerPort="5109" EndpointRef="LocationsApiTypeEndpoint"/>
+        <PortBinding ContainerPort="80" EndpointRef="LocationsApiTypeEndpoint"/>
       </ContainerHostPolicies>
     </Policies>
   </ServiceManifestImport>
@@ -64,7 +64,7 @@
     <ConfigOverrides />
     <Policies>
       <ContainerHostPolicies CodePackageRef="Code">
-        <PortBinding ContainerPort="5108" EndpointRef="PaymentApiTypeEndpoint"/>
+        <PortBinding ContainerPort="80" EndpointRef="PaymentApiTypeEndpoint"/>
       </ContainerHostPolicies>
     </Policies>
   </ServiceManifestImport>

diff --git a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/BasketApiPkg/ServiceManifest.xml b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/BasketApiPkg/ServiceManifest.xml
@@ -24,11 +24,12 @@
       <EnvironmentVariable Name="ASPNETCORE_URLS" Value="http://0.0.0.0:80"/>
       <EnvironmentVariable Name="ConnectionString" Value="basketdata.eshoponservicefabric"/>
       <EnvironmentVariable Name="identityUrl" Value="http://identityapi.eshoponservicefabric:5105"/>
-      <EnvironmentVariable Name="IdentityUrlExternal" Value="http://your_servicefabric_dns:19081/eShopOnServiceFabric/IdentityApi"/>
+      <EnvironmentVariable Name="IdentityUrlExternal" Value="http://your_dns_servicefabric:19081/eShopOnServiceFabric/IdentityApi"/>
       <EnvironmentVariable Name="EventBusConnection" Value="rabbitmq.eshoponservicefabric"/>
       <EnvironmentVariable Name="AzureServiceBusEnabled" Value="False"/>
       <EnvironmentVariable Name="EventBusUserName" Value="admin"/>
       <EnvironmentVariable Name="EventBusPassword" Value="password"/>
+      <EnvironmentVariable Name="PATH_BASE" Value="/eShopOnServiceFabric/BasketApi"/>
     </EnvironmentVariables>
   </CodePackage>
 
@@ -41,7 +42,7 @@
       <!-- This endpoint is used by the communication listener to obtain the port on which to 
            listen. Please note that if your service is partitioned, this port is shared with 
            replicas of different partitions that are placed in your code. -->
-      <Endpoint Name="BasketApiTypeEndpoint" Port="5103" UriScheme="http" />
+      <Endpoint Name="BasketApiTypeEndpoint" Port="5103" UriScheme="http" PathSuffix="eShopOnServiceFabric/BasketApi"/>
     </Endpoints>
   </Resources>
 </ServiceManifest>
diff --git a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/CatalogApiPkg/ServiceManifest.xml b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/CatalogApiPkg/ServiceManifest.xml
@@ -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_servicefabric_dns:19081/eShopOnServiceFabric/CatalogApi/api/v1/catalog/items/[0]/pic/"/>
+      <EnvironmentVariable Name="PicBaseUrl" Value="http://your_dns_servicefabric:19081/eShopOnServiceFabric/CatalogApi/api/v1/catalog/items/[0]/pic/"/>
       <EnvironmentVariable Name="AzureStorageAccountName" Value=""/>
       <EnvironmentVariable Name="AzureStorageAccountKey" Value=""/>
       <EnvironmentVariable Name="UseCustomizationData" Value="True"/>
@@ -32,6 +32,7 @@
       <EnvironmentVariable Name="AzureServiceBusEnabled" Value="False"/>
       <EnvironmentVariable Name="EventBusUserName" Value="admin"/>
       <EnvironmentVariable Name="EventBusPassword" Value="password"/>
+      <EnvironmentVariable Name="PATH_BASE" Value="/eShopOnServiceFabric/CatalogApi"/>
     </EnvironmentVariables>
   </CodePackage>
 
@@ -44,7 +45,7 @@
       <!-- This endpoint is used by the communication listener to obtain the port on which to 
            listen. Please note that if your service is partitioned, this port is shared with 
            replicas of different partitions that are placed in your code. -->
-      <Endpoint Name="CatalogApiTypeEndpoint" Port="5101" UriScheme="http" />
+      <Endpoint Name="CatalogApiTypeEndpoint" Port="5101" UriScheme="http" PathSuffix="eShopOnServiceFabric/CatalogApi"/>
     </Endpoints>
   </Resources>
 </ServiceManifest>
diff --git a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/IdentityApiPkg/ServiceManifest.xml b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/IdentityApiPkg/ServiceManifest.xml
@@ -23,10 +23,10 @@
       <EnvironmentVariable Name="ASPNETCORE_ENVIRONMENT" Value="Development"/>
       <EnvironmentVariable Name="ASPNETCORE_URLS" Value="http://0.0.0.0:80"/>
       <EnvironmentVariable Name="PATH_BASE" Value="/eShopOnServiceFabric/IdentityApi"/>
-      <EnvironmentVariable Name="SpaClient" Value="http://your_servicefabric_dns:19081/eShopOnServiceFabric/WebSPA"/>
-      <EnvironmentVariable Name="XamarinCallback" Value="http://your_servicefabric_dns:19081/eShopOnServiceFabric/IdentityApi/xamarincallback"/>      
-      <EnvironmentVariable Name="ConnectionString" Value="Data Source=sqlserver.eshoponservicefabric,5433;Database=Microsoft.eShopOnContainers.Services.IdentityDb;User Id=sa;Password=Pass@word"/>
-      <EnvironmentVariable Name="MvcClient" Value="http://your_servicefabric_dns:19081/eShopOnServiceFabric/WebMVC"/>
+      <EnvironmentVariable Name="SpaClient" Value="http://your_dns_servicefabric:19081/eShopOnServiceFabric/WebSPA"/>
+      <EnvironmentVariable Name="XamarinCallback" Value="http://your_dns_servicefabric:19081/eShopOnServiceFabric/IdentityApi/xamarincallback"/>      
+      <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_dns_servicefabric:19081/eShopOnServiceFabric/WebMVC"/>
       <EnvironmentVariable Name="LocationApiClient" Value=""/>
       <EnvironmentVariable Name="MarketingApiClient" Value=""/>
       <EnvironmentVariable Name="BasketApiClient" Value=""/>

diff --git a/...iceFabric/eShopOnServiceFabric/ApplicationPackageRoot/LocationsApiPkg/ServiceManifest.xml b/...iceFabric/eShopOnServiceFabric/ApplicationPackageRoot/LocationsApiPkg/ServiceManifest.xml
@@ -25,11 +25,12 @@
       <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_servicefabric_dns:19081/eShopOnServiceFabric/IdentityApi"/>
+      <EnvironmentVariable Name="IdentityUrlExternal" Value="http://your_dns_servicefabric:19081/eShopOnServiceFabric/IdentityApi"/>
       <EnvironmentVariable Name="EventBusConnection" Value="rabbitmq.eshoponservicefabric"/>
       <EnvironmentVariable Name="AzureServiceBusEnabled" Value="False"/>      
       <EnvironmentVariable Name="EventBusUserName" Value="admin"/>
       <EnvironmentVariable Name="EventBusPassword" Value="password"/>
+      <EnvironmentVariable Name="PATH_BASE" Value="/eShopOnServiceFabric/LocationsApi"/>
     </EnvironmentVariables>
   </CodePackage>
 
@@ -42,7 +43,7 @@
       <!-- This endpoint is used by the communication listener to obtain the port on which to 
            listen. Please note that if your service is partitioned, this port is shared with 
            replicas of different partitions that are placed in your code. -->
-      <Endpoint Name="LocationsApiTypeEndpoint" Port="5109"/>
+      <Endpoint Name="LocationsApiTypeEndpoint" Port="5109" PathSuffix="eShopOnServiceFabric/LocationsApi"/>
     </Endpoints>
   </Resources>
 </ServiceManifest>
diff --git a/...iceFabric/eShopOnServiceFabric/ApplicationPackageRoot/MarketingApiPkg/ServiceManifest.xml b/...iceFabric/eShopOnServiceFabric/ApplicationPackageRoot/MarketingApiPkg/ServiceManifest.xml
@@ -22,9 +22,8 @@
     <EnvironmentVariables>
       <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="identityUrl" Value="http://identityapi.eshoponservicefabric"/>
-      <EnvironmentVariable Name="IdentityUrlExternal" Value="http://your_servicefabric_dns:19081/eShopOnServiceFabric/IdentityApi"/>
+      <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_dns_servicefabric:19081/eShopOnServiceFabric/IdentityApi"/>
       <EnvironmentVariable Name="EventBusConnection" Value="rabbitmq.eshoponservicefabric"/>
       <EnvironmentVariable Name="AzureServiceBusEnabled" Value="False"/>
       <EnvironmentVariable Name="CampaignDetailFunctionUri" Value=""/>
@@ -34,6 +33,7 @@
       <EnvironmentVariable Name="AzureStorageEnabled" Value="False"/>
       <EnvironmentVariable Name="EventBusUserName" Value="admin"/>
       <EnvironmentVariable Name="EventBusPassword" Value="password"/>
+      <EnvironmentVariable Name="PATH_BASE" Value="/eShopOnServiceFabric/MarketingApi"/>
     </EnvironmentVariables>
   </CodePackage>
 
@@ -46,7 +46,7 @@
       <!-- This endpoint is used by the communication listener to obtain the port on which to 
            listen. Please note that if your service is partitioned, this port is shared with 
            replicas of different partitions that are placed in your code. -->
-      <Endpoint Name="MarketingApiTypeEndpoint" Port="5110"/>
+      <Endpoint Name="MarketingApiTypeEndpoint" Port="5110" PathSuffix="eShopOnServiceFabric/MarketingApi"/>
     </Endpoints>
   </Resources>
 </ServiceManifest>
diff --git a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/OrderingApiPkg/ServiceManifest.xml b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/OrderingApiPkg/ServiceManifest.xml
@@ -24,14 +24,15 @@
       <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_servicefabric_dns:19081/eShopOnServiceFabric/IdentityApi"/>
+      <EnvironmentVariable Name="IdentityUrlExternal" Value="http://your_dns_servicefabric:19081/eShopOnServiceFabric/IdentityApi"/>
       <EnvironmentVariable Name="EventBusConnection" Value="rabbitmq.eshoponservicefabric"/>
       <EnvironmentVariable Name="AzureServiceBusEnabled" Value="False"/>
       <EnvironmentVariable Name="UseCustomizationData" Value="True"/>
       <EnvironmentVariable Name="GracePeriodTime" Value="1"/>
       <EnvironmentVariable Name="CheckUpdateTime" Value="30000"/>
       <EnvironmentVariable Name="EventBusUserName" Value="admin"/>
       <EnvironmentVariable Name="EventBusPassword" Value="password"/>
+      <EnvironmentVariable Name="PATH_BASE" Value="/eShopOnServiceFabric/OrderingApi"/>
     </EnvironmentVariables>
   </CodePackage>
 
@@ -44,7 +45,7 @@
       <!-- This endpoint is used by the communication listener to obtain the port on which to 
            listen. Please note that if your service is partitioned, this port is shared with 
            replicas of different partitions that are placed in your code. -->
-      <Endpoint Name="OrderingApiTypeEndpoint" Port="80" UriScheme="http" />
+      <Endpoint Name="OrderingApiTypeEndpoint" Port="80" UriScheme="http" PathSuffix="eShopOnServiceFabric/OrderingApi"/>
     </Endpoints>
   </Resources>
 </ServiceManifest>
diff --git a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/PaymentApiPkg/ServiceManifest.xml b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/PaymentApiPkg/ServiceManifest.xml
@@ -26,6 +26,7 @@
       <EnvironmentVariable Name="AzureServiceBusEnabled" Value="False"/>      
       <EnvironmentVariable Name="EventBusUserName" Value="admin"/>
       <EnvironmentVariable Name="EventBusPassword" Value="password"/>
+      <EnvironmentVariable Name="PATH_BASE" Value="/eShopOnServiceFabric/PaymentApi"/>
     </EnvironmentVariables>
   </CodePackage>
 
@@ -38,7 +39,7 @@
       <!-- This endpoint is used by the communication listener to obtain the port on which to 
            listen. Please note that if your service is partitioned, this port is shared with 
            replicas of different partitions that are placed in your code. -->
-      <Endpoint Name="PaymentApiTypeEndpoint" Port="5108" />
+      <Endpoint Name="PaymentApiTypeEndpoint" Port="5108" PathSuffix="eShopOnServiceFabric/PaymentApi"/>
     </Endpoints>
   </Resources>
 </ServiceManifest>
diff --git a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/WebMVCPkg/ServiceManifest.xml b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/WebMVCPkg/ServiceManifest.xml
@@ -26,7 +26,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://eshopservicefabricwin:19081/eShopOnServiceFabric/IdentityApi"/>
+      <EnvironmentVariable Name="IdentityUrl" Value="http://your_dns_servicefabric:19081/eShopOnServiceFabric/IdentityApi"/>
       <EnvironmentVariable Name="MarketingUrl" Value=""/>
     </EnvironmentVariables>
   </CodePackage>

diff --git a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/WebSPAPkg/ServiceManifest.xml b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/WebSPAPkg/ServiceManifest.xml
@@ -22,17 +22,18 @@
     <EnvironmentVariables>
       <EnvironmentVariable Name="ASPNETCORE_ENVIRONMENT" Value="Development"/>
       <EnvironmentVariable Name="ASPNETCORE_URLS" Value="http://0.0.0.0:80"/>
-      <EnvironmentVariable Name="CatalogUrl" Value="http://your_servicefabric_dns:19081/eShopOnServiceFabric/CatalogApi"/>
-      <EnvironmentVariable Name="OrderingUrl" Value="http://your_servicefabric_dns:19081/eShopOnServiceFabric/OrderingApi"/>
-      <EnvironmentVariable Name="IdentityUrl" Value="http://your_servicefabric_dns:19081/eShopOnServiceFabric/IdentityApi"/>
-      <EnvironmentVariable Name="BasketUrl" Value="http://your_servicefabric_dns:19081/eShopOnServiceFabric/BasketApi"/>
+      <EnvironmentVariable Name="CatalogUrl" Value="http://your_dns_servicefabric:19081/eShopOnServiceFabric/CatalogApi"/>
+      <EnvironmentVariable Name="OrderingUrl" Value="http://your_dns_servicefabric:19081/eShopOnServiceFabric/OrderingApi"/>
+      <EnvironmentVariable Name="IdentityUrl" Value="http://your_dns_servicefabric:19081/eShopOnServiceFabric/IdentityApi"/>
+      <EnvironmentVariable Name="BasketUrl" Value="http://your_dns_servicefabric:19081/eShopOnServiceFabric/BasketApi"/>
       <EnvironmentVariable Name="MarketingUrl" Value=""/>
       <EnvironmentVariable Name="CatalogUrlHC" Value="http://catalogapi.eshoponservicefabric:5101/hc"/>
       <EnvironmentVariable Name="OrderingUrlHC" Value="http://orderingapi.eshoponservicefabric:5102/hc"/>
       <EnvironmentVariable Name="IdentityUrlHC" Value="http://identityapi.eshoponservicefabric:5105/hc"/>
       <EnvironmentVariable Name="BasketUrlHC" Value="http://basketapi.eshoponservicefabric:5103/hc"/>
       <EnvironmentVariable Name="MarketingUrlHC" Value="http://marketingapi.eshoponservicefabric:5110/hc"/>
       <EnvironmentVariable Name="UseCustomizationData" Value="True"/>
+      <EnvironmentVariable Name="PATH_BASE" Value="/eShopOnServiceFabric/WebSPA"/>
     </EnvironmentVariables>
   </CodePackage>
 
@@ -45,7 +46,7 @@
       <!-- This endpoint is used by the communication listener to obtain the port on which to 
            listen. Please note that if your service is partitioned, this port is shared with 
            replicas of different partitions that are placed in your code. -->
-      <Endpoint Name="WebSPATypeEndpoint" Port="5104" UriScheme="http" />
+      <Endpoint Name="WebSPATypeEndpoint" Port="5104" UriScheme="http" PathSuffix="eShopOnServiceFabric/WebSPA"/>
     </Endpoints>
   </Resources>
 </ServiceManifest>
diff --git a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/WebStatusPkg/ServiceManifest.xml b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/WebStatusPkg/ServiceManifest.xml
@@ -30,6 +30,7 @@
       <EnvironmentVariable Name="LocationsUrl" Value="http://locationsapi.eshoponservicefabric:5109"/>
       <EnvironmentVariable Name="mvc" Value="http://webmvc.eshoponservicefabric:5100"/>
       <EnvironmentVariable Name="spa" Value="http://webspa.eshoponservicefabric:5104"/>
+      <EnvironmentVariable Name="PATH_BASE" Value="/eShopOnServiceFabric/WebStatus"/>
     </EnvironmentVariables>
   </CodePackage>
 
@@ -42,7 +43,7 @@
       <!-- This endpoint is used by the communication listener to obtain the port on which to 
            listen. Please note that if your service is partitioned, this port is shared with 
            replicas of different partitions that are placed in your code. -->
-      <Endpoint Name="WebStatusTypeEndpoint" Port="5107" UriScheme="http" />
+      <Endpoint Name="WebStatusTypeEndpoint" Port="5107" UriScheme="http" PathSuffix="eShopOnServiceFabric/WebStatus"/>
     </Endpoints>
   </Resources>
 </ServiceManifest>
diff --git a/ServiceFabric/eShopOnServiceFabric/PublishProfiles/Cloud.xml b/ServiceFabric/eShopOnServiceFabric/PublishProfiles/Cloud.xml
@@ -20,6 +20,6 @@
                                     AzureActiveDirectory="true"
                                     ServerCertThumbprint="0123456789012345678901234567890123456789" />
   -->
-  <ClusterConnectionParameters ConnectionEndpoint="your_servicefabric_dns:19000" />
+  <ClusterConnectionParameters ConnectionEndpoint="your_dns_servicefabric:19000" />
   <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
 </PublishProfile>