From 2b5178b6a8fa6e57aa71abdd10ccea07b3999e2f Mon Sep 17 00:00:00 2001 From: Autogenerator Pipeline Date: Mon, 24 Aug 2020 09:17:57 +0000 Subject: [PATCH 01/15] Update resource list --- generator/resources.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/generator/resources.json b/generator/resources.json index 083b3cb2ba..6b11c15f12 100644 --- a/generator/resources.json +++ b/generator/resources.json @@ -18,6 +18,10 @@ "Microsoft.AVS/privateClouds/hcxEnterpriseSites": [ "2020-03-20" ], + "Microsoft.Aad/domainServices/ouContainer": [ + "2017-06-01", + "2020-01-01" + ], "Microsoft.Addons/supportProviders/supportPlanTypes": [ "2017-05-15", "2018-03-01" From 904d33d2456a9bf747525e9b8091ce3ae7c5ca93 Mon Sep 17 00:00:00 2001 From: Autogenerator Pipeline Date: Mon, 24 Aug 2020 10:59:40 +0000 Subject: [PATCH 02/15] Autogenerate schemas --- .../Microsoft.MachineLearningServices.json | 60 + schemas/2020-06-01/Microsoft.NetApp.json | 1674 +++++++++++++++++ schemas/common/autogeneratedResources.json | 21 + 3 files changed, 1755 insertions(+) create mode 100644 schemas/2020-06-01/Microsoft.NetApp.json diff --git a/schemas/2020-02-18-preview/Microsoft.MachineLearningServices.json b/schemas/2020-02-18-preview/Microsoft.MachineLearningServices.json index 034dabc6f9..fd2d56e182 100644 --- a/schemas/2020-02-18-preview/Microsoft.MachineLearningServices.json +++ b/schemas/2020-02-18-preview/Microsoft.MachineLearningServices.json @@ -505,6 +505,24 @@ }, "description": "AML Compute properties" }, + "AssignedUser": { + "type": "object", + "properties": { + "objectId": { + "type": "string", + "description": "User’s AAD Object Id." + }, + "tenantId": { + "type": "string", + "description": "User’s AAD Tenant Id." + } + }, + "required": [ + "objectId", + "tenantId" + ], + "description": "A user that can be assigned to a compute instance." + }, "Compute": { "type": "object", "oneOf": [ @@ -593,6 +611,31 @@ ], "description": "Policy for sharing applications on this compute instance among users of parent workspace. If Personal, only the creator can access applications on this compute instance. When Shared, any workspace user can access applications on this instance depending on his/her assigned role." }, + "computeInstanceAuthorizationType": { + "oneOf": [ + { + "type": "string", + "enum": [ + "personal" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The Compute Instance Authorization type. Available values are personal (default)." + }, + "personalComputeInstanceSettings": { + "oneOf": [ + { + "$ref": "#/definitions/PersonalComputeInstanceSettings" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Settings for a personal compute instance." + }, "sshSettings": { "oneOf": [ { @@ -861,6 +904,23 @@ "keyVaultArmId" ] }, + "PersonalComputeInstanceSettings": { + "type": "object", + "properties": { + "assignedUser": { + "oneOf": [ + { + "$ref": "#/definitions/AssignedUser" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "A user that can be assigned to a compute instance." + } + }, + "description": "Settings for a personal compute instance." + }, "PrivateEndpoint": { "type": "object", "properties": {}, diff --git a/schemas/2020-06-01/Microsoft.NetApp.json b/schemas/2020-06-01/Microsoft.NetApp.json new file mode 100644 index 0000000000..07d9e5774c --- /dev/null +++ b/schemas/2020-06-01/Microsoft.NetApp.json @@ -0,0 +1,1674 @@ +{ + "id": "https://schema.management.azure.com/schemas/2020-06-01/Microsoft.NetApp.json#", + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "Microsoft.NetApp", + "description": "Microsoft NetApp Resource Types", + "resourceDefinitions": { + "netAppAccounts": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-06-01" + ] + }, + "location": { + "type": "string", + "description": "Resource location" + }, + "name": { + "type": "string", + "description": "The name of the NetApp account" + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/AccountProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "NetApp account properties" + }, + "resources": { + "type": "array", + "items": { + "oneOf": [ + { + "$ref": "#/definitions/netAppAccounts_capacityPools_childResource" + }, + { + "$ref": "#/definitions/netAppAccounts_snapshotPolicies_childResource" + }, + { + "$ref": "#/definitions/netAppAccounts_backupPolicies_childResource" + } + ] + } + }, + "tags": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Tags are a list of key-value pairs that describe the resource" + }, + "type": { + "type": "string", + "enum": [ + "Microsoft.NetApp/netAppAccounts" + ] + } + }, + "required": [ + "apiVersion", + "location", + "name", + "properties", + "type" + ], + "description": "Microsoft.NetApp/netAppAccounts" + }, + "netAppAccounts_backupPolicies": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-06-01" + ] + }, + "location": { + "type": "string", + "description": "Resource location" + }, + "name": { + "type": "string", + "description": "Backup policy Name which uniquely identify backup policy." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/BackupPolicyProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Backup policy properties" + }, + "tags": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Tags are a list of key-value pairs that describe the resource" + }, + "type": { + "type": "string", + "enum": [ + "Microsoft.NetApp/netAppAccounts/backupPolicies" + ] + } + }, + "required": [ + "apiVersion", + "location", + "name", + "properties", + "type" + ], + "description": "Microsoft.NetApp/netAppAccounts/backupPolicies" + }, + "netAppAccounts_capacityPools": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-06-01" + ] + }, + "location": { + "type": "string", + "description": "Resource location" + }, + "name": { + "oneOf": [ + { + "type": "string", + "pattern": "^[a-zA-Z0-9][a-zA-Z0-9\\-_]{0,63}$", + "minLength": 1, + "maxLength": 64 + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The name of the capacity pool" + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/PoolProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Pool properties" + }, + "resources": { + "type": "array", + "items": { + "oneOf": [ + { + "$ref": "#/definitions/netAppAccounts_capacityPools_volumes_childResource" + } + ] + } + }, + "tags": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Tags are a list of key-value pairs that describe the resource" + }, + "type": { + "type": "string", + "enum": [ + "Microsoft.NetApp/netAppAccounts/capacityPools" + ] + } + }, + "required": [ + "apiVersion", + "location", + "name", + "properties", + "type" + ], + "description": "Microsoft.NetApp/netAppAccounts/capacityPools" + }, + "netAppAccounts_capacityPools_volumes": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-06-01" + ] + }, + "location": { + "type": "string", + "description": "Resource location" + }, + "name": { + "oneOf": [ + { + "type": "string", + "pattern": "^[a-zA-Z][a-zA-Z0-9\\-_]{0,63}$", + "minLength": 1, + "maxLength": 64 + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The name of the volume" + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/VolumeProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Volume properties" + }, + "resources": { + "type": "array", + "items": { + "oneOf": [ + { + "$ref": "#/definitions/netAppAccounts_capacityPools_volumes_snapshots_childResource" + }, + { + "$ref": "#/definitions/netAppAccounts_capacityPools_volumes_backups_childResource" + } + ] + } + }, + "tags": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Tags are a list of key-value pairs that describe the resource" + }, + "type": { + "type": "string", + "enum": [ + "Microsoft.NetApp/netAppAccounts/capacityPools/volumes" + ] + } + }, + "required": [ + "apiVersion", + "location", + "name", + "properties", + "type" + ], + "description": "Microsoft.NetApp/netAppAccounts/capacityPools/volumes" + }, + "netAppAccounts_capacityPools_volumes_backups": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-06-01" + ] + }, + "location": { + "type": "string", + "description": "Resource location" + }, + "name": { + "type": "string", + "description": "The name of the backup" + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/BackupProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Backup properties" + }, + "type": { + "type": "string", + "enum": [ + "Microsoft.NetApp/netAppAccounts/capacityPools/volumes/backups" + ] + } + }, + "required": [ + "apiVersion", + "location", + "name", + "properties", + "type" + ], + "description": "Microsoft.NetApp/netAppAccounts/capacityPools/volumes/backups" + }, + "netAppAccounts_capacityPools_volumes_snapshots": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-06-01" + ] + }, + "location": { + "type": "string", + "description": "Resource location" + }, + "name": { + "type": "string", + "description": "The name of the mount target" + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/SnapshotProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Snapshot properties" + }, + "type": { + "type": "string", + "enum": [ + "Microsoft.NetApp/netAppAccounts/capacityPools/volumes/snapshots" + ] + } + }, + "required": [ + "apiVersion", + "location", + "name", + "properties", + "type" + ], + "description": "Microsoft.NetApp/netAppAccounts/capacityPools/volumes/snapshots" + }, + "netAppAccounts_snapshotPolicies": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-06-01" + ] + }, + "location": { + "type": "string", + "description": "Resource location" + }, + "name": { + "type": "string", + "description": "The name of the snapshot policy target" + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/SnapshotPolicyProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Snapshot policy properties" + }, + "tags": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Tags are a list of key-value pairs that describe the resource" + }, + "type": { + "type": "string", + "enum": [ + "Microsoft.NetApp/netAppAccounts/snapshotPolicies" + ] + } + }, + "required": [ + "apiVersion", + "location", + "name", + "properties", + "type" + ], + "description": "Microsoft.NetApp/netAppAccounts/snapshotPolicies" + } + }, + "definitions": { + "AccountProperties": { + "type": "object", + "properties": { + "activeDirectories": { + "oneOf": [ + { + "type": "array", + "items": { + "$ref": "#/definitions/ActiveDirectory" + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Active Directories" + } + }, + "description": "NetApp account properties" + }, + "ActiveDirectory": { + "type": "object", + "properties": { + "activeDirectoryId": { + "type": "string", + "description": "Id of the Active Directory" + }, + "adName": { + "type": "string", + "minLength": 1, + "maxLength": 64, + "description": "Name of the active directory machine. This optional parameter is used only while creating kerberos volume" + }, + "backupOperators": { + "oneOf": [ + { + "type": "array", + "items": { + "type": "string" + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Users to be added to the Built-in Backup Operator active directory group. A list of unique usernames without domain specifier" + }, + "dns": { + "oneOf": [ + { + "type": "string", + "pattern": "^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)((, ?)(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))*$" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Comma separated list of DNS server IP addresses (IPv4 only) for the Active Directory domain" + }, + "domain": { + "type": "string", + "description": "Name of the Active Directory domain" + }, + "kdcIP": { + "oneOf": [ + { + "type": "string", + "pattern": "^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)((, ?)(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))*$" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "kdc server IP addresses for the active directory machine. This optional parameter is used only while creating kerberos volume." + }, + "organizationalUnit": { + "type": "string", + "description": "The Organizational Unit (OU) within the Windows Active Directory" + }, + "password": { + "type": "string", + "description": "Plain text password of Active Directory domain administrator, value is masked in the response" + }, + "serverRootCACertificate": { + "type": "string", + "minLength": 1, + "maxLength": 10240, + "description": "When LDAP over SSL/TLS is enabled, the LDAP client is required to have base64 encoded Active Directory Certificate Service's self-signed root CA certificate, this optional parameter is used only for dual protocol with LDAP user-mapping volumes." + }, + "site": { + "type": "string", + "description": "The Active Directory site the service will limit Domain Controller discovery to" + }, + "smbServerName": { + "type": "string", + "description": "NetBIOS name of the SMB server. This name will be registered as a computer account in the AD and used to mount volumes" + }, + "username": { + "type": "string", + "description": "Username of Active Directory domain administrator" + } + }, + "description": "Active Directory" + }, + "BackupPolicyProperties": { + "type": "object", + "properties": { + "dailyBackupsToKeep": { + "oneOf": [ + { + "type": "integer" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Daily backups count to keep" + }, + "enabled": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The property to decide policy is enabled or not" + }, + "monthlyBackupsToKeep": { + "oneOf": [ + { + "type": "integer" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Monthly backups count to keep" + }, + "volumeBackups": { + "oneOf": [ + { + "type": "array", + "items": { + "$ref": "#/definitions/VolumeBackups" + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "A list of volumes assigned to this policy" + }, + "volumesAssigned": { + "oneOf": [ + { + "type": "integer" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Volumes using current backup policy" + }, + "weeklyBackupsToKeep": { + "oneOf": [ + { + "type": "integer" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Weekly backups count to keep" + }, + "yearlyBackupsToKeep": { + "oneOf": [ + { + "type": "integer" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Yearly backups count to keep" + } + }, + "description": "Backup policy properties" + }, + "BackupProperties": { + "type": "object", + "properties": { + "label": { + "type": "string", + "description": "Label for backup" + } + }, + "description": "Backup properties" + }, + "ExportPolicyRule": { + "type": "object", + "properties": { + "allowedClients": { + "type": "string", + "description": "Client ingress specification as comma separated string with IPv4 CIDRs, IPv4 host addresses and host names" + }, + "cifs": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Allows CIFS protocol" + }, + "hasRootAccess": { + "oneOf": [ + { + "type": "boolean", + "default": true + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Has root access to volume" + }, + "kerberos5iReadOnly": { + "oneOf": [ + { + "type": "boolean", + "default": false + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Kerberos5i Read only access. To be use with swagger version 2020-05-01 or later" + }, + "kerberos5iReadWrite": { + "oneOf": [ + { + "type": "boolean", + "default": false + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Kerberos5i Read and write access. To be use with swagger version 2020-05-01 or later" + }, + "kerberos5pReadOnly": { + "oneOf": [ + { + "type": "boolean", + "default": false + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Kerberos5p Read only access. To be use with swagger version 2020-05-01 or later" + }, + "kerberos5pReadWrite": { + "oneOf": [ + { + "type": "boolean", + "default": false + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Kerberos5p Read and write access. To be use with swagger version 2020-05-01 or later" + }, + "kerberos5ReadOnly": { + "oneOf": [ + { + "type": "boolean", + "default": false + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Kerberos5 Read only access. To be use with swagger version 2020-05-01 or later" + }, + "kerberos5ReadWrite": { + "oneOf": [ + { + "type": "boolean", + "default": false + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Kerberos5 Read and write access. To be use with swagger version 2020-05-01 or later" + }, + "nfsv3": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Allows NFSv3 protocol. Enable only for NFSv3 type volumes" + }, + "nfsv41": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Allows NFSv4.1 protocol. Enable only for NFSv4.1 type volumes" + }, + "ruleIndex": { + "oneOf": [ + { + "type": "integer" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Order index" + }, + "unixReadOnly": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Read only access" + }, + "unixReadWrite": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Read and write access" + } + }, + "description": "Volume Export Policy Rule" + }, + "MountTargetProperties": { + "type": "object", + "properties": { + "fileSystemId": { + "oneOf": [ + { + "type": "string", + "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$", + "minLength": 36, + "maxLength": 36 + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "UUID v4 used to identify the MountTarget" + }, + "smbServerFqdn": { + "type": "string", + "description": "The SMB server's Fully Qualified Domain Name, FQDN" + } + }, + "required": [ + "fileSystemId" + ], + "description": "Mount target properties" + }, + "netAppAccounts_backupPolicies_childResource": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-06-01" + ] + }, + "location": { + "type": "string", + "description": "Resource location" + }, + "name": { + "type": "string", + "description": "Backup policy Name which uniquely identify backup policy." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/BackupPolicyProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Backup policy properties" + }, + "tags": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Tags are a list of key-value pairs that describe the resource" + }, + "type": { + "type": "string", + "enum": [ + "backupPolicies" + ] + } + }, + "required": [ + "apiVersion", + "location", + "name", + "properties", + "type" + ], + "description": "Microsoft.NetApp/netAppAccounts/backupPolicies" + }, + "netAppAccounts_capacityPools_childResource": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-06-01" + ] + }, + "location": { + "type": "string", + "description": "Resource location" + }, + "name": { + "oneOf": [ + { + "type": "string", + "pattern": "^[a-zA-Z0-9][a-zA-Z0-9\\-_]{0,63}$", + "minLength": 1, + "maxLength": 64 + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The name of the capacity pool" + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/PoolProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Pool properties" + }, + "tags": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Tags are a list of key-value pairs that describe the resource" + }, + "type": { + "type": "string", + "enum": [ + "capacityPools" + ] + } + }, + "required": [ + "apiVersion", + "location", + "name", + "properties", + "type" + ], + "description": "Microsoft.NetApp/netAppAccounts/capacityPools" + }, + "netAppAccounts_capacityPools_volumes_backups_childResource": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-06-01" + ] + }, + "location": { + "type": "string", + "description": "Resource location" + }, + "name": { + "type": "string", + "description": "The name of the backup" + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/BackupProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Backup properties" + }, + "type": { + "type": "string", + "enum": [ + "backups" + ] + } + }, + "required": [ + "apiVersion", + "location", + "name", + "properties", + "type" + ], + "description": "Microsoft.NetApp/netAppAccounts/capacityPools/volumes/backups" + }, + "netAppAccounts_capacityPools_volumes_childResource": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-06-01" + ] + }, + "location": { + "type": "string", + "description": "Resource location" + }, + "name": { + "oneOf": [ + { + "type": "string", + "pattern": "^[a-zA-Z][a-zA-Z0-9\\-_]{0,63}$", + "minLength": 1, + "maxLength": 64 + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The name of the volume" + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/VolumeProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Volume properties" + }, + "tags": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Tags are a list of key-value pairs that describe the resource" + }, + "type": { + "type": "string", + "enum": [ + "volumes" + ] + } + }, + "required": [ + "apiVersion", + "location", + "name", + "properties", + "type" + ], + "description": "Microsoft.NetApp/netAppAccounts/capacityPools/volumes" + }, + "netAppAccounts_capacityPools_volumes_snapshots_childResource": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-06-01" + ] + }, + "location": { + "type": "string", + "description": "Resource location" + }, + "name": { + "type": "string", + "description": "The name of the mount target" + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/SnapshotProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Snapshot properties" + }, + "type": { + "type": "string", + "enum": [ + "snapshots" + ] + } + }, + "required": [ + "apiVersion", + "location", + "name", + "properties", + "type" + ], + "description": "Microsoft.NetApp/netAppAccounts/capacityPools/volumes/snapshots" + }, + "netAppAccounts_snapshotPolicies_childResource": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-06-01" + ] + }, + "location": { + "type": "string", + "description": "Resource location" + }, + "name": { + "type": "string", + "description": "The name of the snapshot policy target" + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/SnapshotPolicyProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Snapshot policy properties" + }, + "tags": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Tags are a list of key-value pairs that describe the resource" + }, + "type": { + "type": "string", + "enum": [ + "snapshotPolicies" + ] + } + }, + "required": [ + "apiVersion", + "location", + "name", + "properties", + "type" + ], + "description": "Microsoft.NetApp/netAppAccounts/snapshotPolicies" + }, + "PoolProperties": { + "type": "object", + "properties": { + "qosType": { + "oneOf": [ + { + "type": "string", + "enum": [ + "Auto", + "Manual" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The qos type of the pool." + }, + "serviceLevel": { + "oneOf": [ + { + "type": "string", + "enum": [ + "Standard", + "Premium", + "Ultra" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The service level of the file system." + }, + "size": { + "oneOf": [ + { + "type": "integer", + "minimum": 4398046511104, + "maximum": 549755813888000 + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Provisioned size of the pool (in bytes). Allowed values are in 4TiB chunks (value must be multiply of 4398046511104)." + } + }, + "required": [ + "serviceLevel", + "size" + ], + "description": "Pool properties" + }, + "ReplicationObject": { + "type": "object", + "properties": { + "endpointType": { + "oneOf": [ + { + "type": "string", + "enum": [ + "src", + "dst" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Indicates whether the local volume is the source or destination for the Volume Replication." + }, + "remoteVolumeRegion": { + "type": "string", + "description": "The remote region for the other end of the Volume Replication." + }, + "remoteVolumeResourceId": { + "type": "string", + "description": "The resource ID of the remote volume." + }, + "replicationId": { + "type": "string", + "description": "Id" + }, + "replicationSchedule": { + "oneOf": [ + { + "type": "string", + "enum": [ + "_10minutely", + "hourly", + "daily", + "weekly", + "monthly" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Schedule." + } + }, + "required": [ + "remoteVolumeResourceId", + "replicationSchedule" + ], + "description": "Replication properties" + }, + "SnapshotPolicyProperties": { + "type": "object", + "properties": { + "dailySchedule": { + "type": "object", + "properties": {}, + "description": "Schedule for daily snapshots" + }, + "enabled": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The property to decide policy is enabled or not" + }, + "hourlySchedule": { + "type": "object", + "properties": {}, + "description": "Schedule for hourly snapshots" + }, + "monthlySchedule": { + "type": "object", + "properties": {}, + "description": "Schedule for monthly snapshots" + }, + "weeklySchedule": { + "type": "object", + "properties": {}, + "description": "Schedule for weekly snapshots" + } + }, + "description": "Snapshot policy properties" + }, + "SnapshotProperties": { + "type": "object", + "properties": {}, + "description": "Snapshot properties" + }, + "VolumeBackupProperties": { + "type": "object", + "properties": { + "backupEnabled": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Backup Enabled" + }, + "backupPolicyId": { + "type": "string", + "description": "Backup Policy Resource ID" + }, + "policyEnforced": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Policy Enforced" + }, + "vaultId": { + "type": "string", + "description": "Vault Resource ID" + } + }, + "description": "Volume Backup Properties" + }, + "VolumeBackups": { + "type": "object", + "properties": { + "backupsCount": { + "oneOf": [ + { + "type": "integer" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Total count of backups for volume" + }, + "policyEnabled": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Policy enabled" + }, + "volumeName": { + "type": "string", + "description": "Volume name" + } + }, + "description": "Volume details using the backup policy" + }, + "VolumeProperties": { + "type": "object", + "properties": { + "backupId": { + "oneOf": [ + { + "type": "string", + "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}|(\\\\?([^\\/]*[\\/])*)([^\\/]+)$", + "minLength": 36, + "maxLength": 36 + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "UUID v4 or resource identifier used to identify the Backup." + }, + "creationToken": { + "oneOf": [ + { + "type": "string", + "pattern": "^[a-zA-Z][a-zA-Z0-9\\-]{0,79}$", + "minLength": 1, + "maxLength": 80 + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "A unique file path for the volume. Used when creating mount targets" + }, + "dataProtection": { + "oneOf": [ + { + "$ref": "#/definitions/VolumePropertiesDataProtection" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "DataProtection type volumes include an object containing details of the replication" + }, + "exportPolicy": { + "oneOf": [ + { + "$ref": "#/definitions/VolumePropertiesExportPolicy" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Set of export policy rules" + }, + "isRestoring": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Restoring" + }, + "kerberosEnabled": { + "oneOf": [ + { + "type": "boolean", + "default": false + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Describe if a volume is KerberosEnabled. To be use with swagger version 2020-05-01 or later" + }, + "mountTargets": { + "oneOf": [ + { + "type": "array", + "items": { + "$ref": "#/definitions/MountTargetProperties" + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "List of mount targets" + }, + "protocolTypes": { + "oneOf": [ + { + "type": "array", + "items": { + "type": "string" + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Set of protocol types" + }, + "securityStyle": { + "oneOf": [ + { + "type": "string", + "enum": [ + "ntfs", + "unix" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The security style of volume." + }, + "serviceLevel": { + "oneOf": [ + { + "type": "string", + "enum": [ + "Standard", + "Premium", + "Ultra" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The service level of the file system." + }, + "snapshotDirectoryVisible": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "If enabled (true) the volume will contain a read-only .snapshot directory which provides access to each of the volume's snapshots (default to true)." + }, + "snapshotId": { + "oneOf": [ + { + "type": "string", + "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}|(\\\\?([^\\/]*[\\/])*)([^\\/]+)$", + "minLength": 36, + "maxLength": 36 + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "UUID v4 or resource identifier used to identify the Snapshot." + }, + "subnetId": { + "type": "string", + "description": "The Azure Resource URI for a delegated subnet. Must have the delegation Microsoft.NetApp/volumes" + }, + "throughputMibps": { + "oneOf": [ + { + "type": "number", + "multipleOf": 0.001, + "minimum": 1, + "maximum": 4500 + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ] + }, + "usageThreshold": { + "oneOf": [ + { + "type": "integer", + "minimum": 107374182400, + "maximum": 109951162777600, + "default": "107374182400" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Maximum storage quota allowed for a file system in bytes. This is a soft quota used for alerting only. Minimum size is 100 GiB. Upper limit is 100TiB. Specified in bytes." + }, + "volumeType": { + "type": "string", + "description": "What type of volume is this" + } + }, + "required": [ + "creationToken", + "subnetId", + "usageThreshold" + ], + "description": "Volume properties" + }, + "VolumePropertiesDataProtection": { + "type": "object", + "properties": { + "backup": { + "oneOf": [ + { + "$ref": "#/definitions/VolumeBackupProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Volume Backup Properties" + }, + "replication": { + "oneOf": [ + { + "$ref": "#/definitions/ReplicationObject" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Replication properties" + }, + "snapshot": { + "oneOf": [ + { + "$ref": "#/definitions/VolumeSnapshotProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Volume Snapshot Properties" + } + }, + "description": "DataProtection type volumes include an object containing details of the replication" + }, + "VolumePropertiesExportPolicy": { + "type": "object", + "properties": { + "rules": { + "oneOf": [ + { + "type": "array", + "items": { + "$ref": "#/definitions/ExportPolicyRule" + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Export policy rule" + } + }, + "description": "Set of export policy rules" + }, + "VolumeSnapshotProperties": { + "type": "object", + "properties": { + "snapshotPolicyId": { + "type": "string", + "description": "Snapshot Policy ResourceId" + } + }, + "description": "Volume Snapshot Properties" + } + } +} \ No newline at end of file diff --git a/schemas/common/autogeneratedResources.json b/schemas/common/autogeneratedResources.json index 0feb0c6304..8da7837222 100644 --- a/schemas/common/autogeneratedResources.json +++ b/schemas/common/autogeneratedResources.json @@ -3550,6 +3550,27 @@ { "$ref": "https://schema.management.azure.com/schemas/2020-02-01/Microsoft.NetApp.json#/resourceDefinitions/netAppAccounts_capacityPools_volumes_snapshots" }, + { + "$ref": "https://schema.management.azure.com/schemas/2020-06-01/Microsoft.NetApp.json#/resourceDefinitions/netAppAccounts" + }, + { + "$ref": "https://schema.management.azure.com/schemas/2020-06-01/Microsoft.NetApp.json#/resourceDefinitions/netAppAccounts_backupPolicies" + }, + { + "$ref": "https://schema.management.azure.com/schemas/2020-06-01/Microsoft.NetApp.json#/resourceDefinitions/netAppAccounts_capacityPools" + }, + { + "$ref": "https://schema.management.azure.com/schemas/2020-06-01/Microsoft.NetApp.json#/resourceDefinitions/netAppAccounts_capacityPools_volumes" + }, + { + "$ref": "https://schema.management.azure.com/schemas/2020-06-01/Microsoft.NetApp.json#/resourceDefinitions/netAppAccounts_capacityPools_volumes_backups" + }, + { + "$ref": "https://schema.management.azure.com/schemas/2020-06-01/Microsoft.NetApp.json#/resourceDefinitions/netAppAccounts_capacityPools_volumes_snapshots" + }, + { + "$ref": "https://schema.management.azure.com/schemas/2020-06-01/Microsoft.NetApp.json#/resourceDefinitions/netAppAccounts_snapshotPolicies" + }, { "$ref": "https://schema.management.azure.com/schemas/2019-03-01/Microsoft.Network.FrontDoor.json#/resourceDefinitions/FrontDoorWebApplicationFirewallPolicies" }, From a145468ced59cc7dc11f13ca1593874b0d912d0f Mon Sep 17 00:00:00 2001 From: Autogenerator Pipeline Date: Mon, 24 Aug 2020 10:59:53 +0000 Subject: [PATCH 03/15] Update resource list --- generator/resources.json | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/generator/resources.json b/generator/resources.json index 6b11c15f12..2111a0a23e 100644 --- a/generator/resources.json +++ b/generator/resources.json @@ -2365,7 +2365,11 @@ "2019-08-01", "2019-10-01", "2019-11-01", - "2020-02-01" + "2020-02-01", + "2020-06-01" + ], + "Microsoft.NetApp/netAppAccounts/backupPolicies": [ + "2020-06-01" ], "Microsoft.NetApp/netAppAccounts/capacityPools": [ "2017-08-15", @@ -2375,7 +2379,8 @@ "2019-08-01", "2019-10-01", "2019-11-01", - "2020-02-01" + "2020-02-01", + "2020-06-01" ], "Microsoft.NetApp/netAppAccounts/capacityPools/volumes": [ "2017-08-15", @@ -2385,7 +2390,11 @@ "2019-08-01", "2019-10-01", "2019-11-01", - "2020-02-01" + "2020-02-01", + "2020-06-01" + ], + "Microsoft.NetApp/netAppAccounts/capacityPools/volumes/backups": [ + "2020-06-01" ], "Microsoft.NetApp/netAppAccounts/capacityPools/volumes/snapshots": [ "2017-08-15", @@ -2395,7 +2404,11 @@ "2019-08-01", "2019-10-01", "2019-11-01", - "2020-02-01" + "2020-02-01", + "2020-06-01" + ], + "Microsoft.NetApp/netAppAccounts/snapshotPolicies": [ + "2020-06-01" ], "Microsoft.Network/ApplicationGatewayWebApplicationFirewallPolicies": [ "2018-12-01", From 708a1887c70531c76213b4d7013eb8ec45b5a794 Mon Sep 17 00:00:00 2001 From: Autogenerator Pipeline Date: Mon, 24 Aug 2020 12:39:16 +0000 Subject: [PATCH 04/15] Autogenerate schemas --- .../Microsoft.SecurityInsights.json | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/schemas/2019-01-01-preview/Microsoft.SecurityInsights.json b/schemas/2019-01-01-preview/Microsoft.SecurityInsights.json index fa52320d70..c3c58394c3 100644 --- a/schemas/2019-01-01-preview/Microsoft.SecurityInsights.json +++ b/schemas/2019-01-01-preview/Microsoft.SecurityInsights.json @@ -1304,6 +1304,26 @@ "properties": {}, "description": "EntityAnalytics property bag." }, + "EventGroupingSettings": { + "type": "object", + "properties": { + "aggregationKind": { + "oneOf": [ + { + "type": "string", + "enum": [ + "SingleAlert", + "AlertPerResult" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ] + } + }, + "description": "Event grouping settings property bag." + }, "EyesOn": { "type": "object", "properties": { @@ -2309,6 +2329,17 @@ ], "description": "Determines whether this alert rule is enabled or disabled." }, + "eventGroupingSettings": { + "oneOf": [ + { + "$ref": "#/definitions/EventGroupingSettings" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Event grouping settings property bag." + }, "incidentConfiguration": { "oneOf": [ { From 82d3696c7198b676c4d686bc91b1ef0e9ba9363f Mon Sep 17 00:00:00 2001 From: Autogenerator Pipeline Date: Tue, 25 Aug 2020 08:44:32 +0000 Subject: [PATCH 05/15] Autogenerate schemas --- schemas/2019-05-01-preview/Microsoft.AppPlatform.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/schemas/2019-05-01-preview/Microsoft.AppPlatform.json b/schemas/2019-05-01-preview/Microsoft.AppPlatform.json index 944eaf5118..7d55877ade 100644 --- a/schemas/2019-05-01-preview/Microsoft.AppPlatform.json +++ b/schemas/2019-05-01-preview/Microsoft.AppPlatform.json @@ -684,13 +684,18 @@ ], "description": "Required Memory size in GB, basic tier should be in range (1, 2), standard tier should be in range (1, 8)" }, + "netCoreMainEntryPath": { + "type": "string", + "description": "The path to the .NET executable relative to zip root" + }, "runtimeVersion": { "oneOf": [ { "type": "string", "enum": [ "Java_8", - "Java_11" + "Java_11", + "NetCore_31" ] }, { @@ -1181,6 +1186,7 @@ "type": "string", "enum": [ "Jar", + "NetCoreZip", "Source" ] }, From e97f197e132434f5604f205cca63d0096dd0d491 Mon Sep 17 00:00:00 2001 From: Autogenerator Pipeline Date: Tue, 25 Aug 2020 09:20:21 +0000 Subject: [PATCH 06/15] Autogenerate schemas --- schemas/2018-06-01/Microsoft.DataFactory.json | 10 + .../Microsoft.HybridCompute.json | 448 ++++++++++++++++++ schemas/common/autogeneratedResources.json | 6 + 3 files changed, 464 insertions(+) create mode 100644 schemas/2020-07-30-preview/Microsoft.HybridCompute.json diff --git a/schemas/2018-06-01/Microsoft.DataFactory.json b/schemas/2018-06-01/Microsoft.DataFactory.json index a3a3b5f5f7..63dc71515d 100644 --- a/schemas/2018-06-01/Microsoft.DataFactory.json +++ b/schemas/2018-06-01/Microsoft.DataFactory.json @@ -12429,6 +12429,11 @@ ], "description": "Unmatched properties from the message are deserialized this collection" }, + "enableReliableLogging": { + "type": "object", + "properties": {}, + "description": "Specifies whether to enable reliable logging. Type: boolean (or Expression with resultType boolean)." + }, "linkedServiceName": { "oneOf": [ { @@ -12440,6 +12445,11 @@ ], "description": "Linked service reference type." }, + "logLevel": { + "type": "object", + "properties": {}, + "description": "Gets or sets the log level, support: Info, Warning. Type: string (or Expression with resultType string)." + }, "path": { "type": "object", "properties": {}, diff --git a/schemas/2020-07-30-preview/Microsoft.HybridCompute.json b/schemas/2020-07-30-preview/Microsoft.HybridCompute.json new file mode 100644 index 0000000000..bdb3c9a463 --- /dev/null +++ b/schemas/2020-07-30-preview/Microsoft.HybridCompute.json @@ -0,0 +1,448 @@ +{ + "id": "https://schema.management.azure.com/schemas/2020-07-30-preview/Microsoft.HybridCompute.json#", + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "Microsoft.HybridCompute", + "description": "Microsoft HybridCompute Resource Types", + "resourceDefinitions": { + "machines": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-07-30-preview" + ] + }, + "identity": { + "oneOf": [ + { + "$ref": "#/definitions/MachineIdentityModel" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ] + }, + "location": { + "type": "string", + "description": "The geo-location where the resource lives" + }, + "name": { + "type": "string", + "description": "The name of the hybrid machine." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/MachinePropertiesModelModelModel" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Hybrid Compute Machine properties" + }, + "resources": { + "type": "array", + "items": { + "oneOf": [ + { + "$ref": "#/definitions/machines_extensions_childResource" + } + ] + } + }, + "tags": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Resource tags." + }, + "type": { + "type": "string", + "enum": [ + "Microsoft.HybridCompute/machines" + ] + } + }, + "required": [ + "apiVersion", + "location", + "name", + "properties", + "type" + ], + "description": "Microsoft.HybridCompute/machines" + }, + "machines_extensions": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-07-30-preview" + ] + }, + "location": { + "type": "string", + "description": "The geo-location where the resource lives" + }, + "name": { + "type": "string", + "description": "The name of the machine extension." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/MachineExtensionProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Describes Machine Extension Properties." + }, + "tags": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Resource tags." + }, + "type": { + "type": "string", + "enum": [ + "Microsoft.HybridCompute/machines/extensions" + ] + } + }, + "required": [ + "apiVersion", + "location", + "name", + "properties", + "type" + ], + "description": "Microsoft.HybridCompute/machines/extensions" + } + }, + "definitions": { + "LocationData": { + "type": "object", + "properties": { + "city": { + "type": "string", + "description": "The city or locality where the resource is located." + }, + "countryOrRegion": { + "type": "string", + "description": "The country or region where the resource is located" + }, + "district": { + "type": "string", + "description": "The district, state, or province where the resource is located." + }, + "name": { + "type": "string", + "maxLength": 256, + "description": "A canonical name for the geographic or physical location." + } + }, + "required": [ + "name" + ], + "description": "Metadata pertaining to the geographic location of the resource." + }, + "MachineExtensionInstanceView": { + "type": "object", + "properties": { + "name": { + "type": "string", + "description": "The machine extension name." + }, + "status": { + "oneOf": [ + { + "$ref": "#/definitions/MachineExtensionInstanceViewStatus" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Instance view status." + }, + "type": { + "type": "string", + "description": "Specifies the type of the extension; an example is \"CustomScriptExtension\"." + }, + "typeHandlerVersion": { + "type": "string", + "description": "Specifies the version of the script handler." + } + }, + "description": "Describes the Machine Extension Instance View." + }, + "MachineExtensionInstanceViewStatus": { + "type": "object", + "properties": { + "code": { + "type": "string", + "description": "The status code." + }, + "displayStatus": { + "type": "string", + "description": "The short localizable label for the status." + }, + "level": { + "oneOf": [ + { + "type": "string", + "enum": [ + "Info", + "Warning", + "Error" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The level code." + }, + "message": { + "type": "string", + "description": "The detailed status message, including for alerts and error messages." + }, + "time": { + "type": "string", + "format": "date-time", + "description": "The time of the status." + } + }, + "description": "Instance view status." + }, + "MachineExtensionProperties": { + "type": "object", + "properties": { + "autoUpgradeMinorVersion": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Indicates whether the extension should use a newer minor version if one is available at deployment time. Once deployed, however, the extension will not upgrade minor versions unless redeployed, even with this property set to true." + }, + "forceUpdateTag": { + "type": "string", + "description": "How the extension handler should be forced to update even if the extension configuration has not changed." + }, + "instanceView": { + "oneOf": [ + { + "$ref": "#/definitions/MachineExtensionPropertiesInstanceView" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The machine extension instance view." + }, + "protectedSettings": { + "type": "object", + "properties": {}, + "description": "The extension can contain either protectedSettings or protectedSettingsFromKeyVault or no protected settings at all." + }, + "publisher": { + "type": "string", + "description": "The name of the extension handler publisher." + }, + "settings": { + "type": "object", + "properties": {}, + "description": "Json formatted public settings for the extension." + }, + "type": { + "type": "string", + "description": "Specifies the type of the extension; an example is \"CustomScriptExtension\"." + }, + "typeHandlerVersion": { + "type": "string", + "description": "Specifies the version of the script handler." + } + }, + "description": "Describes Machine Extension Properties." + }, + "MachineExtensionPropertiesInstanceView": { + "type": "object", + "properties": { + "name": { + "type": "string", + "description": "The machine extension name." + }, + "status": { + "oneOf": [ + { + "$ref": "#/definitions/MachineExtensionInstanceViewStatus" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Instance view status." + }, + "type": { + "type": "string", + "description": "Specifies the type of the extension; an example is \"CustomScriptExtension\"." + }, + "typeHandlerVersion": { + "type": "string", + "description": "Specifies the version of the script handler." + } + }, + "description": "The machine extension instance view." + }, + "MachineIdentityModel": { + "type": "object", + "properties": { + "type": { + "type": "string", + "description": "The identity type." + } + } + }, + "MachinePropertiesModelModelModel": { + "type": "object", + "properties": { + "clientPublicKey": { + "type": "string", + "description": "Public Key that the client provides to be used during initial resource onboarding" + }, + "extensions": { + "oneOf": [ + { + "type": "array", + "items": { + "$ref": "#/definitions/MachineExtensionInstanceView" + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Machine Extensions information" + }, + "locationData": { + "oneOf": [ + { + "$ref": "#/definitions/LocationData" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Metadata pertaining to the geographic location of the resource." + }, + "osProfile": { + "oneOf": [ + { + "$ref": "#/definitions/MachinePropertiesOsProfile" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Specifies the operating system settings for the hybrid machine." + }, + "vmId": { + "type": "string", + "description": "Specifies the hybrid machine unique ID." + } + }, + "description": "Hybrid Compute Machine properties" + }, + "MachinePropertiesOsProfile": { + "type": "object", + "properties": {}, + "description": "Specifies the operating system settings for the hybrid machine." + }, + "machines_extensions_childResource": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-07-30-preview" + ] + }, + "location": { + "type": "string", + "description": "The geo-location where the resource lives" + }, + "name": { + "type": "string", + "description": "The name of the machine extension." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/MachineExtensionProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Describes Machine Extension Properties." + }, + "tags": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Resource tags." + }, + "type": { + "type": "string", + "enum": [ + "extensions" + ] + } + }, + "required": [ + "apiVersion", + "location", + "name", + "properties", + "type" + ], + "description": "Microsoft.HybridCompute/machines/extensions" + } + } +} \ No newline at end of file diff --git a/schemas/common/autogeneratedResources.json b/schemas/common/autogeneratedResources.json index 8da7837222..7819fbb8ea 100644 --- a/schemas/common/autogeneratedResources.json +++ b/schemas/common/autogeneratedResources.json @@ -3205,6 +3205,12 @@ { "$ref": "https://schema.management.azure.com/schemas/2019-12-12/Microsoft.HybridCompute.json#/resourceDefinitions/machines_extensions" }, + { + "$ref": "https://schema.management.azure.com/schemas/2020-07-30-preview/Microsoft.HybridCompute.json#/resourceDefinitions/machines" + }, + { + "$ref": "https://schema.management.azure.com/schemas/2020-07-30-preview/Microsoft.HybridCompute.json#/resourceDefinitions/machines_extensions" + }, { "$ref": "https://schema.management.azure.com/schemas/2016-06-01/Microsoft.HybridData.json#/resourceDefinitions/dataManagers" }, From 2dbc690ed67c7f74d09eec6a3c3a535c10391aa2 Mon Sep 17 00:00:00 2001 From: Autogenerator Pipeline Date: Tue, 25 Aug 2020 09:20:34 +0000 Subject: [PATCH 07/15] Update resource list --- generator/resources.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/generator/resources.json b/generator/resources.json index 2111a0a23e..fd32e27630 100644 --- a/generator/resources.json +++ b/generator/resources.json @@ -1949,10 +1949,12 @@ "2019-09-16" ], "Microsoft.HybridCompute/machines": [ - "2019-12-12" + "2019-12-12", + "2020-07-30-preview" ], "Microsoft.HybridCompute/machines/extensions": [ - "2019-12-12" + "2019-12-12", + "2020-07-30-preview" ], "Microsoft.HybridData/dataManagers": [ "2016-06-01", From fcd35775722f1a8c94161608e216135749bc28a7 Mon Sep 17 00:00:00 2001 From: Autogenerator Pipeline Date: Wed, 26 Aug 2020 08:57:00 +0000 Subject: [PATCH 08/15] Autogenerate schemas --- .../Microsoft.AzureData.json | 230 ++---------------- 1 file changed, 27 insertions(+), 203 deletions(-) diff --git a/schemas/2019-07-24-preview/Microsoft.AzureData.json b/schemas/2019-07-24-preview/Microsoft.AzureData.json index 6078d41d62..8b9d2cefe1 100644 --- a/schemas/2019-07-24-preview/Microsoft.AzureData.json +++ b/schemas/2019-07-24-preview/Microsoft.AzureData.json @@ -320,20 +320,6 @@ "DataControllerProperties": { "type": "object", "properties": { - "handshakeRequest": { - "type": "object", - "properties": {} - }, - "handshakeResponse": { - "oneOf": [ - { - "$ref": "#/definitions/HandshakeResponse" - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ] - }, "onPremiseProperty": { "oneOf": [ { @@ -344,56 +330,13 @@ } ], "description": "Properties from the on premise data controller" - }, - "requestType": { - "oneOf": [ - { - "type": "string", - "enum": [ - "Unknown", - "Handshake", - "UsageUpload" - ] - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ] - }, - "uploadRequest": { - "oneOf": [ - { - "$ref": "#/definitions/UsageUploadRequest" - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ] - }, - "uploadResponse": { - "oneOf": [ - { - "$ref": "#/definitions/UsageUploadResponse" - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ] } }, + "required": [ + "onPremiseProperty" + ], "description": "The data controller properties." }, - "HandshakeResponse": { - "type": "object", - "properties": { - "usageResultUrl": { - "type": "string" - }, - "usageUploadUrl": { - "type": "string" - } - } - }, "OnPremiseProperty": { "type": "object", "properties": { @@ -418,14 +361,38 @@ "description": "Unique thumbprint returned to customer to verify the certificate being uploaded" } }, + "required": [ + "id", + "publicSigningKey" + ], "description": "Properties from the on premise data controller" }, "SqlManagedInstanceProperties": { "type": "object", "properties": { + "admin": { + "type": "string", + "description": "The instance admin user" + }, "dataControllerId": { "type": "string", "description": "null" + }, + "endTime": { + "type": "string", + "description": "The instance end time" + }, + "instanceEndpoint": { + "type": "string", + "description": "The on premise instance endpoint" + }, + "startTime": { + "type": "string", + "description": "The instance start time" + }, + "vCore": { + "type": "string", + "description": "The instance vCore" } }, "description": "Properties of sqlManagedInstance." @@ -552,149 +519,6 @@ "type" ], "description": "Microsoft.AzureData/sqlServerRegistrations/sqlServers" - }, - "UsageRecord": { - "type": "object", - "properties": { - "endTime": { - "type": "string", - "format": "date-time" - }, - "eventId": { - "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" - } - ] - }, - "eventSeq": { - "oneOf": [ - { - "type": "integer" - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ] - }, - "id": { - "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" - } - ] - }, - "location": { - "type": "string" - }, - "name": { - "type": "string" - }, - "namespace": { - "type": "string" - }, - "quantity": { - "oneOf": [ - { - "type": "number" - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ] - }, - "resourceGroup": { - "type": "string" - }, - "startTime": { - "type": "string", - "format": "date-time" - }, - "subscriptionId": { - "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" - } - ] - }, - "tags": { - "type": "string" - }, - "type": { - "type": "string" - } - } - }, - "UsageUploadRequest": { - "type": "object", - "properties": { - "data": { - "oneOf": [ - { - "type": "array", - "items": { - "$ref": "#/definitions/UsageRecord" - } - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ] - }, - "dataTimestamp": { - "type": "string", - "format": "date-time" - }, - "exportType": { - "type": "string" - }, - "signature": { - "type": "string" - } - } - }, - "UsageUploadResponse": { - "type": "object", - "properties": { - "usageUploadStatus": { - "oneOf": [ - { - "type": "string", - "enum": [ - "Unknown", - "Failed", - "PartialSuccess", - "Completed" - ] - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ] - }, - "usageWaterMark": { - "oneOf": [ - { - "type": "integer" - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ] - } - } } } } \ No newline at end of file From 774fc0fb1783dba6db02dbc85670113cf58594d5 Mon Sep 17 00:00:00 2001 From: Autogenerator Pipeline Date: Wed, 26 Aug 2020 11:08:34 +0000 Subject: [PATCH 09/15] Autogenerate schemas --- .../Microsoft.MachineLearningServices.json | 2923 +++++++++++++++++ schemas/common/autogeneratedResources.json | 15 + 2 files changed, 2938 insertions(+) create mode 100644 schemas/2020-09-01-preview/Microsoft.MachineLearningServices.json diff --git a/schemas/2020-09-01-preview/Microsoft.MachineLearningServices.json b/schemas/2020-09-01-preview/Microsoft.MachineLearningServices.json new file mode 100644 index 0000000000..f0fab8806f --- /dev/null +++ b/schemas/2020-09-01-preview/Microsoft.MachineLearningServices.json @@ -0,0 +1,2923 @@ +{ + "id": "https://schema.management.azure.com/schemas/2020-09-01-preview/Microsoft.MachineLearningServices.json#", + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "Microsoft.MachineLearningServices", + "description": "Microsoft MachineLearningServices Resource Types", + "resourceDefinitions": { + "workspaces": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-09-01-preview" + ] + }, + "identity": { + "oneOf": [ + { + "$ref": "#/definitions/Identity" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Identity for the resource." + }, + "location": { + "type": "string", + "description": "Specifies the location of the resource." + }, + "name": { + "type": "string", + "description": "Name of Azure Machine Learning workspace." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/WorkspaceProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The properties of a machine learning workspace." + }, + "resources": { + "type": "array", + "items": { + "oneOf": [ + { + "$ref": "#/definitions/workspaces_computes_childResource" + }, + { + "$ref": "#/definitions/workspaces_privateEndpointConnections_childResource" + }, + { + "$ref": "#/definitions/workspaces_linkedServices_childResource" + }, + { + "$ref": "#/definitions/workspaces_services_childResource" + } + ] + } + }, + "sku": { + "oneOf": [ + { + "$ref": "#/definitions/Sku" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Sku of the resource" + }, + "tags": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Contains resource tags defined as key/value pairs." + }, + "type": { + "type": "string", + "enum": [ + "Microsoft.MachineLearningServices/workspaces" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.MachineLearningServices/workspaces" + }, + "workspaces_computes": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-09-01-preview" + ] + }, + "identity": { + "oneOf": [ + { + "$ref": "#/definitions/Identity" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Identity for the resource." + }, + "location": { + "type": "string", + "description": "Specifies the location of the resource." + }, + "name": { + "type": "string", + "description": "Name of the Azure Machine Learning compute." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/Compute" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Machine Learning compute object." + }, + "sku": { + "oneOf": [ + { + "$ref": "#/definitions/Sku" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Sku of the resource" + }, + "tags": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Contains resource tags defined as key/value pairs." + }, + "type": { + "type": "string", + "enum": [ + "Microsoft.MachineLearningServices/workspaces/computes" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.MachineLearningServices/workspaces/computes" + }, + "workspaces_linkedServices": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-09-01-preview" + ] + }, + "identity": { + "oneOf": [ + { + "$ref": "#/definitions/Identity" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Identity for the resource." + }, + "location": { + "type": "string", + "description": "location of the linked service." + }, + "name": { + "type": "string", + "description": "Friendly name of the linked workspace" + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/LinkedServiceProps" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "LinkedService specific properties." + }, + "type": { + "type": "string", + "enum": [ + "Microsoft.MachineLearningServices/workspaces/linkedServices" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.MachineLearningServices/workspaces/linkedServices" + }, + "workspaces_privateEndpointConnections": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-09-01-preview" + ] + }, + "identity": { + "oneOf": [ + { + "$ref": "#/definitions/Identity" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Identity for the resource." + }, + "location": { + "type": "string", + "description": "Specifies the location of the resource." + }, + "name": { + "type": "string", + "description": "The name of the private endpoint connection associated with the workspace" + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/PrivateEndpointConnectionProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Properties of the PrivateEndpointConnectProperties." + }, + "sku": { + "oneOf": [ + { + "$ref": "#/definitions/Sku" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Sku of the resource" + }, + "tags": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Contains resource tags defined as key/value pairs." + }, + "type": { + "type": "string", + "enum": [ + "Microsoft.MachineLearningServices/workspaces/privateEndpointConnections" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.MachineLearningServices/workspaces/privateEndpointConnections" + }, + "workspaces_services": { + "type": "object", + "oneOf": [ + { + "$ref": "#/definitions/ACIServiceCreateRequest" + }, + { + "$ref": "#/definitions/CreateEndpointVariantRequest" + } + ], + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-09-01-preview" + ] + }, + "description": { + "type": "string", + "description": "The description of the service." + }, + "environmentImageRequest": { + "oneOf": [ + { + "$ref": "#/definitions/CreateServiceRequestEnvironmentImageRequest" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The Environment, models and assets needed for inferencing." + }, + "keys": { + "oneOf": [ + { + "$ref": "#/definitions/CreateServiceRequestKeys" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The authentication keys." + }, + "kvTags": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The service tag dictionary. Tags are mutable." + }, + "location": { + "type": "string", + "description": "The name of the Azure location/region." + }, + "name": { + "type": "string", + "description": "Name of the Azure Machine Learning service." + }, + "properties": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The service properties dictionary. Properties are immutable." + }, + "type": { + "type": "string", + "enum": [ + "Microsoft.MachineLearningServices/workspaces/services" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.MachineLearningServices/workspaces/services" + } + }, + "definitions": { + "ACIServiceCreateRequest": { + "type": "object", + "properties": { + "appInsightsEnabled": { + "oneOf": [ + { + "type": "boolean", + "default": false + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Whether or not Application Insights is enabled." + }, + "authEnabled": { + "oneOf": [ + { + "type": "boolean", + "default": false + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Whether or not authentication is enabled on the service." + }, + "cname": { + "type": "string", + "description": "The CName for the service." + }, + "computeType": { + "type": "string", + "enum": [ + "ACI" + ] + }, + "containerResourceRequirements": { + "oneOf": [ + { + "$ref": "#/definitions/ContainerResourceRequirements" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The resource requirements for the container (cpu and memory)." + }, + "dataCollection": { + "oneOf": [ + { + "$ref": "#/definitions/ACIServiceCreateRequestDataCollection" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Details of the data collection options specified." + }, + "dnsNameLabel": { + "type": "string", + "description": "The Dns label for the service." + }, + "encryptionProperties": { + "oneOf": [ + { + "$ref": "#/definitions/ACIServiceCreateRequestEncryptionProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The encryption properties." + }, + "sslCertificate": { + "type": "string", + "description": "The public SSL certificate in PEM format to use if SSL is enabled." + }, + "sslEnabled": { + "oneOf": [ + { + "type": "boolean", + "default": false + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Whether or not SSL is enabled." + }, + "sslKey": { + "type": "string", + "description": "The public SSL key in PEM format for the certificate." + }, + "vnetConfiguration": { + "oneOf": [ + { + "$ref": "#/definitions/ACIServiceCreateRequestVnetConfiguration" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The virtual network configuration." + } + }, + "required": [ + "computeType" + ] + }, + "ACIServiceCreateRequestDataCollection": { + "type": "object", + "properties": { + "eventHubEnabled": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Option for enabling/disabling Event Hub." + }, + "storageEnabled": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Option for enabling/disabling storage." + } + }, + "description": "Details of the data collection options specified." + }, + "ACIServiceCreateRequestEncryptionProperties": { + "type": "object", + "properties": { + "keyName": { + "type": "string", + "description": "Encryption Key name" + }, + "keyVersion": { + "type": "string", + "description": "Encryption Key Version" + }, + "vaultBaseUrl": { + "type": "string", + "description": "vault base Url" + } + }, + "required": [ + "keyName", + "keyVersion", + "vaultBaseUrl" + ], + "description": "The encryption properties." + }, + "ACIServiceCreateRequestVnetConfiguration": { + "type": "object", + "properties": { + "subnetName": { + "type": "string", + "description": "The name of the virtual network subnet." + }, + "vnetName": { + "type": "string", + "description": "The name of the virtual network." + } + }, + "description": "The virtual network configuration." + }, + "AKS": { + "type": "object", + "properties": { + "computeType": { + "type": "string", + "enum": [ + "AKS" + ] + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/AKSProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "AKS properties" + } + }, + "required": [ + "computeType" + ], + "description": "A Machine Learning compute based on AKS." + }, + "AksNetworkingConfiguration": { + "type": "object", + "properties": { + "dnsServiceIP": { + "oneOf": [ + { + "type": "string", + "pattern": "^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "An IP address assigned to the Kubernetes DNS service. It must be within the Kubernetes service address range specified in serviceCidr." + }, + "dockerBridgeCidr": { + "oneOf": [ + { + "type": "string", + "pattern": "^([0-9]{1,3}\\.){3}[0-9]{1,3}(\\/([0-9]|[1-2][0-9]|3[0-2]))?$" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "A CIDR notation IP range assigned to the Docker bridge network. It must not overlap with any Subnet IP ranges or the Kubernetes service address range." + }, + "serviceCidr": { + "oneOf": [ + { + "type": "string", + "pattern": "^([0-9]{1,3}\\.){3}[0-9]{1,3}(\\/([0-9]|[1-2][0-9]|3[0-2]))?$" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "A CIDR notation IP range from which to assign service cluster IPs. It must not overlap with any Subnet IP ranges." + }, + "subnetId": { + "type": "string", + "description": "Virtual network subnet resource ID the compute nodes belong to" + } + }, + "description": "Advance configuration for AKS networking" + }, + "AKSProperties": { + "type": "object", + "properties": { + "agentCount": { + "oneOf": [ + { + "type": "integer", + "minimum": 1 + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Number of agents" + }, + "agentVMSize": { + "type": "string", + "description": "Agent virtual machine size" + }, + "aksNetworkingConfiguration": { + "oneOf": [ + { + "$ref": "#/definitions/AksNetworkingConfiguration" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Advance configuration for AKS networking" + }, + "clusterFqdn": { + "type": "string", + "description": "Cluster full qualified domain name" + }, + "sslConfiguration": { + "oneOf": [ + { + "$ref": "#/definitions/SslConfiguration" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The ssl configuration for scoring" + } + }, + "description": "AKS properties" + }, + "AKSServiceCreateRequest": { + "type": "object", + "properties": { + "aadAuthEnabled": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Whether or not AAD authentication is enabled." + }, + "appInsightsEnabled": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Whether or not Application Insights is enabled." + }, + "authEnabled": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Whether or not authentication is enabled." + }, + "autoScaler": { + "oneOf": [ + { + "$ref": "#/definitions/AKSServiceCreateRequestAutoScaler" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The auto scaler properties." + }, + "computeName": { + "type": "string", + "description": "The name of the compute resource." + }, + "computeType": { + "type": "string", + "enum": [ + "AKS" + ] + }, + "containerResourceRequirements": { + "oneOf": [ + { + "$ref": "#/definitions/ContainerResourceRequirements" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The resource requirements for the container (cpu and memory)." + }, + "dataCollection": { + "oneOf": [ + { + "$ref": "#/definitions/AKSServiceCreateRequestDataCollection" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Details of the data collection options specified." + }, + "livenessProbeRequirements": { + "oneOf": [ + { + "$ref": "#/definitions/AKSServiceCreateRequestLivenessProbeRequirements" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The liveness probe requirements." + }, + "maxConcurrentRequestsPerContainer": { + "oneOf": [ + { + "type": "integer" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The maximum number of concurrent requests per container." + }, + "maxQueueWaitMs": { + "oneOf": [ + { + "type": "integer" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Maximum time a request will wait in the queue (in milliseconds). After this time, the service will return 503 (Service Unavailable)" + }, + "namespace": { + "type": "string", + "description": "Kubernetes namespace for the service." + }, + "numReplicas": { + "oneOf": [ + { + "type": "integer" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The number of replicas on the cluster." + }, + "scoringTimeoutMs": { + "oneOf": [ + { + "type": "integer" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The scoring timeout in milliseconds." + } + }, + "required": [ + "computeType" + ], + "description": "The request to create an AKS service." + }, + "AKSServiceCreateRequestAutoScaler": { + "type": "object", + "properties": { + "autoscaleEnabled": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Option to enable/disable auto scaling." + }, + "maxReplicas": { + "oneOf": [ + { + "type": "integer" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The maximum number of replicas in the cluster." + }, + "minReplicas": { + "oneOf": [ + { + "type": "integer" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The minimum number of replicas to scale down to." + }, + "refreshPeriodInSeconds": { + "oneOf": [ + { + "type": "integer" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The amount of seconds to wait between auto scale updates." + }, + "targetUtilization": { + "oneOf": [ + { + "type": "integer" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The target utilization percentage to use for determining whether to scale the cluster." + } + }, + "description": "The auto scaler properties." + }, + "AKSServiceCreateRequestDataCollection": { + "type": "object", + "properties": { + "eventHubEnabled": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Option for enabling/disabling Event Hub." + }, + "storageEnabled": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Option for enabling/disabling storage." + } + }, + "description": "Details of the data collection options specified." + }, + "AKSServiceCreateRequestLivenessProbeRequirements": { + "type": "object", + "properties": { + "failureThreshold": { + "oneOf": [ + { + "type": "integer" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The number of failures to allow before returning an unhealthy status." + }, + "initialDelaySeconds": { + "oneOf": [ + { + "type": "integer" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The delay before the first probe in seconds." + }, + "periodSeconds": { + "oneOf": [ + { + "type": "integer" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The length of time between probes in seconds." + }, + "successThreshold": { + "oneOf": [ + { + "type": "integer" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The number of successful probes before returning a healthy status." + }, + "timeoutSeconds": { + "oneOf": [ + { + "type": "integer" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The probe timeout in seconds." + } + }, + "description": "The liveness probe requirements." + }, + "AmlCompute": { + "type": "object", + "properties": { + "computeType": { + "type": "string", + "enum": [ + "AmlCompute" + ] + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/AmlComputeProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "AML Compute properties" + } + }, + "required": [ + "computeType" + ], + "description": "An Azure Machine Learning compute." + }, + "AmlComputeProperties": { + "type": "object", + "properties": { + "enableNodePublicIp": { + "oneOf": [ + { + "type": "boolean", + "default": true + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Enable or disable node public IP address provisioning. Possible values are: Possible values are: true - Indicates that the compute nodes will have public IPs provisioned. false - Indicates that the compute nodes will have a private endpoint and no public IPs." + }, + "isolatedNetwork": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Network is isolated or not" + }, + "osType": { + "oneOf": [ + { + "type": "string", + "enum": [ + "Linux", + "Windows" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Compute OS Type." + }, + "remoteLoginPortPublicAccess": { + "oneOf": [ + { + "type": "string", + "enum": [ + "Enabled", + "Disabled", + "NotSpecified" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "State of the public SSH port. Possible values are: Disabled - Indicates that the public ssh port is closed on all nodes of the cluster. Enabled - Indicates that the public ssh port is open on all nodes of the cluster. NotSpecified - Indicates that the public ssh port is closed on all nodes of the cluster if VNet is defined, else is open all public nodes. It can be default only during cluster creation time, after creation it will be either enabled or disabled." + }, + "scaleSettings": { + "oneOf": [ + { + "$ref": "#/definitions/ScaleSettings" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "scale settings for AML Compute" + }, + "subnet": { + "oneOf": [ + { + "$ref": "#/definitions/ResourceId" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Represents a resource ID. For example, for a subnet, it is the resource URL for the subnet." + }, + "userAccountCredentials": { + "oneOf": [ + { + "$ref": "#/definitions/UserAccountCredentials" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Settings for user account that gets created on each on the nodes of a compute." + }, + "virtualMachineImage": { + "oneOf": [ + { + "$ref": "#/definitions/VirtualMachineImage" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Virtual Machine image for Windows AML Compute" + }, + "vmPriority": { + "oneOf": [ + { + "type": "string", + "enum": [ + "Dedicated", + "LowPriority" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Virtual Machine priority." + }, + "vmSize": { + "type": "string", + "description": "Virtual Machine Size" + } + }, + "description": "AML Compute properties" + }, + "Compute": { + "type": "object", + "oneOf": [ + { + "$ref": "#/definitions/AKS" + }, + { + "$ref": "#/definitions/AmlCompute" + }, + { + "$ref": "#/definitions/VirtualMachine" + }, + { + "$ref": "#/definitions/HDInsight" + }, + { + "$ref": "#/definitions/DataFactory" + }, + { + "$ref": "#/definitions/Databricks" + }, + { + "$ref": "#/definitions/DataLakeAnalytics" + } + ], + "properties": { + "computeLocation": { + "type": "string", + "description": "Location for the underlying compute" + }, + "description": { + "type": "string", + "description": "The description of the Machine Learning compute." + }, + "resourceId": { + "type": "string", + "description": "ARM resource id of the underlying compute" + } + }, + "description": "Machine Learning compute object." + }, + "ContainerResourceRequirements": { + "type": "object", + "properties": { + "cpu": { + "oneOf": [ + { + "type": "number" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The number of CPU cores on the container." + }, + "fpga": { + "oneOf": [ + { + "type": "integer" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The number of FPGA PCIE devices exposed to the container. Must be multiple of 2." + }, + "gpu": { + "oneOf": [ + { + "type": "integer" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The number of GPU cores in the container." + }, + "memoryInGB": { + "oneOf": [ + { + "type": "number" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The amount of memory on the container in GB." + } + }, + "description": "The resource requirements for the container (cpu and memory)." + }, + "CreateEndpointVariantRequest": { + "type": "object", + "oneOf": [ + { + "$ref": "#/definitions/AKSServiceCreateRequest" + } + ], + "properties": { + "computeType": { + "type": "string", + "enum": [ + "Custom" + ] + }, + "isDefault": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Is this the default variant." + }, + "trafficPercentile": { + "oneOf": [ + { + "type": "number" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The amount of traffic variant receives." + }, + "type": { + "oneOf": [ + { + "type": "string", + "enum": [ + "Control", + "Treatment" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The type of the variant." + } + }, + "required": [ + "computeType" + ], + "description": "The Variant properties." + }, + "CreateServiceRequestEnvironmentImageRequest": { + "type": "object", + "properties": { + "assets": { + "oneOf": [ + { + "type": "array", + "items": { + "$ref": "#/definitions/ImageAsset" + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The list of assets." + }, + "driverProgram": { + "type": "string", + "description": "The name of the driver file." + }, + "environment": { + "oneOf": [ + { + "$ref": "#/definitions/EnvironmentImageRequestEnvironment" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The details of the AZURE ML environment." + }, + "environmentReference": { + "oneOf": [ + { + "$ref": "#/definitions/EnvironmentImageRequestEnvironmentReference" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The unique identifying details of the AZURE ML environment." + }, + "modelIds": { + "oneOf": [ + { + "type": "array", + "items": { + "type": "string" + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The list of model Ids." + }, + "models": { + "oneOf": [ + { + "type": "array", + "items": { + "$ref": "#/definitions/Model" + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The list of models." + } + }, + "description": "The Environment, models and assets needed for inferencing." + }, + "CreateServiceRequestKeys": { + "type": "object", + "properties": { + "primaryKey": { + "type": "string", + "description": "The primary key." + }, + "secondaryKey": { + "type": "string", + "description": "The secondary key." + } + }, + "description": "The authentication keys." + }, + "Databricks": { + "type": "object", + "properties": { + "computeType": { + "type": "string", + "enum": [ + "Databricks" + ] + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/DatabricksProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ] + } + }, + "required": [ + "computeType" + ], + "description": "A DataFactory compute." + }, + "DatabricksProperties": { + "type": "object", + "properties": { + "databricksAccessToken": { + "type": "string", + "description": "Databricks access token" + } + } + }, + "DataFactory": { + "type": "object", + "properties": { + "computeType": { + "type": "string", + "enum": [ + "DataFactory" + ] + } + }, + "required": [ + "computeType" + ], + "description": "A DataFactory compute." + }, + "DataLakeAnalytics": { + "type": "object", + "properties": { + "computeType": { + "type": "string", + "enum": [ + "DataLakeAnalytics" + ] + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/DataLakeAnalyticsProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ] + } + }, + "required": [ + "computeType" + ], + "description": "A DataLakeAnalytics compute." + }, + "DataLakeAnalyticsProperties": { + "type": "object", + "properties": { + "dataLakeStoreAccountName": { + "type": "string", + "description": "DataLake Store Account Name" + } + } + }, + "DatasetReference": { + "type": "object", + "properties": { + "id": { + "type": "string", + "description": "The id of the dataset reference." + }, + "name": { + "type": "string", + "description": "The name of the dataset reference." + } + }, + "description": "The dataset reference object." + }, + "EncryptionProperty": { + "type": "object", + "properties": { + "keyVaultProperties": { + "oneOf": [ + { + "$ref": "#/definitions/KeyVaultProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ] + }, + "status": { + "oneOf": [ + { + "type": "string", + "enum": [ + "Enabled", + "Disabled" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Indicates whether or not the encryption is enabled for the workspace." + } + }, + "required": [ + "keyVaultProperties", + "status" + ] + }, + "EnvironmentImageRequestEnvironment": { + "type": "object", + "properties": { + "docker": { + "oneOf": [ + { + "$ref": "#/definitions/ModelEnvironmentDefinitionDocker" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The definition of a Docker container." + }, + "environmentVariables": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Definition of environment variables to be defined in the environment." + }, + "inferencingStackVersion": { + "type": "string", + "description": "The inferencing stack version added to the image. To avoid adding an inferencing stack, do not set this value. Valid values: \"latest\"." + }, + "name": { + "type": "string", + "description": "The name of the environment." + }, + "python": { + "oneOf": [ + { + "$ref": "#/definitions/ModelEnvironmentDefinitionPython" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Settings for a Python environment." + }, + "r": { + "oneOf": [ + { + "$ref": "#/definitions/ModelEnvironmentDefinitionR" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Settings for a R environment." + }, + "spark": { + "oneOf": [ + { + "$ref": "#/definitions/ModelEnvironmentDefinitionSpark" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The configuration for a Spark environment." + }, + "version": { + "type": "string", + "description": "The environment version." + } + }, + "description": "The details of the AZURE ML environment." + }, + "EnvironmentImageRequestEnvironmentReference": { + "type": "object", + "properties": { + "name": { + "type": "string", + "description": "Name of the environment." + }, + "version": { + "type": "string", + "description": "Version of the environment." + } + }, + "description": "The unique identifying details of the AZURE ML environment." + }, + "HDInsight": { + "type": "object", + "properties": { + "computeType": { + "type": "string", + "enum": [ + "HDInsight" + ] + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/HDInsightProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ] + } + }, + "required": [ + "computeType" + ], + "description": "A HDInsight compute." + }, + "HDInsightProperties": { + "type": "object", + "properties": { + "address": { + "type": "string", + "description": "Public IP address of the master node of the cluster." + }, + "administratorAccount": { + "oneOf": [ + { + "$ref": "#/definitions/VirtualMachineSshCredentials" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Admin credentials for virtual machine" + }, + "sshPort": { + "oneOf": [ + { + "type": "integer" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Port open for ssh connections on the master node of the cluster." + } + } + }, + "Identity": { + "type": "object", + "properties": { + "type": { + "oneOf": [ + { + "type": "string", + "enum": [ + "SystemAssigned", + "SystemAssigned,UserAssigned", + "UserAssigned", + "None" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The identity type." + }, + "userAssignedIdentities": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "$ref": "#/definitions/UserAssignedIdentity" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "dictionary containing all the user assigned identities, with resourceId of the UAI as key." + } + }, + "description": "Identity for the resource." + }, + "ImageAsset": { + "type": "object", + "properties": { + "id": { + "type": "string", + "description": "The Asset Id." + }, + "mimeType": { + "type": "string", + "description": "The mime type." + }, + "unpack": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Whether the Asset is unpacked." + }, + "url": { + "type": "string", + "description": "The Url of the Asset." + } + }, + "description": "An Image asset." + }, + "KeyVaultProperties": { + "type": "object", + "properties": { + "identityClientId": { + "type": "string", + "description": "For future use - The client id of the identity which will be used to access key vault." + }, + "keyIdentifier": { + "type": "string", + "description": "Key vault uri to access the encryption key." + }, + "keyVaultArmId": { + "type": "string", + "description": "The ArmId of the keyVault where the customer owned encryption key is present." + } + }, + "required": [ + "keyIdentifier", + "keyVaultArmId" + ] + }, + "LinkedServiceProps": { + "type": "object", + "properties": { + "linkedServiceResourceId": { + "type": "string", + "description": "ResourceId of the link target of the linked service." + } + }, + "description": "LinkedService specific properties." + }, + "Model": { + "type": "object", + "properties": { + "createdTime": { + "type": "string", + "format": "date-time", + "description": "The Model creation time (UTC)." + }, + "datasets": { + "oneOf": [ + { + "type": "array", + "items": { + "$ref": "#/definitions/DatasetReference" + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The list of datasets associated with the model." + }, + "derivedModelIds": { + "oneOf": [ + { + "type": "array", + "items": { + "type": "string" + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Models derived from this model" + }, + "description": { + "type": "string", + "description": "The Model description text." + }, + "experimentName": { + "type": "string", + "description": "The name of the experiment where this model was created." + }, + "framework": { + "type": "string", + "description": "The Model framework." + }, + "frameworkVersion": { + "type": "string", + "description": "The Model framework version." + }, + "id": { + "type": "string", + "description": "The Model Id." + }, + "kvTags": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The Model tag dictionary. Items are mutable." + }, + "mimeType": { + "type": "string", + "description": "The MIME type of Model content. For more details about MIME type, please open https://www.iana.org/assignments/media-types/media-types.xhtml" + }, + "modifiedTime": { + "type": "string", + "format": "date-time", + "description": "The Model last modified time (UTC)." + }, + "name": { + "type": "string", + "description": "The Model name." + }, + "parentModelId": { + "type": "string", + "description": "The Parent Model Id." + }, + "properties": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The Model property dictionary. Properties are immutable." + }, + "resourceRequirements": { + "oneOf": [ + { + "$ref": "#/definitions/ContainerResourceRequirements" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The resource requirements for the container (cpu and memory)." + }, + "runId": { + "type": "string", + "description": "The RunId that created this model." + }, + "sampleInputData": { + "type": "string", + "description": "Sample Input Data for the Model. A reference to a dataset in the workspace in the format aml://dataset/{datasetId}" + }, + "sampleOutputData": { + "type": "string", + "description": "Sample Output Data for the Model. A reference to a dataset in the workspace in the format aml://dataset/{datasetId}" + }, + "unpack": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Indicates whether we need to unpack the Model during docker Image creation." + }, + "url": { + "type": "string", + "description": "The URL of the Model. Usually a SAS URL." + }, + "version": { + "oneOf": [ + { + "type": "integer" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The Model version assigned by Model Management Service." + } + }, + "required": [ + "mimeType", + "name", + "url" + ], + "description": "An Azure Machine Learning Model." + }, + "ModelDockerSectionBaseImageRegistry": { + "type": "object", + "properties": { + "address": { + "type": "string" + }, + "password": { + "type": "string" + }, + "username": { + "type": "string" + } + }, + "description": "Image registry that contains the base image." + }, + "ModelEnvironmentDefinitionDocker": { + "type": "object", + "properties": { + "baseDockerfile": { + "type": "string", + "description": "Base Dockerfile used for Docker-based runs. Mutually exclusive with BaseImage." + }, + "baseImage": { + "type": "string", + "description": "Base image used for Docker-based runs. Mutually exclusive with BaseDockerfile." + }, + "baseImageRegistry": { + "oneOf": [ + { + "$ref": "#/definitions/ModelDockerSectionBaseImageRegistry" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Image registry that contains the base image." + } + }, + "description": "The definition of a Docker container." + }, + "ModelEnvironmentDefinitionPython": { + "type": "object", + "properties": { + "baseCondaEnvironment": { + "type": "string" + }, + "condaDependencies": { + "type": "object", + "properties": {}, + "description": "A JObject containing Conda dependencies." + }, + "interpreterPath": { + "type": "string", + "description": "The python interpreter path to use if an environment build is not required. The path specified gets used to call the user script." + }, + "userManagedDependencies": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "True means that AzureML reuses an existing python environment; False means that AzureML will create a python environment based on the Conda dependencies specification." + } + }, + "description": "Settings for a Python environment." + }, + "ModelEnvironmentDefinitionR": { + "type": "object", + "properties": { + "bioConductorPackages": { + "oneOf": [ + { + "type": "array", + "items": { + "type": "string" + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The packages from Bioconductor." + }, + "cranPackages": { + "oneOf": [ + { + "type": "array", + "items": { + "$ref": "#/definitions/RCranPackage" + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The CRAN packages to use." + }, + "customUrlPackages": { + "oneOf": [ + { + "type": "array", + "items": { + "type": "string" + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The packages from custom urls." + }, + "gitHubPackages": { + "oneOf": [ + { + "type": "array", + "items": { + "$ref": "#/definitions/RGitHubPackage" + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The packages directly from GitHub." + }, + "rscriptPath": { + "type": "string", + "description": "The Rscript path to use if an environment build is not required.\r\nThe path specified gets used to call the user script." + }, + "rVersion": { + "type": "string", + "description": "The version of R to be installed" + }, + "snapshotDate": { + "type": "string", + "description": "Date of MRAN snapshot to use in YYYY-MM-DD format, e.g. \"2019-04-17\"" + }, + "userManaged": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Indicates whether the environment is managed by user or by AzureML." + } + }, + "description": "Settings for a R environment." + }, + "ModelEnvironmentDefinitionSpark": { + "type": "object", + "properties": { + "packages": { + "oneOf": [ + { + "type": "array", + "items": { + "$ref": "#/definitions/SparkMavenPackage" + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The Spark packages to use." + }, + "precachePackages": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Whether to precache the packages." + }, + "repositories": { + "oneOf": [ + { + "type": "array", + "items": { + "type": "string" + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The list of spark repositories." + } + }, + "description": "The configuration for a Spark environment." + }, + "PrivateEndpoint": { + "type": "object", + "properties": {}, + "description": "The Private Endpoint resource." + }, + "PrivateEndpointConnectionProperties": { + "type": "object", + "properties": { + "privateEndpoint": { + "oneOf": [ + { + "$ref": "#/definitions/PrivateEndpoint" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The Private Endpoint resource." + }, + "privateLinkServiceConnectionState": { + "oneOf": [ + { + "$ref": "#/definitions/PrivateLinkServiceConnectionState" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "A collection of information about the state of the connection between service consumer and provider." + }, + "provisioningState": { + "oneOf": [ + { + "type": "string", + "enum": [ + "Succeeded", + "Creating", + "Deleting", + "Failed" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The provisioning state of the private endpoint connection resource." + } + }, + "required": [ + "privateLinkServiceConnectionState" + ], + "description": "Properties of the PrivateEndpointConnectProperties." + }, + "PrivateLinkServiceConnectionState": { + "type": "object", + "properties": { + "actionsRequired": { + "type": "string", + "description": "A message indicating if changes on the service provider require any updates on the consumer." + }, + "description": { + "type": "string", + "description": "The reason for approval/rejection of the connection." + }, + "status": { + "oneOf": [ + { + "type": "string", + "enum": [ + "Pending", + "Approved", + "Rejected", + "Disconnected", + "Timeout" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Indicates whether the connection has been Approved/Rejected/Removed by the owner of the service." + } + }, + "description": "A collection of information about the state of the connection between service consumer and provider." + }, + "RCranPackage": { + "type": "object", + "properties": { + "name": { + "type": "string", + "description": "The package name." + }, + "repository": { + "type": "string", + "description": "The repository name." + } + } + }, + "ResourceId": { + "type": "object", + "properties": { + "id": { + "type": "string", + "description": "The ID of the resource" + } + }, + "required": [ + "id" + ], + "description": "Represents a resource ID. For example, for a subnet, it is the resource URL for the subnet." + }, + "RGitHubPackage": { + "type": "object", + "properties": { + "authToken": { + "type": "string", + "description": "Personal access token to install from a private repo" + }, + "repository": { + "type": "string", + "description": "Repository address in the format username/repo[/subdir][@ref|#pull]." + } + } + }, + "ScaleSettings": { + "type": "object", + "properties": { + "maxNodeCount": { + "oneOf": [ + { + "type": "integer" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Max number of nodes to use" + }, + "minNodeCount": { + "oneOf": [ + { + "type": "integer", + "default": "0" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Min number of nodes to use" + }, + "nodeIdleTimeBeforeScaleDown": { + "type": "string", + "format": "duration", + "description": "Node Idle Time before scaling down amlCompute. This string needs to be in the RFC Format." + } + }, + "required": [ + "maxNodeCount" + ], + "description": "scale settings for AML Compute" + }, + "SharedPrivateLinkResource": { + "type": "object", + "properties": { + "name": { + "type": "string", + "description": "Unique name of the private link." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/SharedPrivateLinkResourceProperty" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Properties of a shared private link resource." + } + } + }, + "SharedPrivateLinkResourceProperty": { + "type": "object", + "properties": { + "groupId": { + "type": "string", + "description": "The private link resource group id." + }, + "privateLinkResourceId": { + "type": "string", + "description": "The resource id that private link links to." + }, + "requestMessage": { + "type": "string", + "description": "Request message." + }, + "status": { + "oneOf": [ + { + "type": "string", + "enum": [ + "Pending", + "Approved", + "Rejected", + "Disconnected", + "Timeout" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Indicates whether the connection has been Approved/Rejected/Removed by the owner of the service." + } + }, + "description": "Properties of a shared private link resource." + }, + "Sku": { + "type": "object", + "properties": { + "name": { + "type": "string", + "description": "Name of the sku" + }, + "tier": { + "type": "string", + "description": "Tier of the sku like Basic or Enterprise" + } + }, + "description": "Sku of the resource" + }, + "SparkMavenPackage": { + "type": "object", + "properties": { + "artifact": { + "type": "string" + }, + "group": { + "type": "string" + }, + "version": { + "type": "string" + } + } + }, + "SslConfiguration": { + "type": "object", + "properties": { + "cert": { + "type": "string", + "description": "Cert data" + }, + "cname": { + "type": "string", + "description": "CNAME of the cert" + }, + "key": { + "type": "string", + "description": "Key data" + }, + "status": { + "oneOf": [ + { + "type": "string", + "enum": [ + "Disabled", + "Enabled" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Enable or disable ssl for scoring." + } + }, + "description": "The ssl configuration for scoring" + }, + "UserAccountCredentials": { + "type": "object", + "properties": { + "adminUserName": { + "type": "string", + "description": "Name of the administrator user account which can be used to SSH to nodes." + }, + "adminUserPassword": { + "type": "string", + "description": "Password of the administrator user account." + }, + "adminUserSshPublicKey": { + "type": "string", + "description": "SSH public key of the administrator user account." + } + }, + "required": [ + "adminUserName" + ], + "description": "Settings for user account that gets created on each on the nodes of a compute." + }, + "UserAssignedIdentity": { + "type": "object", + "properties": {}, + "description": "User Assigned Identity" + }, + "VirtualMachine": { + "type": "object", + "properties": { + "computeType": { + "type": "string", + "enum": [ + "VirtualMachine" + ] + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/VirtualMachineProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ] + } + }, + "required": [ + "computeType" + ], + "description": "A Machine Learning compute based on Azure Virtual Machines." + }, + "VirtualMachineImage": { + "type": "object", + "properties": { + "id": { + "type": "string", + "description": "Virtual Machine image path" + } + }, + "required": [ + "id" + ], + "description": "Virtual Machine image for Windows AML Compute" + }, + "VirtualMachineProperties": { + "type": "object", + "properties": { + "address": { + "type": "string", + "description": "Public IP address of the virtual machine." + }, + "administratorAccount": { + "oneOf": [ + { + "$ref": "#/definitions/VirtualMachineSshCredentials" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Admin credentials for virtual machine" + }, + "sshPort": { + "oneOf": [ + { + "type": "integer" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Port open for ssh connections." + }, + "virtualMachineSize": { + "type": "string", + "description": "Virtual Machine size" + } + } + }, + "VirtualMachineSshCredentials": { + "type": "object", + "properties": { + "password": { + "type": "string", + "description": "Password of admin account" + }, + "privateKeyData": { + "type": "string", + "description": "Private key data" + }, + "publicKeyData": { + "type": "string", + "description": "Public key data" + }, + "username": { + "type": "string", + "description": "Username of admin account" + } + }, + "description": "Admin credentials for virtual machine" + }, + "WorkspaceProperties": { + "type": "object", + "properties": { + "allowPublicAccessWhenBehindVnet": { + "oneOf": [ + { + "type": "boolean", + "default": false + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The flag to indicate whether to allow public access when behind VNet." + }, + "applicationInsights": { + "type": "string", + "description": "ARM id of the application insights associated with this workspace. This cannot be changed once the workspace has been created" + }, + "containerRegistry": { + "type": "string", + "description": "ARM id of the container registry associated with this workspace. This cannot be changed once the workspace has been created" + }, + "description": { + "type": "string", + "description": "The description of this workspace." + }, + "discoveryUrl": { + "type": "string", + "description": "Url for the discovery service to identify regional endpoints for machine learning experimentation services" + }, + "encryption": { + "oneOf": [ + { + "$ref": "#/definitions/EncryptionProperty" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ] + }, + "friendlyName": { + "type": "string", + "description": "The friendly name for this workspace. This name in mutable" + }, + "hbiWorkspace": { + "oneOf": [ + { + "type": "boolean", + "default": false + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The flag to signal HBI data in the workspace and reduce diagnostic data collected by the service" + }, + "imageBuildCompute": { + "type": "string", + "description": "The compute name for image build" + }, + "keyVault": { + "type": "string", + "description": "ARM id of the key vault associated with this workspace. This cannot be changed once the workspace has been created" + }, + "sharedPrivateLinkResources": { + "oneOf": [ + { + "type": "array", + "items": { + "$ref": "#/definitions/SharedPrivateLinkResource" + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The list of shared private link resources in this workspace." + }, + "storageAccount": { + "type": "string", + "description": "ARM id of the storage account associated with this workspace. This cannot be changed once the workspace has been created" + } + }, + "description": "The properties of a machine learning workspace." + }, + "workspaces_computes_childResource": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-09-01-preview" + ] + }, + "identity": { + "oneOf": [ + { + "$ref": "#/definitions/Identity" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Identity for the resource." + }, + "location": { + "type": "string", + "description": "Specifies the location of the resource." + }, + "name": { + "type": "string", + "description": "Name of the Azure Machine Learning compute." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/Compute" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Machine Learning compute object." + }, + "sku": { + "oneOf": [ + { + "$ref": "#/definitions/Sku" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Sku of the resource" + }, + "tags": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Contains resource tags defined as key/value pairs." + }, + "type": { + "type": "string", + "enum": [ + "computes" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.MachineLearningServices/workspaces/computes" + }, + "workspaces_linkedServices_childResource": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-09-01-preview" + ] + }, + "identity": { + "oneOf": [ + { + "$ref": "#/definitions/Identity" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Identity for the resource." + }, + "location": { + "type": "string", + "description": "location of the linked service." + }, + "name": { + "type": "string", + "description": "Friendly name of the linked workspace" + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/LinkedServiceProps" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "LinkedService specific properties." + }, + "type": { + "type": "string", + "enum": [ + "linkedServices" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.MachineLearningServices/workspaces/linkedServices" + }, + "workspaces_privateEndpointConnections_childResource": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-09-01-preview" + ] + }, + "identity": { + "oneOf": [ + { + "$ref": "#/definitions/Identity" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Identity for the resource." + }, + "location": { + "type": "string", + "description": "Specifies the location of the resource." + }, + "name": { + "type": "string", + "description": "The name of the private endpoint connection associated with the workspace" + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/PrivateEndpointConnectionProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Properties of the PrivateEndpointConnectProperties." + }, + "sku": { + "oneOf": [ + { + "$ref": "#/definitions/Sku" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Sku of the resource" + }, + "tags": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Contains resource tags defined as key/value pairs." + }, + "type": { + "type": "string", + "enum": [ + "privateEndpointConnections" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.MachineLearningServices/workspaces/privateEndpointConnections" + }, + "workspaces_services_childResource": { + "type": "object", + "oneOf": [ + { + "$ref": "#/definitions/ACIServiceCreateRequest" + }, + { + "$ref": "#/definitions/CreateEndpointVariantRequest" + } + ], + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-09-01-preview" + ] + }, + "description": { + "type": "string", + "description": "The description of the service." + }, + "environmentImageRequest": { + "oneOf": [ + { + "$ref": "#/definitions/CreateServiceRequestEnvironmentImageRequest" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The Environment, models and assets needed for inferencing." + }, + "keys": { + "oneOf": [ + { + "$ref": "#/definitions/CreateServiceRequestKeys" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The authentication keys." + }, + "kvTags": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The service tag dictionary. Tags are mutable." + }, + "location": { + "type": "string", + "description": "The name of the Azure location/region." + }, + "name": { + "type": "string", + "description": "Name of the Azure Machine Learning service." + }, + "properties": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The service properties dictionary. Properties are immutable." + }, + "type": { + "type": "string", + "enum": [ + "services" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.MachineLearningServices/workspaces/services" + } + } +} \ No newline at end of file diff --git a/schemas/common/autogeneratedResources.json b/schemas/common/autogeneratedResources.json index 7819fbb8ea..e908035c11 100644 --- a/schemas/common/autogeneratedResources.json +++ b/schemas/common/autogeneratedResources.json @@ -3397,6 +3397,21 @@ { "$ref": "https://schema.management.azure.com/schemas/2020-06-01/Microsoft.MachineLearningServices.json#/resourceDefinitions/workspaces_privateEndpointConnections" }, + { + "$ref": "https://schema.management.azure.com/schemas/2020-09-01-preview/Microsoft.MachineLearningServices.json#/resourceDefinitions/workspaces" + }, + { + "$ref": "https://schema.management.azure.com/schemas/2020-09-01-preview/Microsoft.MachineLearningServices.json#/resourceDefinitions/workspaces_computes" + }, + { + "$ref": "https://schema.management.azure.com/schemas/2020-09-01-preview/Microsoft.MachineLearningServices.json#/resourceDefinitions/workspaces_linkedServices" + }, + { + "$ref": "https://schema.management.azure.com/schemas/2020-09-01-preview/Microsoft.MachineLearningServices.json#/resourceDefinitions/workspaces_privateEndpointConnections" + }, + { + "$ref": "https://schema.management.azure.com/schemas/2020-09-01-preview/Microsoft.MachineLearningServices.json#/resourceDefinitions/workspaces_services" + }, { "$ref": "https://schema.management.azure.com/schemas/2018-06-01-preview/Microsoft.Maintenance.json#/resourceDefinitions/maintenanceConfigurations" }, From 57c02bb4fee69649a24e6b9e9909063b9e64622a Mon Sep 17 00:00:00 2001 From: Autogenerator Pipeline Date: Wed, 26 Aug 2020 11:08:47 +0000 Subject: [PATCH 10/15] Update resource list --- generator/resources.json | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/generator/resources.json b/generator/resources.json index fd32e27630..b8b49a6141 100644 --- a/generator/resources.json +++ b/generator/resources.json @@ -2186,7 +2186,8 @@ "2020-04-01", "2020-05-01-preview", "2020-05-15-preview", - "2020-06-01" + "2020-06-01", + "2020-09-01-preview" ], "Microsoft.MachineLearningServices/workspaces/computes": [ "2018-03-01-preview", @@ -2200,11 +2201,15 @@ "2020-04-01", "2020-05-01-preview", "2020-05-15-preview", - "2020-06-01" + "2020-06-01", + "2020-09-01-preview" ], "Microsoft.MachineLearningServices/workspaces/connections": [ "2020-06-01" ], + "Microsoft.MachineLearningServices/workspaces/linkedServices": [ + "2020-09-01-preview" + ], "Microsoft.MachineLearningServices/workspaces/linkedWorkspaces": [ "2020-05-01-preview", "2020-05-15-preview" @@ -2216,11 +2221,13 @@ "2020-04-01", "2020-05-01-preview", "2020-05-15-preview", - "2020-06-01" + "2020-06-01", + "2020-09-01-preview" ], "Microsoft.MachineLearningServices/workspaces/services": [ "2020-05-01-preview", - "2020-05-15-preview" + "2020-05-15-preview", + "2020-09-01-preview" ], "Microsoft.Maintenance/maintenanceConfigurations": [ "2018-06-01-preview", From 7a0b8ad5f293727394f1981d5b7cc4ff18b27a04 Mon Sep 17 00:00:00 2001 From: Autogenerator Pipeline Date: Thu, 27 Aug 2020 09:20:17 +0000 Subject: [PATCH 11/15] Autogenerate schemas --- schemas/2018-03-01/Microsoft.Cache.json | 2 +- schemas/2019-07-01/Microsoft.Cache.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/schemas/2018-03-01/Microsoft.Cache.json b/schemas/2018-03-01/Microsoft.Cache.json index 10db7ecc3d..57470e751b 100644 --- a/schemas/2018-03-01/Microsoft.Cache.json +++ b/schemas/2018-03-01/Microsoft.Cache.json @@ -587,7 +587,7 @@ "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" } ], - "description": "The size of the Redis cache to deploy. Valid values: for C (Basic/Standard) family (0, 1, 2, 3, 4, 5, 6), for P (Premium) family (1, 2, 3, 4)." + "description": "The size of the Redis cache to deploy. Valid values: for C (Basic/Standard) family (0, 1, 2, 3, 4, 5, 6), for P (Premium) family (1, 2, 3, 4, 5)." }, "family": { "oneOf": [ diff --git a/schemas/2019-07-01/Microsoft.Cache.json b/schemas/2019-07-01/Microsoft.Cache.json index 33c13f1f3c..6e960ec222 100644 --- a/schemas/2019-07-01/Microsoft.Cache.json +++ b/schemas/2019-07-01/Microsoft.Cache.json @@ -598,7 +598,7 @@ "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" } ], - "description": "The size of the Redis cache to deploy. Valid values: for C (Basic/Standard) family (0, 1, 2, 3, 4, 5, 6), for P (Premium) family (1, 2, 3, 4)." + "description": "The size of the Redis cache to deploy. Valid values: for C (Basic/Standard) family (0, 1, 2, 3, 4, 5, 6), for P (Premium) family (1, 2, 3, 4, 5)." }, "family": { "oneOf": [ From 8c83db24335465130c1520e572ee19baae77da95 Mon Sep 17 00:00:00 2001 From: Autogenerator Pipeline Date: Thu, 27 Aug 2020 12:47:18 +0000 Subject: [PATCH 12/15] Autogenerate schemas --- .../Microsoft.SecurityInsights.json | 32 ++ .../2019-10-01-preview/Microsoft.Search.json | 117 ---- schemas/2020-03-13/Microsoft.Search.json | 117 ---- .../2020-08-01-preview/Microsoft.Search.json | 542 ++++++++++++++++++ schemas/2020-08-01/Microsoft.Search.json | 542 ++++++++++++++++++ schemas/common/autogeneratedResources.json | 20 +- 6 files changed, 1132 insertions(+), 238 deletions(-) create mode 100644 schemas/2020-08-01-preview/Microsoft.Search.json create mode 100644 schemas/2020-08-01/Microsoft.Search.json diff --git a/schemas/2019-01-01-preview/Microsoft.SecurityInsights.json b/schemas/2019-01-01-preview/Microsoft.SecurityInsights.json index c3c58394c3..65d1d4a667 100644 --- a/schemas/2019-01-01-preview/Microsoft.SecurityInsights.json +++ b/schemas/2019-01-01-preview/Microsoft.SecurityInsights.json @@ -2136,6 +2136,17 @@ } ], "description": "SharePoint data type connection." + }, + "teams": { + "oneOf": [ + { + "$ref": "#/definitions/OfficeDataConnectorDataTypesTeams" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Teams data type connection." } }, "description": "The available data types for office data connector." @@ -2182,6 +2193,27 @@ }, "description": "SharePoint data type connection." }, + "OfficeDataConnectorDataTypesTeams": { + "type": "object", + "properties": { + "state": { + "oneOf": [ + { + "type": "string", + "enum": [ + "Enabled", + "Disabled" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Describe whether this data type connection is enabled or not." + } + }, + "description": "Teams data type connection." + }, "OfficeDataConnectorProperties": { "type": "object", "properties": { diff --git a/schemas/2019-10-01-preview/Microsoft.Search.json b/schemas/2019-10-01-preview/Microsoft.Search.json index 59bb5fc642..237cebca76 100644 --- a/schemas/2019-10-01-preview/Microsoft.Search.json +++ b/schemas/2019-10-01-preview/Microsoft.Search.json @@ -49,9 +49,6 @@ "oneOf": [ { "$ref": "#/definitions/searchServices_privateEndpointConnections_childResource" - }, - { - "$ref": "#/definitions/searchServices_sharedPrivateLinkResources_childResource" } ] } @@ -139,45 +136,6 @@ "type" ], "description": "Microsoft.Search/searchServices/privateEndpointConnections" - }, - "searchServices_sharedPrivateLinkResources": { - "type": "object", - "properties": { - "apiVersion": { - "type": "string", - "enum": [ - "2019-10-01-preview" - ] - }, - "name": { - "type": "string", - "description": "The name of the shared private link resource managed by the Azure Cognitive Search service within the specified resource group." - }, - "properties": { - "oneOf": [ - { - "$ref": "#/definitions/SharedPrivateLinkResourceProperties" - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Describes the properties of an existing Shared Private Link Resource managed by the Azure Cognitive Search service." - }, - "type": { - "type": "string", - "enum": [ - "Microsoft.Search/searchServices/sharedPrivateLinkResources" - ] - } - }, - "required": [ - "apiVersion", - "name", - "properties", - "type" - ], - "description": "Microsoft.Search/searchServices/sharedPrivateLinkResources" } }, "definitions": { @@ -423,81 +381,6 @@ ], "description": "Microsoft.Search/searchServices/privateEndpointConnections" }, - "searchServices_sharedPrivateLinkResources_childResource": { - "type": "object", - "properties": { - "apiVersion": { - "type": "string", - "enum": [ - "2019-10-01-preview" - ] - }, - "name": { - "type": "string", - "description": "The name of the shared private link resource managed by the Azure Cognitive Search service within the specified resource group." - }, - "properties": { - "oneOf": [ - { - "$ref": "#/definitions/SharedPrivateLinkResourceProperties" - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Describes the properties of an existing Shared Private Link Resource managed by the Azure Cognitive Search service." - }, - "type": { - "type": "string", - "enum": [ - "sharedPrivateLinkResources" - ] - } - }, - "required": [ - "apiVersion", - "name", - "properties", - "type" - ], - "description": "Microsoft.Search/searchServices/sharedPrivateLinkResources" - }, - "SharedPrivateLinkResourceProperties": { - "type": "object", - "properties": { - "groupId": { - "type": "string", - "description": "The group id from the provider of resource the shared private link resource is for." - }, - "privateLinkResourceId": { - "type": "string", - "description": "The resource id of the resource the shared private link resource is for." - }, - "requestMessage": { - "type": "string", - "description": "The request message for requesting approval of the shared private link resource." - }, - "status": { - "oneOf": [ - { - "type": "string", - "enum": [ - "Pending", - "Approved", - "Rejected", - "Disconnected", - "Timeout" - ] - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Status of the shared private link resource. Can be Pending, Approved, Rejected, Disconnected, or Timeout." - } - }, - "description": "Describes the properties of an existing Shared Private Link Resource managed by the Azure Cognitive Search service." - }, "Sku": { "type": "object", "properties": { diff --git a/schemas/2020-03-13/Microsoft.Search.json b/schemas/2020-03-13/Microsoft.Search.json index a6c4050dc3..78c872f5e0 100644 --- a/schemas/2020-03-13/Microsoft.Search.json +++ b/schemas/2020-03-13/Microsoft.Search.json @@ -49,9 +49,6 @@ "oneOf": [ { "$ref": "#/definitions/searchServices_privateEndpointConnections_childResource" - }, - { - "$ref": "#/definitions/searchServices_sharedPrivateLinkResources_childResource" } ] } @@ -135,45 +132,6 @@ "type" ], "description": "Microsoft.Search/searchServices/privateEndpointConnections" - }, - "searchServices_sharedPrivateLinkResources": { - "type": "object", - "properties": { - "apiVersion": { - "type": "string", - "enum": [ - "2020-03-13" - ] - }, - "name": { - "type": "string", - "description": "The name of the shared private link resource managed by the Azure Cognitive Search service within the specified resource group." - }, - "properties": { - "oneOf": [ - { - "$ref": "#/definitions/SharedPrivateLinkResourceProperties" - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Describes the properties of an existing Shared Private Link Resource managed by the Azure Cognitive Search service." - }, - "type": { - "type": "string", - "enum": [ - "Microsoft.Search/searchServices/sharedPrivateLinkResources" - ] - } - }, - "required": [ - "apiVersion", - "name", - "properties", - "type" - ], - "description": "Microsoft.Search/searchServices/sharedPrivateLinkResources" } }, "definitions": { @@ -415,81 +373,6 @@ ], "description": "Microsoft.Search/searchServices/privateEndpointConnections" }, - "searchServices_sharedPrivateLinkResources_childResource": { - "type": "object", - "properties": { - "apiVersion": { - "type": "string", - "enum": [ - "2020-03-13" - ] - }, - "name": { - "type": "string", - "description": "The name of the shared private link resource managed by the Azure Cognitive Search service within the specified resource group." - }, - "properties": { - "oneOf": [ - { - "$ref": "#/definitions/SharedPrivateLinkResourceProperties" - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Describes the properties of an existing Shared Private Link Resource managed by the Azure Cognitive Search service." - }, - "type": { - "type": "string", - "enum": [ - "sharedPrivateLinkResources" - ] - } - }, - "required": [ - "apiVersion", - "name", - "properties", - "type" - ], - "description": "Microsoft.Search/searchServices/sharedPrivateLinkResources" - }, - "SharedPrivateLinkResourceProperties": { - "type": "object", - "properties": { - "groupId": { - "type": "string", - "description": "The group id from the provider of resource the shared private link resource is for." - }, - "privateLinkResourceId": { - "type": "string", - "description": "The resource id of the resource the shared private link resource is for." - }, - "requestMessage": { - "type": "string", - "description": "The request message for requesting approval of the shared private link resource." - }, - "status": { - "oneOf": [ - { - "type": "string", - "enum": [ - "Pending", - "Approved", - "Rejected", - "Disconnected", - "Timeout" - ] - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Status of the shared private link resource. Can be Pending, Approved, Rejected, Disconnected, or Timeout." - } - }, - "description": "Describes the properties of an existing Shared Private Link Resource managed by the Azure Cognitive Search service." - }, "Sku": { "type": "object", "properties": { diff --git a/schemas/2020-08-01-preview/Microsoft.Search.json b/schemas/2020-08-01-preview/Microsoft.Search.json new file mode 100644 index 0000000000..455e99d673 --- /dev/null +++ b/schemas/2020-08-01-preview/Microsoft.Search.json @@ -0,0 +1,542 @@ +{ + "id": "https://schema.management.azure.com/schemas/2020-08-01-preview/Microsoft.Search.json#", + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "Microsoft.Search", + "description": "Microsoft Search Resource Types", + "resourceDefinitions": { + "searchServices": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-08-01-preview" + ] + }, + "identity": { + "oneOf": [ + { + "$ref": "#/definitions/Identity" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Identity for the resource." + }, + "location": { + "type": "string", + "description": "The geo-location where the resource lives" + }, + "name": { + "type": "string", + "description": "The name of the Azure Cognitive Search service to create or update. Search service names must only contain lowercase letters, digits or dashes, cannot use dash as the first two or last one characters, cannot contain consecutive dashes, and must be between 2 and 60 characters in length. Search service names must be globally unique since they are part of the service URI (https://.search.windows.net). You cannot change the service name after the service is created." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/SearchServiceProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Properties of the Search service." + }, + "resources": { + "type": "array", + "items": { + "oneOf": [ + { + "$ref": "#/definitions/searchServices_privateEndpointConnections_childResource" + }, + { + "$ref": "#/definitions/searchServices_sharedPrivateLinkResources_childResource" + } + ] + } + }, + "sku": { + "oneOf": [ + { + "$ref": "#/definitions/Sku" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Defines the SKU of an Azure Cognitive Search Service, which determines price tier and capacity limits." + }, + "tags": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Resource tags." + }, + "type": { + "type": "string", + "enum": [ + "Microsoft.Search/searchServices" + ] + } + }, + "required": [ + "apiVersion", + "location", + "name", + "properties", + "type" + ], + "description": "Microsoft.Search/searchServices" + }, + "searchServices_privateEndpointConnections": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-08-01-preview" + ] + }, + "name": { + "type": "string", + "description": "The name of the private endpoint connection to the Azure Cognitive Search service with the specified resource group." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/PrivateEndpointConnectionProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Describes the properties of an existing Private Endpoint connection to the Azure Cognitive Search service." + }, + "type": { + "type": "string", + "enum": [ + "Microsoft.Search/searchServices/privateEndpointConnections" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.Search/searchServices/privateEndpointConnections" + }, + "searchServices_sharedPrivateLinkResources": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-08-01-preview" + ] + }, + "name": { + "type": "string", + "description": "The name of the shared private link resource managed by the Azure Cognitive Search service within the specified resource group." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/SharedPrivateLinkResourceProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Describes the properties of an existing Shared Private Link Resource managed by the Azure Cognitive Search service." + }, + "type": { + "type": "string", + "enum": [ + "Microsoft.Search/searchServices/sharedPrivateLinkResources" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.Search/searchServices/sharedPrivateLinkResources" + } + }, + "definitions": { + "Identity": { + "type": "object", + "properties": { + "type": { + "oneOf": [ + { + "type": "string", + "enum": [ + "None", + "SystemAssigned" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The identity type." + } + }, + "required": [ + "type" + ], + "description": "Identity for the resource." + }, + "IpRule": { + "type": "object", + "properties": { + "value": { + "type": "string", + "description": "Value corresponding to a single IPv4 address (eg., 123.1.2.3) or an IP range in CIDR format (eg., 123.1.2.3/24) to be allowed." + } + }, + "description": "The IP restriction rule of the Azure Cognitive Search service." + }, + "NetworkRuleSet": { + "type": "object", + "properties": { + "ipRules": { + "oneOf": [ + { + "type": "array", + "items": { + "$ref": "#/definitions/IpRule" + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "A list of IP restriction rules that defines the inbound network(s) with allowing access to the search service endpoint. At the meantime, all other public IP networks are blocked by the firewall. These restriction rules are applied only when the 'publicNetworkAccess' of the search service is 'enabled'; otherwise, traffic over public interface is not allowed even with any public IP rules, and private endpoint connections would be the exclusive access method." + } + }, + "description": "Network specific rules that determine how the Azure Cognitive Search service may be reached." + }, + "PrivateEndpointConnectionProperties": { + "type": "object", + "properties": { + "privateEndpoint": { + "oneOf": [ + { + "$ref": "#/definitions/PrivateEndpointConnectionPropertiesPrivateEndpoint" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The private endpoint resource from Microsoft.Network provider." + }, + "privateLinkServiceConnectionState": { + "oneOf": [ + { + "$ref": "#/definitions/PrivateEndpointConnectionPropertiesPrivateLinkServiceConnectionState" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Describes the current state of an existing Private Link Service connection to the Azure Private Endpoint." + } + }, + "description": "Describes the properties of an existing Private Endpoint connection to the Azure Cognitive Search service." + }, + "PrivateEndpointConnectionPropertiesPrivateEndpoint": { + "type": "object", + "properties": { + "id": { + "type": "string", + "description": "The resource id of the private endpoint resource from Microsoft.Network provider." + } + }, + "description": "The private endpoint resource from Microsoft.Network provider." + }, + "PrivateEndpointConnectionPropertiesPrivateLinkServiceConnectionState": { + "type": "object", + "properties": { + "actionsRequired": { + "type": "string", + "default": "None", + "description": "A description of any extra actions that may be required." + }, + "description": { + "type": "string", + "description": "The description for the private link service connection state." + }, + "status": { + "oneOf": [ + { + "type": "string", + "enum": [ + "Pending", + "Approved", + "Rejected", + "Disconnected" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Status of the the private link service connection. Can be Pending, Approved, Rejected, or Disconnected." + } + }, + "description": "Describes the current state of an existing Private Link Service connection to the Azure Private Endpoint." + }, + "SearchServiceProperties": { + "type": "object", + "properties": { + "hostingMode": { + "oneOf": [ + { + "type": "string", + "enum": [ + "default", + "highDensity" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Applicable only for the standard3 SKU. You can set this property to enable up to 3 high density partitions that allow up to 1000 indexes, which is much higher than the maximum indexes allowed for any other SKU. For the standard3 SKU, the value is either 'default' or 'highDensity'. For all other SKUs, this value must be 'default'." + }, + "networkRuleSet": { + "oneOf": [ + { + "$ref": "#/definitions/NetworkRuleSet" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Network specific rules that determine how the Azure Cognitive Search service may be reached." + }, + "partitionCount": { + "oneOf": [ + { + "type": "integer", + "minimum": 1, + "maximum": 12, + "default": "1" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The number of partitions in the Search service; if specified, it can be 1, 2, 3, 4, 6, or 12. Values greater than 1 are only valid for standard SKUs. For 'standard3' services with hostingMode set to 'highDensity', the allowed values are between 1 and 3." + }, + "publicNetworkAccess": { + "oneOf": [ + { + "type": "string", + "enum": [ + "enabled", + "disabled" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "This value can be set to 'enabled' to avoid breaking changes on existing customer resources and templates. If set to 'disabled', traffic over public interface is not allowed, and private endpoint connections would be the exclusive access method." + }, + "replicaCount": { + "oneOf": [ + { + "type": "integer", + "minimum": 1, + "maximum": 12, + "default": "1" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The number of replicas in the Search service. If specified, it must be a value between 1 and 12 inclusive for standard SKUs or between 1 and 3 inclusive for basic SKU." + } + }, + "description": "Properties of the Search service." + }, + "searchServices_privateEndpointConnections_childResource": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-08-01-preview" + ] + }, + "name": { + "type": "string", + "description": "The name of the private endpoint connection to the Azure Cognitive Search service with the specified resource group." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/PrivateEndpointConnectionProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Describes the properties of an existing Private Endpoint connection to the Azure Cognitive Search service." + }, + "type": { + "type": "string", + "enum": [ + "privateEndpointConnections" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.Search/searchServices/privateEndpointConnections" + }, + "searchServices_sharedPrivateLinkResources_childResource": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-08-01-preview" + ] + }, + "name": { + "type": "string", + "description": "The name of the shared private link resource managed by the Azure Cognitive Search service within the specified resource group." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/SharedPrivateLinkResourceProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Describes the properties of an existing Shared Private Link Resource managed by the Azure Cognitive Search service." + }, + "type": { + "type": "string", + "enum": [ + "sharedPrivateLinkResources" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.Search/searchServices/sharedPrivateLinkResources" + }, + "SharedPrivateLinkResourceProperties": { + "type": "object", + "properties": { + "groupId": { + "type": "string", + "description": "The group id from the provider of resource the shared private link resource is for." + }, + "privateLinkResourceId": { + "type": "string", + "description": "The resource id of the resource the shared private link resource is for." + }, + "provisioningState": { + "oneOf": [ + { + "type": "string", + "enum": [ + "Updating", + "Deleting", + "Failed", + "Succeeded", + "Incomplete" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The provisioning state of the shared private link resource. Can be Updating, Deleting, Failed, Succeeded or Incomplete." + }, + "requestMessage": { + "type": "string", + "description": "The request message for requesting approval of the shared private link resource." + }, + "resourceRegion": { + "type": "string", + "description": "Optional. Can be used to specify the Azure Resource Manager location of the resource to which a shared private link is to be created. This is only required for those resources whose DNS configuration are regional (such as Azure Kubernetes Service)." + }, + "status": { + "oneOf": [ + { + "type": "string", + "enum": [ + "Pending", + "Approved", + "Rejected", + "Disconnected" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Status of the shared private link resource. Can be Pending, Approved, Rejected or Disconnected." + } + }, + "description": "Describes the properties of an existing Shared Private Link Resource managed by the Azure Cognitive Search service." + }, + "Sku": { + "type": "object", + "properties": { + "name": { + "oneOf": [ + { + "type": "string", + "enum": [ + "free", + "basic", + "standard", + "standard2", + "standard3", + "storage_optimized_l1", + "storage_optimized_l2" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The SKU of the Search service. Valid values include: 'free': Shared service. 'basic': Dedicated service with up to 3 replicas. 'standard': Dedicated service with up to 12 partitions and 12 replicas. 'standard2': Similar to standard, but with more capacity per search unit. 'standard3': The largest Standard offering with up to 12 partitions and 12 replicas (or up to 3 partitions with more indexes if you also set the hostingMode property to 'highDensity'). 'storage_optimized_l1': Supports 1TB per partition, up to 12 partitions. 'storage_optimized_l2': Supports 2TB per partition, up to 12 partitions.'." + } + }, + "description": "Defines the SKU of an Azure Cognitive Search Service, which determines price tier and capacity limits." + } + } +} \ No newline at end of file diff --git a/schemas/2020-08-01/Microsoft.Search.json b/schemas/2020-08-01/Microsoft.Search.json new file mode 100644 index 0000000000..4e9fff2151 --- /dev/null +++ b/schemas/2020-08-01/Microsoft.Search.json @@ -0,0 +1,542 @@ +{ + "id": "https://schema.management.azure.com/schemas/2020-08-01/Microsoft.Search.json#", + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "Microsoft.Search", + "description": "Microsoft Search Resource Types", + "resourceDefinitions": { + "searchServices": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-08-01" + ] + }, + "identity": { + "oneOf": [ + { + "$ref": "#/definitions/Identity" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Identity for the resource." + }, + "location": { + "type": "string", + "description": "The geo-location where the resource lives" + }, + "name": { + "type": "string", + "description": "The name of the Azure Cognitive Search service to create or update. Search service names must only contain lowercase letters, digits or dashes, cannot use dash as the first two or last one characters, cannot contain consecutive dashes, and must be between 2 and 60 characters in length. Search service names must be globally unique since they are part of the service URI (https://.search.windows.net). You cannot change the service name after the service is created." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/SearchServiceProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Properties of the Search service." + }, + "resources": { + "type": "array", + "items": { + "oneOf": [ + { + "$ref": "#/definitions/searchServices_privateEndpointConnections_childResource" + }, + { + "$ref": "#/definitions/searchServices_sharedPrivateLinkResources_childResource" + } + ] + } + }, + "sku": { + "oneOf": [ + { + "$ref": "#/definitions/Sku" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Defines the SKU of an Azure Cognitive Search Service, which determines price tier and capacity limits." + }, + "tags": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Resource tags." + }, + "type": { + "type": "string", + "enum": [ + "Microsoft.Search/searchServices" + ] + } + }, + "required": [ + "apiVersion", + "location", + "name", + "properties", + "type" + ], + "description": "Microsoft.Search/searchServices" + }, + "searchServices_privateEndpointConnections": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-08-01" + ] + }, + "name": { + "type": "string", + "description": "The name of the private endpoint connection to the Azure Cognitive Search service with the specified resource group." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/PrivateEndpointConnectionProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Describes the properties of an existing Private Endpoint connection to the Azure Cognitive Search service." + }, + "type": { + "type": "string", + "enum": [ + "Microsoft.Search/searchServices/privateEndpointConnections" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.Search/searchServices/privateEndpointConnections" + }, + "searchServices_sharedPrivateLinkResources": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-08-01" + ] + }, + "name": { + "type": "string", + "description": "The name of the shared private link resource managed by the Azure Cognitive Search service within the specified resource group." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/SharedPrivateLinkResourceProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Describes the properties of an existing Shared Private Link Resource managed by the Azure Cognitive Search service." + }, + "type": { + "type": "string", + "enum": [ + "Microsoft.Search/searchServices/sharedPrivateLinkResources" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.Search/searchServices/sharedPrivateLinkResources" + } + }, + "definitions": { + "Identity": { + "type": "object", + "properties": { + "type": { + "oneOf": [ + { + "type": "string", + "enum": [ + "None", + "SystemAssigned" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The identity type." + } + }, + "required": [ + "type" + ], + "description": "Identity for the resource." + }, + "IpRule": { + "type": "object", + "properties": { + "value": { + "type": "string", + "description": "Value corresponding to a single IPv4 address (eg., 123.1.2.3) or an IP range in CIDR format (eg., 123.1.2.3/24) to be allowed." + } + }, + "description": "The IP restriction rule of the Azure Cognitive Search service." + }, + "NetworkRuleSet": { + "type": "object", + "properties": { + "ipRules": { + "oneOf": [ + { + "type": "array", + "items": { + "$ref": "#/definitions/IpRule" + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "A list of IP restriction rules that defines the inbound network(s) with allowing access to the search service endpoint. At the meantime, all other public IP networks are blocked by the firewall. These restriction rules are applied only when the 'publicNetworkAccess' of the search service is 'enabled'; otherwise, traffic over public interface is not allowed even with any public IP rules, and private endpoint connections would be the exclusive access method." + } + }, + "description": "Network specific rules that determine how the Azure Cognitive Search service may be reached." + }, + "PrivateEndpointConnectionProperties": { + "type": "object", + "properties": { + "privateEndpoint": { + "oneOf": [ + { + "$ref": "#/definitions/PrivateEndpointConnectionPropertiesPrivateEndpoint" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The private endpoint resource from Microsoft.Network provider." + }, + "privateLinkServiceConnectionState": { + "oneOf": [ + { + "$ref": "#/definitions/PrivateEndpointConnectionPropertiesPrivateLinkServiceConnectionState" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Describes the current state of an existing Private Link Service connection to the Azure Private Endpoint." + } + }, + "description": "Describes the properties of an existing Private Endpoint connection to the Azure Cognitive Search service." + }, + "PrivateEndpointConnectionPropertiesPrivateEndpoint": { + "type": "object", + "properties": { + "id": { + "type": "string", + "description": "The resource id of the private endpoint resource from Microsoft.Network provider." + } + }, + "description": "The private endpoint resource from Microsoft.Network provider." + }, + "PrivateEndpointConnectionPropertiesPrivateLinkServiceConnectionState": { + "type": "object", + "properties": { + "actionsRequired": { + "type": "string", + "default": "None", + "description": "A description of any extra actions that may be required." + }, + "description": { + "type": "string", + "description": "The description for the private link service connection state." + }, + "status": { + "oneOf": [ + { + "type": "string", + "enum": [ + "Pending", + "Approved", + "Rejected", + "Disconnected" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Status of the the private link service connection. Can be Pending, Approved, Rejected, or Disconnected." + } + }, + "description": "Describes the current state of an existing Private Link Service connection to the Azure Private Endpoint." + }, + "SearchServiceProperties": { + "type": "object", + "properties": { + "hostingMode": { + "oneOf": [ + { + "type": "string", + "enum": [ + "default", + "highDensity" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Applicable only for the standard3 SKU. You can set this property to enable up to 3 high density partitions that allow up to 1000 indexes, which is much higher than the maximum indexes allowed for any other SKU. For the standard3 SKU, the value is either 'default' or 'highDensity'. For all other SKUs, this value must be 'default'." + }, + "networkRuleSet": { + "oneOf": [ + { + "$ref": "#/definitions/NetworkRuleSet" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Network specific rules that determine how the Azure Cognitive Search service may be reached." + }, + "partitionCount": { + "oneOf": [ + { + "type": "integer", + "minimum": 1, + "maximum": 12, + "default": "1" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The number of partitions in the Search service; if specified, it can be 1, 2, 3, 4, 6, or 12. Values greater than 1 are only valid for standard SKUs. For 'standard3' services with hostingMode set to 'highDensity', the allowed values are between 1 and 3." + }, + "publicNetworkAccess": { + "oneOf": [ + { + "type": "string", + "enum": [ + "enabled", + "disabled" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "This value can be set to 'enabled' to avoid breaking changes on existing customer resources and templates. If set to 'disabled', traffic over public interface is not allowed, and private endpoint connections would be the exclusive access method." + }, + "replicaCount": { + "oneOf": [ + { + "type": "integer", + "minimum": 1, + "maximum": 12, + "default": "1" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The number of replicas in the Search service. If specified, it must be a value between 1 and 12 inclusive for standard SKUs or between 1 and 3 inclusive for basic SKU." + } + }, + "description": "Properties of the Search service." + }, + "searchServices_privateEndpointConnections_childResource": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-08-01" + ] + }, + "name": { + "type": "string", + "description": "The name of the private endpoint connection to the Azure Cognitive Search service with the specified resource group." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/PrivateEndpointConnectionProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Describes the properties of an existing Private Endpoint connection to the Azure Cognitive Search service." + }, + "type": { + "type": "string", + "enum": [ + "privateEndpointConnections" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.Search/searchServices/privateEndpointConnections" + }, + "searchServices_sharedPrivateLinkResources_childResource": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-08-01" + ] + }, + "name": { + "type": "string", + "description": "The name of the shared private link resource managed by the Azure Cognitive Search service within the specified resource group." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/SharedPrivateLinkResourceProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Describes the properties of an existing Shared Private Link Resource managed by the Azure Cognitive Search service." + }, + "type": { + "type": "string", + "enum": [ + "sharedPrivateLinkResources" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.Search/searchServices/sharedPrivateLinkResources" + }, + "SharedPrivateLinkResourceProperties": { + "type": "object", + "properties": { + "groupId": { + "type": "string", + "description": "The group id from the provider of resource the shared private link resource is for." + }, + "privateLinkResourceId": { + "type": "string", + "description": "The resource id of the resource the shared private link resource is for." + }, + "provisioningState": { + "oneOf": [ + { + "type": "string", + "enum": [ + "Updating", + "Deleting", + "Failed", + "Succeeded", + "Incomplete" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The provisioning state of the shared private link resource. Can be Updating, Deleting, Failed, Succeeded or Incomplete." + }, + "requestMessage": { + "type": "string", + "description": "The request message for requesting approval of the shared private link resource." + }, + "resourceRegion": { + "type": "string", + "description": "Optional. Can be used to specify the Azure Resource Manager location of the resource to which a shared private link is to be created. This is only required for those resources whose DNS configuration are regional (such as Azure Kubernetes Service)." + }, + "status": { + "oneOf": [ + { + "type": "string", + "enum": [ + "Pending", + "Approved", + "Rejected", + "Disconnected" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Status of the shared private link resource. Can be Pending, Approved, Rejected or Disconnected." + } + }, + "description": "Describes the properties of an existing Shared Private Link Resource managed by the Azure Cognitive Search service." + }, + "Sku": { + "type": "object", + "properties": { + "name": { + "oneOf": [ + { + "type": "string", + "enum": [ + "free", + "basic", + "standard", + "standard2", + "standard3", + "storage_optimized_l1", + "storage_optimized_l2" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The SKU of the Search service. Valid values include: 'free': Shared service. 'basic': Dedicated service with up to 3 replicas. 'standard': Dedicated service with up to 12 partitions and 12 replicas. 'standard2': Similar to standard, but with more capacity per search unit. 'standard3': The largest Standard offering with up to 12 partitions and 12 replicas (or up to 3 partitions with more indexes if you also set the hostingMode property to 'highDensity'). 'storage_optimized_l1': Supports 1TB per partition, up to 12 partitions. 'storage_optimized_l2': Supports 2TB per partition, up to 12 partitions.'." + } + }, + "description": "Defines the SKU of an Azure Cognitive Search Service, which determines price tier and capacity limits." + } + } +} \ No newline at end of file diff --git a/schemas/common/autogeneratedResources.json b/schemas/common/autogeneratedResources.json index e908035c11..b24fabf5fe 100644 --- a/schemas/common/autogeneratedResources.json +++ b/schemas/common/autogeneratedResources.json @@ -3979,9 +3979,6 @@ { "$ref": "https://schema.management.azure.com/schemas/2019-10-01-preview/Microsoft.Search.json#/resourceDefinitions/searchServices_privateEndpointConnections" }, - { - "$ref": "https://schema.management.azure.com/schemas/2019-10-01-preview/Microsoft.Search.json#/resourceDefinitions/searchServices_sharedPrivateLinkResources" - }, { "$ref": "https://schema.management.azure.com/schemas/2020-03-13/Microsoft.Search.json#/resourceDefinitions/searchServices" }, @@ -3989,7 +3986,22 @@ "$ref": "https://schema.management.azure.com/schemas/2020-03-13/Microsoft.Search.json#/resourceDefinitions/searchServices_privateEndpointConnections" }, { - "$ref": "https://schema.management.azure.com/schemas/2020-03-13/Microsoft.Search.json#/resourceDefinitions/searchServices_sharedPrivateLinkResources" + "$ref": "https://schema.management.azure.com/schemas/2020-08-01/Microsoft.Search.json#/resourceDefinitions/searchServices" + }, + { + "$ref": "https://schema.management.azure.com/schemas/2020-08-01/Microsoft.Search.json#/resourceDefinitions/searchServices_privateEndpointConnections" + }, + { + "$ref": "https://schema.management.azure.com/schemas/2020-08-01/Microsoft.Search.json#/resourceDefinitions/searchServices_sharedPrivateLinkResources" + }, + { + "$ref": "https://schema.management.azure.com/schemas/2020-08-01-preview/Microsoft.Search.json#/resourceDefinitions/searchServices" + }, + { + "$ref": "https://schema.management.azure.com/schemas/2020-08-01-preview/Microsoft.Search.json#/resourceDefinitions/searchServices_privateEndpointConnections" + }, + { + "$ref": "https://schema.management.azure.com/schemas/2020-08-01-preview/Microsoft.Search.json#/resourceDefinitions/searchServices_sharedPrivateLinkResources" }, { "$ref": "https://schema.management.azure.com/schemas/2015-08-01/Microsoft.ServiceBus.json#/resourceDefinitions/namespaces" From 689558fbcba51b2bfdcba01653221df9fec2e62c Mon Sep 17 00:00:00 2001 From: Autogenerator Pipeline Date: Thu, 27 Aug 2020 12:47:31 +0000 Subject: [PATCH 13/15] Update resource list --- generator/resources.json | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/generator/resources.json b/generator/resources.json index b8b49a6141..31f2b549d4 100644 --- a/generator/resources.json +++ b/generator/resources.json @@ -3993,15 +3993,19 @@ "2015-02-28", "2015-08-19", "2019-10-01-preview", - "2020-03-13" + "2020-03-13", + "2020-08-01", + "2020-08-01-preview" ], "Microsoft.Search/searchServices/privateEndpointConnections": [ "2019-10-01-preview", - "2020-03-13" + "2020-03-13", + "2020-08-01", + "2020-08-01-preview" ], "Microsoft.Search/searchServices/sharedPrivateLinkResources": [ - "2019-10-01-preview", - "2020-03-13" + "2020-08-01", + "2020-08-01-preview" ], "Microsoft.Security/advancedThreatProtectionSettings": [ "2017-08-01-preview", From e2a2c7a1ddca39dd712343e803be34c7ed22ccde Mon Sep 17 00:00:00 2001 From: Autogenerator Pipeline Date: Fri, 28 Aug 2020 09:05:54 +0000 Subject: [PATCH 14/15] Autogenerate schemas --- .../2019-08-01/tenantDeploymentTemplate.json | 6 ++ .../2019-10-01-preview/Microsoft.Billing.json | 78 +++++++++++++++++++ 2 files changed, 84 insertions(+) diff --git a/schemas/2019-08-01/tenantDeploymentTemplate.json b/schemas/2019-08-01/tenantDeploymentTemplate.json index 762e1a784f..595a3cc6a6 100644 --- a/schemas/2019-08-01/tenantDeploymentTemplate.json +++ b/schemas/2019-08-01/tenantDeploymentTemplate.json @@ -129,9 +129,15 @@ { "$ref": "https://schema.management.azure.com/schemas/2019-10-01-preview/Microsoft.Billing.json#/tenant_resourceDefinitions/billingAccounts_billingProfiles_policies" }, + { + "$ref": "https://schema.management.azure.com/schemas/2019-10-01-preview/Microsoft.Billing.json#/tenant_resourceDefinitions/billingAccounts_billingRoleAssignments" + }, { "$ref": "https://schema.management.azure.com/schemas/2019-10-01-preview/Microsoft.Billing.json#/tenant_resourceDefinitions/billingAccounts_customers_policies" }, + { + "$ref": "https://schema.management.azure.com/schemas/2019-10-01-preview/Microsoft.Billing.json#/tenant_resourceDefinitions/billingAccounts_departments_billingRoleAssignments" + }, { "$ref": "https://schema.management.azure.com/schemas/2019-10-01-preview/Microsoft.Billing.json#/tenant_resourceDefinitions/billingAccounts_enrollmentAccounts_billingRoleAssignments" }, diff --git a/schemas/2019-10-01-preview/Microsoft.Billing.json b/schemas/2019-10-01-preview/Microsoft.Billing.json index b45b08023e..fe6a040dcb 100644 --- a/schemas/2019-10-01-preview/Microsoft.Billing.json +++ b/schemas/2019-10-01-preview/Microsoft.Billing.json @@ -208,6 +208,45 @@ ], "description": "Microsoft.Billing/billingAccounts/billingProfiles/policies" }, + "billingAccounts_billingRoleAssignments": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2019-10-01-preview" + ] + }, + "name": { + "type": "string", + "description": "The ID that uniquely identifies a role assignment." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/BillingRoleAssignmentProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The properties of the role assignment." + }, + "type": { + "type": "string", + "enum": [ + "Microsoft.Billing/billingAccounts/billingRoleAssignments" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.Billing/billingAccounts/billingRoleAssignments" + }, "billingAccounts_customers_policies": { "type": "object", "properties": { @@ -254,6 +293,45 @@ ], "description": "Microsoft.Billing/billingAccounts/customers/policies" }, + "billingAccounts_departments_billingRoleAssignments": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2019-10-01-preview" + ] + }, + "name": { + "type": "string", + "description": "The ID that uniquely identifies a role assignment." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/BillingRoleAssignmentProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The properties of the role assignment." + }, + "type": { + "type": "string", + "enum": [ + "Microsoft.Billing/billingAccounts/departments/billingRoleAssignments" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.Billing/billingAccounts/departments/billingRoleAssignments" + }, "billingAccounts_enrollmentAccounts_billingRoleAssignments": { "type": "object", "properties": { From 7d173f8f426d7e14b05d24d92b503d128ec1520a Mon Sep 17 00:00:00 2001 From: Autogenerator Pipeline Date: Fri, 28 Aug 2020 09:06:08 +0000 Subject: [PATCH 15/15] Update resource list --- generator/resources.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/generator/resources.json b/generator/resources.json index 31f2b549d4..20f27a3aea 100644 --- a/generator/resources.json +++ b/generator/resources.json @@ -689,10 +689,16 @@ "2019-10-01-preview", "2020-05-01" ], + "Microsoft.Billing/billingAccounts/billingRoleAssignments": [ + "2019-10-01-preview" + ], "Microsoft.Billing/billingAccounts/customers/policies": [ "2019-10-01-preview", "2020-05-01" ], + "Microsoft.Billing/billingAccounts/departments/billingRoleAssignments": [ + "2019-10-01-preview" + ], "Microsoft.Billing/billingAccounts/enrollmentAccounts/billingRoleAssignments": [ "2019-10-01-preview" ],