diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonS3LinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonS3LinkedService.cs index e81f16e28efe6..b5126a53e0d5d 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonS3LinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AmazonS3LinkedService.cs @@ -42,6 +42,9 @@ public AmazonS3LinkedService() /// Parameters for linked service. /// List of tags that can be used for /// describing the linked service. + /// The authentication type of S3. + /// Allowed value: AccessKey (default) or TemporarySecurityCredentials. + /// Type: string (or Expression with resultType string). /// The access key identifier of the Amazon /// S3 Identity and Access Management (IAM) user. Type: string (or /// Expression with resultType string). @@ -52,16 +55,21 @@ public AmazonS3LinkedService() /// it only if you want to try a different service endpoint or want to /// switch between https and http. Type: string (or Expression with /// resultType string). + /// The session token for the S3 temporary + /// security credential. Type: string (or Expression with resultType + /// string). /// The encrypted credential used for /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public AmazonS3LinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object accessKeyId = default(object), SecretBase secretAccessKey = default(SecretBase), object serviceUrl = default(object), object encryptedCredential = default(object)) + public AmazonS3LinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object authenticationType = default(object), object accessKeyId = default(object), SecretBase secretAccessKey = default(SecretBase), object serviceUrl = default(object), object sessionToken = default(object), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { + AuthenticationType = authenticationType; AccessKeyId = accessKeyId; SecretAccessKey = secretAccessKey; ServiceUrl = serviceUrl; + SessionToken = sessionToken; EncryptedCredential = encryptedCredential; CustomInit(); } @@ -71,6 +79,14 @@ public AmazonS3LinkedService() /// partial void CustomInit(); + /// + /// Gets or sets the authentication type of S3. Allowed value: + /// AccessKey (default) or TemporarySecurityCredentials. Type: string + /// (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.authenticationType")] + public object AuthenticationType { get; set; } + /// /// Gets or sets the access key identifier of the Amazon S3 Identity /// and Access Management (IAM) user. Type: string (or Expression with @@ -96,6 +112,13 @@ public AmazonS3LinkedService() [JsonProperty(PropertyName = "typeProperties.serviceUrl")] public object ServiceUrl { get; set; } + /// + /// Gets or sets the session token for the S3 temporary security + /// credential. Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.sessionToken")] + public object SessionToken { get; set; } + /// /// Gets or sets the encrypted credential used for authentication. /// Credentials are encrypted using the integration runtime credential diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ConcurLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ConcurLinkedService.cs index ad5cd52c9051c..f8f169009ba40 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ConcurLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ConcurLinkedService.cs @@ -46,6 +46,9 @@ public ConcurLinkedService() /// Parameters for linked service. /// List of tags that can be used for /// describing the linked service. + /// Properties used to connect to + /// Concur. It is mutually exclusive with any other properties in the + /// linked service. Type: object. /// The password corresponding to the user name /// that you provided in the username field. /// Specifies whether the data @@ -61,9 +64,10 @@ public ConcurLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public ConcurLinkedService(object clientId, object username, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), SecretBase password = default(SecretBase), object useEncryptedEndpoints = default(object), object useHostVerification = default(object), object usePeerVerification = default(object), object encryptedCredential = default(object)) + public ConcurLinkedService(object clientId, object username, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionProperties = default(object), SecretBase password = default(SecretBase), object useEncryptedEndpoints = default(object), object useHostVerification = default(object), object usePeerVerification = default(object), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { + ConnectionProperties = connectionProperties; ClientId = clientId; Username = username; Password = password; @@ -79,6 +83,14 @@ public ConcurLinkedService() /// partial void CustomInit(); + /// + /// Gets or sets properties used to connect to Concur. It is mutually + /// exclusive with any other properties in the linked service. Type: + /// object. + /// + [JsonProperty(PropertyName = "typeProperties.connectionProperties")] + public object ConnectionProperties { get; set; } + /// /// Gets or sets application client_id supplied by Concur App /// Management. diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CopyActivity.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CopyActivity.cs index f65561ed3f871..e8ad9ea11e789 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CopyActivity.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CopyActivity.cs @@ -65,8 +65,11 @@ public CopyActivity() /// Expression with resultType boolean). /// Redirect incompatible /// row settings when EnableSkipIncompatibleRow is true. - /// 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. + /// Log settings customer needs provide when + /// enabling log. /// Preserve Rules. /// Preserve rules. /// Whether to enable Data @@ -76,7 +79,7 @@ public CopyActivity() /// consistency. /// List of inputs for the activity. /// List of outputs for the activity. - public CopyActivity(string name, CopySource source, CopySink sink, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList), LinkedServiceReference linkedServiceName = default(LinkedServiceReference), ActivityPolicy policy = default(ActivityPolicy), object translator = default(object), object enableStaging = default(object), StagingSettings stagingSettings = default(StagingSettings), object parallelCopies = default(object), object dataIntegrationUnits = default(object), object enableSkipIncompatibleRow = default(object), RedirectIncompatibleRowSettings redirectIncompatibleRowSettings = default(RedirectIncompatibleRowSettings), LogStorageSettings logStorageSettings = default(LogStorageSettings), IList preserveRules = default(IList), IList preserve = default(IList), object validateDataConsistency = default(object), SkipErrorFile skipErrorFile = default(SkipErrorFile), IList inputs = default(IList), IList outputs = default(IList)) + public CopyActivity(string name, CopySource source, CopySink sink, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList), LinkedServiceReference linkedServiceName = default(LinkedServiceReference), ActivityPolicy policy = default(ActivityPolicy), object translator = default(object), object enableStaging = default(object), StagingSettings stagingSettings = default(StagingSettings), object parallelCopies = default(object), object dataIntegrationUnits = default(object), object enableSkipIncompatibleRow = default(object), RedirectIncompatibleRowSettings redirectIncompatibleRowSettings = default(RedirectIncompatibleRowSettings), LogStorageSettings logStorageSettings = default(LogStorageSettings), LogSettings logSettings = default(LogSettings), IList preserveRules = default(IList), IList preserve = default(IList), object validateDataConsistency = default(object), SkipErrorFile skipErrorFile = default(SkipErrorFile), IList inputs = default(IList), IList outputs = default(IList)) : base(name, additionalProperties, description, dependsOn, userProperties, linkedServiceName, policy) { Source = source; @@ -89,6 +92,7 @@ public CopyActivity() EnableSkipIncompatibleRow = enableSkipIncompatibleRow; RedirectIncompatibleRowSettings = redirectIncompatibleRowSettings; LogStorageSettings = logStorageSettings; + LogSettings = logSettings; PreserveRules = preserveRules; Preserve = preserve; ValidateDataConsistency = validateDataConsistency; @@ -168,12 +172,18 @@ public CopyActivity() public RedirectIncompatibleRowSettings RedirectIncompatibleRowSettings { get; set; } /// - /// Gets or sets log storage settings customer need to provide when - /// enabling session log. + /// Gets or sets (Deprecated. Please use LogSettings) Log storage + /// settings customer need to provide when enabling session log. /// [JsonProperty(PropertyName = "typeProperties.logStorageSettings")] public LogStorageSettings LogStorageSettings { get; set; } + /// + /// Gets or sets log settings customer needs provide when enabling log. + /// + [JsonProperty(PropertyName = "typeProperties.logSettings")] + public LogSettings LogSettings { get; set; } + /// /// Gets or sets preserve Rules. /// @@ -240,6 +250,10 @@ public override void Validate() { LogStorageSettings.Validate(); } + if (LogSettings != null) + { + LogSettings.Validate(); + } if (Inputs != null) { foreach (var element in Inputs) diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CopyActivityLogSettings.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CopyActivityLogSettings.cs new file mode 100644 index 0000000000000..39faed8f717a6 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CopyActivityLogSettings.cs @@ -0,0 +1,65 @@ +// +// 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. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + using Newtonsoft.Json; + using System.Linq; + + /// + /// Settings for copy activity log. + /// + public partial class CopyActivityLogSettings + { + /// + /// Initializes a new instance of the CopyActivityLogSettings class. + /// + public CopyActivityLogSettings() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the CopyActivityLogSettings class. + /// + /// Gets or sets the log level, support: Info, + /// Warning. Type: string (or Expression with resultType + /// string). + /// Specifies whether to enable + /// reliable logging. Type: boolean (or Expression with resultType + /// boolean). + public CopyActivityLogSettings(object logLevel = default(object), object enableReliableLogging = default(object)) + { + LogLevel = logLevel; + EnableReliableLogging = enableReliableLogging; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the log level, support: Info, Warning. Type: string + /// (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "logLevel")] + public object LogLevel { get; set; } + + /// + /// Gets or sets specifies whether to enable reliable logging. Type: + /// boolean (or Expression with resultType boolean). + /// + [JsonProperty(PropertyName = "enableReliableLogging")] + public object EnableReliableLogging { get; set; } + + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Factory.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Factory.cs index 9a3ef89d1f7c3..e0db13ba3602c 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Factory.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Factory.cs @@ -53,7 +53,10 @@ public Factory() /// factory. /// List of parameters for /// factory. - public Factory(string id = default(string), string name = default(string), string type = default(string), string location = default(string), IDictionary tags = default(IDictionary), string eTag = default(string), IDictionary additionalProperties = default(IDictionary), FactoryIdentity identity = default(FactoryIdentity), string provisioningState = default(string), System.DateTime? createTime = default(System.DateTime?), string version = default(string), FactoryRepoConfiguration repoConfiguration = default(FactoryRepoConfiguration), IDictionary globalParameters = default(IDictionary)) + /// Whether or not public network + /// access is allowed for the data factory. Possible values include: + /// 'Enabled', 'Disabled' + public Factory(string id = default(string), string name = default(string), string type = default(string), string location = default(string), IDictionary tags = default(IDictionary), string eTag = default(string), IDictionary additionalProperties = default(IDictionary), FactoryIdentity identity = default(FactoryIdentity), string provisioningState = default(string), System.DateTime? createTime = default(System.DateTime?), string version = default(string), FactoryRepoConfiguration repoConfiguration = default(FactoryRepoConfiguration), IDictionary globalParameters = default(IDictionary), string publicNetworkAccess = default(string)) : base(id, name, type, location, tags, eTag) { AdditionalProperties = additionalProperties; @@ -63,6 +66,7 @@ public Factory() Version = version; RepoConfiguration = repoConfiguration; GlobalParameters = globalParameters; + PublicNetworkAccess = publicNetworkAccess; CustomInit(); } @@ -114,6 +118,13 @@ public Factory() [JsonProperty(PropertyName = "properties.globalParameters")] public IDictionary GlobalParameters { get; set; } + /// + /// Gets or sets whether or not public network access is allowed for + /// the data factory. Possible values include: 'Enabled', 'Disabled' + /// + [JsonProperty(PropertyName = "properties.publicNetworkAccess")] + public string PublicNetworkAccess { get; set; } + /// /// Validate the object. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/LogLocationSettings.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/LogLocationSettings.cs new file mode 100644 index 0000000000000..e8af925646c8e --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/LogLocationSettings.cs @@ -0,0 +1,83 @@ +// +// 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. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + using Microsoft.Rest; + using Newtonsoft.Json; + using System.Linq; + + /// + /// Log location settings. + /// + public partial class LogLocationSettings + { + /// + /// Initializes a new instance of the LogLocationSettings class. + /// + public LogLocationSettings() + { + LinkedServiceName = new LinkedServiceReference(); + CustomInit(); + } + + /// + /// Initializes a new instance of the LogLocationSettings class. + /// + /// Log storage linked service + /// reference. + /// The path to storage for storing detailed logs of + /// activity execution. Type: string (or Expression with resultType + /// string). + public LogLocationSettings(LinkedServiceReference linkedServiceName, object path = default(object)) + { + LinkedServiceName = linkedServiceName; + Path = path; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets log storage linked service reference. + /// + [JsonProperty(PropertyName = "linkedServiceName")] + public LinkedServiceReference LinkedServiceName { get; set; } + + /// + /// Gets or sets the path to storage for storing detailed logs of + /// activity execution. Type: string (or Expression with resultType + /// string). + /// + [JsonProperty(PropertyName = "path")] + public object Path { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (LinkedServiceName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "LinkedServiceName"); + } + if (LinkedServiceName != null) + { + LinkedServiceName.Validate(); + } + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/LogSettings.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/LogSettings.cs new file mode 100644 index 0000000000000..be026f31fb965 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/LogSettings.cs @@ -0,0 +1,92 @@ +// +// 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. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + using Microsoft.Rest; + using Newtonsoft.Json; + using System.Linq; + + /// + /// Log settings. + /// + public partial class LogSettings + { + /// + /// Initializes a new instance of the LogSettings class. + /// + public LogSettings() + { + LogLocationSettings = new LogLocationSettings(); + CustomInit(); + } + + /// + /// Initializes a new instance of the LogSettings class. + /// + /// Log location settings customer + /// needs to provide when enabling log. + /// Specifies whether to enable + /// copy activity log. Type: boolean (or Expression with resultType + /// boolean). + /// Specifies settings for copy + /// activity log. + public LogSettings(LogLocationSettings logLocationSettings, object enableCopyActivityLog = default(object), CopyActivityLogSettings copyActivityLogSettings = default(CopyActivityLogSettings)) + { + EnableCopyActivityLog = enableCopyActivityLog; + CopyActivityLogSettings = copyActivityLogSettings; + LogLocationSettings = logLocationSettings; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets specifies whether to enable copy activity log. Type: + /// boolean (or Expression with resultType boolean). + /// + [JsonProperty(PropertyName = "enableCopyActivityLog")] + public object EnableCopyActivityLog { get; set; } + + /// + /// Gets or sets specifies settings for copy activity log. + /// + [JsonProperty(PropertyName = "copyActivityLogSettings")] + public CopyActivityLogSettings CopyActivityLogSettings { get; set; } + + /// + /// Gets or sets log location settings customer needs to provide when + /// enabling log. + /// + [JsonProperty(PropertyName = "logLocationSettings")] + public LogLocationSettings LogLocationSettings { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (LogLocationSettings == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "LogLocationSettings"); + } + if (LogLocationSettings != null) + { + LogLocationSettings.Validate(); + } + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/LogStorageSettings.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/LogStorageSettings.cs index 777cc15863a80..92ae1462a1696 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/LogStorageSettings.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/LogStorageSettings.cs @@ -17,7 +17,7 @@ namespace Microsoft.Azure.Management.DataFactory.Models using System.Linq; /// - /// Log storage settings. + /// (Deprecated. Please use LogSettings) Log storage settings. /// public partial class LogStorageSettings { diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PublicNetworkAccess.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PublicNetworkAccess.cs new file mode 100644 index 0000000000000..384def9844834 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PublicNetworkAccess.cs @@ -0,0 +1,22 @@ +// +// 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. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + + /// + /// Defines values for PublicNetworkAccess. + /// + public static class PublicNetworkAccess + { + public const string Enabled = "Enabled"; + public const string Disabled = "Disabled"; + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SsisPackageLocation.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SSISPackageLocation.cs similarity index 100% rename from sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SsisPackageLocation.cs rename to sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SSISPackageLocation.cs diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/SdkInfo_DataFactoryManagementClient.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/SdkInfo_DataFactoryManagementClient.cs index 2011a9871690d..75005e8302fd5 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/SdkInfo_DataFactoryManagementClient.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/SdkInfo_DataFactoryManagementClient.cs @@ -40,16 +40,5 @@ public static IEnumerable> ApiInfo_DataFactoryMana }.AsEnumerable(); } } - // BEGIN: Code Generation Metadata Section - public static readonly String AutoRestVersion = "v2"; - public static readonly String AutoRestBootStrapperVersion = "autorest@2.0.4413"; - public static readonly String AutoRestCmdExecuted = "cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/datafactory/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=D:\\Projects\\azure-sdk-for-net\\sdk"; - public static readonly String GithubForkName = "Azure"; - public static readonly String GithubBranchName = "master"; - public static readonly String GithubCommidId = "fce3400431eff281bddd04bed9727e63765b8da0"; - public static readonly String CodeGenerationErrors = ""; - public static readonly String GithubRepoName = "azure-rest-api-specs"; - // END: Code Generation Metadata Section } } -