diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.Hubs.cs b/src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.Hubs.cs index 136f5fe6cff9..8da9566ec60d 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.Hubs.cs +++ b/src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.Hubs.cs @@ -66,6 +66,12 @@ public virtual PSHub CreatePSHub(CreatePSHubParameters parameters) parameters.Name, parameters.RawJsonContent)) {DataFactoryName = parameters.DataFactoryName, ResourceGroupName = parameters.ResourceGroupName}; + + if (!DataFactoryCommonUtilities.IsSucceededProvisioningState(hub.ProvisioningState)) + { + // ToDo: service side should set the error message for provisioning failures. + throw new ProvisioningFailedException(Resources.HubProvisioningFailed); + } }; if (parameters.Force) @@ -95,12 +101,6 @@ public virtual PSHub CreatePSHub(CreatePSHubParameters parameters) createHub); } - if (!DataFactoryCommonUtilities.IsSucceededProvisioningState(hub.ProvisioningState)) - { - // ToDo: service side should set the error message for provisioning failures. - throw new ProvisioningFailedException(Resources.HubProvisioningFailed); - } - return hub; } diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.LinkedServices.cs b/src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.LinkedServices.cs index 39bc8403022e..cd15d4d188e5 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.LinkedServices.cs +++ b/src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.LinkedServices.cs @@ -135,6 +135,14 @@ public virtual PSLinkedService CreatePSLinkedService(CreatePSLinkedServiceParame ResourceGroupName = parameters.ResourceGroupName, DataFactoryName = parameters.DataFactoryName }; + + if (!DataFactoryCommonUtilities.IsSucceededProvisioningState(linkedService.ProvisioningState)) + { + string errorMessage = linkedService.Properties == null + ? string.Empty + : linkedService.Properties.ErrorMessage; + throw new ProvisioningFailedException(errorMessage); + } }; if (parameters.Force) @@ -163,14 +171,6 @@ public virtual PSLinkedService CreatePSLinkedService(CreatePSLinkedServiceParame createLinkedService); } - if (!DataFactoryCommonUtilities.IsSucceededProvisioningState(linkedService.ProvisioningState)) - { - string errorMessage = linkedService.Properties == null - ? string.Empty - : linkedService.Properties.ErrorMessage; - throw new ProvisioningFailedException(errorMessage); - } - return linkedService; } diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.Pipelines.cs b/src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.Pipelines.cs index 11ab9636fe36..04e56c305a87 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.Pipelines.cs +++ b/src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.Pipelines.cs @@ -197,6 +197,14 @@ public virtual PSPipeline CreatePSPipeline(CreatePSPipelineParameters parameters ResourceGroupName = parameters.ResourceGroupName, DataFactoryName = parameters.DataFactoryName }; + + if (!DataFactoryCommonUtilities.IsSucceededProvisioningState(pipeline.ProvisioningState)) + { + string errorMessage = pipeline.Properties == null + ? string.Empty + : pipeline.Properties.ErrorMessage; + throw new ProvisioningFailedException(errorMessage); + } }; if (parameters.Force) @@ -225,14 +233,6 @@ public virtual PSPipeline CreatePSPipeline(CreatePSPipelineParameters parameters createPipeline); } - if (!DataFactoryCommonUtilities.IsSucceededProvisioningState(pipeline.ProvisioningState)) - { - string errorMessage = pipeline.Properties == null - ? string.Empty - : pipeline.Properties.ErrorMessage; - throw new ProvisioningFailedException(errorMessage); - } - return pipeline; } diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.Tables.cs b/src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.Tables.cs index 504ce3daf71e..9532d0cec903 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.Tables.cs +++ b/src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.Tables.cs @@ -130,6 +130,14 @@ public virtual PSTable CreatePSTable(CreatePSTableParameters parameters) ResourceGroupName = parameters.ResourceGroupName, DataFactoryName = parameters.DataFactoryName }; + + if (!DataFactoryCommonUtilities.IsSucceededProvisioningState(table.ProvisioningState)) + { + string errorMessage = table.Properties == null + ? string.Empty + : table.Properties.ErrorMessage; + throw new ProvisioningFailedException(errorMessage); + } }; if (parameters.Force) @@ -158,14 +166,6 @@ public virtual PSTable CreatePSTable(CreatePSTableParameters parameters) createTable); } - if (!DataFactoryCommonUtilities.IsSucceededProvisioningState(table.ProvisioningState)) - { - string errorMessage = table.Properties == null - ? string.Empty - : table.Properties.ErrorMessage; - throw new ProvisioningFailedException(errorMessage); - } - return table; }