[AutoPR mgmt-v2018_06_01] [DataFactory]: Add CMK Properties

sdk/datafactory/mgmt-v2018_06_01/pom.xml

@@ -11,11 +11,11 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.3.2</version>
-        <relativePath>../../parents/azure-arm-parent/pom.xml</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-datafactory</artifactId>
-    <version>1.0.0-beta-6</version>
+    <version>1.0.0-beta</version>
     <packaging>jar</packaging>
     <name>Microsoft Azure SDK for DataFactory Management</name>
     <description>This package contains Microsoft DataFactory Management SDK.</description>

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;
+    }
+
+}

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;
+    }
+
+}

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<FactoryInner>, Resource, GroupableReso
      */
     DateTime createTime();
 
+    /**
+     * @return the encryption value.
+     */
+    EncryptionConfiguration encryption();
+
     /**
      * @return the eTag value.
      */
@@ -117,6 +122,18 @@ interface WithAdditionalProperties {
             WithCreate withAdditionalProperties(Map<String, Object> 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<Factory>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithAdditionalProperties, DefinitionStages.WithGlobalParameters, DefinitionStages.WithIdentity, DefinitionStages.WithPublicNetworkAccess, DefinitionStages.WithRepoConfiguration {
+        interface WithCreate extends Creatable<Factory>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithAdditionalProperties, DefinitionStages.WithEncryption, DefinitionStages.WithGlobalParameters, DefinitionStages.WithIdentity, DefinitionStages.WithPublicNetworkAccess, DefinitionStages.WithRepoConfiguration {
         }
     }
     /**

sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/FactoryIdentity.java

@@ -9,15 +9,15 @@
 package com.microsoft.azure.management.datafactory.v2018_06_01;
 
 import java.util.UUID;
+import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * Identity properties of the factory resource.
  */
 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<String, Object> 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<String, Object> 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<String, Object> userAssignedIdentities) {
+        this.userAssignedIdentities = userAssignedIdentities;
+        return this;
+    }
+
 }

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