From 7db9038bd39c73fe2a639578af83b4b52d9212bb Mon Sep 17 00:00:00 2001
From: "REDMOND\\glfeokti" <glfeokti@microsoft.com>
Date: Mon, 5 Oct 2020 04:29:15 -0700
Subject: [PATCH 1/2] Data Masking settings for Diagnostic

---
 .../2020-06-01-preview/definitions.json       | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json
index 51dfac6d821d..6265364c2ef2 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json
@@ -1697,6 +1697,54 @@
       ],
       "description": "Parameters supplied to the CreateOrUpdate certificate operation."
     },
+    "DataMasking": {
+      "properties": {
+        "queryParams": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/DataMaskingEntity"
+          },
+          "description": "Masking settings for Url query parameters"
+        },
+        "headers": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/DataMaskingEntity"
+          },
+          "description": "Masking settings for headers"
+        }
+      }
+    },
+    "DataMaskingEntity": {
+      "properties": {
+        "value": {
+          "type": "string",
+          "description": "The name of an entity to mask (e.g. a name of a header or a query parameter)."
+        },
+        "mode": {
+          "type": "string",
+          "enum": [
+            "Mask",
+            "Hide"
+          ],
+          "x-ms-enum": {
+            "name": "DataMaskingMode",
+            "modelAsString": true,
+            "values": [
+              {
+                "value": "Mask",
+                "description": "Mask the value of an entity."
+              },
+              {
+                "value": "Hide",
+                "description": "Hide the presence of an entity."
+              }
+            ]
+          },
+          "description": "Data masking mode."
+        }
+      }
+    },
     "DeployConfigurationParameters": {
       "properties": {
         "properties": {
@@ -3264,6 +3312,10 @@
         "response": {
           "$ref": "#/definitions/HttpMessageDiagnostic",
           "description": "Diagnostic settings for response."
+        },
+        "dataMasking": {
+          "$ref": "#/definitions/DataMasking",
+          "description": "Data masking settings."
         }
       },
       "description": "Diagnostic settings for incoming/outgoing HTTP messages to the Gateway."

From eb84af83ef3f8b03b73918a0b35ff0b3c9672776 Mon Sep 17 00:00:00 2001
From: "REDMOND\\glfeokti" <glfeokti@microsoft.com>
Date: Fri, 9 Oct 2020 11:54:29 -0700
Subject: [PATCH 2/2] Move dataMasking under HttpMessageDiagnostic

---
 .../preview/2020-06-01-preview/definitions.json           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json
index 6265364c2ef2..861174d5b69d 100644
--- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json
+++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json
@@ -2218,6 +2218,10 @@
         "body": {
           "$ref": "#/definitions/BodyDiagnosticSettings",
           "description": "Body logging settings."
+        },
+        "dataMasking": {
+          "$ref": "#/definitions/DataMasking",
+          "description": "Data masking settings."
         }
       },
       "description": "Http message diagnostic settings."
@@ -3312,10 +3316,6 @@
         "response": {
           "$ref": "#/definitions/HttpMessageDiagnostic",
           "description": "Diagnostic settings for response."
-        },
-        "dataMasking": {
-          "$ref": "#/definitions/DataMasking",
-          "description": "Data masking settings."
         }
       },
       "description": "Diagnostic settings for incoming/outgoing HTTP messages to the Gateway."