From 8063592b962ca31bf5f55b19c0f80b4544346fc3 Mon Sep 17 00:00:00 2001
From: Apoorv Mehrotra <apmehrotra@microsoft.com>
Date: Wed, 23 Nov 2022 15:26:54 -0800
Subject: [PATCH] Changing service configuration type

---
 .../examples/EndpointsPutDefault.json         | 20 ++++---
 .../stable/2023-03-15/hybridconnectivity.json | 54 ++++++++++---------
 2 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPutDefault.json b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPutDefault.json
index ef9c608b23f8..aa5461c0ca6f 100644
--- a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPutDefault.json
+++ b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/examples/EndpointsPutDefault.json
@@ -6,14 +6,16 @@
     "EndpointResource": {
       "properties": {
         "type": "default",
-        "serviceConfigurations": {
-          "ssh": {
+        "serviceConfigurations": [
+          {
+            "serviceName": "SSH",
             "port": "22"
           },
-          "wac": {
+          {
+            "serviceName": "WAC",
             "port": "80"
           }
-        }
+        ]
       }
     }
   },
@@ -25,14 +27,16 @@
         "type": "Microsoft.HybridConnectivity/endpoints",
         "properties": {
           "type": "default",
-          "serviceConfigurations": {
-            "ssh": {
+          "serviceConfigurations": [
+            {
+              "serviceName": "SSH",
               "port": "22"
             },
-            "wac": {
+            {
+              "serviceName": "WAC",
               "port": "80"
             }
-          },
+          ],
           "provisioningState": "Succeeded"
         }
       }
diff --git a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/hybridconnectivity.json b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/hybridconnectivity.json
index 061da27a46b9..5550e8b3085a 100644
--- a/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/hybridconnectivity.json
+++ b/specification/hybridconnectivity/resource-manager/Microsoft.HybridConnectivity/stable/2023-03-15/hybridconnectivity.json
@@ -335,7 +335,6 @@
           {
             "name": "ListCredentialsRequest",
             "in": "body",
-            "required": true,
             "schema": {
               "$ref": "#/definitions/ListCredentialsRequest"
             },
@@ -496,7 +495,8 @@
         },
         "serviceConfigurationToken": {
           "type": "string",
-          "description": "The token to access the enabled service."
+          "description": "The token to access the enabled service.",
+          "x-ms-secret": true
         }
       }
     },
@@ -589,33 +589,38 @@
           "description": "The resource provisioning state."
         },
         "serviceConfigurations": {
-          "type": "object",
+          "type": "array",
           "description": "The enabled service configurations.",
           "items": {
-            "$ref": "#/definitions/ServiceConfigurations"
-          }
+            "$ref": "#/definitions/ServiceConfiguration"
+          },
+          "x-ms-identifiers": [
+            "serviceName"
+          ]
         }
       }
     },
-    "ServiceConfigurations": {
-      "type": "object",
-      "description": "The service configuration object definition where each key's value is additional property dictionary.",
+    "ServiceConfiguration": {
+      "description": "The service configuration object definition",
       "properties": {
-        "ssh": {
-          "type": "object",
-          "description": "Details for SSH service configuration.",
-          "additionalProperties": {
-            "type": "string"
+        "serviceName": {
+          "type": "string",
+          "description": "The type of service enabled.",
+          "enum": [
+            "SSH",
+            "WAC"
+          ],
+          "x-ms-enum": {
+            "name": "serviceName",
+            "modelAsString": true
           }
         },
-        "wac": {
-          "type": "object",
-          "description": "Details for WAC service configuration.",
-          "additionalProperties": {
-            "type": "string"
-          }
+        "port": {
+          "type": "string",
+          "description": "The port on which service is enabled."
         }
-      }
+      },
+      "type": "object"
     },
     "EndpointResource": {
       "description": "The endpoint for the target resource.",
@@ -697,7 +702,8 @@
             "WAC"
           ],
           "x-ms-enum": {
-            "name": "ServiceName"
+            "name": "serviceName",
+            "modelAsString": true
           }
         }
       }
@@ -705,9 +711,6 @@
     "ListCredentialsRequest": {
       "type": "object",
       "description": "Represent ListCredentials Request object.",
-      "required": [
-        "serviceName"
-      ],
       "properties": {
         "serviceName": {
           "type": "string",
@@ -717,7 +720,8 @@
             "WAC"
           ],
           "x-ms-enum": {
-            "name": "ServiceName"
+            "name": "serviceName",
+            "modelAsString": true
           }
         }
       }