Fix Swagger correctness bugs. (#16280)

Azure · Oct 15, 2021 · cbce56c · cbce56c
1 parent 3e4feab
commit cbce56c
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 5 deletions.
diff --git a/...esource-manager/Microsoft.SecurityInsights/preview/2021-03-01-preview/SourceControls.json b/...esource-manager/Microsoft.SecurityInsights/preview/2021-03-01-preview/SourceControls.json
@@ -360,14 +360,20 @@
           "description": "source control properties",
           "$ref": "#/definitions/SourceControlProperties",
           "x-ms-client-flatten": true
+        },
+        "systemData": {
+          "description": "System data of Cluster resource",
+          "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
+          "x-ms-client-flatten": true,
+          "readOnly": true
         }
       },
       "type": "object"
     },
     "SourceControlProperties": {
       "description": "Describes source control properties",
       "properties": {
-        "sourceControlId": {
+        "id": {
           "description": "The id (a Guid) of the source control",
           "type": "string"
         },
@@ -416,6 +422,14 @@
           "description": "Branch name of repository.",
           "type": "string"
         },
+        "displayUrl": {
+          "description": "Display url of repository.",
+          "type": "string"
+        },
+        "deploymentLogsUrl": {
+          "description": "Url to access repository action logs.",
+          "type": "string"
+        },
         "pathMapping": {
           "description": "Dictionary of source control content type and path mapping.",
           "items": {

diff --git a/...urityInsights/preview/2021-03-01-preview/examples/sourcecontrols/CreateSourceControl.json b/...urityInsights/preview/2021-03-01-preview/examples/sourcecontrols/CreateSourceControl.json
@@ -19,6 +19,7 @@
         "repository": {
           "url": "https://github.com/user/repo",
           "branch": "master",
+          "displayUrl": "https://github.com/user/repo",
           "pathMapping": [
             {
               "contentType": "AnalyticRules",
@@ -41,7 +42,7 @@
         "type": "Microsoft.SecurityInsights/SourceControls",
         "etag": "\"0300bf09-0000-0000-0000-5c37296e0000\"",
         "properties": {
-          "sourceControlId": "789e0c1f-4a3d-43ad-809c-e713b677b04a",
+          "id": "789e0c1f-4a3d-43ad-809c-e713b677b04a",
           "displayName": "My Source Control",
           "description": "this is a source control",
           "repoType": "Github",
@@ -52,6 +53,8 @@
           "repository": {
             "url": "https://github.com/user/repo",
             "branch": "master",
+            "displayUrl": "https://github.com/user/repo",
+            "deploymentLogsUrl": "https://github.com/user/repo/actions",
             "pathMapping": [
               {
                 "contentType": "AnalyticRules",
@@ -63,6 +66,14 @@
               }
             ]
           }
+        },
+        "systemData": {
+          "createdBy": "user1",
+          "createdByType": "User",
+          "createdAt": "2021-01-01T17:18:19.1234567Z",
+          "lastModifiedBy": "user2",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2021-01-02T17:18:19.1234567Z"
         }
       }
     },
@@ -73,7 +84,7 @@
         "type": "Microsoft.SecurityInsights/SourceControls",
         "etag": "\"0300bf09-0000-0000-0000-5c37296e0000\"",
         "properties": {
-          "sourceControlId": "789e0c1f-4a3d-43ad-809c-e713b677b04a",
+          "id": "789e0c1f-4a3d-43ad-809c-e713b677b04a",
           "displayName": "My Source Control",
           "description": "this is a source control",
           "repoType": "Github",
@@ -84,6 +95,8 @@
           "repository": {
             "url": "https://github.com/user/repo",
             "branch": "master",
+            "displayUrl": "https://github.com/user/repo",
+            "deploymentLogsUrl": "https://github.com/user/repo/actions",
             "pathMapping": [
               {
                 "contentType": "AnalyticRules",
@@ -95,6 +108,14 @@
               }
             ]
           }
+        },
+        "systemData": {
+          "createdBy": "user1",
+          "createdByType": "User",
+          "createdAt": "2021-01-01T17:18:19.1234567Z",
+          "lastModifiedBy": "user2",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2021-01-02T17:18:19.1234567Z"
         }
       }
     }

diff --git a/...rityInsights/preview/2021-03-01-preview/examples/sourcecontrols/GetSourceControlById.json b/...rityInsights/preview/2021-03-01-preview/examples/sourcecontrols/GetSourceControlById.json
@@ -15,7 +15,7 @@
         "type": "Microsoft.SecurityInsights/SourceControls",
         "etag": "\"0300bf09-0000-0000-0000-5c37296e0000\"",
         "properties": {
-          "sourceControlId": "789e0c1f-4a3d-43ad-809c-e713b677b04a",
+          "id": "789e0c1f-4a3d-43ad-809c-e713b677b04a",
           "displayName": "My Source Control",
           "description": "this is a source control",
           "repoType": "Github",
@@ -26,6 +26,8 @@
           "repository": {
             "url": "https://github.com/user/repo",
             "branch": "master",
+            "displayUrl": "https://github.com/user/repo",
+            "deploymentLogsUrl": "https://github.com/user/repo/actions",
             "pathMapping": [
               {
                 "contentType": "AnalyticRules",
@@ -37,6 +39,14 @@
               }
             ]
           }
+        },
+        "systemData": {
+          "createdBy": "user1",
+          "createdByType": "User",
+          "createdAt": "2021-01-01T17:18:19.1234567Z",
+          "lastModifiedBy": "user2",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2021-01-02T17:18:19.1234567Z"
         }
       }
     }

diff --git a/...ecurityInsights/preview/2021-03-01-preview/examples/sourcecontrols/GetSourceControls.json b/...ecurityInsights/preview/2021-03-01-preview/examples/sourcecontrols/GetSourceControls.json
@@ -16,7 +16,7 @@
             "type": "Microsoft.SecurityInsights/SourceControls",
             "etag": "\"0300bf09-0000-0000-0000-5c37296e0000\"",
             "properties": {
-              "sourceControlId": "789e0c1f-4a3d-43ad-809c-e713b677b04a",
+              "id": "789e0c1f-4a3d-43ad-809c-e713b677b04a",
               "displayName": "My Source Control",
               "description": "this is a source control",
               "repoType": "Github",
@@ -27,6 +27,8 @@
               "repository": {
                 "url": "https://github.com/user/repo",
                 "branch": "master",
+                "displayUrl": "https://github.com/user/repo",
+                "deploymentLogsUrl": "https://github.com/user/repo/actions",
                 "pathMapping": [
                   {
                     "contentType": "AnalyticRules",
@@ -38,6 +40,14 @@
                   }
                 ]
               }
+            },
+            "systemData": {
+              "createdBy": "user1",
+              "createdByType": "User",
+              "createdAt": "2021-01-01T17:18:19.1234567Z",
+              "lastModifiedBy": "user2",
+              "lastModifiedByType": "User",
+              "lastModifiedAt": "2021-01-02T17:18:19.1234567Z"
             }
           }
         ]