diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/ITriggerRunsOperations.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/ITriggerRunsOperations.cs index 1ed05c1a7c8d..1e081eef7a0e 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/ITriggerRunsOperations.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/ITriggerRunsOperations.cs @@ -52,6 +52,34 @@ public partial interface ITriggerRunsOperations /// Task RerunWithHttpMessagesAsync(string resourceGroupName, string factoryName, string triggerName, string runId, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// + /// Cancel a single trigger instance by runId. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The trigger name. + /// + /// + /// The pipeline run identifier. + /// + /// + /// The headers that will be added to request. + /// + /// + /// The cancellation token. + /// + /// + /// Thrown when the operation returned an invalid status code + /// + /// + /// Thrown when a required parameter is null + /// + Task CancelWithHttpMessagesAsync(string resourceGroupName, string factoryName, string triggerName, string runId, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + /// /// Query trigger runs. /// /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobFSLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobFSLinkedService.cs index d28f610d2576..53371190e54d 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobFSLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobFSLinkedService.cs @@ -57,11 +57,16 @@ public AzureBlobFSLinkedService() /// The name or ID of the tenant to which the /// service principal belongs. Type: string (or Expression with /// resultType string). + /// Indicates the azure cloud type of the + /// service principle auth. Allowed values are AzurePublic, AzureChina, + /// AzureUsGovernment, AzureGermany. Default value is the data factory + /// regions’ cloud type. 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 AzureBlobFSLinkedService(object url, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object accountKey = default(object), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object encryptedCredential = default(object)) + public AzureBlobFSLinkedService(object url, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object accountKey = default(object), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { Url = url; @@ -69,6 +74,7 @@ public AzureBlobFSLinkedService() ServicePrincipalId = servicePrincipalId; ServicePrincipalKey = servicePrincipalKey; Tenant = tenant; + AzureCloudType = azureCloudType; EncryptedCredential = encryptedCredential; CustomInit(); } @@ -115,6 +121,16 @@ public AzureBlobFSLinkedService() [JsonProperty(PropertyName = "typeProperties.tenant")] public object Tenant { get; set; } + /// + /// Gets or sets indicates the azure cloud type of the service + /// principle auth. Allowed values are AzurePublic, AzureChina, + /// AzureUsGovernment, AzureGermany. Default value is the data factory + /// regions’ cloud type. Type: string (or Expression with resultType + /// string). + /// + [JsonProperty(PropertyName = "typeProperties.azureCloudType")] + public object AzureCloudType { 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/AzureBlobStorageLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobStorageLinkedService.cs index 54ef46f23082..3d4447bf2d46 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobStorageLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobStorageLinkedService.cs @@ -66,11 +66,16 @@ public AzureBlobStorageLinkedService() /// The name or ID of the tenant to which the /// service principal belongs. Type: string (or Expression with /// resultType string). + /// Indicates the azure cloud type of the + /// service principle auth. Allowed values are AzurePublic, AzureChina, + /// AzureUsGovernment, AzureGermany. Default value is the data factory + /// regions’ cloud type. 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 AzureBlobStorageLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), AzureKeyVaultSecretReference accountKey = default(AzureKeyVaultSecretReference), object sasUri = default(object), AzureKeyVaultSecretReference sasToken = default(AzureKeyVaultSecretReference), string serviceEndpoint = default(string), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), string encryptedCredential = default(string)) + public AzureBlobStorageLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), AzureKeyVaultSecretReference accountKey = default(AzureKeyVaultSecretReference), object sasUri = default(object), AzureKeyVaultSecretReference sasToken = default(AzureKeyVaultSecretReference), string serviceEndpoint = default(string), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), string encryptedCredential = default(string)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; @@ -81,6 +86,7 @@ public AzureBlobStorageLinkedService() ServicePrincipalId = servicePrincipalId; ServicePrincipalKey = servicePrincipalKey; Tenant = tenant; + AzureCloudType = azureCloudType; EncryptedCredential = encryptedCredential; CustomInit(); } @@ -151,6 +157,16 @@ public AzureBlobStorageLinkedService() [JsonProperty(PropertyName = "typeProperties.tenant")] public object Tenant { get; set; } + /// + /// Gets or sets indicates the azure cloud type of the service + /// principle auth. Allowed values are AzurePublic, AzureChina, + /// AzureUsGovernment, AzureGermany. Default value is the data factory + /// regions’ cloud type. Type: string (or Expression with resultType + /// string). + /// + [JsonProperty(PropertyName = "typeProperties.azureCloudType")] + public object AzureCloudType { 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/AzureDataLakeStoreLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataLakeStoreLinkedService.cs index bd50b5a3e1c9..007781598e44 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataLakeStoreLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataLakeStoreLinkedService.cs @@ -54,6 +54,11 @@ public AzureDataLakeStoreLinkedService() /// The name or ID of the tenant to which the /// service principal belongs. Type: string (or Expression with /// resultType string). + /// Indicates the azure cloud type of the + /// service principle auth. Allowed values are AzurePublic, AzureChina, + /// AzureUsGovernment, AzureGermany. Default value is the data factory + /// regions’ cloud type. Type: string (or Expression with resultType + /// string). /// Data Lake Store account name. Type: /// string (or Expression with resultType string). /// Data Lake Store account subscription @@ -66,13 +71,14 @@ public AzureDataLakeStoreLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public AzureDataLakeStoreLinkedService(object dataLakeStoreUri, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object accountName = default(object), object subscriptionId = default(object), object resourceGroupName = default(object), object encryptedCredential = default(object)) + public AzureDataLakeStoreLinkedService(object dataLakeStoreUri, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), object accountName = default(object), object subscriptionId = default(object), object resourceGroupName = default(object), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { DataLakeStoreUri = dataLakeStoreUri; ServicePrincipalId = servicePrincipalId; ServicePrincipalKey = servicePrincipalKey; Tenant = tenant; + AzureCloudType = azureCloudType; AccountName = accountName; SubscriptionId = subscriptionId; ResourceGroupName = resourceGroupName; @@ -115,6 +121,16 @@ public AzureDataLakeStoreLinkedService() [JsonProperty(PropertyName = "typeProperties.tenant")] public object Tenant { get; set; } + /// + /// Gets or sets indicates the azure cloud type of the service + /// principle auth. Allowed values are AzurePublic, AzureChina, + /// AzureUsGovernment, AzureGermany. Default value is the data factory + /// regions’ cloud type. Type: string (or Expression with resultType + /// string). + /// + [JsonProperty(PropertyName = "typeProperties.azureCloudType")] + public object AzureCloudType { get; set; } + /// /// Gets or sets data Lake Store account name. Type: string (or /// Expression with resultType string). diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureFileStorageLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureFileStorageLinkedService.cs index e7038753e6b4..a2448b59ddf5 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureFileStorageLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureFileStorageLinkedService.cs @@ -62,11 +62,13 @@ public AzureFileStorageLinkedService() /// The azure file share name. It is required /// when auth with accountKey/sasToken. Type: string (or Expression /// with resultType string). + /// The azure file share snapshot version. 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 AzureFileStorageLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object host = default(object), object userId = default(object), SecretBase password = default(SecretBase), object connectionString = default(object), AzureKeyVaultSecretReference accountKey = default(AzureKeyVaultSecretReference), object sasUri = default(object), AzureKeyVaultSecretReference sasToken = default(AzureKeyVaultSecretReference), object fileShare = default(object), object encryptedCredential = default(object)) + public AzureFileStorageLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object host = default(object), object userId = default(object), SecretBase password = default(SecretBase), object connectionString = default(object), AzureKeyVaultSecretReference accountKey = default(AzureKeyVaultSecretReference), object sasUri = default(object), AzureKeyVaultSecretReference sasToken = default(AzureKeyVaultSecretReference), object fileShare = default(object), object snapshot = default(object), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { Host = host; @@ -77,6 +79,7 @@ public AzureFileStorageLinkedService() SasUri = sasUri; SasToken = sasToken; FileShare = fileShare; + Snapshot = snapshot; EncryptedCredential = encryptedCredential; CustomInit(); } @@ -144,6 +147,13 @@ public AzureFileStorageLinkedService() [JsonProperty(PropertyName = "typeProperties.fileShare")] public object FileShare { get; set; } + /// + /// Gets or sets the azure file share snapshot version. Type: string + /// (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.snapshot")] + public object Snapshot { 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/AzureSqlDWLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlDWLinkedService.cs index cf1d5a0721c6..b6a653a0227c 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlDWLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlDWLinkedService.cs @@ -55,11 +55,16 @@ public AzureSqlDWLinkedService() /// The name or ID of the tenant to which the /// service principal belongs. Type: string (or Expression with /// resultType string). + /// Indicates the azure cloud type of the + /// service principle auth. Allowed values are AzurePublic, AzureChina, + /// AzureUsGovernment, AzureGermany. Default value is the data factory + /// regions’ cloud type. 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 AzureSqlDWLinkedService(object connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), AzureKeyVaultSecretReference password = default(AzureKeyVaultSecretReference), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object encryptedCredential = default(object)) + public AzureSqlDWLinkedService(object connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), AzureKeyVaultSecretReference password = default(AzureKeyVaultSecretReference), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; @@ -67,6 +72,7 @@ public AzureSqlDWLinkedService() ServicePrincipalId = servicePrincipalId; ServicePrincipalKey = servicePrincipalKey; Tenant = tenant; + AzureCloudType = azureCloudType; EncryptedCredential = encryptedCredential; CustomInit(); } @@ -114,6 +120,16 @@ public AzureSqlDWLinkedService() [JsonProperty(PropertyName = "typeProperties.tenant")] public object Tenant { get; set; } + /// + /// Gets or sets indicates the azure cloud type of the service + /// principle auth. Allowed values are AzurePublic, AzureChina, + /// AzureUsGovernment, AzureGermany. Default value is the data factory + /// regions’ cloud type. Type: string (or Expression with resultType + /// string). + /// + [JsonProperty(PropertyName = "typeProperties.azureCloudType")] + public object AzureCloudType { 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/AzureSqlDatabaseLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlDatabaseLinkedService.cs index 042fedfb87fa..adf8fc049fcc 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlDatabaseLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlDatabaseLinkedService.cs @@ -56,11 +56,16 @@ public AzureSqlDatabaseLinkedService() /// The name or ID of the tenant to which the /// service principal belongs. Type: string (or Expression with /// resultType string). + /// Indicates the azure cloud type of the + /// service principle auth. Allowed values are AzurePublic, AzureChina, + /// AzureUsGovernment, AzureGermany. Default value is the data factory + /// regions’ cloud type. 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 AzureSqlDatabaseLinkedService(object connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), AzureKeyVaultSecretReference password = default(AzureKeyVaultSecretReference), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object encryptedCredential = default(object)) + public AzureSqlDatabaseLinkedService(object connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), AzureKeyVaultSecretReference password = default(AzureKeyVaultSecretReference), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; @@ -68,6 +73,7 @@ public AzureSqlDatabaseLinkedService() ServicePrincipalId = servicePrincipalId; ServicePrincipalKey = servicePrincipalKey; Tenant = tenant; + AzureCloudType = azureCloudType; EncryptedCredential = encryptedCredential; CustomInit(); } @@ -114,6 +120,16 @@ public AzureSqlDatabaseLinkedService() [JsonProperty(PropertyName = "typeProperties.tenant")] public object Tenant { get; set; } + /// + /// Gets or sets indicates the azure cloud type of the service + /// principle auth. Allowed values are AzurePublic, AzureChina, + /// AzureUsGovernment, AzureGermany. Default value is the data factory + /// regions’ cloud type. Type: string (or Expression with resultType + /// string). + /// + [JsonProperty(PropertyName = "typeProperties.azureCloudType")] + public object AzureCloudType { 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/AzureSqlMILinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlMILinkedService.cs index 9c2188e31085..c3f7e2891d9c 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlMILinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlMILinkedService.cs @@ -54,11 +54,16 @@ public AzureSqlMILinkedService() /// The name or ID of the tenant to which the /// service principal belongs. Type: string (or Expression with /// resultType string). + /// Indicates the azure cloud type of the + /// service principle auth. Allowed values are AzurePublic, AzureChina, + /// AzureUsGovernment, AzureGermany. Default value is the data factory + /// regions’ cloud type. 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 AzureSqlMILinkedService(object connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), AzureKeyVaultSecretReference password = default(AzureKeyVaultSecretReference), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object encryptedCredential = default(object)) + public AzureSqlMILinkedService(object connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), AzureKeyVaultSecretReference password = default(AzureKeyVaultSecretReference), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; @@ -66,6 +71,7 @@ public AzureSqlMILinkedService() ServicePrincipalId = servicePrincipalId; ServicePrincipalKey = servicePrincipalKey; Tenant = tenant; + AzureCloudType = azureCloudType; EncryptedCredential = encryptedCredential; CustomInit(); } @@ -112,6 +118,16 @@ public AzureSqlMILinkedService() [JsonProperty(PropertyName = "typeProperties.tenant")] public object Tenant { get; set; } + /// + /// Gets or sets indicates the azure cloud type of the service + /// principle auth. Allowed values are AzurePublic, AzureChina, + /// AzureUsGovernment, AzureGermany. Default value is the data factory + /// regions’ cloud type. Type: string (or Expression with resultType + /// string). + /// + [JsonProperty(PropertyName = "typeProperties.azureCloudType")] + public object AzureCloudType { 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/ODataLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ODataLinkedService.cs index 6c12d34d0386..35aef57a1c51 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ODataLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ODataLinkedService.cs @@ -57,6 +57,11 @@ public ODataLinkedService() /// Specify the application id of your /// application registered in Azure Active Directory. Type: string (or /// Expression with resultType string). + /// Indicates the azure cloud type of the + /// service principle auth. Allowed values are AzurePublic, AzureChina, + /// AzureUsGovernment, AzureGermany. Default value is the data factory + /// regions’ cloud type. Type: string (or Expression with resultType + /// string). /// Specify the resource you are requesting /// authorization to use Directory. Type: string (or Expression with /// resultType string). @@ -79,7 +84,7 @@ public ODataLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public ODataLinkedService(object url, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), string authenticationType = default(string), object userName = default(object), SecretBase password = default(SecretBase), object tenant = default(object), object servicePrincipalId = default(object), object aadResourceId = default(object), string aadServicePrincipalCredentialType = default(string), SecretBase servicePrincipalKey = default(SecretBase), SecretBase servicePrincipalEmbeddedCert = default(SecretBase), SecretBase servicePrincipalEmbeddedCertPassword = default(SecretBase), object encryptedCredential = default(object)) + public ODataLinkedService(object url, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), string authenticationType = default(string), object userName = default(object), SecretBase password = default(SecretBase), object tenant = default(object), object servicePrincipalId = default(object), object azureCloudType = default(object), object aadResourceId = default(object), string aadServicePrincipalCredentialType = default(string), SecretBase servicePrincipalKey = default(SecretBase), SecretBase servicePrincipalEmbeddedCert = default(SecretBase), SecretBase servicePrincipalEmbeddedCertPassword = default(SecretBase), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { Url = url; @@ -88,6 +93,7 @@ public ODataLinkedService() Password = password; Tenant = tenant; ServicePrincipalId = servicePrincipalId; + AzureCloudType = azureCloudType; AadResourceId = aadResourceId; AadServicePrincipalCredentialType = aadServicePrincipalCredentialType; ServicePrincipalKey = servicePrincipalKey; @@ -146,6 +152,16 @@ public ODataLinkedService() [JsonProperty(PropertyName = "typeProperties.servicePrincipalId")] public object ServicePrincipalId { get; set; } + /// + /// Gets or sets indicates the azure cloud type of the service + /// principle auth. Allowed values are AzurePublic, AzureChina, + /// AzureUsGovernment, AzureGermany. Default value is the data factory + /// regions’ cloud type. Type: string (or Expression with resultType + /// string). + /// + [JsonProperty(PropertyName = "typeProperties.azureCloudType")] + public object AzureCloudType { get; set; } + /// /// Gets or sets specify the resource you are requesting authorization /// to use Directory. Type: string (or Expression with resultType diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RestServiceLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RestServiceLinkedService.cs index 94f43d799dbd..ef7a9bf8a1bd 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RestServiceLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RestServiceLinkedService.cs @@ -61,13 +61,18 @@ public RestServiceLinkedService() /// The tenant information (domain name or tenant /// ID) used in AadServicePrincipal authentication type under which /// your application resides. + /// Indicates the azure cloud type of the + /// service principle auth. Allowed values are AzurePublic, AzureChina, + /// AzureUsGovernment, AzureGermany. Default value is the data factory + /// regions’ cloud type. Type: string (or Expression with resultType + /// string). /// The resource you are requesting /// authorization to use. /// The encrypted credential used for /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public RestServiceLinkedService(object url, string authenticationType, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object enableServerCertificateValidation = default(object), object userName = default(object), SecretBase password = default(SecretBase), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object aadResourceId = default(object), object encryptedCredential = default(object)) + public RestServiceLinkedService(object url, string authenticationType, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object enableServerCertificateValidation = default(object), object userName = default(object), SecretBase password = default(SecretBase), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), object aadResourceId = default(object), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { Url = url; @@ -78,6 +83,7 @@ public RestServiceLinkedService() ServicePrincipalId = servicePrincipalId; ServicePrincipalKey = servicePrincipalKey; Tenant = tenant; + AzureCloudType = azureCloudType; AadResourceId = aadResourceId; EncryptedCredential = encryptedCredential; CustomInit(); @@ -144,6 +150,16 @@ public RestServiceLinkedService() [JsonProperty(PropertyName = "typeProperties.tenant")] public object Tenant { get; set; } + /// + /// Gets or sets indicates the azure cloud type of the service + /// principle auth. Allowed values are AzurePublic, AzureChina, + /// AzureUsGovernment, AzureGermany. Default value is the data factory + /// regions’ cloud type. Type: string (or Expression with resultType + /// string). + /// + [JsonProperty(PropertyName = "typeProperties.azureCloudType")] + public object AzureCloudType { get; set; } + /// /// Gets or sets the resource you are requesting authorization to use. /// 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/SapOpenHubSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapOpenHubSource.cs index fdf89ffbc085..2b9fc918ca02 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapOpenHubSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapOpenHubSource.cs @@ -55,11 +55,20 @@ public SapOpenHubSource() /// Once it is set, only data with requestId larger than the value of /// this property will be retrieved. The default value is 0. Type: /// integer (or Expression with resultType integer ). - public SapOpenHubSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object excludeLastRequest = default(object), object baseRequestId = default(object)) + /// Specifies the custom + /// RFC function module that will be used to read data from SAP Table. + /// Type: string (or Expression with resultType string). + /// The single character that will + /// be used as delimiter passed to SAP RFC as well as splitting the + /// output data retrieved. Type: string (or Expression with resultType + /// string). + public SapOpenHubSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object excludeLastRequest = default(object), object baseRequestId = default(object), object customRfcReadTableFunctionModule = default(object), object sapDataColumnDelimiter = default(object)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { ExcludeLastRequest = excludeLastRequest; BaseRequestId = baseRequestId; + CustomRfcReadTableFunctionModule = customRfcReadTableFunctionModule; + SapDataColumnDelimiter = sapDataColumnDelimiter; CustomInit(); } @@ -85,5 +94,21 @@ public SapOpenHubSource() [JsonProperty(PropertyName = "baseRequestId")] public object BaseRequestId { get; set; } + /// + /// Gets or sets specifies the custom RFC function module that will be + /// used to read data from SAP Table. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "customRfcReadTableFunctionModule")] + public object CustomRfcReadTableFunctionModule { get; set; } + + /// + /// Gets or sets the single character that will be used as delimiter + /// passed to SAP RFC as well as splitting the output data retrieved. + /// Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "sapDataColumnDelimiter")] + public object SapDataColumnDelimiter { get; set; } + } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapTableSource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapTableSource.cs index bbf90efc064f..39a48d79f60d 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapTableSource.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SapTableSource.cs @@ -63,6 +63,10 @@ public SapTableSource() /// Specifies the custom /// RFC function module that will be used to read data from SAP Table. /// Type: string (or Expression with resultType string). + /// The single character that will + /// be used as delimiter passed to SAP RFC as well as splitting the + /// output data retrieved. Type: string (or Expression with resultType + /// string). /// The partition mechanism that will be /// used for SAP table read in parallel. Possible values include: /// 'None', 'PartitionOnInt', 'PartitionOnCalendarYear', @@ -70,7 +74,7 @@ public SapTableSource() /// 'PartitionOnTime' /// The settings that will be leveraged /// for SAP table source partitioning. - public SapTableSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object rowCount = default(object), object rowSkips = default(object), object rfcTableFields = default(object), object rfcTableOptions = default(object), object batchSize = default(object), object customRfcReadTableFunctionModule = default(object), string partitionOption = default(string), SapTablePartitionSettings partitionSettings = default(SapTablePartitionSettings)) + public SapTableSource(IDictionary additionalProperties = default(IDictionary), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object maxConcurrentConnections = default(object), object queryTimeout = default(object), IList additionalColumns = default(IList), object rowCount = default(object), object rowSkips = default(object), object rfcTableFields = default(object), object rfcTableOptions = default(object), object batchSize = default(object), object customRfcReadTableFunctionModule = default(object), object sapDataColumnDelimiter = default(object), string partitionOption = default(string), SapTablePartitionSettings partitionSettings = default(SapTablePartitionSettings)) : base(additionalProperties, sourceRetryCount, sourceRetryWait, maxConcurrentConnections, queryTimeout, additionalColumns) { RowCount = rowCount; @@ -79,6 +83,7 @@ public SapTableSource() RfcTableOptions = rfcTableOptions; BatchSize = batchSize; CustomRfcReadTableFunctionModule = customRfcReadTableFunctionModule; + SapDataColumnDelimiter = sapDataColumnDelimiter; PartitionOption = partitionOption; PartitionSettings = partitionSettings; CustomInit(); @@ -135,6 +140,14 @@ public SapTableSource() [JsonProperty(PropertyName = "customRfcReadTableFunctionModule")] public object CustomRfcReadTableFunctionModule { get; set; } + /// + /// Gets or sets the single character that will be used as delimiter + /// passed to SAP RFC as well as splitting the output data retrieved. + /// Type: string (or Expression with resultType string). + /// + [JsonProperty(PropertyName = "sapDataColumnDelimiter")] + public object SapDataColumnDelimiter { get; set; } + /// /// Gets or sets the partition mechanism that will be used for SAP /// table read in parallel. Possible values include: 'None', diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WebHookActivity.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WebHookActivity.cs index 90a9110d80a4..ee354575cc3f 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WebHookActivity.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WebHookActivity.cs @@ -58,9 +58,9 @@ public WebHookActivity() /// Authentication method used for calling /// the endpoint. /// When set to true, statusCode, - /// output and error in callback request body will be consumed by - /// activity. The activity can be marked as failed by setting - /// statusCode >= 400 in callback request. Default is false. Type: + /// output and error in callback request body will be consumed by + /// activity. The activity can be marked as failed by setting + /// statusCode >= 400 in callback request. Default is false. Type: /// boolean (or Expression with resultType boolean). public WebHookActivity(string name, object url, IDictionary additionalProperties = default(IDictionary), string description = default(string), IList dependsOn = default(IList), IList userProperties = default(IList), string timeout = default(string), object headers = default(object), object body = default(object), WebActivityAuthentication authentication = default(WebActivityAuthentication), object reportStatusOnCallBack = default(object)) : base(name, additionalProperties, description, dependsOn, userProperties) @@ -127,9 +127,9 @@ static WebHookActivity() public WebActivityAuthentication Authentication { get; set; } /// - /// Gets or sets when set to true, statusCode, output and error in - /// callback request body will be consumed by activity. The activity - /// can be marked as failed by setting statusCode &gt;= 400 in + /// Gets or sets when set to true, statusCode, output and error in + /// callback request body will be consumed by activity. The activity + /// can be marked as failed by setting statusCode &gt;= 400 in /// callback request. Default is false. Type: boolean (or Expression /// with resultType boolean). /// 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 a1c453f7fb67..b31348b3961b 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 @@ -37,16 +37,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=C:\\Users\\rizh\\Documents\\azure-sdk-for-net\\sdk"; - public static readonly String GithubForkName = "Azure"; - public static readonly String GithubBranchName = "master"; - public static readonly String GithubCommidId = "09ac2b33d780dbf2f74de2083012f62aaa33c451"; - public static readonly String CodeGenerationErrors = ""; - public static readonly String GithubRepoName = "azure-rest-api-specs"; - // END: Code Generation Metadata Section } } - diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/TriggerRunsOperations.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/TriggerRunsOperations.cs index 6ada40ff5cc2..c87cbf6cf311 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/TriggerRunsOperations.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/TriggerRunsOperations.cs @@ -288,6 +288,244 @@ internal TriggerRunsOperations(DataFactoryManagementClient client) return _result; } + /// + /// Cancel a single trigger instance by runId. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The trigger name. + /// + /// + /// The pipeline run identifier. + /// + /// + /// Headers that will be added to request. + /// + /// + /// The cancellation token. + /// + /// + /// Thrown when the operation returned an invalid status code + /// + /// + /// Thrown when a required parameter is null + /// + /// + /// Thrown when a required parameter is null + /// + /// + /// A response object containing the response body and response headers. + /// + public async Task CancelWithHttpMessagesAsync(string resourceGroupName, string factoryName, string triggerName, string runId, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + { + if (Client.SubscriptionId == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); + } + if (resourceGroupName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName"); + } + if (resourceGroupName != null) + { + if (resourceGroupName.Length > 90) + { + throw new ValidationException(ValidationRules.MaxLength, "resourceGroupName", 90); + } + if (resourceGroupName.Length < 1) + { + throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1); + } + if (!System.Text.RegularExpressions.Regex.IsMatch(resourceGroupName, "^[-\\w\\._\\(\\)]+$")) + { + throw new ValidationException(ValidationRules.Pattern, "resourceGroupName", "^[-\\w\\._\\(\\)]+$"); + } + } + if (factoryName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "factoryName"); + } + if (factoryName != null) + { + if (factoryName.Length > 63) + { + throw new ValidationException(ValidationRules.MaxLength, "factoryName", 63); + } + if (factoryName.Length < 3) + { + throw new ValidationException(ValidationRules.MinLength, "factoryName", 3); + } + if (!System.Text.RegularExpressions.Regex.IsMatch(factoryName, "^[A-Za-z0-9]+(?:-[A-Za-z0-9]+)*$")) + { + throw new ValidationException(ValidationRules.Pattern, "factoryName", "^[A-Za-z0-9]+(?:-[A-Za-z0-9]+)*$"); + } + } + if (triggerName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "triggerName"); + } + if (triggerName != null) + { + if (triggerName.Length > 260) + { + throw new ValidationException(ValidationRules.MaxLength, "triggerName", 260); + } + if (triggerName.Length < 1) + { + throw new ValidationException(ValidationRules.MinLength, "triggerName", 1); + } + if (!System.Text.RegularExpressions.Regex.IsMatch(triggerName, "^[A-Za-z0-9_][^<>*#.%&:\\\\+?/]*$")) + { + throw new ValidationException(ValidationRules.Pattern, "triggerName", "^[A-Za-z0-9_][^<>*#.%&:\\\\+?/]*$"); + } + } + if (runId == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "runId"); + } + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } + // Tracing + bool _shouldTrace = ServiceClientTracing.IsEnabled; + string _invocationId = null; + if (_shouldTrace) + { + _invocationId = ServiceClientTracing.NextInvocationId.ToString(); + Dictionary tracingParameters = new Dictionary(); + tracingParameters.Add("resourceGroupName", resourceGroupName); + tracingParameters.Add("factoryName", factoryName); + tracingParameters.Add("triggerName", triggerName); + tracingParameters.Add("runId", runId); + tracingParameters.Add("cancellationToken", cancellationToken); + ServiceClientTracing.Enter(_invocationId, this, "Cancel", tracingParameters); + } + // Construct URL + var _baseUrl = Client.BaseUri.AbsoluteUri; + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}/triggerRuns/{runId}/cancel").ToString(); + _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); + _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); + _url = _url.Replace("{factoryName}", System.Uri.EscapeDataString(factoryName)); + _url = _url.Replace("{triggerName}", System.Uri.EscapeDataString(triggerName)); + _url = _url.Replace("{runId}", System.Uri.EscapeDataString(runId)); + List _queryParameters = new List(); + if (Client.ApiVersion != null) + { + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); + } + if (_queryParameters.Count > 0) + { + _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters); + } + // Create HTTP transport objects + var _httpRequest = new HttpRequestMessage(); + HttpResponseMessage _httpResponse = null; + _httpRequest.Method = new HttpMethod("POST"); + _httpRequest.RequestUri = new System.Uri(_url); + // Set Headers + if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value) + { + _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString()); + } + if (Client.AcceptLanguage != null) + { + if (_httpRequest.Headers.Contains("accept-language")) + { + _httpRequest.Headers.Remove("accept-language"); + } + _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage); + } + + + if (customHeaders != null) + { + foreach(var _header in customHeaders) + { + if (_httpRequest.Headers.Contains(_header.Key)) + { + _httpRequest.Headers.Remove(_header.Key); + } + _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value); + } + } + + // Serialize Request + string _requestContent = null; + // Set Credentials + if (Client.Credentials != null) + { + cancellationToken.ThrowIfCancellationRequested(); + await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false); + } + // Send Request + if (_shouldTrace) + { + ServiceClientTracing.SendRequest(_invocationId, _httpRequest); + } + cancellationToken.ThrowIfCancellationRequested(); + _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false); + if (_shouldTrace) + { + ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse); + } + HttpStatusCode _statusCode = _httpResponse.StatusCode; + cancellationToken.ThrowIfCancellationRequested(); + string _responseContent = null; + if ((int)_statusCode != 200) + { + var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); + try + { + _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); + CloudError _errorBody = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); + if (_errorBody != null) + { + ex = new CloudException(_errorBody.Message); + ex.Body = _errorBody; + } + } + catch (JsonException) + { + // Ignore the exception + } + ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent); + ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent); + if (_httpResponse.Headers.Contains("x-ms-request-id")) + { + ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault(); + } + if (_shouldTrace) + { + ServiceClientTracing.Error(_invocationId, ex); + } + _httpRequest.Dispose(); + if (_httpResponse != null) + { + _httpResponse.Dispose(); + } + throw ex; + } + // Create Result + var _result = new AzureOperationResponse(); + _result.Request = _httpRequest; + _result.Response = _httpResponse; + if (_httpResponse.Headers.Contains("x-ms-request-id")) + { + _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault(); + } + if (_shouldTrace) + { + ServiceClientTracing.Exit(_invocationId, _result); + } + return _result; + } + /// /// Query trigger runs. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/TriggerRunsOperationsExtensions.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/TriggerRunsOperationsExtensions.cs index 4dcc29f1ea6d..5414089fbcf8 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/TriggerRunsOperationsExtensions.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/TriggerRunsOperationsExtensions.cs @@ -70,6 +70,55 @@ public static void Rerun(this ITriggerRunsOperations operations, string resource (await operations.RerunWithHttpMessagesAsync(resourceGroupName, factoryName, triggerName, runId, null, cancellationToken).ConfigureAwait(false)).Dispose(); } + /// + /// Cancel a single trigger instance by runId. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The trigger name. + /// + /// + /// The pipeline run identifier. + /// + public static void Cancel(this ITriggerRunsOperations operations, string resourceGroupName, string factoryName, string triggerName, string runId) + { + operations.CancelAsync(resourceGroupName, factoryName, triggerName, runId).GetAwaiter().GetResult(); + } + + /// + /// Cancel a single trigger instance by runId. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The resource group name. + /// + /// + /// The factory name. + /// + /// + /// The trigger name. + /// + /// + /// The pipeline run identifier. + /// + /// + /// The cancellation token. + /// + public static async Task CancelAsync(this ITriggerRunsOperations operations, string resourceGroupName, string factoryName, string triggerName, string runId, CancellationToken cancellationToken = default(CancellationToken)) + { + (await operations.CancelWithHttpMessagesAsync(resourceGroupName, factoryName, triggerName, runId, null, cancellationToken).ConfigureAwait(false)).Dispose(); + } + /// /// Query trigger runs. ///