Swagger changes for Azure PostgreSQL, MySQL and MariaDB for feature p…

…arity (Azure#8511) * Change for Azure Postgres and MySQL Swagger to include M2 requirements * MySQL AAD changes * Private Connection related changes * TLS rleated changes * Swagger changes for Azure PostgreSQL, MySQL and MariaDB * Fixing the spelling and prettier check issues * Fixing LintDiff * Fixing Semantic Validation errors * Fixing Semantic Validation errors * Updating readme.md * Updating readme.md * Incroporating review coments * Incroporating review coments * Fixing review coments * Fixing review coments * Adressing review comments * Adressing review comments * Adressing review comments * Adressing review comments * Adressing PrettierCheck errors * Adressing modal validation errors * Adressing modal validation errors * Updating descriptions * Updating descriptions * Updating descriptions * Updating the review comments * Updating the review comments * Updating the review comments
00Kai0 · Oct 12, 2020 · ed122a0 · ed122a0
1 parent d6b9201
commit ed122a0
Show file tree

Hide file tree

Showing 47 changed files with 2,918 additions and 106 deletions.
diff --git a/...mariadb/resource-manager/Microsoft.DBforMariaDB/stable/2018-06-01/examples/ServerGet.json b/...mariadb/resource-manager/Microsoft.DBforMariaDB/stable/2018-06-01/examples/ServerGet.json
@@ -28,7 +28,24 @@
           "earliestRestoreDate": "2018-03-14T18:02:41.577+00:00",
           "replicationRole": "None",
           "masterServerId": "",
-          "replicaCapacity": 5
+          "replicaCapacity": 5,
+          "publicNetworkAccess": "Enabled",
+          "privateEndpointConnections": [
+            {
+              "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMariaDB/servers/mariadbtestsvc4/privateEndpointConnections/private-endpoint-name-00000000-1111-2222-3333-444444444444",
+              "properties": {
+                "provisioningState": "Ready",
+                "privateEndpoint": {
+                  "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/Default-Network/providers/Microsoft.Network/privateEndpoints/private-endpoint-name"
+                },
+                "privateLinkServiceConnectionState": {
+                  "status": "Approved",
+                  "description": "Auto-approved",
+                  "actionsRequired": "None"
+                }
+              }
+            }
+          ]
         },
         "location": "westus",
         "tags": {

diff --git a/...ariadb/resource-manager/Microsoft.DBforMariaDB/stable/2018-06-01/examples/ServerList.json b/...ariadb/resource-manager/Microsoft.DBforMariaDB/stable/2018-06-01/examples/ServerList.json
@@ -25,7 +25,9 @@
               "sslEnforcement": "Enabled",
               "userVisibleState": "Ready",
               "fullyQualifiedDomainName": "mariadbtestsvc1.mariadb.database.azure.com",
-              "earliestRestoreDate": "2018-02-28T23:56:02.627+00:00"
+              "earliestRestoreDate": "2018-02-28T23:56:02.627+00:00",
+              "publicNetworkAccess": "Enabled",
+              "privateEndpointConnections": []
             },
             "location": "westus",
             "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMariaDB/servers/mariadbtestsvc1",
@@ -50,7 +52,24 @@
               "sslEnforcement": "Enabled",
               "userVisibleState": "Ready",
               "fullyQualifiedDomainName": "mariadbtstsvc2.mariadb.database.azure.com",
-              "earliestRestoreDate": "2018-02-28T23:56:54.3+00:00"
+              "earliestRestoreDate": "2018-02-28T23:56:54.3+00:00",
+              "publicNetworkAccess": "Enabled",
+              "privateEndpointConnections": [
+                {
+                  "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMariaDB/servers/mariadbtstsvc2/privateEndpointConnections/private-endpoint-name-00000000-1111-2222-3333-444444444444",
+                  "properties": {
+                    "provisioningState": "Ready",
+                    "privateEndpoint": {
+                      "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/Default-Network/providers/Microsoft.Network/privateEndpoints/private-endpoint-name"
+                    },
+                    "privateLinkServiceConnectionState": {
+                      "status": "Approved",
+                      "description": "Auto-approved",
+                      "actionsRequired": "None"
+                    }
+                  }
+                }
+              ]
             },
             "location": "westus",
             "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMariaDB/servers/mariadbtstsvc2",
@@ -75,7 +94,24 @@
               "sslEnforcement": "Enabled",
               "userVisibleState": "Ready",
               "fullyQualifiedDomainName": "mariadbtestsvc3.mariadb.database.azure.com",
