xiaoxuqi-ms · xiaoxuqi-ms · Feb 7, 2020 · Feb 7, 2020
diff --git a/...tion/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/AccountFilters.json b/...tion/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/AccountFilters.json
@@ -8,7 +8,6 @@
     "description": "This Swagger was generated by the API Framework.",
     "version": "2018-07-01"
   },
-  "host": "management.azure.com",
   "consumes": [
     "application/json"
   ],
@@ -199,6 +198,18 @@
         }
       ],
       "properties": {
+        "name": {
+          "type": "string",
+          "readOnly": true
+        },
+        "id": {
+          "type": "string",
+          "readOnly": true
+        },
+        "type": {
+          "type": "string",
+          "readOnly": true
+        },
         "properties": {
           "$ref": "#/definitions/MediaFilterProperties",
           "x-ms-client-flatten": true
@@ -546,4 +557,4 @@
       "description": "The Version of the API to be used with the client request."
     }
   }
-}
+}
diff --git a/...diaservices/resource-manager/Microsoft.Media/stable/2018-07-01/AssetsAndAssetFilters.json b/...diaservices/resource-manager/Microsoft.Media/stable/2018-07-01/AssetsAndAssetFilters.json
@@ -8,7 +8,6 @@
     "description": "This Swagger was generated by the API Framework.",
     "version": "2018-07-01"
   },
-  "host": "management.azure.com",
   "consumes": [
     "application/json"
   ],
@@ -222,9 +221,20 @@
         }
       ],
       "properties": {
+        "name": {
+          "type": "string",
+          "readOnly": true
+        },
+        "id": {
+          "type": "string",
+          "readOnly": true
+        },
+        "type": {
+          "type": "string",
+          "readOnly": true
+        },
         "properties": {
           "$ref": "#/definitions/AssetProperties",
-          "description": "The resource properties.",
           "x-ms-client-flatten": true
         }
       },
@@ -403,6 +413,18 @@
         }
       ],
       "properties": {
+        "name": {
+          "type": "string",
+          "readOnly": true
+        },
+        "id": {
+          "type": "string",
+          "readOnly": true
+        },
+        "type": {
+          "type": "string",
+          "readOnly": true
+        },
         "properties": {
           "$ref": "#/definitions/MediaFilterProperties",
           "x-ms-client-flatten": true
@@ -464,10 +486,8 @@
       "description": "A collection of Asset items."
     },
     "ListContainerSasInput": {
-      "description": "The parameters to the list SAS request.",
       "properties": {
         "permissions": {
-          "description": "The permissions to set on the SAS URL.",
           "type": "string",
           "enum": [
             "Read",
@@ -494,7 +514,6 @@
           }
         },
         "expiryTime": {
-          "description": "The SAS URL expiration time.  This must be less than 24 hours from the current time.",
           "type": "string",
           "format": "date-time"
         }
@@ -1270,4 +1289,4 @@
       "description": "The Version of the API to be used with the client request."
     }
   }
-}
+}
diff --git a/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/Common.json b/specification/mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/Common.json
@@ -77,4 +77,4 @@
       ]
     }
   }
-}
+}
diff --git a/.../mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/ContentKeyPolicies.json b/.../mediaservices/resource-manager/Microsoft.Media/stable/2018-07-01/ContentKeyPolicies.json
@@ -81,7 +81,8 @@
         "keyId": {
           "type": "string",
           "format": "uuid",
-          "description": "The content key ID."
+          "description": "The content key ID.",
+          "x-nullable": true
         }
       },
       "type": "object",
@@ -387,7 +388,8 @@
         "keyValue": {
           "type": "string",
           "format": "byte",
-          "description": "The key value of the key"
+          "description": "The key value of the key",
+          "x-nullable": true
         }
       },
       "type": "object",
@@ -407,20 +409,22 @@
         "exponent": {
           "type": "string",
           "format": "byte",
-          "description": "The RSA Parameter exponent"
+          "description": "The RSA Parameter exponent.",
+          "x-nullable": true
         },
         "modulus": {
           "type": "string",
           "format": "byte",
-          "description": "The RSA Parameter modulus"
+          "description": "The RSA Parameter modulus.",
+          "x-nullable": true
         }
       },
       "type": "object",
       "required": [
         "exponent",
         "modulus"
       ],
