Skip to content

Commit

Permalink
CodeGen from PR 10867 in Azure/azure-rest-api-specs
Browse files Browse the repository at this point in the history
[DataFactory]: Add CMK Properties (#10867)

* [DataFactory]: Add CMK Properties

* Prettier validation

* Model Identity Type as string

* RemoveEnumChanges
  • Loading branch information
SDKAuto committed Dec 4, 2020
1 parent 3b31cef commit 5bf9ccc
Show file tree
Hide file tree
Showing 8 changed files with 2,251 additions and 3 deletions.
9 changes: 9 additions & 0 deletions schemas/2014-04-01-preview/deploymentTemplate.json
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,13 @@
{ "$ref": "https://schema.management.azure.com/schemas/2020-06-14/Microsoft.Kusto.json#/resourceDefinitions/clusters_dataconnections" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-06-14/Microsoft.Kusto.json#/resourceDefinitions/clusters_principalassignments" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-06-14/Microsoft.Kusto.json#/resourceDefinitions/clusters_databases_principalassignments" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_databases" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_databases_dataconnections" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_attacheddatabaseconfigurations" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_dataconnections" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_principalassignments" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_databases_principalassignments" },
{ "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/alertrules" },
{ "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/components" },
{ "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/autoscalesettings" },
Expand Down Expand Up @@ -1843,6 +1850,8 @@
{ "$ref": "https://schema.management.azure.com/schemas/2019-10-01/Microsoft.Migrate.json#/resourceDefinitions/assessmentProjects_groups_assessments" },
{ "$ref": "https://schema.management.azure.com/schemas/2019-10-01/Microsoft.Migrate.json#/resourceDefinitions/assessmentProjects_hypervcollectors" },
{ "$ref": "https://schema.management.azure.com/schemas/2019-10-01/Microsoft.Migrate.json#/resourceDefinitions/assessmentProjects_vmwarecollectors" },
{ "$ref": "https://schema.management.azure.com/schemas/2019-10-01-preview/Microsoft.Migrate.json#/resourceDefinitions/moveCollections" },
{ "$ref": "https://schema.management.azure.com/schemas/2019-10-01-preview/Microsoft.Migrate.json#/resourceDefinitions/moveCollections_moveResources" },
{ "$ref": "https://schema.management.azure.com/schemas/2019-03-01/Microsoft.Insights.json#/resourceDefinitions/actionGroups" },
{ "$ref": "https://schema.management.azure.com/schemas/2018-06-01-preview/Microsoft.ManagedServices.json#/resourceDefinitions/registrationAssignments" },
{ "$ref": "https://schema.management.azure.com/schemas/2018-06-01-preview/Microsoft.ManagedServices.json#/resourceDefinitions/registrationDefinitions" },
Expand Down
7 changes: 7 additions & 0 deletions schemas/2015-01-01/deploymentTemplate.json
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,13 @@
{ "$ref": "https://schema.management.azure.com/schemas/2020-06-14/Microsoft.Kusto.json#/resourceDefinitions/clusters_dataconnections" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-06-14/Microsoft.Kusto.json#/resourceDefinitions/clusters_principalassignments" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-06-14/Microsoft.Kusto.json#/resourceDefinitions/clusters_databases_principalassignments" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_databases" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_databases_dataconnections" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_attacheddatabaseconfigurations" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_dataconnections" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_principalassignments" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_databases_principalassignments" },
{ "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/alertrules" },
{ "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/components" },
{ "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/autoscalesettings" },
Expand Down
2 changes: 1 addition & 1 deletion schemas/2017-09-01-preview/Microsoft.DataFactory.json
Original file line number Diff line number Diff line change
Expand Up @@ -12175,4 +12175,4 @@
"description": "Zoho server dataset."
}
}
}
}
74 changes: 72 additions & 2 deletions schemas/2018-06-01/Microsoft.DataFactory.json
Original file line number Diff line number Diff line change
Expand Up @@ -5908,6 +5908,16 @@
],
"description": "Cmdkey command custom setup type properties."
},
"CMKIdentityDefinition": {
"type": "object",
"properties": {
"userAssignedIdentity": {
"type": "string",
"description": "The resource id of the user assigned identity to authenticate to customer's key vault."
}
},
"description": "Managed Identity used for CMK."
},
"CommonDataServiceForAppsEntityDataset": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -10376,6 +10386,39 @@
],
"description": "A copy activity Eloqua server source."
},
"EncryptionConfiguration": {
"type": "object",
"properties": {
"identity": {
"oneOf": [
{
"$ref": "#/definitions/CMKIdentityDefinition"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Managed Identity used for CMK."
},
"keyName": {
"type": "string",
"description": "The name of the key in Azure Key Vault to use as Customer Managed Key."
},
"keyVersion": {
"type": "string",
"description": "The version of the key used for CMK. If not provided, latest version will be used."
},
"vaultBaseUrl": {
"type": "string",
"description": "The url of the Azure Key Vault used for CMK."
}
},
"required": [
"keyName",
"vaultBaseUrl"
],
"description": "Definition of CMK for the factory."
},
"EntityReference": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -11490,7 +11533,23 @@
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "The identity type. Currently the only supported type is 'SystemAssigned'."
"description": "The identity type."
},
"userAssignedIdentities": {
"oneOf": [
{
"type": "object",
"additionalProperties": {
"type": "object",
"properties": {}
},
"properties": {}
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Definition of all user assigned identities for a factory."
}
},
"required": [
Expand All @@ -11501,6 +11560,17 @@
"FactoryProperties": {
"type": "object",
"properties": {
"encryption": {
"oneOf": [
{
"$ref": "#/definitions/EncryptionConfiguration"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Definition of CMK for the factory."
},
"globalParameters": {
"oneOf": [
{
Expand Down Expand Up @@ -28080,4 +28150,4 @@
"description": "A copy activity Zoho server source."
}
}
}
}
7 changes: 7 additions & 0 deletions schemas/2019-04-01/deploymentTemplate.json
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,13 @@
{ "$ref": "https://schema.management.azure.com/schemas/2020-06-14/Microsoft.Kusto.json#/resourceDefinitions/clusters_dataconnections" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-06-14/Microsoft.Kusto.json#/resourceDefinitions/clusters_principalassignments" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-06-14/Microsoft.Kusto.json#/resourceDefinitions/clusters_databases_principalassignments" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_databases" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_databases_dataconnections" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_attacheddatabaseconfigurations" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_dataconnections" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_principalassignments" },
{ "$ref": "https://schema.management.azure.com/schemas/2020-09-18/Microsoft.Kusto.json#/resourceDefinitions/clusters_databases_principalassignments" },
{ "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/alertrules" },
{ "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/components" },
{ "$ref": "https://schema.management.azure.com/schemas/2019-11-01-preview/Microsoft.Insights.json#/resourceDefinitions/dataCollectionRules" },
Expand Down
Loading

0 comments on commit 5bf9ccc

Please sign in to comment.