-              "earliestRestoreDate": "2018-02-28T23:59:44.847+00:00"
+              "earliestRestoreDate": "2018-02-28T23:59:44.847+00:00",
+              "publicNetworkAccess": "Enabled",
+              "privateEndpointConnections": [
+                {
+                  "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMariaDB/servers/mariadbtestsvc3/privateEndpointConnections/private-endpoint-name-00000000-1111-2222-3333-444444444444",
+                  "properties": {
+                    "provisioningState": "Ready",
+                    "privateEndpoint": {
+                      "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/Default-Network/providers/Microsoft.Network/privateEndpoints/private-endpoint-name"
+                    },
+                    "privateLinkServiceConnectionState": {
+                      "status": "Approved",
+                      "description": "Auto-approved",
+                      "actionsRequired": "None"
+                    }
+                  }
+                }
+              ]
             },
             "location": "westus",
             "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg1/providers/Microsoft.DBforMariaDB/servers/mariadbtestsvc3",

diff --git a/...-manager/Microsoft.DBforMariaDB/stable/2018-06-01/examples/ServerListByResourceGroup.json b/...-manager/Microsoft.DBforMariaDB/stable/2018-06-01/examples/ServerListByResourceGroup.json
@@ -26,7 +26,9 @@
               "sslEnforcement": "Enabled",
               "userVisibleState": "Ready",
               "fullyQualifiedDomainName": "mariadbtestsvc1.mariadb.database.azure.com",
-              "earliestRestoreDate": "2018-03-07T18:17:35.729321+00:00"
+              "earliestRestoreDate": "2018-03-07T18:17:35.729321+00:00",
+              "publicNetworkAccess": "Enabled",
+              "privateEndpointConnections": []
             },
             "location": "westus",
             "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMariaDB/servers/mariadbtestsvc1",
@@ -51,7 +53,24 @@
               "sslEnforcement": "Enabled",
               "userVisibleState": "Ready",
               "fullyQualifiedDomainName": "mariadbtstsvc2.mariadb.database.azure.com",
-              "earliestRestoreDate": "2018-03-07T18:17:35.729321+00:00"
+              "earliestRestoreDate": "2018-03-07T18:17:35.729321+00:00",
+              "publicNetworkAccess": "Enabled",
+              "privateEndpointConnections": [
+                {
+                  "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMariaDB/servers/mariadbtstsvc2/privateEndpointConnections/private-endpoint-name-00000000-1111-2222-3333-444444444444",
+                  "properties": {
+                    "provisioningState": "Ready",
+                    "privateEndpoint": {
+                      "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/Default-Network/providers/Microsoft.Network/privateEndpoints/private-endpoint-name"
+                    },
+                    "privateLinkServiceConnectionState": {
+                      "status": "Approved",
+                      "description": "Auto-approved",
+                      "actionsRequired": "None"
+                    }
+                  }
+                }
+              ]
             },
             "location": "westus",
             "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMariaDB/servers/mariadbtstsvc2",

diff --git a/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/stable/2018-06-01/mariadb.json b/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/stable/2018-06-01/mariadb.json
@@ -1320,6 +1320,101 @@
         "modelAsString": false
       }
     },
+    "ServerPrivateEndpointConnection": {
+      "description": "A private endpoint connection under a server",
+      "type": "object",
+      "properties": {
+        "id": {
+          "description": "Resource Id of the private endpoint connection.",
+          "type": "string",
+          "readOnly": true
+        },
+        "properties": {
+          "$ref": "#/definitions/ServerPrivateEndpointConnectionProperties",
+          "description": "Private endpoint connection properties",
+          "readOnly": true
+        }
+      }
+    },
+    "ServerPrivateEndpointConnectionProperties": {
+      "description": "Properties of a private endpoint connection.",
+      "type": "object",
+      "properties": {
+        "privateEndpoint": {
+          "$ref": "#/definitions/PrivateEndpointProperty",
+          "description": "Private endpoint which the connection belongs to."
+        },
+        "privateLinkServiceConnectionState": {
+          "$ref": "#/definitions/ServerPrivateLinkServiceConnectionStateProperty",
+          "description": "Connection state of the private endpoint connection."
+        },
+        "provisioningState": {
+          "description": "State of the private endpoint connection.",
+          "enum": [
+            "Approving",
+            "Ready",
+            "Dropping",
+            "Failed",
+            "Rejecting"
+          ],
+          "type": "string",
+          "readOnly": true,
+          "x-ms-enum": {
+            "name": "PrivateEndpointProvisioningState",
+            "modelAsString": true
+          }
+        }
+      }
+    },
+    "PrivateEndpointProperty": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "description": "Resource id of the private endpoint.",
+          "type": "string"
+        }
+      },
+      "x-ms-azure-resource": true
+    },
+    "ServerPrivateLinkServiceConnectionStateProperty": {
+      "required": [
+        "status",
+        "description"
+      ],
+      "type": "object",
+      "properties": {
+        "status": {
+          "description": "The private link service connection status.",
+          "enum": [
+            "Approved",
+            "Pending",
+            "Rejected",
+            "Disconnected"
+          ],
+          "type": "string",
+          "x-ms-enum": {
+            "name": "PrivateLinkServiceConnectionStateStatus",
+            "modelAsString": true
+          }
+        },
+        "description": {
+          "description": "The private link service connection description.",
+          "type": "string"
+        },
+        "actionsRequired": {
+          "description": "The actions required for private link service connection.",
+          "enum": [
+            "None"
+          ],
+          "type": "string",
+          "readOnly": true,
+          "x-ms-enum": {
+            "name": "PrivateLinkServiceConnectionStateActionsRequire",
+            "modelAsString": true
+          }
+        }
+      }
+    },
     "TrackedResource": {
       "description": "Resource properties including location and tags for track resources.",
       "properties": {
@@ -1401,6 +1496,26 @@
           "format": "int32",
           "minimum": 0,
           "description": "The maximum number of replicas that a master server can have."
+        },
+        "publicNetworkAccess": {
+          "type": "string",
+          "description": "Whether or not public endpoint access is allowed for this server.  Value is optional but if passed in, must be 'Enabled' or 'Disabled'",
+          "enum": [
+            "Enabled",
+            "Disabled"
+          ],
+          "x-ms-enum": {
+            "name": "PublicNetworkAccessEnum",
+            "modelAsString": true
+          }
+        },
+        "privateEndpointConnections": {
+          "description": "List of private endpoint connections on a server",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ServerPrivateEndpointConnection"
+          },
+          "readOnly": true
         }
       },
       "description": "The properties of a server."

