[2020-06-01-preview] Update Oauth Server secrets Contract (#10602)

* Oauth server secrets contract * fix azureMonitor enum
Azure · Aug 31, 2020 · 4e353d1 · 4e353d1
1 parent d9afeed
commit 4e353d1
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/...-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/apimauthorizationservers.json b/...-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/apimauthorizationservers.json
@@ -403,7 +403,7 @@
           "200": {
             "description": "Gets the secrets of the specified authorization server.",
             "schema": {
-              "$ref": "./definitions.json#/definitions/ClientSecretContract"
+              "$ref": "./definitions.json#/definitions/AuthorizationServerSecretsContract"
             },
             "headers": {
               "ETag": {

diff --git a/...ment/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json b/...ment/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json
@@ -1168,6 +1168,25 @@
       ],
       "description": "External OAuth authorization server Update settings contract."
     },
+    "AuthorizationServerSecretsContract": {
+      "properties": {
+        "clientSecret": {
+          "x-ms-secret": true,
+          "type": "string",
+          "description": "oAuth Authorization Server Secrets."
+        },
+        "resourceOwnerUsername": {
+          "type": "string",
+          "description": "Can be optionally specified when resource owner password grant type is supported by this authorization server. Default resource owner username."
+        },
+        "resourceOwnerPassword": {
+          "x-ms-secret": true,
+          "type": "string",
+          "description": "Can be optionally specified when resource owner password grant type is supported by this authorization server. Default resource owner password."
+        }
+      },
+      "description": "OAuth Server Secrets Contract."
+    },
     "BackendAuthorizationHeaderCredentials": {
       "properties": {
         "scheme": {
@@ -2748,7 +2767,8 @@
           "description": "Logger type.",
           "enum": [
             "azureEventHub",
-            "applicationInsights"
+            "applicationInsights",
+            "azureMonitor"
           ],
           "x-ms-enum": {
             "name": "LoggerType",
@@ -2761,6 +2781,10 @@
               {
                 "value": "applicationInsights",
                 "description": "Azure Application Insights as log destination."
+              },
+              {
+                "value": "azureMonitor",
+                "description": "Azure Monitor"
               }
             ]
           }

diff --git a/...ment/preview/2020-06-01-preview/examples/ApiManagementAuthorizationServerListSecrets.json b/...ment/preview/2020-06-01-preview/examples/ApiManagementAuthorizationServerListSecrets.json
@@ -9,7 +9,9 @@
   "responses": {
     "200": {
       "body": {
-        "clientSecret": "2"
+        "clientSecret": "2",
+        "resourceOwnerUsername": "un",
+        "resourceOwnerPassword": "pwd"
       }
     }
   }