Azure DNS s360 fixes (Azure#12336)

* Azure DNS s360 changes * Changes part 2 * Breaking change fix * Adding schema for 201 response * Revert "Breaking change fix" This reverts commit 791a1dd. * Adding new property and deprecating old one * Prettier + missed property * Reverting change. Will be fixed in service code
mkarmark · Jul 20, 2021 · ab1fdce · ab1fdce
1 parent f27b4c8
commit ab1fdce
Show file tree

Hide file tree

Showing 6 changed files with 128 additions and 11 deletions.
diff --git a/specification/dns/resource-manager/Microsoft.Network/preview/2015-05-04-preview/dns.json b/specification/dns/resource-manager/Microsoft.Network/preview/2015-05-04-preview/dns.json
@@ -118,6 +118,12 @@
               "$ref": "#/definitions/RecordSet"
             }
           },
+          "201": {
+            "description": "RecordSet was created",
+            "schema": {
+              "$ref": "#/definitions/RecordSet"
+            }
+          },
           "202": {
             "description": ""
           }
@@ -185,6 +191,9 @@
         "responses": {
           "200": {
             "description": ""
+          },
+          "204": {
+            "description": "No content. RecordSet was not found."
           }
         }
       },
@@ -247,6 +256,12 @@
             "schema": {
               "$ref": "#/definitions/RecordSet"
             }
+          },
+          "default": {
+            "description": "Default response. It will be deserialized as per the Error definition.",
+            "schema": {
+              "$ref": "#/definitions/CloudError"
+            }
           }
         }
       }
@@ -737,6 +752,11 @@
           "format": "int64",
           "description": "Gets or sets the TTL of the records in the RecordSet."
         },
+        "fqdn": {
+          "type": "string",
+          "description": "Fully qualified domain name of the record set.",
+          "readOnly": true
+        },
         "ARecords": {
           "type": "array",
           "items": {
@@ -799,21 +819,33 @@
     },
     "RecordSet": {
       "properties": {
+        "id": {
+          "type": "string",
+          "description": "The ID of the record set.",
+          "readOnly": true
+        },
+        "name": {
+          "type": "string",
+          "description": "The name of the record set.",
+          "readOnly": true
+        },
+        "type": {
+          "type": "string",
+          "description": "The type of the record set.",
+          "readOnly": true
+        },
         "etag": {
           "type": "string",
-          "description": "Gets or sets the ETag of the RecordSet."
+          "description": "The etag of the record set."
         },
         "properties": {
           "$ref": "#/definitions/RecordSetProperties",
-          "description": "Gets or sets the properties of the RecordSet."
+          "x-ms-client-flatten": true,
+          "description": "The properties of the record set."
         }
       },
-      "allOf": [
-        {
-          "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/TrackedResource"
-        }
-      ],
-      "description": "Describes a DNS RecordSet (a set of DNS records with the same name and type)."
+      "description": "Describes a DNS record set (a collection of DNS records with the same name and type).",
+      "x-ms-azure-resource": true
     },
     "RecordSetListResult": {
       "properties": {
@@ -838,6 +870,12 @@
           "format": "int64",
           "description": "Gets or sets the maximum number of record sets that can be created in this zone."
         },
+        "maxNumberOfRecordsPerRecordSet": {
+          "type": "integer",
+          "format": "int64",
+          "description": "The maximum number of records per record set that can be created in this DNS zone.  This is a read-only property and any attempt to set this value will be ignored.",
+          "readOnly": true
+        },
         "numberOfRecordSets": {
           "type": "integer",
           "format": "int64",
@@ -888,6 +926,43 @@
         }
       },
       "x-ms-external": true
+    },
+    "CloudError": {
+      "type": "object",
+      "x-ms-external": true,
+      "properties": {
+        "error": {
+          "$ref": "#/definitions/CloudErrorBody",
+          "description": "Cloud error body."
+        }
+      },
+      "description": "An error response from the service."
+    },
+    "CloudErrorBody": {
+      "type": "object",
+      "x-ms-external": true,
+      "properties": {
+        "code": {
+          "type": "string",
+          "description": "An identifier for the error. Codes are invariant and are intended to be consumed programmatically."
+        },
+        "message": {
+          "type": "string",
+          "description": "A message describing the error, intended to be suitable for display in a user interface."
+        },
+        "target": {
+          "type": "string",
+          "description": "The target of the particular error. For example, the name of the property in error."
+        },
+        "details": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/CloudErrorBody"
+          },
+          "description": "A list of additional details about the error."
+        }
+      },
+      "description": "An error response from the service."
     }
   },
   "parameters": {}

