diff --git a/schemas/2018-06-01/Microsoft.DataFactory.json b/schemas/2018-06-01/Microsoft.DataFactory.json index 63710a4254..a3a3b5f5f7 100644 --- a/schemas/2018-06-01/Microsoft.DataFactory.json +++ b/schemas/2018-06-01/Microsoft.DataFactory.json @@ -74,6 +74,9 @@ }, { "$ref": "#/definitions/factories_dataflows_childResource" + }, + { + "$ref": "#/definitions/factories_managedVirtualNetworks_childResource" } ] } @@ -304,6 +307,114 @@ ], "description": "Microsoft.DataFactory/factories/linkedservices" }, + "factories_managedVirtualNetworks": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2018-06-01" + ] + }, + "name": { + "oneOf": [ + { + "type": "string", + "pattern": "^([_A-Za-z0-9]|([_A-Za-z0-9][-_A-Za-z0-9]{0,125}[_A-Za-z0-9]))$", + "minLength": 1, + "maxLength": 127 + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Managed virtual network name" + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/ManagedVirtualNetwork" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "A managed Virtual Network associated with the Azure Data Factory" + }, + "resources": { + "type": "array", + "items": { + "oneOf": [ + { + "$ref": "#/definitions/factories_managedVirtualNetworks_managedPrivateEndpoints_childResource" + } + ] + } + }, + "type": { + "type": "string", + "enum": [ + "Microsoft.DataFactory/factories/managedVirtualNetworks" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.DataFactory/factories/managedVirtualNetworks" + }, + "factories_managedVirtualNetworks_managedPrivateEndpoints": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2018-06-01" + ] + }, + "name": { + "oneOf": [ + { + "type": "string", + "pattern": "^([_A-Za-z0-9]|([_A-Za-z0-9][-_A-Za-z0-9]{0,125}[_A-Za-z0-9]))$", + "minLength": 1, + "maxLength": 127 + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Managed private endpoint name" + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/ManagedPrivateEndpoint" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Properties of a managed private endpoint" + }, + "type": { + "type": "string", + "enum": [ + "Microsoft.DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints" + }, "factories_pipelines": { "type": "object", "properties": { @@ -4086,6 +4197,11 @@ ], "description": "Concur Service dataset." }, + "ConnectionStateProperties": { + "type": "object", + "properties": {}, + "description": "The connection state of a managed private endpoint" + }, "ControlActivity": { "type": "object", "oneOf": [ @@ -5202,17 +5318,6 @@ } ], "description": "Linked service reference type." - }, - "staging": { - "oneOf": [ - { - "$ref": "#/definitions/DataFlowStagingInfo" - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Staging info for execute data flow activity." } }, "required": [ @@ -5263,17 +5368,6 @@ } ], "description": "Linked service reference type." - }, - "staging": { - "oneOf": [ - { - "$ref": "#/definitions/DataFlowStagingInfo" - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Staging info for execute data flow activity." } }, "required": [ @@ -7819,6 +7913,104 @@ ], "description": "Microsoft.DataFactory/factories/linkedservices" }, + "factories_managedVirtualNetworks_childResource": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2018-06-01" + ] + }, + "name": { + "oneOf": [ + { + "type": "string", + "pattern": "^([_A-Za-z0-9]|([_A-Za-z0-9][-_A-Za-z0-9]{0,125}[_A-Za-z0-9]))$", + "minLength": 1, + "maxLength": 127 + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Managed virtual network name" + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/ManagedVirtualNetwork" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "A managed Virtual Network associated with the Azure Data Factory" + }, + "type": { + "type": "string", + "enum": [ + "managedVirtualNetworks" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.DataFactory/factories/managedVirtualNetworks" + }, + "factories_managedVirtualNetworks_managedPrivateEndpoints_childResource": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2018-06-01" + ] + }, + "name": { + "oneOf": [ + { + "type": "string", + "pattern": "^([_A-Za-z0-9]|([_A-Za-z0-9][-_A-Za-z0-9]{0,125}[_A-Za-z0-9]))$", + "minLength": 1, + "maxLength": 127 + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Managed private endpoint name" + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/ManagedPrivateEndpoint" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Properties of a managed private endpoint" + }, + "type": { + "type": "string", + "enum": [ + "managedPrivateEndpoints" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints" + }, "factories_pipelines_childResource": { "type": "object", "properties": { @@ -12476,6 +12668,83 @@ }, "description": "Managed integration runtime type properties." }, + "ManagedPrivateEndpoint": { + "type": "object", + "properties": { + "additionalProperties": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "object", + "properties": {} + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Unmatched properties from the message are deserialized this collection" + }, + "connectionState": { + "oneOf": [ + { + "$ref": "#/definitions/ConnectionStateProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The connection state of a managed private endpoint" + }, + "fqdns": { + "oneOf": [ + { + "type": "array", + "items": { + "type": "string" + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Fully qualified domain names" + }, + "groupId": { + "type": "string", + "description": "The groupId to which the managed private endpoint is created" + }, + "privateLinkResourceId": { + "type": "string", + "description": "The ARM resource ID of the resource to which the managed private endpoint is created" + } + }, + "description": "Properties of a managed private endpoint" + }, + "ManagedVirtualNetwork": { + "type": "object", + "properties": { + "additionalProperties": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "object", + "properties": {} + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Unmatched properties from the message are deserialized this collection" + } + }, + "description": "A managed Virtual Network associated with the Azure Data Factory" + }, "MappingDataFlow": { "type": "object", "properties": { diff --git a/schemas/common/autogeneratedResources.json b/schemas/common/autogeneratedResources.json index a18ff59272..f492cf72e2 100644 --- a/schemas/common/autogeneratedResources.json +++ b/schemas/common/autogeneratedResources.json @@ -1840,6 +1840,12 @@ { "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.DataFactory.json#/resourceDefinitions/factories_linkedservices" }, + { + "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.DataFactory.json#/resourceDefinitions/factories_managedVirtualNetworks" + }, + { + "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.DataFactory.json#/resourceDefinitions/factories_managedVirtualNetworks_managedPrivateEndpoints" + }, { "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.DataFactory.json#/resourceDefinitions/factories_pipelines" },