CodeGen from PR 12537 in Azure/azure-rest-api-specs

Merge 3e1c1502b5e19bcf7727685dd2ce2f53f4f9a6fd into 111dc7ff1f271c38b04b913ec629b26f26561455
AzureSDKAutomation · Jan 21, 2021 · eddcf06 · eddcf06
1 parent 4288be5
commit eddcf06
Show file tree

Hide file tree

Showing 2 changed files with 78 additions and 13 deletions.
diff --git a/schemas/2016-11-01/Microsoft.ImportExport.json b/schemas/2016-11-01/Microsoft.ImportExport.json
@@ -54,6 +54,39 @@
     }
   },
   "definitions": {
+    "DeliveryPackageInformation": {
+      "type": "object",
+      "properties": {
+        "carrierName": {
+          "type": "string",
+          "description": "The name of the carrier that is used to ship the import or export drives."
+        },
+        "driveCount": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The number of drives included in the package."
+        },
+        "shipDate": {
+          "type": "string",
+          "description": "The date when the package is shipped."
+        },
+        "trackingNumber": {
+          "type": "string",
+          "description": "The tracking number of the package."
+        }
+      },
+      "required": [
+        "carrierName",
+        "trackingNumber"
+      ],
+      "description": "Contains information about the delivery package being shipped by the customer to the Microsoft data center."
+    },
     "DriveStatus": {
       "type": "object",
       "properties": {
@@ -138,6 +171,35 @@
       },
       "description": "Provides information about the drive's status"
     },
+    "EncryptionKeyDetails": {
+      "type": "object",
+      "properties": {
+        "kekType": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "MicrosoftManaged",
+                "CustomerManaged"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The type of kek encryption key."
+        },
+        "kekUrl": {
+          "type": "string",
+          "description": "Specifies the url for kek encryption key. "
+        },
+        "kekVaultResourceID": {
+          "type": "string",
+          "description": "Specifies the keyvault resource id for kek encryption key. "
+        }
+      },
+      "description": "Specifies the encryption key properties"
+    },
     "Export": {
       "type": "object",
       "properties": {
@@ -152,7 +214,7 @@
           ],
           "description": "A list of the blobs to be exported."
         },
-        "blobListblobPath": {
+        "blobListBlobPath": {
           "type": "string",
           "description": "The relative URI to the block blob that contains the list of blob paths or blob path prefixes as defined above, beginning with the container name. If the blob is in root container, the URI must begin with $root. "
         }
@@ -221,13 +283,13 @@
         "deliveryPackage": {
           "oneOf": [
             {
-              "$ref": "#/definitions/PackageInfomation"
+              "$ref": "#/definitions/DeliveryPackageInformation"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "Contains information about the package being shipped by the customer to the Microsoft data center."
+          "description": "Contains information about the delivery package being shipped by the customer to the Microsoft data center."
         },
         "diagnosticsPath": {
           "type": "string",
@@ -247,6 +309,17 @@
           ],
           "description": "List of up to ten drives that comprise the job. The drive list is a required element for an import job; it is not specified for export jobs."
         },
+        "encryptionKey": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/EncryptionKeyDetails"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Specifies the encryption key properties"
+        },
         "export": {
           "oneOf": [
             {
@@ -480,15 +553,7 @@
           "description": "The first line of the street address to use when returning the drives. "
         }
       },
-      "required": [
-        "city",
-        "countryOrRegion",
-        "postalCode",
-        "recipientName",
-        "stateOrProvince",
-        "streetAddress1"
-      ],
       "description": "Contains information about the Microsoft datacenter to which the drives should be shipped."
     }
   }
-}
+}
diff --git a/schemas/2020-08-01/Microsoft.ImportExport.json b/schemas/2020-08-01/Microsoft.ImportExport.json
@@ -564,4 +564,4 @@
       "description": "Contains information about the Microsoft datacenter to which the drives should be shipped."
     }
   }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -564,4 +564,4 @@ @@
           "description": "Contains information about the Microsoft datacenter to which the drives should be shipped."
         }
       }
-    }
+    }