-      "description": "Specifies a RSA key for token validation"
+      "description": "Specifies a RSA key for token validation."
     },
     "ContentKeyPolicyX509CertificateTokenKey": {
       "x-ms-discriminator-value": "#Microsoft.Media.ContentKeyPolicyX509CertificateTokenKey",
@@ -758,6 +762,18 @@
         }
       ],
       "properties": {
+        "name": {
+          "type": "string",
+          "readOnly": true
+        },
+        "id": {
+          "type": "string",
+          "readOnly": true
+        },
+        "type": {
+          "type": "string",
+          "readOnly": true
+        },
         "properties": {
           "$ref": "#/definitions/ContentKeyPolicyProperties",
           "x-ms-client-flatten": true
@@ -1192,4 +1208,4 @@
       "description": "The Version of the API to be used with the client request."
     }
   }
-}
+}
diff --git a/...urce-manager/Microsoft.Media/stable/2018-07-01/StreamingPoliciesAndStreamingLocators.json b/...urce-manager/Microsoft.Media/stable/2018-07-01/StreamingPoliciesAndStreamingLocators.json
@@ -8,7 +8,6 @@
     "description": "This Swagger was generated by the API Framework.",
     "version": "2018-07-01"
   },
-  "host": "management.azure.com",
   "consumes": [
     "application/json"
   ],
@@ -376,6 +375,18 @@
         }
       ],
       "properties": {
+        "name": {
+          "type": "string",
+          "readOnly": true
+        },
+        "id": {
+          "type": "string",
+          "readOnly": true
+        },
+        "type": {
+          "type": "string",
+          "readOnly": true
+        },
         "properties": {
           "$ref": "#/definitions/StreamingPolicyProperties",
           "x-ms-client-flatten": true
@@ -631,6 +642,18 @@
         }
       ],
       "properties": {
+        "name": {
+          "type": "string",
+          "readOnly": true
+        },
+        "id": {
+          "type": "string",
+          "readOnly": true
+        },
+        "type": {
+          "type": "string",
+          "readOnly": true
+        },
         "properties": {
           "$ref": "#/definitions/StreamingLocatorProperties",
           "x-ms-client-flatten": true
@@ -1286,4 +1309,4 @@
       "description": "The Version of the API to be used with the client request."
     }
   }
-}
+}
diff --git a/...es/resource-manager/Microsoft.Media/stable/2018-07-01/examples/accountFilters-create.json b/...es/resource-manager/Microsoft.Media/stable/2018-07-01/examples/accountFilters-create.json
@@ -168,4 +168,4 @@
       }
     }
   }
-}
+}
diff --git a/...es/resource-manager/Microsoft.Media/stable/2018-07-01/examples/accountFilters-delete.json b/...es/resource-manager/Microsoft.Media/stable/2018-07-01/examples/accountFilters-delete.json
@@ -10,4 +10,4 @@
     "200": {},
     "204": {}
   }
-}
+}
diff --git a/...source-manager/Microsoft.Media/stable/2018-07-01/examples/accountFilters-get-by-name.json b/...source-manager/Microsoft.Media/stable/2018-07-01/examples/accountFilters-get-by-name.json
@@ -53,4 +53,4 @@
     },
     "404": {}
   }
-}
+}
diff --git a/.../resource-manager/Microsoft.Media/stable/2018-07-01/examples/accountFilters-list-all.json b/.../resource-manager/Microsoft.Media/stable/2018-07-01/examples/accountFilters-list-all.json
@@ -108,4 +108,4 @@
       }
     }
   }
-}
+}
diff --git a/...es/resource-manager/Microsoft.Media/stable/2018-07-01/examples/accountFilters-update.json b/...es/resource-manager/Microsoft.Media/stable/2018-07-01/examples/accountFilters-update.json
@@ -78,4 +78,4 @@
       }
     }
   }
-}
+}
diff --git a/...ices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/assetFilters-create.json b/...ices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/assetFilters-create.json
@@ -169,4 +169,4 @@
       }
     }
   }
