This commit is contained in:
Lei Ni 2020-02-20 11:22:56 +08:00
Родитель 5051bd417d
Коммит a92d9ac52c
12 изменённых файлов: 214 добавлений и 24 удалений

Просмотреть файл

@ -5,7 +5,11 @@
regenExpected = (opts,done) ->
keys = Object.getOwnPropertyNames(opts.mappings)
instances = keys.length
instances = 0
for kkey in keys
value = opts.mappings[kkey]
instances += value.apiVersions.length
for kkey in keys
value = opts.mappings[kkey]

Просмотреть файл

@ -31,7 +31,7 @@
},
"homepage": "https://github.com/Azure/autorest.azureresourceschema/blob/master/README.md",
"devDependencies": {
"@autorest/autorest": "^3.0.6113",
"@autorest/autorest": "^3.0.6175",
"coffee-script": "^1.11.1",
"dotnet-sdk-2.0.0": "^1.4.4",
"gulp": "^3.9.1",

Просмотреть файл

@ -107,7 +107,7 @@
],
"description": "The properties of the Azure File volume. Azure File shares are mounted as volumes."
},
"Componentsschemascontainergroupidentitypropertiesuserassignedidentitiesadditionalproperties": {
"Components10wh5udschemascontainergroupidentitypropertiesuserassignedidentitiesadditionalproperties": {
"type": "object",
"properties": {}
},
@ -198,7 +198,7 @@
{
"type": "object",
"additionalProperties": {
"$ref": "#/definitions/Componentsschemascontainergroupidentitypropertiesuserassignedidentitiesadditionalproperties"
"$ref": "#/definitions/Components10wh5udschemascontainergroupidentitypropertiesuserassignedidentitiesadditionalproperties"
},
"properties": {}
},

Просмотреть файл

@ -12777,7 +12777,7 @@
"rootPath": {
"type": "object",
"properties": {},
"description": "The root path in 'sparkJobLinkedService' for all the job<EFBFBD><EFBFBD>s files. Type: string (or Expression with resultType string)."
"description": "The root path in 'sparkJobLinkedService' for all the jobs files. Type: string (or Expression with resultType string)."
},
"sparkConfig": {
"oneOf": [

Просмотреть файл

@ -703,7 +703,7 @@
{
"type": "object",
"additionalProperties": {
"$ref": "#/definitions/Componentsschemasclusteridentitypropertiesuserassignedidentitiesadditionalproperties"
"$ref": "#/definitions/Componentsc51ht8schemasclusteridentitypropertiesuserassignedidentitiesadditionalproperties"
},
"properties": {}
},
@ -811,7 +811,7 @@
],
"description": "Microsoft.HDInsight/clusters/extensions"
},
"Componentsschemasclusteridentitypropertiesuserassignedidentitiesadditionalproperties": {
"Componentsc51ht8schemasclusteridentitypropertiesuserassignedidentitiesadditionalproperties": {
"type": "object",
"properties": {}
},

Просмотреть файл

@ -703,7 +703,7 @@
{
"type": "object",
"additionalProperties": {
"$ref": "#/definitions/Componentsschemasclusteridentitypropertiesuserassignedidentitiesadditionalproperties"
"$ref": "#/definitions/Componentsc51ht8schemasclusteridentitypropertiesuserassignedidentitiesadditionalproperties"
},
"properties": {}
},
@ -811,7 +811,7 @@
],
"description": "Microsoft.HDInsight/clusters/extensions"
},
"Componentsschemasclusteridentitypropertiesuserassignedidentitiesadditionalproperties": {
"Componentsc51ht8schemasclusteridentitypropertiesuserassignedidentitiesadditionalproperties": {
"type": "object",
"properties": {}
},

Просмотреть файл

@ -14,7 +14,15 @@
]
},
"name": {
"type": "string",
"oneOf": [
{
"type": "string",
"pattern": "^.*/ActiveDirectory$"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "The requested administrator name."
},
"properties": {
@ -1176,6 +1184,17 @@
],
"description": "Specifies whether storageAccountAccessKey value is the storage's secondary key."
},
"queueDelayMs": {
"oneOf": [
{
"type": "integer"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Specifies the amount of time in milliseconds that can elapse before audit actions are forced to be processed.\r\nThe default minimum value is 1000 (1 second). The maximum is 2,147,483,647."
},
"retentionDays": {
"oneOf": [
{
@ -1220,7 +1239,7 @@
},
"storageEndpoint": {
"type": "string",
"description": "Specifies the blob storage endpoint (e.g. https://MyAccount.blob.core.windows.net). If state is Enabled, storageEndpoint is required."
"description": "Specifies the blob storage endpoint (e.g. https://MyAccount.blob.core.windows.net). If state is Enabled, storageEndpoint or isAzureMonitorTargetEnabled is required."
}
},
"required": [
@ -1373,7 +1392,7 @@
},
"storageContainerSasKey": {
"type": "string",
"description": "A shared access signature (SAS Key) that has write access to the blob container specified in 'storageContainerPath' parameter. If 'storageAccountAccessKey' isn't specified, StorageContainerSasKey is required."
"description": "A shared access signature (SAS Key) that has read and write access to the blob container specified in 'storageContainerPath' parameter. If 'storageAccountAccessKey' isn't specified, StorageContainerSasKey is required."
}
},
"description": "Properties of a database Vulnerability Assessment."
@ -1467,6 +1486,17 @@
"type": "string",
"description": "Specifies condition of where clause when creating an audit."
},
"queueDelayMs": {
"oneOf": [
{
"type": "integer"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Specifies the amount of time in milliseconds that can elapse before audit actions are forced to be processed.\r\nThe default minimum value is 1000 (1 second). The maximum is 2,147,483,647."
},
"retentionDays": {
"oneOf": [
{
@ -1511,7 +1541,7 @@
},
"storageEndpoint": {
"type": "string",
"description": "Specifies the blob storage endpoint (e.g. https://MyAccount.blob.core.windows.net). If state is Enabled, storageEndpoint is required."
"description": "Specifies the blob storage endpoint (e.g. https://MyAccount.blob.core.windows.net). If state is Enabled, storageEndpoint or isAzureMonitorTargetEnabled is required."
}
},
"required": [
@ -1562,6 +1592,17 @@
"type": "string",
"description": "Specifies condition of where clause when creating an audit."
},
"queueDelayMs": {
"oneOf": [
{
"type": "integer"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Specifies the amount of time in milliseconds that can elapse before audit actions are forced to be processed.\r\nThe default minimum value is 1000 (1 second). The maximum is 2,147,483,647."
},
"retentionDays": {
"oneOf": [
{
@ -1606,7 +1647,7 @@
},
"storageEndpoint": {
"type": "string",
"description": "Specifies the blob storage endpoint (e.g. https://MyAccount.blob.core.windows.net). If state is Enabled, storageEndpoint is required."
"description": "Specifies the blob storage endpoint (e.g. https://MyAccount.blob.core.windows.net). If state is Enabled, storageEndpoint or isAzureMonitorTargetEnabled is required."
}
},
"required": [
@ -2384,6 +2425,23 @@
"labelName": {
"type": "string",
"description": "The label name."
},
"rank": {
"oneOf": [
{
"type": "string",
"enum": [
"None",
"Low",
"Medium",
"High",
"Critical"
]
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
]
}
},
"description": "Properties of a sensitivity label."
@ -2427,6 +2485,17 @@
],
"description": "Specifies whether storageAccountAccessKey value is the storage's secondary key."
},
"queueDelayMs": {
"oneOf": [
{
"type": "integer"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Specifies the amount of time in milliseconds that can elapse before audit actions are forced to be processed.\r\nThe default minimum value is 1000 (1 second). The maximum is 2,147,483,647."
},
"retentionDays": {
"oneOf": [
{
@ -2471,7 +2540,7 @@
},
"storageEndpoint": {
"type": "string",
"description": "Specifies the blob storage endpoint (e.g. https://MyAccount.blob.core.windows.net). If state is Enabled, storageEndpoint is required."
"description": "Specifies the blob storage endpoint (e.g. https://MyAccount.blob.core.windows.net). If state is Enabled, storageEndpoint or isAzureMonitorTargetEnabled is required."
}
},
"required": [

Просмотреть файл

@ -313,6 +313,53 @@
],
"description": "Microsoft.Sql/managedInstances/vulnerabilityAssessments"
},
"servers_administrators": {
"type": "object",
"properties": {
"apiVersion": {
"type": "string",
"enum": [
"2018-06-01-preview"
]
},
"name": {
"oneOf": [
{
"type": "string",
"pattern": "^.*/ActiveDirectory$"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "The name of server active directory administrator."
},
"properties": {
"oneOf": [
{
"$ref": "#/definitions/AdministratorProperties"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Properties of a active directory administrator."
},
"type": {
"type": "string",
"enum": [
"Microsoft.Sql/servers/administrators"
]
}
},
"required": [
"apiVersion",
"name",
"properties",
"type"
],
"description": "Microsoft.Sql/servers/administrators"
},
"servers_databases_securityAlertPolicies": {
"type": "object",
"properties": {
@ -448,6 +495,59 @@
}
},
"definitions": {
"AdministratorProperties": {
"type": "object",
"properties": {
"administratorType": {
"oneOf": [
{
"type": "string",
"enum": [
"ActiveDirectory"
]
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Type of the sever administrator."
},
"login": {
"type": "string",
"description": "Login name of the server administrator."
},
"sid": {
"oneOf": [
{
"type": "string",
"pattern": "^[0-9a-fA-F]{8}(-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}$"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "SID (object ID) of the server administrator."
},
"tenantId": {
"oneOf": [
{
"type": "string",
"pattern": "^[0-9a-fA-F]{8}(-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}$"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Tenant ID of the administrator."
}
},
"required": [
"administratorType",
"login",
"sid"
],
"description": "Properties of a active directory administrator."
},
"InstancePoolProperties": {
"type": "object",
"properties": {
@ -803,7 +903,7 @@
},
"storageContainerSasKey": {
"type": "string",
"description": "A shared access signature (SAS Key) that has write access to the blob container specified in 'storageContainerPath' parameter. If 'storageAccountAccessKey' isn't specified, StorageContainerSasKey is required."
"description": "A shared access signature (SAS Key) that has read and write access to the blob container specified in 'storageContainerPath' parameter. If 'storageAccountAccessKey' isn't specified, StorageContainerSasKey is required."
}
},
"required": [
@ -984,6 +1084,23 @@
"labelName": {
"type": "string",
"description": "The label name."
},
"rank": {
"oneOf": [
{
"type": "string",
"enum": [
"None",
"Low",
"Medium",
"High",
"Critical"
]
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
]
}
},
"description": "Properties of a sensitivity label."
@ -1012,7 +1129,7 @@
},
"storageContainerSasKey": {
"type": "string",
"description": "A shared access signature (SAS Key) that has write access to the blob container specified in 'storageContainerPath' parameter. If 'storageAccountAccessKey' isn't specified, StorageContainerSasKey is required."
"description": "A shared access signature (SAS Key) that has read and write access to the blob container specified in 'storageContainerPath' parameter. If 'storageAccountAccessKey' isn't specified, StorageContainerSasKey is required."
}
},
"required": [

Просмотреть файл

@ -84,7 +84,7 @@
}
},
"definitions": {
"Componentsschemasimagetemplateidentitypropertiesuserassignedidentitiesadditionalproperties": {
"Componentsvrq145schemasimagetemplateidentitypropertiesuserassignedidentitiesadditionalproperties": {
"type": "object",
"properties": {}
},
@ -209,7 +209,7 @@
{
"type": "object",
"additionalProperties": {
"$ref": "#/definitions/Componentsschemasimagetemplateidentitypropertiesuserassignedidentitiesadditionalproperties"
"$ref": "#/definitions/Componentsvrq145schemasimagetemplateidentitypropertiesuserassignedidentitiesadditionalproperties"
},
"properties": {}
},

Просмотреть файл

@ -131,7 +131,7 @@
},
"address2": {
"type": "string",
"description": "The second line of the Address. Optional."
"description": "First line of an Address."
},
"city": {
"type": "string",

Просмотреть файл

@ -4066,7 +4066,7 @@
],
"description": "Information needed for cloning operation."
},
"Componentsschemasmanagedserviceidentitypropertiesuserassignedidentitiesadditionalproperties": {
"Components1jq1t4ischemasmanagedserviceidentitypropertiesuserassignedidentitiesadditionalproperties": {
"type": "object",
"properties": {}
},
@ -4938,7 +4938,7 @@
{
"type": "object",
"additionalProperties": {
"$ref": "#/definitions/Componentsschemasmanagedserviceidentitypropertiesuserassignedidentitiesadditionalproperties"
"$ref": "#/definitions/Components1jq1t4ischemasmanagedserviceidentitypropertiesuserassignedidentitiesadditionalproperties"
},
"properties": {}
},

Просмотреть файл

@ -3203,7 +3203,7 @@
],
"description": "Information needed for cloning operation."
},
"Componentsschemasmanagedserviceidentitypropertiesuserassignedidentitiesadditionalproperties": {
"Components1jq1t4ischemasmanagedserviceidentitypropertiesuserassignedidentitiesadditionalproperties": {
"type": "object",
"properties": {}
},
@ -3943,7 +3943,7 @@
{
"type": "object",
"additionalProperties": {
"$ref": "#/definitions/Componentsschemasmanagedserviceidentitypropertiesuserassignedidentitiesadditionalproperties"
"$ref": "#/definitions/Components1jq1t4ischemasmanagedserviceidentitypropertiesuserassignedidentitiesadditionalproperties"
},
"properties": {}
},