Merge pull request #201574 from hickeys/users/ahmedb/ahmedb-frs

new serviceendpoint replacing orderer and storage endpoints

Author: laurabren

articles/azure-fluid-relay/concepts/version-compatibility.md

@@ -1,7 +1,6 @@
 ---
 title: Version compatibility with Fluid Framework releases
-description: |
-  How to determine what versions of the Fluid Framework releases are compatible with Azure Fluid Relay service.
+description: How to determine what versions of the Fluid Framework releases are compatible with Azure Fluid Relay
 services: azure-fluid
 author: tylerbutler
 ms.author: tylerbu
@@ -31,19 +30,25 @@ npx install-peerdeps @fluidframework/azure-client
 ```
 
 > [!TIP]
-> During Public Preview, the versions of **@fluidframework/azure-client** and **fluid-framework** will match. That is, if
-> the current release of **@fluidframework/azure-client** is 0.48, then it will be compatible with **fluid-framework** 0.48. The inverse is also true.
+> If building with any pre-release version of of **@fluidframework/azure-client** and **fluid-framework** we strongly recommend that you update to the latest 1.0 version. Earlier versions will not be
+> supported with the General Availability of Azure Fluid Relay. With this upgrade, you’ll make use of our new multi-region routing capability where
+> Azure Fluid Relay will host your session closer to your end users to improve customer experience. In the latest package, you will need to update your
+> serviceConfig object to the new Azure Fluid Relay service endpoint instead of the storage and orderer endpoints:
+> If your Azure Fluid Relay resource is in West US 2, please use **https://us.fluidrelay.azure.com**. If it is West Europe, 
+> use **https://eu.fluidrelay.azure.com**. If it is in Southeast Asia, use **https://global.fluidrelay.azure.com**.
+> These values can also be found in the "Access Key" section of the Fluid Relay resource in the Azure portal. The orderer and storage endpoints will be deprecated soon.
+
 
 ## Compatibility table
 
 | npm package                         | Minimum version | API                                                              |
 | ----------------------------------  | :-------------- | :--------------------------------------------------------------- |
-| @fluidframework/azure-client        | [0.48.4][]      | [API](https://fluidframework.com/docs/apis/azure-client/)        |
-| fluid-framework                     | [0.48.4][]      | [API](https://fluidframework.com/docs/apis/fluid-framework/)     |
-| @fluidframework/azure-service-utils | [0.48.4][]      | [API](https://fluidframework.com/docs/apis/azure-service-utils/) |
-| @fluidframework/test-client-utils   | [0.48.4][]      | [API](https://fluidframework.com/docs/apis/test-client-utils/)   |
+| @fluidframework/azure-client        | [1.0.1][]      | [API](https://fluidframework.com/docs/apis/azure-client/)        |
+| fluid-framework                     | [1.0.1][]      | [API](https://fluidframework.com/docs/apis/fluid-framework/)     |
+| @fluidframework/azure-service-utils | [1.0.1][]      | [API](https://fluidframework.com/docs/apis/azure-service-utils/) |
+| @fluidframework/test-client-utils   | [1.0.1][]      | [API](https://fluidframework.com/docs/apis/test-client-utils/)   |
 
-[0.48.4]: https://fluidframework.com/docs/updates/v0.48/
+[1.0.1]: https://fluidframework.com/docs/updates/v1.0.0/
 
 ## Next steps
 

articles/azure-fluid-relay/how-tos/connect-fluid-azure-service.md

@@ -35,8 +35,8 @@ To connect to an Azure Fluid Relay instance you first need to create an `AzureCl
 const config = {
   tenantId: "myTenantId",
   tokenProvider: new InsecureTokenProvider("myTenantKey", { id: "userId" }),
-  orderer: "https://myOrdererUrl",
-  storage: "https://myStorageUrl",
+  endpoint: "https://myServiceEndpointUrl",
+  type: "remote",
 };
 
 const clientProps = {
@@ -59,8 +59,8 @@ const config = {
     "myAzureFunctionUrl" + "/api/GetAzureToken",
     { userId: "userId", userName: "Test User" }
   ),
-  orderer: "https://myOrdererUrl",
-  storage: "https://myStorageUrl",
+  endpoint: "https://myServiceEndpointUrl",
+  type: "remote",
 };
 
 const clientProps = {
@@ -86,8 +86,8 @@ const config = {
     "myAzureFunctionUrl" + "/api/GetAzureToken",
     { userId: "UserId", userName: "Test User", additionalDetails: userDetails }
   ),
-  orderer: "https://myOrdererUrl",
-  storage: "https://myStorageUrl",
+  endpoint: "https://myServiceEndpointUrl",
+  type: "remote",
 };
 ```
 

articles/azure-fluid-relay/how-tos/local-mode-with-azure-client.md

@@ -28,8 +28,8 @@ This article walks through the steps to configure **AzureClient** in local mode
         connection: {
             tenantId: LOCAL_MODE_TENANT_ID,
             tokenProvider: new InsecureTokenProvider("", { id: "123", name: "Test User" }),
-            orderer: "http://localhost:7070",
-            storage: "http://localhost:7070",
+            endpoint: "http://localhost:7070",
+            type: "remote",
         },
     };
 

articles/azure-fluid-relay/how-tos/test-automation.md

@@ -34,17 +34,15 @@ function createAzureClient(): AzureClient {
     const user = { id: "userId", name: "Test User" };
 
     const connectionConfig = useAzure ? {
+        type: "remote",
         tenantId: "myTenantId",
         tokenProvider: new InsecureTokenProvider(tenantKey, user),
-        orderer: "https://myOrdererUrl",
-        storage: "https://myStorageUrl",
+        endpoint: "https://myServiceEndpointUrl",
     } : {
-        tenantId: LOCAL_MODE_TENANT_ID,
+        type: "local",
         tokenProvider: new InsecureTokenProvider("", user),
-        orderer: "http://localhost:7070",
-        storage: "http://localhost:7070",
+        endpoint: "http://localhost:7070",
     };
-
     const clientProps = {
         connection: config,
     };

articles/azure-fluid-relay/quickstarts/quickstart-dice-roll.md

@@ -55,16 +55,16 @@ To run against the Azure Fluid Relay service, you'll need to update your app's c
 
 ### Configure and create an Azure client
 
-To configure the Azure client, replace the values in the `serviceConfig` object in `app.js` with your Azure Fluid Relay
-service configuration values. These values can be found in the "Access Key" section of the Fluid Relay resource in the Azure portal.
+To configure the Azure client, replace the local connection `serviceConfig` object in `app.js` with your Azure Fluid Relay
+service configuration values. These values can be found in the "Access Key" section of the Fluid Relay resource in the Azure portal. Your `serviceConfig` object should look like this with the values replaced
 
 ```javascript
 const serviceConfig = {
     connection: {
-        tenantId: LOCAL_MODE_TENANT_ID, // REPLACE WITH YOUR TENANT ID
+        tenantId: "MY_TENANT_ID", // REPLACE WITH YOUR TENANT ID
         tokenProvider: new InsecureTokenProvider("" /* REPLACE WITH YOUR PRIMARY KEY */, { id: "userId" }),
-        orderer: "http://localhost:7070", // REPLACE WITH YOUR ORDERER ENDPOINT
-        storage: "http://localhost:7070", // REPLACE WITH YOUR STORAGE ENDPOINT
+        endpoint: "https://myServiceEndpointUrl", // REPLACE WITH YOUR SERVICE ENDPOINT
+        type: "remote",
     }
 };
 ```