-}
+}
diff --git a/...ices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/assetFilters-delete.json b/...ices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/assetFilters-delete.json
@@ -11,4 +11,4 @@
     "200": {},
     "204": {}
   }
-}
+}
diff --git a/...resource-manager/Microsoft.Media/stable/2018-07-01/examples/assetFilters-get-by-name.json b/...resource-manager/Microsoft.Media/stable/2018-07-01/examples/assetFilters-get-by-name.json
@@ -65,4 +65,4 @@
     },
     "404": {}
   }
-}
+}
diff --git a/...es/resource-manager/Microsoft.Media/stable/2018-07-01/examples/assetFilters-list-all.json b/...es/resource-manager/Microsoft.Media/stable/2018-07-01/examples/assetFilters-list-all.json
@@ -128,4 +128,4 @@
       }
     }
   }
-}
+}
diff --git a/...ices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/assetFilters-update.json b/...ices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/assetFilters-update.json
@@ -79,4 +79,4 @@
       }
     }
   }
-}
+}
diff --git a/...iaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/assets-create.json b/...iaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/assets-create.json
@@ -19,11 +19,10 @@
         "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contoso/providers/Microsoft.Media/mediaservices/contosomedia/assets/ClimbingMountLogan",
         "type": "Microsoft.Media/mediaservices/assets",
         "properties": {
-          "assetId": "09194258-36ba-4403-abb3-68780e6bc545",
-          "created": "2018-08-08T18:29:26.08Z",
-          "lastModified": "2018-08-08T18:29:26.08Z",
+          "assetId": "d69c0886-1120-4630-a3da-4909b2805718",
+          "created": "2020-02-07T22:04:43.21Z",
+          "lastModified": "2020-02-07T22:04:43.21Z",
           "description": "A documentary showing the ascent of Mount Logan",
-          "container": "asset-09194258-36ba-4403-abb3-68780e6bc545",
           "storageAccountName": "storage0",
           "storageEncryptionFormat": "None"
         }
@@ -35,15 +34,15 @@
         "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/contoso/providers/Microsoft.Media/mediaservices/contosomedia/assets/ClimbingMountLogan",
         "type": "Microsoft.Media/mediaservices/assets",
         "properties": {
-          "assetId": "09194258-36ba-4403-abb3-68780e6bc545",
-          "created": "2018-08-08T18:29:26.08Z",
-          "lastModified": "2018-08-08T18:29:26.107Z",
+          "assetId": "d69c0886-1120-4630-a3da-4909b2805718",
+          "created": "2020-02-07T22:04:43.21Z",
+          "lastModified": "2020-02-07T22:04:43.223Z",
           "description": "A documentary showing the ascent of Mount Logan",
-          "container": "asset-09194258-36ba-4403-abb3-68780e6bc545",
+          "container": "asset-d69c0886-1120-4630-a3da-4909b2805718",
           "storageAccountName": "storage0",
           "storageEncryptionFormat": "None"
         }
       }
     }
   }
-}
+}
diff --git a/...iaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/assets-delete.json b/...iaservices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/assets-delete.json
@@ -10,4 +10,4 @@
     "200": {},
     "204": {}
   }
-}
+}
diff --git a/...vices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/assets-get-by-name.json b/...vices/resource-manager/Microsoft.Media/stable/2018-07-01/examples/assets-get-by-name.json
@@ -25,4 +25,4 @@
     },
     "404": {}
   }
-}
+}
diff --git a/...source-manager/Microsoft.Media/stable/2018-07-01/examples/assets-get-encryption-keys.json b/...source-manager/Microsoft.Media/stable/2018-07-01/examples/assets-get-encryption-keys.json
@@ -11,6 +11,11 @@
       "body": {
         "key": "AAAAAAAAAAAAAAAAAAAAAA==",
         "assetFileEncryptionMetadata": [
+          {
+            "initializationVector": "268435469",
+            "assetFileName": "file0.mp4",
+            "assetFileId": "10000000-0000-0000-0000-00000000000d"
+          },
           {
             "initializationVector": "-988929866",
             "assetFileName": "AssetFile0",
@@ -30,4 +35,4 @@
       }
     }
   }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -77,4 +77,4 @@ @@
           ]
         }
       }
-    }
+    }