diff --git a/...ger/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerAdminCreateUpdate.json b/...ger/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerAdminCreateUpdate.json
@@ -29,7 +29,17 @@
       }
     },
     "202": {
-      "body": "Accepted"
+      "body": {
+        "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc4/administrators/activeDirectory",
+        "name": "activeDirectory",
+        "type": "Microsoft.DBforMySQL/servers/administrators",
+        "properties": {
+          "administratorType": "ActiveDirectory",
+          "login": "[email protected]",
+          "sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c",
+          "tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c"
+        }
+      }
     }
   }
 }
diff --git a/...e-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerAdminDelete.json b/...e-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerAdminDelete.json
@@ -7,14 +7,8 @@
     "api-version": "2017-12-01-preview"
   },
   "responses": {
-    "200": {
-      "body": "OK"
-    },
-    "202": {
-      "body": "Accepted"
-    },
-    "204": {
-      "body": "No Content"
-    }
+    "200": {},
+    "202": {},
+    "204": {}
   }
 }
diff --git a/...source-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerCreate.json b/...source-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerCreate.json
@@ -10,6 +10,7 @@
         "administratorLogin": "cloudsa",
         "administratorLoginPassword": "pass$w0rd",
         "sslEnforcement": "Enabled",
+        "minimalTlsVersion": "TLS1_2",
         "storageProfile": {
           "storageMB": 128000,
           "backupRetentionDays": 7,
@@ -46,6 +47,7 @@
           },
           "version": "5.7",
           "sslEnforcement": "Enabled",
+          "minimalTlsVersion": "TLS1_2",
           "userVisibleState": "Ready",
           "fullyQualifiedDomainName": "mysqltestsvc4.mysql.database.azure.com",
           "earliestRestoreDate": "2018-03-14T18:02:41.577+00:00"

diff --git a/.../resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerGet.json b/.../resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerGet.json
@@ -23,6 +23,7 @@
           },
           "version": "5.7",
           "sslEnforcement": "Enabled",
+          "minimalTlsVersion": "TLS1_0",
           "userVisibleState": "Ready",
           "fullyQualifiedDomainName": "mysqltestsvc4.mysql.database.azure.com",
           "earliestRestoreDate": "2018-03-14T18:02:41.577+00:00",

diff --git a/...resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerList.json b/...resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerList.json
@@ -23,6 +23,7 @@
               },
               "version": "5.7",
               "sslEnforcement": "Enabled",
+              "minimalTlsVersion": "TLS1_2",
               "userVisibleState": "Ready",
               "fullyQualifiedDomainName": "mysqltestsvc1.mysql.database.azure.com",
               "earliestRestoreDate": "2018-02-28T23:56:02.627+00:00"
@@ -48,6 +49,7 @@
               },
               "version": "5.7",
               "sslEnforcement": "Enabled",
+              "minimalTlsVersion": "TLS1_1",
               "userVisibleState": "Ready",
               "fullyQualifiedDomainName": "mysqltstsvc2.mysql.database.azure.com",
               "earliestRestoreDate": "2018-02-28T23:56:54.3+00:00"
@@ -73,6 +75,7 @@
               },
               "version": "5.7",
               "sslEnforcement": "Enabled",
+              "minimalTlsVersion": "TLS1_0",
               "userVisibleState": "Ready",
               "fullyQualifiedDomainName": "mysqltestsvc3.mysql.database.azure.com",
               "earliestRestoreDate": "2018-02-28T23:59:44.847+00:00"