Skip to content

[ReleasePR mediaservices] [Hub Generated] Review request for Microsoft.Media to add version stable/2020-05-01 #1404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
openapi-sdkautomation wants to merge 1 commit into from
Closed

[ReleasePR mediaservices] [Hub Generated] Review request for Microsoft.Media to add version stable/2020-05-01 #1404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions schemas/2014-04-01-preview/deploymentTemplate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,13 @@
{ "$ref": "https://schema.management.azure.com/schemas/2020-06-14/Microsoft.Kusto.json#/resourceDefinitions/clusters_dataconnections" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-06-14/Microsoft.Kusto.json#/resourceDefinitions/clusters_principalassignments" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-06-14/Microsoft.Kusto.json#/resourceDefinitions/clusters_databases_principalassignments" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_databases" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_databases_dataconnections" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_attacheddatabaseconfigurations" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_dataconnections" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_principalassignments" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_databases_principalassignments" },
{ "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/alertrules" },
{ "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/components" },
{ "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/autoscalesettings" },
Expand Down Expand Up @@ -1843,6 +1850,8 @@
{ "$ref": "https://schema.management.azure.com/schemas/2019-10-01/Microsoft.Migrate.json#/resourceDefinitions/assessmentProjects_groups_assessments" },
{ "$ref": "https://schema.management.azure.com/schemas/2019-10-01/Microsoft.Migrate.json#/resourceDefinitions/assessmentProjects_hypervcollectors" },
{ "$ref": "https://schema.management.azure.com/schemas/2019-10-01/Microsoft.Migrate.json#/resourceDefinitions/assessmentProjects_vmwarecollectors" },
{ "$ref": "https://schema.management.azure.com/schemas/2019-10-01-preview/Microsoft.Migrate.json#/resourceDefinitions/moveCollections" },
{ "$ref": "https://schema.management.azure.com/schemas/2019-10-01-preview/Microsoft.Migrate.json#/resourceDefinitions/moveCollections_moveResources" },
{ "$ref": "https://schema.management.azure.com/schemas/2019-03-01/Microsoft.Insights.json#/resourceDefinitions/actionGroups" },
{ "$ref": "https://schema.management.azure.com/schemas/2018-06-01-preview/Microsoft.ManagedServices.json#/resourceDefinitions/registrationAssignments" },
{ "$ref": "https://schema.management.azure.com/schemas/2018-06-01-preview/Microsoft.ManagedServices.json#/resourceDefinitions/registrationDefinitions" },
Expand Down
7 changes: 7 additions & 0 deletions schemas/2015-01-01/deploymentTemplate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,13 @@
{ "$ref": "https://schema.management.azure.com/schemas/2020-06-14/Microsoft.Kusto.json#/resourceDefinitions/clusters_dataconnections" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-06-14/Microsoft.Kusto.json#/resourceDefinitions/clusters_principalassignments" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-06-14/Microsoft.Kusto.json#/resourceDefinitions/clusters_databases_principalassignments" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_databases" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_databases_dataconnections" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_attacheddatabaseconfigurations" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_dataconnections" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_principalassignments" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_databases_principalassignments" },
{ "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/alertrules" },
{ "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/components" },
{ "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/autoscalesettings" },
Expand Down
2 changes: 1 addition & 1 deletion schemas/2015-06-01/Microsoft.Cdn.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,4 +595,4 @@
"description": "The SKU (pricing tier) of the CDN profile."
}
}
}
}
2 changes: 1 addition & 1 deletion schemas/2015-10-01-preview/Microsoft.DataLakeStore.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,4 +298,4 @@
}
}
}
}
}
222 changes: 123 additions & 99 deletions schemas/2015-10-01/Microsoft.Media.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,99 +1,123 @@
{
"id": "https://schema.management.azure.com/schemas/2015-10-01/Microsoft.Media.json#",
"$schema": "http://json-schema.org/draft-04/schema#",
"title": "Microsoft.Media",
"description": "Microsoft Media Service Resource Type",
"resourceDefinitions": {
"mediaServices": {
"type": "object",
"properties": {
"type": {
"enum": [
"Microsoft.Media/mediaServices"
]
},
"apiVersion": {
"enum": [
"2015-10-01"
]
},
"name": {
"oneOf": [
{
"type": "string",
"pattern": "^[a-z0-9]{3,26}$"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
]
},
"properties": {
"oneOf": [
{
"$ref": "#/definitions/storageAccounts"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
]
}
},
"required": [
"type",
"apiVersion",
"location"
],
"description": "Microsoft.Media/mediaServices"
}
},
"definitions" : {
"storageAccounts": {
"properties": {
"storageAccounts": {
"oneOf" : [
{
"type": "array",
"items": {
"$ref": "#/definitions/storageAccount"
}
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
]
}
},
"type": "object"
},
"storageAccount": {
"oneOf": [
{
"type": "object",
"properties": {
"id": {
"type": "string"
},
"isPrimary": {
"oneOf": [
{
"type": "boolean"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
]
}
},
"required": [
"id",
"isPrimary"
]
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
]
}
}
}
{
"id": "https://schema.management.azure.com/schemas/2015-10-01/Microsoft.Media.json#",
"$schema": "http://json-schema.org/draft-04/schema#",
"title": "Microsoft.Media",
"description": "Microsoft Media Resource Types",
"resourceDefinitions": {
"mediaservices": {
"type": "object",
"properties": {
"apiVersion": {
"type": "string",
"enum": [
"2015-10-01"
]
},
"location": {
"type": "string",
"description": "The geographic location of the resource. This must be one of the supported and registered Azure Geo Regions (for example, West US, East US, Southeast Asia, and so forth)."
},
"name": {
"oneOf": [
{
"type": "string",
"pattern": "^[a-z0-9]{3,24}$",
"minLength": 3,
"maxLength": 24
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Name of the Media Service."
},
"properties": {
"oneOf": [
{
"$ref": "#/definitions/MediaServiceProperties"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "The additional properties of a Media Service resource."
},
"tags": {
"oneOf": [
{
"type": "object",
"additionalProperties": {
"type": "string"
},
"properties": {}
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Tags to help categorize the resource in the Azure portal."
},
"type": {
"type": "string",
"enum": [
"Microsoft.Media/mediaservices"
]
}
},
"required": [
"apiVersion",
"name",
"properties",
"type"
],
"description": "Microsoft.Media/mediaservices"
}
},
"definitions": {
"MediaServiceProperties": {
"type": "object",
"properties": {
"storageAccounts": {
"oneOf": [
{
"type": "array",
"items": {
"$ref": "#/definitions/StorageAccount"
}
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "The storage accounts for this resource."
}
},
"description": "The additional properties of a Media Service resource."
},
"StorageAccount": {
"type": "object",
"properties": {
"id": {
"type": "string",
"description": "The id of the storage account resource. Media Services relies on tables and queues as well as blobs, so the primary storage account must be a Standard Storage account (either Microsoft.ClassicStorage or Microsoft.Storage). Blob only storage accounts can be added as secondary storage accounts (isPrimary false)."
},
"isPrimary": {
"oneOf": [
{
"type": "boolean"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Is this storage account resource the primary storage account for the Media Service resource. Blob only storage must set this to false."
}
},
"required": [
"id",
"isPrimary"
],
"description": "The properties of a storage account associated with this resource."
}
}
}
2 changes: 1 addition & 1 deletion schemas/2016-02-01-preview/Microsoft.CognitiveServices.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,4 +146,4 @@
"description": "The SKU of the cognitive services account."
}
}
}
}
2 changes: 1 addition & 1 deletion schemas/2016-04-02/Microsoft.Cdn.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,4 +579,4 @@
"description": "The SKU (pricing tier) of the CDN profile."
}
}
}
}
2 changes: 1 addition & 1 deletion schemas/2016-10-02/Microsoft.Cdn.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,4 +570,4 @@
"description": "The pricing tier (defines a CDN provider, feature list and rate) of the CDN profile."
}
}
}
}
2 changes: 1 addition & 1 deletion schemas/2016-11-01/Microsoft.DataLakeStore.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,4 +668,4 @@
"description": "Metadata information used by account encryption."
}
}
}
}
2 changes: 1 addition & 1 deletion schemas/2016-11-01/Microsoft.ImportExport.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,4 +491,4 @@
"description": "Contains information about the Microsoft datacenter to which the drives should be shipped."
}
}
}
}
2 changes: 1 addition & 1 deletion schemas/2017-04-02/Microsoft.Cdn.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,4 +574,4 @@
"description": "The pricing tier (defines a CDN provider, feature list and rate) of the CDN profile."
}
}
}
}
2 changes: 1 addition & 1 deletion schemas/2017-04-18/Microsoft.CognitiveServices.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,4 +654,4 @@
"description": "A rule governing the accessibility from a specific virtual network."
}
}
}
}
57 changes: 57 additions & 0 deletions schemas/2017-06-01/Microsoft.AAD.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,17 @@
],
"description": "Secure LDAP Settings"
},
"migrationProperties": {
"oneOf": [
{
"$ref": "#/definitions/MigrationProperties"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Migration Properties"
},
"notificationSettings": {
"oneOf": [
{
Expand Down Expand Up @@ -388,6 +399,52 @@
},
"description": "Secure LDAP Settings"
},
"MigrationProgress": {
"type": "object",
"properties": {
"completionPercentage": {
"oneOf": [
{
"type": "number"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Completion Percentage"
},
"progressMessage": {
"type": "string",
"description": "Progress Message"
}
},
"description": "Migration Progress"
},
"MigrationProperties": {
"type": "object",
"properties": {
"migrationProgress": {
"oneOf": [
{
"$ref": "#/definitions/MigrationProgress"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Migration Progress"
},
"oldSubnetId": {
"type": "string",
"description": "Old Subnet Id"
},
"oldVnetSiteId": {
"type": "string",
"description": "Old Vnet Site Id"
}
},
"description": "Migration Properties"
},
"NotificationSettings": {
"type": "object",
"properties": {
Expand Down
Loading