Fix Swagger Correctness Issues For HealthcareApis (#12651)

* Initial commit * Fix model validation * Fix typo
Azure · Feb 2, 2021 · 0529893 · 0529893
1 parent decf0c3
commit 0529893
Show file tree

Hide file tree

Showing 12 changed files with 130 additions and 1 deletion.
diff --git a/...-manager/Microsoft.HealthcareApis/preview/2018-08-20-preview/examples/OperationsList.json b/...-manager/Microsoft.HealthcareApis/preview/2018-08-20-preview/examples/OperationsList.json
@@ -8,21 +8,25 @@
         "value": [
           {
             "name": "Microsoft.HealthcareApis/services/read",
+            "isDataAction": false,
             "display": {},
             "origin": "user,system"
           },
           {
             "name": "Microsoft.HealthcareApis/services/write",
+            "isDataAction": false,
             "display": {},
             "origin": "user,system"
           },
           {
             "name": "Microsoft.HealthcareApis/services/delete",
+            "isDataAction": false,
             "display": {},
             "origin": "user,system"
           },
           {
             "name": "Microsoft.HealthcareApis/locations/operationresults/read",
+            "isDataAction": false,
             "display": {
               "provider": "Microsoft.HealthcareApis",
               "resource": "operationresults",
@@ -33,11 +37,13 @@
           },
           {
             "name": "Microsoft.HealthcareApis/checkNameAvailability/post",
+            "isDataAction": false,
             "display": {},
             "origin": "user"
           },
           {
             "name": "Microsoft.HealthcareApis/Operations/read",
+            "isDataAction": false,
             "display": {
               "provider": "Microsoft.HealthcareApis",
               "resource": "operations",

diff --git a/...e-manager/Microsoft.HealthcareApis/preview/2018-08-20-preview/examples/ServiceCreate.json b/...e-manager/Microsoft.HealthcareApis/preview/2018-08-20-preview/examples/ServiceCreate.json
@@ -43,6 +43,9 @@
           "maxAge": 1440,
           "allowCredentials": false
         }
+      },
+      "identity": {
+        "type": "SystemAssigned"
       }
     }
   },
@@ -92,6 +95,11 @@
             "maxAge": 1440,
             "allowCredentials": false
           }
+        },
+        "identity": {
+          "principalId": "03fe6ae0-952c-4e4b-954b-cc0364dd252e",
+          "tenantId": "72f988bf-86f1-41af-91ab-2d8cd011db47",
+          "type": "SystemAssigned"
         }
       }
     },
@@ -140,6 +148,11 @@
             "maxAge": 1440,
             "allowCredentials": false
           }
+        },
+        "identity": {
+          "principalId": "03fe6ae0-952c-4e4b-954b-cc0364dd252e",
+          "tenantId": "72f988bf-86f1-41af-91ab-2d8cd011db47",
+          "type": "SystemAssigned"
         }
       }
     }

diff --git a/...resource-manager/Microsoft.HealthcareApis/preview/2018-08-20-preview/healthcare-apis.json b/...resource-manager/Microsoft.HealthcareApis/preview/2018-08-20-preview/healthcare-apis.json
@@ -674,6 +674,34 @@
         "etag": {
           "description": "An etag associated with the resource, used for optimistic concurrency when editing it.",
           "type": "string"
+        },
+        "identity": {
+          "type": "object",
+          "description": "Setting indicating whether the service has a managed identity associated with it.",
+          "properties": {
+            "principalId": {
+              "readOnly": true,
+              "type": "string",
+              "description": "The principal ID of the resource identity."
+            },
+            "tenantId": {
+              "readOnly": true,
+              "type": "string",
+              "description": "The tenant ID of the resource."
+            },
+            "type": {
+              "description": "Type of identity being specified, currently SystemAssigned and None are allowed.",
+              "type": "string",
+              "enum": [
+                "SystemAssigned",
+                "None"
+              ],
+              "x-ms-enum": {
+                "name": "ManagedServiceIdentityType",
+                "modelAsString": true
+              }
+            }
+          }
         }
       },
       "x-ms-azure-resource": true,
@@ -757,6 +785,10 @@
           "type": "string",
           "description": "Operation name: {provider}/{resource}/{read | write | action | delete}"
         },
