Address comments, split section

Author: olegsavin

articles/hdinsight-aks/trino/trino-connect-to-metastore.md

@@ -35,26 +35,62 @@ The following example covers the addition of Hive catalog and metastore database
 
 **There are few important sections you need to add to your cluster ARM template to configure the Hive catalog and Hive metastore database:**
 
--	`secretsProfile` with Azure Key Vault and list of secrets to be used in Trino cluster, required to connect to external Hive metastore.
--	`serviceConfigsProfiles` with Trino catalogs. For more information, see [Add catalogs to existing cluster](trino-add-catalogs.md).
--   `hive.metastore=hdi` catalog property indicating to use external Hive metastores database with in-cluster hive metastore service, for each catalog where hive metastore is required.
--   `config.properties` with external Hive metastore database parameters. Alternatively same parameters specified in `trinoProfile.catalogOptions.hive` section.
+### Metastore configuration
+Configure external Hive metastore database which will be used by the cluster in `config.properties` file:
+```json
+{
+    "fileName": "config.properties",
+    "values": {
+        "hive.metastore.hdi.metastoreDbConnectionURL": "jdbc:sqlserver://mysqlserver1.database.windows.net;database=myhmsdb1;encrypt=true;trustServerCertificate=true;create=false;loginTimeout=30",
+        "hive.metastore.hdi.metastoreDbConnectionUserName": "trinoadmin",
+        "hive.metastore.hdi.metastoreDbConnectionPasswordSecret": "hms-db-pwd",
+        "hive.metastore.hdi.metastoreWarehouseDir": "abfs://[email protected]/hive/warehouse"
+    }
+}
+```
+| Property| Description| Example|
+|---|---|---|
+|hive.metastore.hdi.metastoreDbConnectionURL|JDBC connection string to database.|jdbc:sqlserver://mysqlserver1.database.windows.net;database=myhmsdb1;encrypt=true;trustServerCertificate=true;create=false;loginTimeout=30|
+|hive.metastore.hdi.metastoreDbConnectionUserName|SQL user name to connect to database.|trinoadmin|
+|hive.metastore.hdi.metastoreDbConnectionPasswordSecret|Secret referenceName configured in secretsProfile with password.|hms-db-pwd|
+|hive.metastore.hdi.metastoreWarehouseDir|ABFS URI to location in storage where data is stored.|`abfs://[email protected]/hive/warehouse`|
 
+### Metastore authentication
+Configure authentication to external Hive metastore database by specifiying Azure Key Vault secrets to use in ARM template.
+> [!NOTE]
+> `referenceName` should match value provided in `hive.metastore.hdi.metastoreDbConnectionPasswordSecret`
+```json
+"secretsProfile": {
+    "keyVaultResourceId": "/subscriptions/{USER_SUBSCRIPTION_ID}/resourceGroups/{USER_RESOURCE_GROUP}/providers/Microsoft.KeyVault/vaults/{USER_KEYVAULT_NAME}",
+    "secrets": [
+        {
+            "referenceName": "hms-db-pwd",
+            "type": "secret",
+            "keyVaultObjectName": "hms-db-pwd"
+        }                        ]
+},
+```
 | Property| Description| Example|
 |---|---|---|
 |secretsProfile.keyVaultResourceId|Azure resource ID string to Azure Key Vault where secrets for Hive metastore are stored.|/subscriptions/0000000-0000-0000-0000-000000000000/resourceGroups/trino-rg/providers/Microsoft.KeyVault/vaults/trinoakv|
 |secretsProfile.secrets[*].referenceName|Unique reference name of the secret to use later in clusterProfile.|Secret1_ref|
 |secretsProfile.secrets[*].type|Type of object in Azure Key Vault, only “secret” is supported.|secret|
 |secretsProfile.secrets[*].keyVaultObjectName|Name of secret object in Azure Key Vault containing actual secret value.|secret1|
