From 69bbd6025a1631bf14cf8a0ecace9743f0657399 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Wed, 17 Feb 2021 21:00:48 +0000 Subject: [PATCH] CodeGen from PR 12384 in Azure/azure-rest-api-specs Merge e60d12d459b9bb0a2d01f36e023a068da3f3ca5b into 6ecbac8c595dbd6ef9f3f357f19a75467adf0bea --- .../Models/AzureMLExecutePipelineActivity.cs | 48 ++++++++++++++++--- ...kageLocation.cs => SSISPackageLocation.cs} | 0 .../Models/WebActivityAuthentication.cs | 45 ++++++++++++----- .../SdkInfo_DataFactoryManagementClient.cs | 11 ----- 4 files changed, 73 insertions(+), 31 deletions(-) rename sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/{SsisPackageLocation.cs => SSISPackageLocation.cs} (100%) diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureMLExecutePipelineActivity.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureMLExecutePipelineActivity.cs index 46c97bd2849b..5f864e653dbf 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureMLExecutePipelineActivity.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureMLExecutePipelineActivity.cs @@ -38,8 +38,6 @@ public AzureMLExecutePipelineActivity() /// class. /// /// Activity name. - /// ID of the published Azure ML pipeline. - /// Type: string (or Expression with resultType string). /// Unmatched properties from the /// message are deserialized this collection /// Activity description. @@ -47,6 +45,14 @@ public AzureMLExecutePipelineActivity() /// Activity user properties. /// Linked service reference. /// Activity policy. + /// ID of the published Azure ML pipeline. + /// Type: string (or Expression with resultType string). + /// ID of the published Azure ML + /// pipeline endpoint. Type: string (or Expression with resultType + /// string). + /// Version of the published Azure ML pipeline + /// endpoint. Type: string (or Expression with resultType + /// string). /// Run history experiment name of the /// pipeline run. This information will be passed in the ExperimentName /// property of the published pipeline execution request. Type: string @@ -57,6 +63,11 @@ public AzureMLExecutePipelineActivity() /// will be passed in the ParameterAssignments property of the /// published pipeline execution request. Type: object with key value /// pairs (or Expression with resultType object). + /// Dictionary used for changing data + /// path assignments without retraining. Values will be passed in the + /// dataPathAssignments property of the published pipeline execution + /// request. Type: object with key value pairs (or Expression with + /// resultType object). /// The parent Azure ML Service pipeline /// run id. This information will be passed in the ParentRunId property /// of the published pipeline execution request. Type: string (or @@ -66,12 +77,15 @@ public AzureMLExecutePipelineActivity() /// will be passed in the continueOnStepFailure property of the /// published pipeline execution request. Type: boolean (or Expression /// with resultType boolean). - public AzureMLExecutePipelineActivity(string name, object mlPipelineId, 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 experimentName = default(object), object mlPipelineParameters = default(object), object mlParentRunId = default(object), object continueOnStepFailure = default(object)) + public AzureMLExecutePipelineActivity(string name, 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 mlPipelineId = default(object), object mlPipelineEndpointId = default(object), object version = default(object), object experimentName = default(object), object mlPipelineParameters = default(object), object dataPathAssignments = default(object), object mlParentRunId = default(object), object continueOnStepFailure = default(object)) : base(name, additionalProperties, description, dependsOn, userProperties, linkedServiceName, policy) { MlPipelineId = mlPipelineId; + MlPipelineEndpointId = mlPipelineEndpointId; + Version = version; ExperimentName = experimentName; MlPipelineParameters = mlPipelineParameters; + DataPathAssignments = dataPathAssignments; MlParentRunId = mlParentRunId; ContinueOnStepFailure = continueOnStepFailure; CustomInit(); @@ -89,6 +103,20 @@ public AzureMLExecutePipelineActivity() [JsonProperty(PropertyName = "typeProperties.mlPipelineId")] public object MlPipelineId { get; set; } + /// + /// Gets or sets ID of the published Azure ML pipeline endpoint. Type: + /// string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.mlPipelineEndpointId")] + public object MlPipelineEndpointId { get; set; } + + /// + /// Gets or sets version of the published Azure ML pipeline endpoint. + /// Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.version")] + public object Version { get; set; } + /// /// Gets or sets run history experiment name of the pipeline run. This /// information will be passed in the ExperimentName property of the @@ -109,6 +137,16 @@ public AzureMLExecutePipelineActivity() [JsonProperty(PropertyName = "typeProperties.mlPipelineParameters")] public object MlPipelineParameters { get; set; } + /// + /// Gets or sets dictionary used for changing data path assignments + /// without retraining. Values will be passed in the + /// dataPathAssignments property of the published pipeline execution + /// request. Type: object with key value pairs (or Expression with + /// resultType object). + /// + [JsonProperty(PropertyName = "typeProperties.dataPathAssignments")] + public object DataPathAssignments { get; set; } + /// /// Gets or sets the parent Azure ML Service pipeline run id. This /// information will be passed in the ParentRunId property of the @@ -136,10 +174,6 @@ public AzureMLExecutePipelineActivity() public override void Validate() { base.Validate(); - if (MlPipelineId == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "MlPipelineId"); - } } } } 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/Models/WebActivityAuthentication.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WebActivityAuthentication.cs index e18ed9592e1f..1d2537faa65f 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WebActivityAuthentication.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WebActivityAuthentication.cs @@ -31,21 +31,28 @@ public WebActivityAuthentication() /// Initializes a new instance of the WebActivityAuthentication class. /// /// Web activity authentication - /// (Basic/ClientCertificate/MSI) - /// Base64-encoded contents of a PFX file. + /// (Basic/ClientCertificate/MSI/ServicePrincipal) + /// Base64-encoded contents of a PFX file or + /// Certificate when used for ServicePrincipal /// Web activity authentication user name for - /// basic authentication. + /// basic authentication or ClientID when used for ServicePrincipal. + /// Type: string (or Expression with resultType string). /// Password for the PFX file or basic - /// authentication. + /// authentication / Secret when used for ServicePrincipal /// Resource for which Azure Auth token will be - /// requested when using MSI Authentication. - public WebActivityAuthentication(string type, SecretBase pfx = default(SecretBase), string username = default(string), SecretBase password = default(SecretBase), string resource = default(string)) + /// requested when using MSI Authentication. Type: string (or + /// Expression with resultType string). + /// TenantId for which Azure Auth token will + /// be requested when using ServicePrincipal Authentication. Type: + /// string (or Expression with resultType string). + public WebActivityAuthentication(string type, SecretBase pfx = default(SecretBase), object username = default(object), SecretBase password = default(SecretBase), object resource = default(object), object userTenant = default(object)) { Type = type; Pfx = pfx; Username = username; Password = password; Resource = resource; + UserTenant = userTenant; CustomInit(); } @@ -56,36 +63,48 @@ public WebActivityAuthentication() /// /// Gets or sets web activity authentication - /// (Basic/ClientCertificate/MSI) + /// (Basic/ClientCertificate/MSI/ServicePrincipal) /// [JsonProperty(PropertyName = "type")] public string Type { get; set; } /// - /// Gets or sets base64-encoded contents of a PFX file. + /// Gets or sets base64-encoded contents of a PFX file or Certificate + /// when used for ServicePrincipal /// [JsonProperty(PropertyName = "pfx")] public SecretBase Pfx { get; set; } /// /// Gets or sets web activity authentication user name for basic - /// authentication. + /// authentication or ClientID when used for ServicePrincipal. Type: + /// string (or Expression with resultType string). /// [JsonProperty(PropertyName = "username")] - public string Username { get; set; } + public object Username { get; set; } /// - /// Gets or sets password for the PFX file or basic authentication. + /// Gets or sets password for the PFX file or basic authentication / + /// Secret when used for ServicePrincipal /// [JsonProperty(PropertyName = "password")] public SecretBase Password { get; set; } /// /// Gets or sets resource for which Azure Auth token will be requested - /// when using MSI Authentication. + /// when using MSI Authentication. Type: string (or Expression with + /// resultType string). /// [JsonProperty(PropertyName = "resource")] - public string Resource { get; set; } + public object Resource { get; set; } + + /// + /// Gets or sets tenantId for which Azure Auth token will be requested + /// when using ServicePrincipal Authentication. Type: string (or + /// Expression with resultType string). + /// + [JsonProperty(PropertyName = "userTenant")] + public object UserTenant { get; set; } /// /// Validate the object. 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 2011a9871690..75005e8302fd 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 } } -