Skip to content

Commit 774d1c1

Browse files
authored
New Resource: azurerm_data_factory_linked_service_sql_managed_instance (hashicorp#30896)
[FEATURE] * **New Resource**: `azurerm_data_factory_linked_service_sql_managed_instance`
1 parent 94d8425 commit 774d1c1

7 files changed

Lines changed: 1116 additions & 2 deletions

internal/services/datafactory/client/client.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"github.com/hashicorp/go-azure-sdk/resource-manager/datafactory/2018-06-01/dataflows"
1111
"github.com/hashicorp/go-azure-sdk/resource-manager/datafactory/2018-06-01/factories"
1212
"github.com/hashicorp/go-azure-sdk/resource-manager/datafactory/2018-06-01/integrationruntimes"
13+
"github.com/hashicorp/go-azure-sdk/resource-manager/datafactory/2018-06-01/linkedservices"
1314
"github.com/hashicorp/go-azure-sdk/resource-manager/datafactory/2018-06-01/managedprivateendpoints"
1415
"github.com/hashicorp/go-azure-sdk/resource-manager/datafactory/2018-06-01/managedvirtualnetworks"
1516
"github.com/hashicorp/go-azure-sdk/resource-manager/datafactory/2018-06-01/pipelines"
@@ -22,6 +23,7 @@ type Client struct {
2223
Credentials *credentials.CredentialsClient
2324
DataFlowClient *dataflows.DataFlowsClient
2425
IntegrationRuntimesClient *integrationruntimes.IntegrationRuntimesClient
26+
LinkedServicesClient *linkedservices.LinkedServicesClient
2527
ManagedPrivateEndpoints *managedprivateendpoints.ManagedPrivateEndpointsClient
2628
ManagedVirtualNetworks *managedvirtualnetworks.ManagedVirtualNetworksClient
2729
PipelinesClient *pipelines.PipelinesClient
@@ -57,6 +59,12 @@ func NewClient(o *common.ClientOptions) (*Client, error) {
5759
}
5860
o.Configure(integrationRuntimesClient.Client, o.Authorizers.ResourceManager)
5961

62+
linkedServicesClient, err := linkedservices.NewLinkedServicesClientWithBaseURI(o.Environment.ResourceManager)
63+
if err != nil {
64+
return nil, fmt.Errorf("building Linked Services client: %+v", err)
65+
}
66+
o.Configure(linkedServicesClient.Client, o.Authorizers.ResourceManager)
67+
6068
managedPrivateEndpointsClient, err := managedprivateendpoints.NewManagedPrivateEndpointsClientWithBaseURI(o.Environment.ResourceManager)
6169
if err != nil {
6270
return nil, fmt.Errorf("building ManagedPrivateEndpoints client: %+v", err)
@@ -90,6 +98,7 @@ func NewClient(o *common.ClientOptions) (*Client, error) {
9098
Credentials: credentialsClient,
9199
DataFlowClient: dataFlowClient,
92100
IntegrationRuntimesClient: integrationRuntimesClient,
101+
LinkedServicesClient: linkedServicesClient,
93102
ManagedPrivateEndpoints: managedPrivateEndpointsClient,
94103
ManagedVirtualNetworks: managedVirtualNetworksClient,
95104
PipelinesClient: PipelinesClient,

internal/services/datafactory/data_factory.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ func expandDataFactoryLinkedServiceIntegrationRuntime(integrationRuntimeName str
3737
// Because the password isn't returned from the api in the connection string, we'll check all
3838
// but the password string and return true if they match.
3939
func azureRmDataFactoryLinkedServiceConnectionStringDiff(_, old string, new string, _ *pluginsdk.ResourceData) bool {
40-
oldSplit := strings.Split(strings.ToLower(old), ";")
41-
newSplit := strings.Split(strings.ToLower(new), ";")
40+
oldSplit := strings.Split(strings.TrimSuffix(strings.ToLower(old), ";"), ";")
41+
newSplit := strings.Split(strings.TrimSuffix(strings.ToLower(new), ";"), ";")
4242

4343
sort.Strings(oldSplit)
4444
sort.Strings(newSplit)

0 commit comments

Comments
 (0)