-|trinoProfile.catalogOptions.hive|List of Hive or iceberg or delta catalogs with parameters of external Hive metastore database, require parameters for each. To use external metastore database, catalog must be present in this list.
-|trinoProfile.catalogOptions.hive[*].catalogName|Name of Trino catalog configured in `serviceConfigsProfiles`, which configured to use external Hive metastore database.|hive1|
-|config.properties/hive.metastore.hdi.metastoreDbConnectionURL (or trinoProfile.catalogOptions.hive[*].metastoreDbConnectionURL)|JDBC connection string to database.|jdbc:sqlserver://mysqlserver1.database.windows.net;database=myhmsdb1;encrypt=true;trustServerCertificate=true;create=false;loginTimeout=30|
-|hive.metastore.hdi.metastoreDbConnectionUserName (or trinoProfile.catalogOptions.hive[*].metastoreDbConnectionUserName)|SQL user name to connect to database.|trinoadmin|
-|hive.metastore.hdi.metastoreDbConnectionPasswordSecret (or trinoProfile.catalogOptions.hive[*].metastoreDbConnectionPasswordSecret)|Secret referenceName configured in secretsProfile with password.|hms-db-pwd|
-|hive.metastore.hdi.metastoreWarehouseDir (or trinoProfile.catalogOptions.hive[*].metastoreWarehouseDir)|ABFS URI to location in storage where data is stored.|`abfs://[email protected]/hive/warehouse`|
 
-To configure external Hive metastore to an existing Trino cluster, add the required sections in your cluster ARM template by referring to the following example:
+### Catalog configuration
+In order for a Trino catalog to use external Hive metastore it should specify `hive.metastore=hdi` property. For more information, see [Add catalogs to existing cluster](trino-add-catalogs.md):
+```
+{
+    "fileName": "hive1.properties",
+    "values": {
+        "connector.name": "hive",
+        "hive.metastore": "hdi"
+    }
+}
+```
 
+### Complete example
+To configure external Hive metastore to an existing Trino cluster, add the required sections in your cluster ARM template by referring to the following example:
 
 ```json
 {
@@ -91,10 +127,10 @@ To configure external Hive metastore to an existing Trino cluster, add the requi
                                         {
                                             "fileName": "config.properties",
                                             "values": {
-                                            "hive.metastore.hdi.metastoreDbConnectionURL": "jdbc:sqlserver://mysqlserver1.database.windows.net;database=myhmsdb1;encrypt=true;trustServerCertificate=true;create=false;loginTimeout=30",
-                                            "hive.metastore.hdi.metastoreDbConnectionUserName": "trinoadmin",
-                                            "hive.metastore.hdi.metastoreDbConnectionPasswordSecret": "hms-db-pwd",
-                                            "hive.metastore.hdi.metastoreWarehouseDir": "abfs://[email protected]/hive/warehouse"
+                                                "hive.metastore.hdi.metastoreDbConnectionURL": "jdbc:sqlserver://mysqlserver1.database.windows.net;database=myhmsdb1;encrypt=true;trustServerCertificate=true;create=false;loginTimeout=30",
+                                                "hive.metastore.hdi.metastoreDbConnectionUserName": "trinoadmin",
+                                                "hive.metastore.hdi.metastoreDbConnectionPasswordSecret": "hms-db-pwd",
+                                                "hive.metastore.hdi.metastoreWarehouseDir": "abfs://[email protected]/hive/warehouse"
                                             }
                                         }
                                     ]
@@ -139,9 +175,18 @@ select * from hive1.schema1.tpchorders limit 100;
 ```
 
 ## Alternative configuration
-Alternatively external Hive metastore database parameters can be specified in trinoProfile together with `hive.metastore=hdi` catalog property:
+Alternatively external Hive metastore database parameters can be specified in `trinoProfile.catalogOptions.hive` together with `hive.metastore=hdi` catalog property:
 
+| Property| Description| Example|
+|---|---|---|
+|trinoProfile.catalogOptions.hive|List of Hive or iceberg or delta catalogs with parameters of external Hive metastore database, require parameters for each. To use external metastore database, catalog must be present in this list.
+|trinoProfile.catalogOptions.hive[*].catalogName|Name of Trino catalog configured in `serviceConfigsProfiles`, which configured to use external Hive metastore database.|hive1|
+|trinoProfile.catalogOptions.hive[*].metastoreDbConnectionURL|JDBC connection string to database.|jdbc:sqlserver://mysqlserver1.database.windows.net;database=myhmsdb1;encrypt=true;trustServerCertificate=true;create=false;loginTimeout=30|
+|trinoProfile.catalogOptions.hive[*].metastoreDbConnectionUserName|SQL user name to connect to database.|trinoadmin|
+|trinoProfile.catalogOptions.hive[*].metastoreDbConnectionPasswordSecret|Secret referenceName configured in secretsProfile with password.|hms-db-pwd|
+|trinoProfile.catalogOptions.hive[*].metastoreWarehouseDir|ABFS URI to location in storage where data is stored.|`abfs://[email protected]/hive/warehouse`|
 
+### Complete example
 ```json
 {
     "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",