diff --git a/specification/dns/resource-manager/Microsoft.Network/stable/2016-04-01/dns.json b/specification/dns/resource-manager/Microsoft.Network/stable/2016-04-01/dns.json
@@ -989,7 +989,8 @@
           "description": "The properties of the record set."
         }
       },
-      "description": "Describes a DNS record set (a collection of DNS records with the same name and type)."
+      "description": "Describes a DNS record set (a collection of DNS records with the same name and type).",
+      "x-ms-azure-resource": true
     },
     "RecordSetUpdateParameters": {
       "properties": {
@@ -1041,6 +1042,19 @@
           },
           "description": "The name servers for this DNS zone. This is a read-only property and any attempt to set this value will be ignored.",
           "readOnly": true
+        },
+        "zoneType": {
+          "type": "string",
+          "enum": [
+            "Public",
+            "Private"
+          ],
+          "x-ms-enum": {
+            "name": "ZoneType",
+            "modelAsString": false
+          },
+          "default": "Public",
+          "description": "The type of this DNS zone (Public or Private)."
         }
       },
       "description": "Represents the properties of the zone."

diff --git a/specification/dns/resource-manager/Microsoft.Network/stable/2017-09-01/dns.json b/specification/dns/resource-manager/Microsoft.Network/stable/2017-09-01/dns.json
@@ -1142,6 +1142,19 @@
           },
           "description": "The name servers for this DNS zone. This is a read-only property and any attempt to set this value will be ignored.",
           "readOnly": true
+        },
+        "zoneType": {
+          "type": "string",
+          "enum": [
+            "Public",
+            "Private"
+          ],
+          "x-ms-enum": {
+            "name": "ZoneType",
+            "modelAsString": false
+          },
+          "default": "Public",
+          "description": "The type of this DNS zone (Public or Private)."
         }
       },
       "description": "Represents the properties of the zone."

diff --git a/specification/dns/resource-manager/Microsoft.Network/stable/2017-10-01/dns.json b/specification/dns/resource-manager/Microsoft.Network/stable/2017-10-01/dns.json
@@ -1400,6 +1400,19 @@
           },
           "description": "The name servers for this DNS zone. This is a read-only property and any attempt to set this value will be ignored.",
           "readOnly": true
+        },
+        "zoneType": {
+          "type": "string",
+          "enum": [
+            "Public",
+            "Private"
+          ],
+          "x-ms-enum": {
+            "name": "ZoneType",
+            "modelAsString": false
+          },
+          "default": "Public",
+          "description": "The type of this DNS zone (Public or Private)."
         }
       },
       "description": "Represents the properties of the zone."

diff --git a/...atedns/resource-manager/Microsoft.Network/stable/2020-01-01/examples/RecordSetSOAPut.json b/...atedns/resource-manager/Microsoft.Network/stable/2020-01-01/examples/RecordSetSOAPut.json
@@ -19,6 +19,7 @@
           "refreshTime": 3600,
           "retryTime": 300,
           "expireTime": 2419200,
+          "minimumTTL": 300,
           "minimumTtl": 300
         }
       }
@@ -45,6 +46,7 @@
             "refreshTime": 3600,
             "retryTime": 300,
             "expireTime": 2419200,
+            "minimumTTL": 300,
             "minimumTtl": 300
           }
         }

diff --git a/...atedns/resource-manager/Microsoft.Network/stable/2020-06-01/examples/RecordSetSOAPut.json b/...atedns/resource-manager/Microsoft.Network/stable/2020-06-01/examples/RecordSetSOAPut.json
@@ -19,7 +19,7 @@
           "refreshTime": 3600,
           "retryTime": 300,
           "expireTime": 2419200,
-          "minimumTtl": 300
+          "minimumTTL": 300
         }
       }
     }
@@ -45,7 +45,7 @@
             "refreshTime": 3600,
             "retryTime": 300,
             "expireTime": 2419200,
-            "minimumTtl": 300
+            "minimumTTL": 300
           }
         }
       }