RoundTrip additional property and object additional property S360 fix…

… by adding defaults and renaming respectively (Azure#12992) * Swagger correctness issue fix(Additional Property not allowed) * Added custom-word * Removing unused properrty * Ignored Tera * Reverting not related changes * RoundTrip additional property and object additional property S360 fix by adding defaults and renaming respectively * Removed default * Removing some default in older version * Fixed model validation errors and added few more defaults * Fixed Sementic errors * Lint fix
mkarmark · Jul 20, 2021 · 1e13e43 · 1e13e43
1 parent 944ce62
commit 1e13e43
Show file tree

Hide file tree

Showing 10 changed files with 81 additions and 56 deletions.
diff --git a/cSpell.json b/cSpell.json
@@ -45,6 +45,18 @@
                 "Tera"
             ]
         },
+        {
+            "filename": "**/specification/databox/resource-manager/Microsoft.DataBox/stable/2019-09-01/databox.json",
+            "words": [
+                "Tera"
+            ]
+        },
+        {
+            "filename": "**/specification/databox/resource-manager/Microsoft.DataBox/stable/2020-04-01/databox.json",
+            "words": [
+                "Tera"
+            ]
+        },
         {
             "filename": "**/specification/databox/resource-manager/Microsoft.DataBox/stable/2020-11-01/databox.json",
             "words": [

diff --git a/specification/databox/resource-manager/Microsoft.DataBox/stable/2018-01-01/databox.json b/specification/databox/resource-manager/Microsoft.DataBox/stable/2018-01-01/databox.json
@@ -863,6 +863,9 @@
     },
     "CopyLogDetails": {
       "description": "Details for log generated during copy.",
+      "required": [
+        "copyLogDetailsType"
+      ],
       "type": "object",
       "properties": {
         "copyLogDetailsType": {
@@ -873,7 +876,6 @@
             "DataBoxHeavy"
           ],
           "type": "string",
-          "readOnly": true,
           "x-ms-enum": {
             "name": "ClassDiscriminator",
             "modelAsExtensible": false,
@@ -1777,6 +1779,9 @@
     },
     "JobSecrets": {
       "description": "The base class for the secrets",
+      "required": [
+        "jobSecretsType"
+      ],
       "type": "object",
       "properties": {
         "jobSecretsType": {
@@ -1787,7 +1792,6 @@
             "DataBoxHeavy"
           ],
           "type": "string",
-          "readOnly": true,
           "x-ms-enum": {
             "name": "ClassDiscriminator",
             "modelAsExtensible": false,
@@ -2018,7 +2022,8 @@
         },
         "sendNotification": {
           "description": "Notification is required or not.",
-          "type": "boolean"
+          "type": "boolean",
+          "default": true
         }
       }
     },
@@ -2359,7 +2364,8 @@
                 "description": "Commercial Address."
               }
             ]
-          }
+          },
+          "default": "None"
         }
       }
     },

diff --git a/...ion/databox/resource-manager/Microsoft.DataBox/stable/2018-01-01/examples/JobsCreate.json b/...ion/databox/resource-manager/Microsoft.DataBox/stable/2018-01-01/examples/JobsCreate.json
@@ -44,11 +44,8 @@
           },
           "destinationAccountDetails": [
             {
+              "dataDestinationType": "StorageAccount",
               "storageAccountId": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourcegroups/databoxbvt/providers/Microsoft.Storage/storageAccounts/databoxbvttestaccount"
-            },
-            {
-              "stagingStorageAccountId": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourcegroups/databoxbvt/providers/Microsoft.Storage/storageAccounts/databoxbvttestaccount",
-              "resourceGroupId": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourcegroups/databoxbvt"
             }
           ]
         }

diff --git a/...ation/databox/resource-manager/Microsoft.DataBox/stable/2018-01-01/examples/JobsGet2.json b/...ation/databox/resource-manager/Microsoft.DataBox/stable/2018-01-01/examples/JobsGet2.json
@@ -133,11 +133,8 @@
             },
             "destinationAccountDetails": [
               {
+                "dataDestinationType": "StorageAccount",
                 "storageAccountId": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourcegroups/databoxbvt/providers/Microsoft.Storage/storageAccounts/databoxbvttestaccount"
-              },
-              {
-                "stagingStorageAccountId": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourcegroups/databoxbvt/providers/Microsoft.Storage/storageAccounts/databoxbvttestaccount",
-                "resourceGroupId": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourcegroups/databoxbvt"
               }
             ],
             "errorDetails": [],

