diff --git a/sdk/datafactory/mgmt-v2018_06_01/pom.xml b/sdk/datafactory/mgmt-v2018_06_01/pom.xml
index 3261667ed8a0..6a01bee79fc6 100644
--- a/sdk/datafactory/mgmt-v2018_06_01/pom.xml
+++ b/sdk/datafactory/mgmt-v2018_06_01/pom.xml
@@ -11,11 +11,11 @@
com.microsoft.azure
azure-arm-parent
- 1.3.2
- ../../parents/azure-arm-parent/pom.xml
+ 1.1.0
+ ../../../pom.management.xml
azure-mgmt-datafactory
- 1.0.0-beta-6
+ 1.0.0-beta
jar
Microsoft Azure SDK for DataFactory Management
This package contains Microsoft DataFactory Management SDK.
diff --git a/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/CMKIdentityDefinition.java b/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/CMKIdentityDefinition.java
new file mode 100644
index 000000000000..b6864dc29cc0
--- /dev/null
+++ b/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/CMKIdentityDefinition.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.datafactory.v2018_06_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Managed Identity used for CMK.
+ */
+public class CMKIdentityDefinition {
+ /**
+ * The resource id of the user assigned identity to authenticate to
+ * customer's key vault.
+ */
+ @JsonProperty(value = "userAssignedIdentity")
+ private String userAssignedIdentity;
+
+ /**
+ * Get the resource id of the user assigned identity to authenticate to customer's key vault.
+ *
+ * @return the userAssignedIdentity value
+ */
+ public String userAssignedIdentity() {
+ return this.userAssignedIdentity;
+ }
+
+ /**
+ * Set the resource id of the user assigned identity to authenticate to customer's key vault.
+ *
+ * @param userAssignedIdentity the userAssignedIdentity value to set
+ * @return the CMKIdentityDefinition object itself.
+ */
+ public CMKIdentityDefinition withUserAssignedIdentity(String userAssignedIdentity) {
+ this.userAssignedIdentity = userAssignedIdentity;
+ return this;
+ }
+
+}
diff --git a/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/EncryptionConfiguration.java b/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/EncryptionConfiguration.java
new file mode 100644
index 000000000000..7ccf4dd01767
--- /dev/null
+++ b/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/EncryptionConfiguration.java
@@ -0,0 +1,123 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.datafactory.v2018_06_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Definition of CMK for the factory.
+ */
+public class EncryptionConfiguration {
+ /**
+ * The name of the key in Azure Key Vault to use as Customer Managed Key.
+ */
+ @JsonProperty(value = "keyName", required = true)
+ private String keyName;
+
+ /**
+ * The url of the Azure Key Vault used for CMK.
+ */
+ @JsonProperty(value = "vaultBaseUrl", required = true)
+ private String vaultBaseUrl;
+
+ /**
+ * The version of the key used for CMK. If not provided, latest version
+ * will be used.
+ */
+ @JsonProperty(value = "keyVersion")
+ private String keyVersion;
+
+ /**
+ * User assigned identity to use to authenticate to customer's key vault.
+ * If not provided Managed Service Identity will be used.
+ */
+ @JsonProperty(value = "identity")
+ private CMKIdentityDefinition identity;
+
+ /**
+ * Get the name of the key in Azure Key Vault to use as Customer Managed Key.
+ *
+ * @return the keyName value
+ */
+ public String keyName() {
+ return this.keyName;
+ }
+
+ /**
+ * Set the name of the key in Azure Key Vault to use as Customer Managed Key.
+ *
+ * @param keyName the keyName value to set
+ * @return the EncryptionConfiguration object itself.
+ */
+ public EncryptionConfiguration withKeyName(String keyName) {
+ this.keyName = keyName;
+ return this;
+ }
+
+ /**
+ * Get the url of the Azure Key Vault used for CMK.
+ *
+ * @return the vaultBaseUrl value
+ */
+ public String vaultBaseUrl() {
+ return this.vaultBaseUrl;
+ }
+
+ /**
+ * Set the url of the Azure Key Vault used for CMK.
+ *
+ * @param vaultBaseUrl the vaultBaseUrl value to set
+ * @return the EncryptionConfiguration object itself.
+ */
+ public EncryptionConfiguration withVaultBaseUrl(String vaultBaseUrl) {
+ this.vaultBaseUrl = vaultBaseUrl;
+ return this;
+ }
+
+ /**
+ * Get the version of the key used for CMK. If not provided, latest version will be used.
+ *
+ * @return the keyVersion value
+ */
+ public String keyVersion() {
+ return this.keyVersion;
+ }
+
+ /**
+ * Set the version of the key used for CMK. If not provided, latest version will be used.
+ *
+ * @param keyVersion the keyVersion value to set
+ * @return the EncryptionConfiguration object itself.
+ */
+ public EncryptionConfiguration withKeyVersion(String keyVersion) {
+ this.keyVersion = keyVersion;
+ return this;
+ }
+
+ /**
+ * Get user assigned identity to use to authenticate to customer's key vault. If not provided Managed Service Identity will be used.
+ *
+ * @return the identity value
+ */
+ public CMKIdentityDefinition identity() {
+ return this.identity;
+ }
+
+ /**
+ * Set user assigned identity to use to authenticate to customer's key vault. If not provided Managed Service Identity will be used.
+ *
+ * @param identity the identity value to set
+ * @return the EncryptionConfiguration object itself.
+ */
+ public EncryptionConfiguration withIdentity(CMKIdentityDefinition identity) {
+ this.identity = identity;
+ return this;
+ }
+
+}
diff --git a/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/Factory.java b/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/Factory.java
index 486e76a9b1d7..26d806ee1f0d 100644
--- a/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/Factory.java
+++ b/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/Factory.java
@@ -36,6 +36,11 @@ public interface Factory extends HasInner, Resource, GroupableReso
*/
DateTime createTime();
+ /**
+ * @return the encryption value.
+ */
+ EncryptionConfiguration encryption();
+
/**
* @return the eTag value.
*/
@@ -117,6 +122,18 @@ interface WithAdditionalProperties {
WithCreate withAdditionalProperties(Map additionalProperties);
}
+ /**
+ * The stage of the factory definition allowing to specify Encryption.
+ */
+ interface WithEncryption {
+ /**
+ * Specifies encryption.
+ * @param encryption Properties to enable Customer Managed Key for the factory
+ * @return the next definition stage
+ */
+ WithCreate withEncryption(EncryptionConfiguration encryption);
+ }
+
/**
* The stage of the factory definition allowing to specify GlobalParameters.
*/
@@ -170,7 +187,7 @@ interface WithRepoConfiguration {
* the resource to be created (via {@link WithCreate#create()}), but also allows
* for any other optional settings to be specified.
*/
- interface WithCreate extends Creatable, Resource.DefinitionWithTags, DefinitionStages.WithAdditionalProperties, DefinitionStages.WithGlobalParameters, DefinitionStages.WithIdentity, DefinitionStages.WithPublicNetworkAccess, DefinitionStages.WithRepoConfiguration {
+ interface WithCreate extends Creatable, Resource.DefinitionWithTags, DefinitionStages.WithAdditionalProperties, DefinitionStages.WithEncryption, DefinitionStages.WithGlobalParameters, DefinitionStages.WithIdentity, DefinitionStages.WithPublicNetworkAccess, DefinitionStages.WithRepoConfiguration {
}
}
/**
diff --git a/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/FactoryIdentity.java b/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/FactoryIdentity.java
index b74ec3e29d86..355a5bba0dcd 100644
--- a/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/FactoryIdentity.java
+++ b/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/FactoryIdentity.java
@@ -9,6 +9,7 @@
package com.microsoft.azure.management.datafactory.v2018_06_01;
import java.util.UUID;
+import java.util.Map;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
@@ -16,8 +17,7 @@
*/
public class FactoryIdentity {
/**
- * The identity type. Currently the only supported type is
- * 'SystemAssigned'.
+ * The identity type.
*/
@JsonProperty(value = "type", required = true)
private String type;
@@ -34,6 +34,12 @@ public class FactoryIdentity {
@JsonProperty(value = "tenantId", access = JsonProperty.Access.WRITE_ONLY)
private UUID tenantId;
+ /**
+ * List of user assigned identities for the factory.
+ */
+ @JsonProperty(value = "userAssignedIdentities")
+ private Map userAssignedIdentities;
+
/**
* Creates an instance of FactoryIdentity class.
*/
@@ -42,7 +48,7 @@ public FactoryIdentity() {
}
/**
- * Get the identity type. Currently the only supported type is 'SystemAssigned'.
+ * Get the identity type.
*
* @return the type value
*/
@@ -51,7 +57,7 @@ public String type() {
}
/**
- * Set the identity type. Currently the only supported type is 'SystemAssigned'.
+ * Set the identity type.
*
* @param type the type value to set
* @return the FactoryIdentity object itself.
@@ -79,4 +85,24 @@ public UUID tenantId() {
return this.tenantId;
}
+ /**
+ * Get list of user assigned identities for the factory.
+ *
+ * @return the userAssignedIdentities value
+ */
+ public Map userAssignedIdentities() {
+ return this.userAssignedIdentities;
+ }
+
+ /**
+ * Set list of user assigned identities for the factory.
+ *
+ * @param userAssignedIdentities the userAssignedIdentities value to set
+ * @return the FactoryIdentity object itself.
+ */
+ public FactoryIdentity withUserAssignedIdentities(Map userAssignedIdentities) {
+ this.userAssignedIdentities = userAssignedIdentities;
+ return this;
+ }
+
}
diff --git a/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/implementation/DataFlowInner.java b/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/implementation/DataFlowInner.java
index ae6b5b3cdcbd..640ce52d1e97 100644
--- a/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/implementation/DataFlowInner.java
+++ b/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/implementation/DataFlowInner.java
@@ -14,7 +14,6 @@
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.fasterxml.jackson.annotation.JsonTypeName;
import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.microsoft.azure.management.datafactory.v2018_06_01.MappingDataFlow;
/**
* Azure Data Factory nested object which contains a flow with data movements
diff --git a/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/implementation/DatasetInner.java b/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/implementation/DatasetInner.java
index d969a1e90878..0258c7daae54 100644
--- a/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/implementation/DatasetInner.java
+++ b/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/implementation/DatasetInner.java
@@ -9,69 +9,7 @@
package com.microsoft.azure.management.datafactory.v2018_06_01.implementation;
import java.util.Map;
-
-import com.microsoft.azure.management.datafactory.v2018_06_01.AmazonMWSObjectDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.AmazonRedshiftTableDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.AmazonS3Dataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.AvroDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.AzureBlobDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.AzureBlobFSDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.AzureDataExplorerTableDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.AzureDataLakeStoreDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.AzureDatabricksDeltaLakeDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.AzureMariaDBTableDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.AzureMySqlTableDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.AzurePostgreSqlTableDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.AzureSearchIndexDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.AzureSqlDWTableDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.AzureSqlMITableDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.AzureSqlTableDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.AzureTableDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.BinaryDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.CassandraTableDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.CommonDataServiceForAppsEntityDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.ConcurObjectDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.CosmosDbMongoDbApiCollectionDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.CosmosDbSqlApiCollectionDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.CouchbaseTableDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.CustomDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.Db2TableDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.DelimitedTextDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.DocumentDbCollectionDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.DrillTableDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.DynamicsAXResourceDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.DynamicsCrmEntityDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.DynamicsEntityDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.EloquaObjectDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.ExcelDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.FileShareDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.GoogleAdWordsObjectDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.GoogleBigQueryObjectDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.GreenplumTableDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.HBaseObjectDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.HiveObjectDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.HttpDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.HubspotObjectDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.ImpalaObjectDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.InformixTableDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.JiraObjectDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.JsonDataset;
import com.microsoft.azure.management.datafactory.v2018_06_01.LinkedServiceReference;
-import com.microsoft.azure.management.datafactory.v2018_06_01.MagentoObjectDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.MariaDBTableDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.MarketoObjectDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.MicrosoftAccessTableDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.MongoDbAtlasCollectionDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.MongoDbCollectionDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.MongoDbV2CollectionDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.MySqlTableDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.NetezzaTableDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.ODataResourceDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.OdbcTableDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.Office365Dataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.OracleServiceCloudObjectDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.OracleTableDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.OrcDataset;
import com.microsoft.azure.management.datafactory.v2018_06_01.ParameterSpecification;
import java.util.List;
import com.microsoft.azure.management.datafactory.v2018_06_01.DatasetFolder;
@@ -79,38 +17,6 @@
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.fasterxml.jackson.annotation.JsonTypeName;
import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.microsoft.azure.management.datafactory.v2018_06_01.ParquetDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.PaypalObjectDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.PhoenixObjectDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.PostgreSqlTableDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.PrestoObjectDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.QuickBooksObjectDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.RelationalTableDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.ResponsysObjectDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.RestResourceDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.SalesforceMarketingCloudObjectDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.SalesforceObjectDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.SalesforceServiceCloudObjectDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.SapBwCubeDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.SapCloudForCustomerResourceDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.SapEccResourceDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.SapHanaTableDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.SapOpenHubTableDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.SapTableResourceDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.ServiceNowObjectDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.SharePointOnlineListResourceDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.ShopifyObjectDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.SnowflakeDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.SparkObjectDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.SqlServerTableDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.SquareObjectDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.SybaseTableDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.TeradataTableDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.VerticaTableDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.WebTableDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.XeroObjectDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.XmlDataset;
-import com.microsoft.azure.management.datafactory.v2018_06_01.ZohoObjectDataset;
/**
* The Azure Data Factory nested object which identifies data within different
diff --git a/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/implementation/FactoryImpl.java b/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/implementation/FactoryImpl.java
index 7b2e0131554e..65d0c29a2c6e 100644
--- a/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/implementation/FactoryImpl.java
+++ b/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/implementation/FactoryImpl.java
@@ -17,6 +17,7 @@
import org.joda.time.DateTime;
import com.microsoft.azure.management.datafactory.v2018_06_01.FactoryRepoConfiguration;
import com.microsoft.azure.management.datafactory.v2018_06_01.GlobalParameterSpecification;
+import com.microsoft.azure.management.datafactory.v2018_06_01.EncryptionConfiguration;
import com.microsoft.azure.management.datafactory.v2018_06_01.PublicNetworkAccess;
import rx.functions.Func1;
@@ -81,6 +82,11 @@ public DateTime createTime() {
return this.inner().createTime();
}
+ @Override
+ public EncryptionConfiguration encryption() {
+ return this.inner().encryption();
+ }
+
@Override
public String eTag() {
return this.inner().eTag();
@@ -128,6 +134,12 @@ public FactoryImpl withAdditionalProperties(Map additionalProper
return this;
}
+ @Override
+ public FactoryImpl withEncryption(EncryptionConfiguration encryption) {
+ this.inner().withEncryption(encryption);
+ return this;
+ }
+
@Override
public FactoryImpl withGlobalParameters(Map globalParameters) {
this.inner().withGlobalParameters(globalParameters);
diff --git a/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/implementation/FactoryInner.java b/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/implementation/FactoryInner.java
index c6c377fb2e21..83c85a0122e0 100644
--- a/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/implementation/FactoryInner.java
+++ b/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/implementation/FactoryInner.java
@@ -13,6 +13,7 @@
import org.joda.time.DateTime;
import com.microsoft.azure.management.datafactory.v2018_06_01.FactoryRepoConfiguration;
import com.microsoft.azure.management.datafactory.v2018_06_01.GlobalParameterSpecification;
+import com.microsoft.azure.management.datafactory.v2018_06_01.EncryptionConfiguration;
import com.microsoft.azure.management.datafactory.v2018_06_01.PublicNetworkAccess;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.microsoft.rest.serializer.JsonFlatten;
@@ -67,6 +68,12 @@ public class FactoryInner extends Resource {
@JsonProperty(value = "properties.globalParameters")
private Map globalParameters;
+ /**
+ * Properties to enable Customer Managed Key for the factory.
+ */
+ @JsonProperty(value = "properties.encryption")
+ private EncryptionConfiguration encryption;
+
/**
* Whether or not public network access is allowed for the data factory.
* Possible values include: 'Enabled', 'Disabled'.
@@ -187,6 +194,26 @@ public FactoryInner withGlobalParameters(Map