diff --git a/sdk/datafactory/mgmt-v2018_06_01/pom.xml b/sdk/datafactory/mgmt-v2018_06_01/pom.xml
index 62feedf34f06..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-5
+ 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/AmazonS3LinkedService.java b/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/AmazonS3LinkedService.java
index 34d108ea5364..d650e97a6b73 100644
--- a/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/AmazonS3LinkedService.java
+++ b/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/AmazonS3LinkedService.java
@@ -21,6 +21,14 @@
@JsonTypeName("AmazonS3")
@JsonFlatten
public class AmazonS3LinkedService extends LinkedServiceInner {
+ /**
+ * The authentication type of S3. Allowed value: AccessKey (default) or
+ * TemporarySecurityCredentials. Type: string (or Expression with
+ * resultType string).
+ */
+ @JsonProperty(value = "typeProperties.authenticationType")
+ private Object authenticationType;
+
/**
* The access key identifier of the Amazon S3 Identity and Access
* Management (IAM) user. Type: string (or Expression with resultType
@@ -45,6 +53,12 @@ public class AmazonS3LinkedService extends LinkedServiceInner {
@JsonProperty(value = "typeProperties.serviceUrl")
private Object serviceUrl;
+ /**
+ * The session token for the S3 temporary security credential.
+ */
+ @JsonProperty(value = "typeProperties.sessionToken")
+ private SecretBase sessionToken;
+
/**
* The encrypted credential used for authentication. Credentials are
* encrypted using the integration runtime credential manager. Type: string
@@ -53,6 +67,26 @@ public class AmazonS3LinkedService extends LinkedServiceInner {
@JsonProperty(value = "typeProperties.encryptedCredential")
private Object encryptedCredential;
+ /**
+ * Get the authentication type of S3. Allowed value: AccessKey (default) or TemporarySecurityCredentials. Type: string (or Expression with resultType string).
+ *
+ * @return the authenticationType value
+ */
+ public Object authenticationType() {
+ return this.authenticationType;
+ }
+
+ /**
+ * Set the authentication type of S3. Allowed value: AccessKey (default) or TemporarySecurityCredentials. Type: string (or Expression with resultType string).
+ *
+ * @param authenticationType the authenticationType value to set
+ * @return the AmazonS3LinkedService object itself.
+ */
+ public AmazonS3LinkedService withAuthenticationType(Object authenticationType) {
+ this.authenticationType = authenticationType;
+ return this;
+ }
+
/**
* Get the access key identifier of the Amazon S3 Identity and Access Management (IAM) user. Type: string (or Expression with resultType string).
*
@@ -113,6 +147,26 @@ public AmazonS3LinkedService withServiceUrl(Object serviceUrl) {
return this;
}
+ /**
+ * Get the session token for the S3 temporary security credential.
+ *
+ * @return the sessionToken value
+ */
+ public SecretBase sessionToken() {
+ return this.sessionToken;
+ }
+
+ /**
+ * Set the session token for the S3 temporary security credential.
+ *
+ * @param sessionToken the sessionToken value to set
+ * @return the AmazonS3LinkedService object itself.
+ */
+ public AmazonS3LinkedService withSessionToken(SecretBase sessionToken) {
+ this.sessionToken = sessionToken;
+ return this;
+ }
+
/**
* Get the encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string).
*
diff --git a/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/ConcurLinkedService.java b/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/ConcurLinkedService.java
index b92ab7144023..b1a3f76dc6c1 100644
--- a/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/ConcurLinkedService.java
+++ b/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/ConcurLinkedService.java
@@ -21,6 +21,13 @@
@JsonTypeName("Concur")
@JsonFlatten
public class ConcurLinkedService extends LinkedServiceInner {
+ /**
+ * Properties used to connect to Concur. It is mutually exclusive with any
+ * other properties in the linked service. Type: object.
+ */
+ @JsonProperty(value = "typeProperties.connectionProperties")
+ private Object connectionProperties;
+
/**
* Application client_id supplied by Concur App Management.
*/
@@ -70,6 +77,26 @@ public class ConcurLinkedService extends LinkedServiceInner {
@JsonProperty(value = "typeProperties.encryptedCredential")
private Object encryptedCredential;
+ /**
+ * Get properties used to connect to Concur. It is mutually exclusive with any other properties in the linked service. Type: object.
+ *
+ * @return the connectionProperties value
+ */
+ public Object connectionProperties() {
+ return this.connectionProperties;
+ }
+
+ /**
+ * Set properties used to connect to Concur. It is mutually exclusive with any other properties in the linked service. Type: object.
+ *
+ * @param connectionProperties the connectionProperties value to set
+ * @return the ConcurLinkedService object itself.
+ */
+ public ConcurLinkedService withConnectionProperties(Object connectionProperties) {
+ this.connectionProperties = connectionProperties;
+ return this;
+ }
+
/**
* Get application client_id supplied by Concur App Management.
*
diff --git a/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/CopyActivity.java b/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/CopyActivity.java
index 44418ba364bf..19d57b5eb3c7 100644
--- a/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/CopyActivity.java
+++ b/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/CopyActivity.java
@@ -83,11 +83,18 @@ public class CopyActivity extends ExecutionActivity {
private RedirectIncompatibleRowSettings redirectIncompatibleRowSettings;
/**
- * Log storage settings customer need to provide when enabling session log.
+ * (Deprecated. Please use LogSettings) Log storage settings customer need
+ * to provide when enabling session log.
*/
@JsonProperty(value = "typeProperties.logStorageSettings")
private LogStorageSettings logStorageSettings;
+ /**
+ * Log settings customer needs provide when enabling log.
+ */
+ @JsonProperty(value = "typeProperties.logSettings")
+ private LogSettings logSettings;
+
/**
* Preserve Rules.
*/
@@ -306,7 +313,7 @@ public CopyActivity withRedirectIncompatibleRowSettings(RedirectIncompatibleRowS
}
/**
- * Get log storage settings customer need to provide when enabling session log.
+ * Get (Deprecated. Please use LogSettings) Log storage settings customer need to provide when enabling session log.
*
* @return the logStorageSettings value
*/
@@ -315,7 +322,7 @@ public LogStorageSettings logStorageSettings() {
}
/**
- * Set log storage settings customer need to provide when enabling session log.
+ * Set (Deprecated. Please use LogSettings) Log storage settings customer need to provide when enabling session log.
*
* @param logStorageSettings the logStorageSettings value to set
* @return the CopyActivity object itself.
@@ -325,6 +332,26 @@ public CopyActivity withLogStorageSettings(LogStorageSettings logStorageSettings
return this;
}
+ /**
+ * Get log settings customer needs provide when enabling log.
+ *
+ * @return the logSettings value
+ */
+ public LogSettings logSettings() {
+ return this.logSettings;
+ }
+
+ /**
+ * Set log settings customer needs provide when enabling log.
+ *
+ * @param logSettings the logSettings value to set
+ * @return the CopyActivity object itself.
+ */
+ public CopyActivity withLogSettings(LogSettings logSettings) {
+ this.logSettings = logSettings;
+ return this;
+ }
+
/**
* Get preserve Rules.
*
diff --git a/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/CopyActivityLogSettings.java b/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/CopyActivityLogSettings.java
new file mode 100644
index 000000000000..d64b005ccfb6
--- /dev/null
+++ b/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/CopyActivityLogSettings.java
@@ -0,0 +1,71 @@
+/**
+ * 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;
+
+/**
+ * Settings for copy activity log.
+ */
+public class CopyActivityLogSettings {
+ /**
+ * Gets or sets the log level, support: Info, Warning. Type: string (or
+ * Expression with resultType string).
+ */
+ @JsonProperty(value = "logLevel")
+ private Object logLevel;
+
+ /**
+ * Specifies whether to enable reliable logging. Type: boolean (or
+ * Expression with resultType boolean).
+ */
+ @JsonProperty(value = "enableReliableLogging")
+ private Object enableReliableLogging;
+
+ /**
+ * Get gets or sets the log level, support: Info, Warning. Type: string (or Expression with resultType string).
+ *
+ * @return the logLevel value
+ */
+ public Object logLevel() {
+ return this.logLevel;
+ }
+
+ /**
+ * Set gets or sets the log level, support: Info, Warning. Type: string (or Expression with resultType string).
+ *
+ * @param logLevel the logLevel value to set
+ * @return the CopyActivityLogSettings object itself.
+ */
+ public CopyActivityLogSettings withLogLevel(Object logLevel) {
+ this.logLevel = logLevel;
+ return this;
+ }
+
+ /**
+ * Get specifies whether to enable reliable logging. Type: boolean (or Expression with resultType boolean).
+ *
+ * @return the enableReliableLogging value
+ */
+ public Object enableReliableLogging() {
+ return this.enableReliableLogging;
+ }
+
+ /**
+ * Set specifies whether to enable reliable logging. Type: boolean (or Expression with resultType boolean).
+ *
+ * @param enableReliableLogging the enableReliableLogging value to set
+ * @return the CopyActivityLogSettings object itself.
+ */
+ public CopyActivityLogSettings withEnableReliableLogging(Object enableReliableLogging) {
+ this.enableReliableLogging = enableReliableLogging;
+ return this;
+ }
+
+}
diff --git a/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/LogLocationSettings.java b/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/LogLocationSettings.java
new file mode 100644
index 000000000000..b1bb2a97251f
--- /dev/null
+++ b/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/LogLocationSettings.java
@@ -0,0 +1,70 @@
+/**
+ * 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;
+
+/**
+ * Log location settings.
+ */
+public class LogLocationSettings {
+ /**
+ * Log storage linked service reference.
+ */
+ @JsonProperty(value = "linkedServiceName", required = true)
+ private LinkedServiceReference linkedServiceName;
+
+ /**
+ * The path to storage for storing detailed logs of activity execution.
+ * Type: string (or Expression with resultType string).
+ */
+ @JsonProperty(value = "path")
+ private Object path;
+
+ /**
+ * Get log storage linked service reference.
+ *
+ * @return the linkedServiceName value
+ */
+ public LinkedServiceReference linkedServiceName() {
+ return this.linkedServiceName;
+ }
+
+ /**
+ * Set log storage linked service reference.
+ *
+ * @param linkedServiceName the linkedServiceName value to set
+ * @return the LogLocationSettings object itself.
+ */
+ public LogLocationSettings withLinkedServiceName(LinkedServiceReference linkedServiceName) {
+ this.linkedServiceName = linkedServiceName;
+ return this;
+ }
+
+ /**
+ * Get the path to storage for storing detailed logs of activity execution. Type: string (or Expression with resultType string).
+ *
+ * @return the path value
+ */
+ public Object path() {
+ return this.path;
+ }
+
+ /**
+ * Set the path to storage for storing detailed logs of activity execution. Type: string (or Expression with resultType string).
+ *
+ * @param path the path value to set
+ * @return the LogLocationSettings object itself.
+ */
+ public LogLocationSettings withPath(Object path) {
+ this.path = path;
+ return this;
+ }
+
+}
diff --git a/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/LogSettings.java b/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/LogSettings.java
new file mode 100644
index 000000000000..8d44368b8db7
--- /dev/null
+++ b/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/LogSettings.java
@@ -0,0 +1,96 @@
+/**
+ * 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;
+
+/**
+ * Log settings.
+ */
+public class LogSettings {
+ /**
+ * Specifies whether to enable copy activity log. Type: boolean (or
+ * Expression with resultType boolean).
+ */
+ @JsonProperty(value = "enableCopyActivityLog")
+ private Object enableCopyActivityLog;
+
+ /**
+ * Specifies settings for copy activity log.
+ */
+ @JsonProperty(value = "copyActivityLogSettings")
+ private CopyActivityLogSettings copyActivityLogSettings;
+
+ /**
+ * Log location settings customer needs to provide when enabling log.
+ */
+ @JsonProperty(value = "logLocationSettings", required = true)
+ private LogLocationSettings logLocationSettings;
+
+ /**
+ * Get specifies whether to enable copy activity log. Type: boolean (or Expression with resultType boolean).
+ *
+ * @return the enableCopyActivityLog value
+ */
+ public Object enableCopyActivityLog() {
+ return this.enableCopyActivityLog;
+ }
+
+ /**
+ * Set specifies whether to enable copy activity log. Type: boolean (or Expression with resultType boolean).
+ *
+ * @param enableCopyActivityLog the enableCopyActivityLog value to set
+ * @return the LogSettings object itself.
+ */
+ public LogSettings withEnableCopyActivityLog(Object enableCopyActivityLog) {
+ this.enableCopyActivityLog = enableCopyActivityLog;
+ return this;
+ }
+
+ /**
+ * Get specifies settings for copy activity log.
+ *
+ * @return the copyActivityLogSettings value
+ */
+ public CopyActivityLogSettings copyActivityLogSettings() {
+ return this.copyActivityLogSettings;
+ }
+
+ /**
+ * Set specifies settings for copy activity log.
+ *
+ * @param copyActivityLogSettings the copyActivityLogSettings value to set
+ * @return the LogSettings object itself.
+ */
+ public LogSettings withCopyActivityLogSettings(CopyActivityLogSettings copyActivityLogSettings) {
+ this.copyActivityLogSettings = copyActivityLogSettings;
+ return this;
+ }
+
+ /**
+ * Get log location settings customer needs to provide when enabling log.
+ *
+ * @return the logLocationSettings value
+ */
+ public LogLocationSettings logLocationSettings() {
+ return this.logLocationSettings;
+ }
+
+ /**
+ * Set log location settings customer needs to provide when enabling log.
+ *
+ * @param logLocationSettings the logLocationSettings value to set
+ * @return the LogSettings object itself.
+ */
+ public LogSettings withLogLocationSettings(LogLocationSettings logLocationSettings) {
+ this.logLocationSettings = logLocationSettings;
+ return this;
+ }
+
+}
diff --git a/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/LogStorageSettings.java b/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/LogStorageSettings.java
index a9abe562e5a4..98b67f014d1a 100644
--- a/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/LogStorageSettings.java
+++ b/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/LogStorageSettings.java
@@ -12,7 +12,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
/**
- * Log storage settings.
+ * (Deprecated. Please use LogSettings) Log storage settings.
*/
public class LogStorageSettings {
/**
diff --git a/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/TumblingWindowFrequency.java b/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/TumblingWindowFrequency.java
index 481f62c353a4..8ad2da9c2f65 100644
--- a/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/TumblingWindowFrequency.java
+++ b/sdk/datafactory/mgmt-v2018_06_01/src/main/java/com/microsoft/azure/management/datafactory/v2018_06_01/TumblingWindowFrequency.java
@@ -22,6 +22,9 @@ public final class TumblingWindowFrequency extends ExpandableStringEnum