diff --git a/...ation/databox/resource-manager/Microsoft.DataBox/stable/2018-01-01/examples/JobsGet3.json b/...ation/databox/resource-manager/Microsoft.DataBox/stable/2018-01-01/examples/JobsGet3.json
@@ -133,11 +133,8 @@
             },
             "destinationAccountDetails": [
               {
+                "dataDestinationType": "StorageAccount",
                 "storageAccountId": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourcegroups/databoxbvt/providers/Microsoft.Storage/storageAccounts/databoxbvttestaccount"
-              },
-              {
-                "stagingStorageAccountId": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourcegroups/databoxbvt/providers/Microsoft.Storage/storageAccounts/databoxbvttestaccount",
-                "resourceGroupId": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourcegroups/databoxbvt"
               }
             ],
             "errorDetails": [],

diff --git a/...ation/databox/resource-manager/Microsoft.DataBox/stable/2018-01-01/examples/JobsGet4.json b/...ation/databox/resource-manager/Microsoft.DataBox/stable/2018-01-01/examples/JobsGet4.json
@@ -104,11 +104,8 @@
             },
             "destinationAccountDetails": [
               {
+                "dataDestinationType": "StorageAccount",
                 "storageAccountId": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourcegroups/databoxbvt/providers/Microsoft.Storage/storageAccounts/databoxbvttestaccount"
-              },
-              {
-                "stagingStorageAccountId": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourcegroups/databoxbvt/providers/Microsoft.Storage/storageAccounts/databoxbvttestaccount",
-                "resourceGroupId": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourcegroups/databoxbvt"
               }
             ],
             "errorDetails": [],

diff --git a/...ation/databox/resource-manager/Microsoft.DataBox/stable/2018-01-01/examples/JobsGet5.json b/...ation/databox/resource-manager/Microsoft.DataBox/stable/2018-01-01/examples/JobsGet5.json
@@ -76,11 +76,8 @@
             },
             "destinationAccountDetails": [
               {
+                "dataDestinationType": "StorageAccount",
                 "storageAccountId": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourcegroups/databoxbvt/providers/Microsoft.Storage/storageAccounts/databoxbvttestaccount"
-              },
-              {
-                "stagingStorageAccountId": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourcegroups/databoxbvt/providers/Microsoft.Storage/storageAccounts/databoxbvttestaccount",
-                "resourceGroupId": "/subscriptions/fa68082f-8ff7-4a25-95c7-ce9da541242f/resourcegroups/databoxbvt"
               }
             ],
             "errorDetails": [],

diff --git a/specification/databox/resource-manager/Microsoft.DataBox/stable/2019-09-01/databox.json b/specification/databox/resource-manager/Microsoft.DataBox/stable/2019-09-01/databox.json
@@ -1924,11 +1924,11 @@
       "description": "Dc Access Security code for device.",
       "type": "object",
       "properties": {
-        "forwardDcAccessCode": {
+        "forwardDCAccessCode": {
           "description": "Dc Access Code for dispatching from DC.",
           "type": "string"
         },
-        "reverseDcAccessCode": {
+        "reverseDCAccessCode": {
           "description": "Dc Access code for dropping off at DC.",
           "type": "string"
         }
@@ -2038,7 +2038,7 @@
     "DiskScheduleAvailabilityRequest": {
       "description": "Request body to get the availability for scheduling disk orders.",
       "required": [
-        "expectedDataSizeInTerabytes",
+        "expectedDataSizeInTeraBytes",
         "storageLocation",
         "skuName"
       ],
@@ -2049,7 +2049,7 @@
         }
       ],
       "properties": {
-        "expectedDataSizeInTerabytes": {
+        "expectedDataSizeInTeraBytes": {
           "format": "int32",
           "description": "The expected size of the data, which needs to be transferred in this job, in terabytes.",
           "type": "integer"
@@ -2125,7 +2125,7 @@
       ],
       "type": "object",
       "properties": {
-        "expectedDataSizeInTerabytes": {
+        "expectedDataSizeInTeraBytes": {
           "format": "int32",
           "description": "The expected size of the data, which needs to be transferred in this job, in terabytes.",
           "type": "integer"
@@ -2402,7 +2402,8 @@
                 "description": "Scheduled job."
               }
             ]
-          }
+          },
+          "default": "NonScheduled"
         },
         "deliveryInfo": {
           "$ref": "#/definitions/JobDeliveryInfo",
@@ -2748,7 +2749,8 @@
         },
         "sendNotification": {
           "description": "Notification is required or not.",
-          "type": "boolean"
+          "type": "boolean",
+          "default": true
         }
       }
     },
@@ -3271,7 +3273,8 @@
                 "description": "Commercial Address."
               }
             ]
-          }
+          },
+          "default": "None"
         }
       }
     },