+        "isDataAction": {
+          "description": "Gets or sets a value indicating whether the operation is a data action or not",
+          "type": "boolean"
+        },
         "origin": {
           "readOnly": true,
           "type": "string",
@@ -765,6 +797,10 @@
         "display": {
           "description": "The information displayed about the operation.",
           "$ref": "#/definitions/OperationDisplay"
+        },
+        "properties": {
+          "$ref": "#/definitions/OperationProperties",
+          "description": "Properties of the operation"
         }
       }
     },
@@ -794,6 +830,11 @@
         }
       }
     },
+    "OperationProperties": {
+      "description": "Operation properties.",
+      "type": "object",
+      "properties": {}
+    },
     "CheckNameAvailabilityParameters": {
       "description": "Input values.",
       "type": "object",

diff --git a/...urce-manager/Microsoft.HealthcareApis/stable/2019-09-16/examples/OperationResultsGet.json b/...urce-manager/Microsoft.HealthcareApis/stable/2019-09-16/examples/OperationResultsGet.json
@@ -15,6 +15,7 @@
         "properties": {}
       }
     },
+    "202": {},
     "404": {
       "body": {
         "error": {

diff --git a/.../resource-manager/Microsoft.HealthcareApis/stable/2019-09-16/examples/OperationsList.json b/.../resource-manager/Microsoft.HealthcareApis/stable/2019-09-16/examples/OperationsList.json
@@ -8,21 +8,25 @@
         "value": [
           {
             "name": "Microsoft.HealthcareApis/services/read",
+            "isDataAction": false,
             "display": {},
             "origin": "user,system"
           },
           {
             "name": "Microsoft.HealthcareApis/services/write",
+            "isDataAction": false,
             "display": {},
             "origin": "user,system"
           },
           {
             "name": "Microsoft.HealthcareApis/services/delete",
+            "isDataAction": false,
             "display": {},
             "origin": "user,system"
           },
           {
             "name": "Microsoft.HealthcareApis/locations/operationresults/read",
+            "isDataAction": false,
             "display": {
               "provider": "Microsoft.HealthcareApis",
               "resource": "operationresults",
@@ -33,11 +37,13 @@
           },
           {
             "name": "Microsoft.HealthcareApis/checkNameAvailability/post",
+            "isDataAction": false,
             "display": {},
             "origin": "user"
           },
           {
             "name": "Microsoft.HealthcareApis/Operations/read",
+            "isDataAction": false,
             "display": {
               "provider": "Microsoft.HealthcareApis",
               "resource": "operations",

diff --git a/...careapis/resource-manager/Microsoft.HealthcareApis/stable/2019-09-16/healthcare-apis.json b/...careapis/resource-manager/Microsoft.HealthcareApis/stable/2019-09-16/healthcare-apis.json
@@ -428,6 +428,9 @@
               "$ref": "#/definitions/OperationResultsDescription"
             }
           },
+          "202": {
+            "description": "Accepted - Get request accepted; the operation will complete asynchronously."
+          },
           "404": {
             "description": "No operation result was found matching operationResultId.",
             "schema": {
@@ -803,6 +806,10 @@
           "type": "string",
           "description": "Operation name: {provider}/{resource}/{read | write | action | delete}"
         },
+        "isDataAction": {
+          "description": "Gets or sets a value indicating whether the operation is a data action or not",
+          "type": "boolean"
+        },
         "origin": {
           "readOnly": true,
           "type": "string",
@@ -811,6 +818,10 @@
         "display": {
           "description": "The information displayed about the operation.",
           "$ref": "#/definitions/OperationDisplay"
+        },
+        "properties": {
+          "$ref": "#/definitions/OperationProperties",
+          "description": "Properties of the operation"
         }
       }
     },
@@ -840,6 +851,11 @@
         }
       }
     },
+    "OperationProperties": {
+      "description": "Operation properties.",
+      "type": "object",
+      "properties": {}
+    },
     "CheckNameAvailabilityParameters": {
       "description": "Input values.",
       "type": "object",

diff --git a/...urce-manager/Microsoft.HealthcareApis/stable/2020-03-15/examples/OperationResultsGet.json b/...urce-manager/Microsoft.HealthcareApis/stable/2020-03-15/examples/OperationResultsGet.json
@@ -15,6 +15,7 @@
         "properties": {}
       }
     },
+    "202": {},
     "404": {
       "body": {
         "error": {

diff --git a/.../resource-manager/Microsoft.HealthcareApis/stable/2020-03-15/examples/OperationsList.json b/.../resource-manager/Microsoft.HealthcareApis/stable/2020-03-15/examples/OperationsList.json
@@ -8,21 +8,25 @@
         "value": [
           {
             "name": "Microsoft.HealthcareApis/services/read",
+            "isDataAction": false,
             "display": {},
             "origin": "user,system"
           },
           {
             "name": "Microsoft.HealthcareApis/services/write",
+            "isDataAction": false,
             "display": {},
             "origin": "user,system"
           },
           {
             "name": "Microsoft.HealthcareApis/services/delete",
+            "isDataAction": false,
             "display": {},
             "origin": "user,system"
           },
           {
             "name": "Microsoft.HealthcareApis/locations/operationresults/read",
+            "isDataAction": false,
             "display": {
               "provider": "Microsoft.HealthcareApis",
               "resource": "operationresults",
@@ -33,11 +37,13 @@
           },
           {
             "name": "Microsoft.HealthcareApis/checkNameAvailability/post",
+            "isDataAction": false,
             "display": {},
             "origin": "user"
           },
           {
             "name": "Microsoft.HealthcareApis/Operations/read",
+            "isDataAction": false,
             "display": {
               "provider": "Microsoft.HealthcareApis",
               "resource": "operations",

diff --git a/...careapis/resource-manager/Microsoft.HealthcareApis/stable/2020-03-15/healthcare-apis.json b/...careapis/resource-manager/Microsoft.HealthcareApis/stable/2020-03-15/healthcare-apis.json
@@ -428,6 +428,9 @@
               "$ref": "#/definitions/OperationResultsDescription"
             }
           },
+          "202": {
+            "description": "Accepted - Get request accepted; the operation will complete asynchronously."
+          },
           "404": {
             "description": "No operation result was found matching operationResultId.",
             "schema": {
@@ -808,6 +811,10 @@
           "type": "string",
           "description": "Operation name: {provider}/{resource}/{read | write | action | delete}"
         },
+        "isDataAction": {
+          "description": "Gets or sets a value indicating whether the operation is a data action or not",
+          "type": "boolean"
+        },
         "origin": {
           "readOnly": true,
           "type": "string",
@@ -816,6 +823,10 @@
         "display": {
           "description": "The information displayed about the operation.",
           "$ref": "#/definitions/OperationDisplay"
+        },
+        "properties": {
+          "$ref": "#/definitions/OperationProperties",
+          "description": "Properties of the operation"
         }
       }
     },
@@ -845,6 +856,11 @@
         }
       }
     },
+    "OperationProperties": {
+      "description": "Operation properties.",
+      "type": "object",
+      "properties": {}
+    },
     "CheckNameAvailabilityParameters": {
       "description": "Input values.",
       "type": "object",

diff --git a/.../resource-manager/Microsoft.HealthcareApis/stable/2020-03-30/examples/OperationsList.json b/.../resource-manager/Microsoft.HealthcareApis/stable/2020-03-30/examples/OperationsList.json
@@ -9,16 +9,19 @@
           {
             "name": "Microsoft.HealthcareApis/services/read",
             "display": {},
+            "isDataAction": false,
             "origin": "user,system"
           },
           {
             "name": "Microsoft.HealthcareApis/services/write",
             "display": {},
+            "isDataAction": false,
             "origin": "user,system"
           },
           {
             "name": "Microsoft.HealthcareApis/services/delete",
             "display": {},
+            "isDataAction": false,
             "origin": "user,system"
           },
           {
@@ -29,11 +32,13 @@
               "operation": "read",
               "description": "Get the status of an asynchronous operation"
             },
+            "isDataAction": false,
             "origin": "user,system"
           },
           {
             "name": "Microsoft.HealthcareApis/checkNameAvailability/post",
             "display": {},
+            "isDataAction": false,
             "origin": "user"
           },
           {
@@ -44,6 +49,7 @@
               "operation": "read",
               "description": "Get the list of operations supported by this Resource Provider."
             },
+            "isDataAction": false,
             "origin": "user,system"
           }
         ]

diff --git a/...is/resource-manager/Microsoft.HealthcareApis/stable/2020-03-30/examples/ServicePatch.json b/...is/resource-manager/Microsoft.HealthcareApis/stable/2020-03-30/examples/ServicePatch.json
@@ -65,6 +65,7 @@
           "publicNetworkAccess": "Disabled"
         }
       }
-    }
+    },
+    "202": {}
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -65,6 +65,7 @@ @@
               "publicNetworkAccess": "Disabled"
             }
           }
-        }
+        },
+        "202": {}
       }
     }