diff --git a/specification/databox/resource-manager/Microsoft.DataBox/stable/2020-04-01/databox.json b/specification/databox/resource-manager/Microsoft.DataBox/stable/2020-04-01/databox.json
@@ -1903,7 +1903,8 @@
         },
         "devicePassword": {
           "description": "Set Device password for unlocking Databox Heavy. Should not be passed for TransferType:ExportFromAzure jobs. If this is not passed, the service will generate password itself. This will not be returned in Get Call. Password Requirements :  Password must be minimum of 12 and maximum of 64 characters. Password must have at least one uppercase alphabet, one number and one special character. Password cannot have the following characters : IilLoO0 Password can have only alphabets, numbers and these characters : @#\\-$%^!+=;:_()]+",
-          "type": "string"
+          "type": "string",
+          "x-ms-secret": true
         }
       },
       "x-ms-discriminator-value": "DataBoxHeavy"
@@ -1988,7 +1989,8 @@
         },
         "devicePassword": {
           "description": "Set Device password for unlocking Databox. Should not be passed for TransferType:ExportFromAzure jobs. If this is not passed, the service will generate password itself. This will not be returned in Get Call. Password Requirements :  Password must be minimum of 12 and maximum of 64 characters. Password must have at least one uppercase alphabet, one number and one special character. Password cannot have the following characters : IilLoO0 Password can have only alphabets, numbers and these characters : @#\\-$%^!+=;:_()]+",
-          "type": "string"
+          "type": "string",
+          "x-ms-secret": true
         }
       },
       "x-ms-discriminator-value": "DataBox"
@@ -2096,7 +2098,8 @@
                 "description": "Verbose logging (includes Errors, CRC, size information and others)."
               }
             ]
-          }
+          },
+          "default": "Error"
         },
         "accountDetails": {
           "$ref": "#/definitions/DataAccountDetails",
@@ -2260,11 +2263,11 @@
       "description": "Dc access security code",
       "type": "object",
       "properties": {
-        "reverseDcAccessCode": {
+        "reverseDCAccessCode": {
           "description": "Reverse Dc access security code.",
           "type": "string"
         },
-        "forwardDcAccessCode": {
+        "forwardDCAccessCode": {
           "description": "Forward Dc access security code.",
           "type": "string"
         }
@@ -2290,7 +2293,7 @@
       "required": [
         "storageLocation",
         "skuName",
-        "expectedDataSizeInTerabytes"
+        "expectedDataSizeInTeraBytes"
       ],
       "type": "object",
       "allOf": [
@@ -2299,7 +2302,7 @@
         }
       ],
       "properties": {
-        "expectedDataSizeInTerabytes": {
+        "expectedDataSizeInTeraBytes": {
           "format": "int32",
           "description": "The expected size of the data, which needs to be transferred in this job, in terabytes.",
           "type": "integer"
@@ -2511,7 +2514,7 @@
           "description": "Details about which key encryption type is being used.",
           "readOnly": true
         },
-        "expectedDataSizeInTerabytes": {
+        "expectedDataSizeInTeraBytes": {
           "format": "int32",
           "description": "The expected size of the data, which needs to be transferred in this job, in terabytes.",
           "type": "integer"
@@ -2701,7 +2704,8 @@
                 "description": "Scheduled job."
               }
             ]
-          }
+          },
+          "default": "NonScheduled"
         },
         "deliveryInfo": {
           "$ref": "#/definitions/JobDeliveryInfo",
@@ -3034,7 +3038,8 @@
                 "description": "Key encryption key is managed by the Customer."
               }
             ]
-          }
+          },
+          "default": "MicrosoftManaged"
         },
         "kekUrl": {
           "description": "Key encryption key. It is required in case of Customer managed KekType.",
@@ -3123,7 +3128,8 @@
         },
         "sendNotification": {
           "description": "Notification is required or not.",
-          "type": "boolean"
+          "type": "boolean",
+          "default": true
         }
       }
     },
@@ -3678,7 +3684,8 @@
                 "description": "Commercial Address."
               }
             ]
-          }
+          },
+          "default": "None"
         }
       }
     },
@@ -4097,7 +4104,8 @@
                 "description": "Azure Managed disk storage."
               }
             ]
-          }
+          },
+          "default": "StorageAccount"
         },
         "transferAllBlobs": {
           "description": "To indicate if all Azure blobs have to be transferred",
@@ -4187,7 +4195,8 @@
                 "description": "Azure Managed disk storage."
               }
             ]
-          }
+          },
+          "default": "StorageAccount"
         },
         "blobFilterDetails": {
           "$ref": "#/definitions/BlobFilterDetails",