From 32ca945fc778ca777523baec70cbcc318215c817 Mon Sep 17 00:00:00 2001 From: Bruce Harrison Date: Wed, 10 Jan 2024 16:08:12 -0600 Subject: [PATCH 1/6] add user_assigned_identity_credential_name to azurerm_data_factory_integration_runtime_managed --- ...y_integration_runtime_azure_ssis_resource.go | 17 +++++++++++++++++ ...integration_runtime_azure_ssis.html.markdown | 2 ++ 2 files changed, 19 insertions(+) diff --git a/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource.go b/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource.go index c056414efb29..d8066c973ce1 100644 --- a/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource.go +++ b/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource.go @@ -107,6 +107,12 @@ func resourceDataFactoryIntegrationRuntimeAzureSsis() *pluginsdk.Resource { ValidateFunc: validation.IntBetween(1, 16), }, + "user_assigned_identity_credential_name": { + Type: pluginsdk.TypeString, + Optional: true, + ValidateFunc: validation.StringIsNotEmpty, + }, + "edition": { Type: pluginsdk.TypeString, Optional: true, @@ -564,6 +570,10 @@ func resourceDataFactoryIntegrationRuntimeAzureSsisRead(d *pluginsdk.ResourceDat return fmt.Errorf("setting `catalog_info`: %+v", err) } + if err := d.Set("user_assigned_identity_credential_name", ssisProps.Credential.ReferenceName); err != nil { + return fmt.Errorf("setting `user_assigned_identity_credential_name`: %+v", err) + } + if err := d.Set("custom_setup_script", flattenDataFactoryIntegrationRuntimeAzureSsisCustomSetupScript(ssisProps.CustomSetupScriptProperties, d)); err != nil { return fmt.Errorf("setting `custom_setup_script`: %+v", err) } @@ -648,6 +658,13 @@ func expandDataFactoryIntegrationRuntimeAzureSsisProperties(d *pluginsdk.Resourc PackageStores: expandDataFactoryIntegrationRuntimeAzureSsisPackageStore(d.Get("package_store").([]interface{})), } + if credentialName := d.Get("user_assigned_identity_credential_name"); credentialName.(string) != "" { + ssisProperties.Credential = &datafactory.CredentialReference{ + ReferenceName: utils.String(credentialName.(string)), + Type: utils.String("CredentialReference"), + } + } + if catalogInfos, ok := d.GetOk("catalog_info"); ok && len(catalogInfos.([]interface{})) > 0 { catalogInfo := catalogInfos.([]interface{})[0].(map[string]interface{}) diff --git a/website/docs/r/data_factory_integration_runtime_azure_ssis.html.markdown b/website/docs/r/data_factory_integration_runtime_azure_ssis.html.markdown index b9e42992a324..3a828afd4e75 100644 --- a/website/docs/r/data_factory_integration_runtime_azure_ssis.html.markdown +++ b/website/docs/r/data_factory_integration_runtime_azure_ssis.html.markdown @@ -47,6 +47,8 @@ The following arguments are supported: * `number_of_nodes` - (Optional) Number of nodes for the Azure-SSIS Integration Runtime. Max is `10`. Defaults to `1`. +* `user_assigned_identity_credential_name` - (Optional) The name of a Data Factory Credential associated with a User Assigned Managed Identity. See [`azurerm_data_factory_credential_user_managed_identity`](data_factory_credential_user_assigned_managed_identity.html.html) + * `max_parallel_executions_per_node` - (Optional) Defines the maximum parallel executions per node. Defaults to `1`. Max is `1`. * `edition` - (Optional) The Azure-SSIS Integration Runtime edition. Valid values are `Standard` and `Enterprise`. Defaults to `Standard`. From b3f97058dbacc238a7158ce794c9c25d9b3a1713 Mon Sep 17 00:00:00 2001 From: Bruce Harrison Date: Wed, 10 Jan 2024 16:18:11 -0600 Subject: [PATCH 2/6] add test --- ...ration_runtime_azure_ssis_resource_test.go | 83 +++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource_test.go b/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource_test.go index b651d85fd075..6f8c9bb06816 100644 --- a/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource_test.go +++ b/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource_test.go @@ -150,6 +150,21 @@ func TestAccDataFactoryIntegrationRuntimeManagedSsis_aadAuth(t *testing.T) { }) } +func TestAccDataFactoryIntegrationRuntimeManagedSsis_userAssignedManagedCredentials(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_data_factory_integration_runtime_azure_ssis", "test") + r := IntegrationRuntimeManagedSsisResource{} + + data.ResourceTest(t, r, []acceptance.TestStep{ + { + Config: r.userAssignedManagedCredentials(data), + Check: acceptance.ComposeTestCheckFunc( + check.That(data.ResourceName).ExistsInAzure(r), + ), + }, + data.ImportStep(), + }) +} + func TestAccDataFactoryIntegrationRuntimeManagedSsis_expressVnetInjection(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_data_factory_integration_runtime_azure_ssis", "test") r := IntegrationRuntimeManagedSsisResource{} @@ -846,6 +861,74 @@ resource "azurerm_data_factory_integration_runtime_azure_ssis" "test" { `, data.RandomInteger, data.Locations.Primary, data.RandomString) } +func (IntegrationRuntimeManagedSsisResource) userAssignedManagedCredentials(data acceptance.TestData) string { + return fmt.Sprintf(` + provider "azurerm" { + features {} + } + + resource "azurerm_resource_group" "test" { + name = "acctestRG-df-%d" + location = "%s" + } + + resource "azurerm_data_factory" "test" { + name = "acctestdfirm%d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + + identity { + type = "SystemAssigned" + } + } + + resource "azurerm_user_assigned_identity" "test" { + location = azurerm_resource_group.test.location + name = "testuser%d" + resource_group_name = azurerm_resource_group.test.name + } + + + resource "azurerm_data_factory_credential_user_managed_identity" "test" { + name = "credential1" + data_factory_id = azurerm_data_factory.test.id + identity_id = azurerm_user_assigned_identity.test.id + } + + resource "azurerm_sql_server" "test" { + name = "acctestsql%d" + resource_group_name = azurerm_resource_group.test.name + location = azurerm_resource_group.test.location + version = "12.0" + administrator_login = "ssis_catalog_admin" + administrator_login_password = "my-s3cret-p4ssword!" + } + + resource "azurerm_sql_active_directory_administrator" "test" { + server_name = azurerm_sql_server.test.name + resource_group_name = azurerm_resource_group.test.name + login = azurerm_data_factory.test.name + tenant_id = azurerm_user_assigned_identity.test.tenant_id + object_id = azurerm_user_assigned_identity.test.principal_id + } + + resource "azurerm_data_factory_integration_runtime_azure_ssis" "test" { + name = "managed-integration-runtime" + data_factory_id = azurerm_data_factory.test.id + location = azurerm_resource_group.test.location + node_size = "Standard_D8_v3" + user_assigned_identity_credential_name = azurerm_data_factory_credential_user_managed_identity.test.name + + catalog_info { + server_endpoint = azurerm_sql_server.test.fully_qualified_domain_name + pricing_tier = "Basic" + } + + depends_on = [azurerm_sql_active_directory_administrator.test] + } + `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) +} + func (t IntegrationRuntimeManagedSsisResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) { id, err := parse.IntegrationRuntimeID(state.ID) if err != nil { From f14325825ca627947495a36f4e51a466cda78727 Mon Sep 17 00:00:00 2001 From: Bruce Harrison Date: Wed, 10 Jan 2024 16:31:39 -0600 Subject: [PATCH 3/6] fix test --- ...ration_runtime_azure_ssis_resource_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource_test.go b/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource_test.go index 6f8c9bb06816..94ec122f2c98 100644 --- a/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource_test.go +++ b/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource_test.go @@ -871,6 +871,12 @@ func (IntegrationRuntimeManagedSsisResource) userAssignedManagedCredentials(data name = "acctestRG-df-%d" location = "%s" } + + resource "azurerm_user_assigned_identity" "test" { + location = azurerm_resource_group.test.location + name = "testuser%d" + resource_group_name = azurerm_resource_group.test.name + } resource "azurerm_data_factory" "test" { name = "acctestdfirm%d" @@ -878,19 +884,13 @@ func (IntegrationRuntimeManagedSsisResource) userAssignedManagedCredentials(data resource_group_name = azurerm_resource_group.test.name identity { - type = "SystemAssigned" + type = "UserAssigned" + identity_ids = [azurerm_user_assigned_identity.test.id] } } - resource "azurerm_user_assigned_identity" "test" { - location = azurerm_resource_group.test.location - name = "testuser%d" - resource_group_name = azurerm_resource_group.test.name - } - - resource "azurerm_data_factory_credential_user_managed_identity" "test" { - name = "credential1" + name = "credential%d" data_factory_id = azurerm_data_factory.test.id identity_id = azurerm_user_assigned_identity.test.id } @@ -913,7 +913,7 @@ func (IntegrationRuntimeManagedSsisResource) userAssignedManagedCredentials(data } resource "azurerm_data_factory_integration_runtime_azure_ssis" "test" { - name = "managed-integration-runtime" + name = "managed-integration-runtime-%d" data_factory_id = azurerm_data_factory.test.id location = azurerm_resource_group.test.location node_size = "Standard_D8_v3" @@ -926,7 +926,7 @@ func (IntegrationRuntimeManagedSsisResource) userAssignedManagedCredentials(data depends_on = [azurerm_sql_active_directory_administrator.test] } - `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) + `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) } func (t IntegrationRuntimeManagedSsisResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) { From 72f01098157eb1c36d8cc9a828133ece180befc4 Mon Sep 17 00:00:00 2001 From: Bruce Harrison Date: Thu, 11 Jan 2024 08:54:07 -0600 Subject: [PATCH 4/6] lint test --- ...ration_runtime_azure_ssis_resource_test.go | 116 +++++++++--------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource_test.go b/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource_test.go index 94ec122f2c98..bb45f90a73c9 100644 --- a/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource_test.go +++ b/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource_test.go @@ -863,69 +863,69 @@ resource "azurerm_data_factory_integration_runtime_azure_ssis" "test" { func (IntegrationRuntimeManagedSsisResource) userAssignedManagedCredentials(data acceptance.TestData) string { return fmt.Sprintf(` - provider "azurerm" { - features {} - } - - resource "azurerm_resource_group" "test" { - name = "acctestRG-df-%d" - location = "%s" - } +provider "azurerm" { + features {} +} - resource "azurerm_user_assigned_identity" "test" { - location = azurerm_resource_group.test.location - name = "testuser%d" - resource_group_name = azurerm_resource_group.test.name - } - - resource "azurerm_data_factory" "test" { - name = "acctestdfirm%d" - location = azurerm_resource_group.test.location - resource_group_name = azurerm_resource_group.test.name - - identity { - type = "UserAssigned" - identity_ids = [azurerm_user_assigned_identity.test.id] - } - } +resource "azurerm_resource_group" "test" { + name = "acctestRG-df-%d" + location = "%s" +} - resource "azurerm_data_factory_credential_user_managed_identity" "test" { - name = "credential%d" - data_factory_id = azurerm_data_factory.test.id - identity_id = azurerm_user_assigned_identity.test.id - } +resource "azurerm_user_assigned_identity" "test" { + location = azurerm_resource_group.test.location + name = "testuser%d" + resource_group_name = azurerm_resource_group.test.name +} - resource "azurerm_sql_server" "test" { - name = "acctestsql%d" - resource_group_name = azurerm_resource_group.test.name - location = azurerm_resource_group.test.location - version = "12.0" - administrator_login = "ssis_catalog_admin" - administrator_login_password = "my-s3cret-p4ssword!" - } - - resource "azurerm_sql_active_directory_administrator" "test" { - server_name = azurerm_sql_server.test.name - resource_group_name = azurerm_resource_group.test.name - login = azurerm_data_factory.test.name - tenant_id = azurerm_user_assigned_identity.test.tenant_id - object_id = azurerm_user_assigned_identity.test.principal_id +resource "azurerm_data_factory" "test" { + name = "acctestdfirm%d" + location = azurerm_resource_group.test.location + resource_group_name = azurerm_resource_group.test.name + + identity { + type = "UserAssigned" + identity_ids = [azurerm_user_assigned_identity.test.id] } - - resource "azurerm_data_factory_integration_runtime_azure_ssis" "test" { - name = "managed-integration-runtime-%d" - data_factory_id = azurerm_data_factory.test.id - location = azurerm_resource_group.test.location - node_size = "Standard_D8_v3" - user_assigned_identity_credential_name = azurerm_data_factory_credential_user_managed_identity.test.name - - catalog_info { - server_endpoint = azurerm_sql_server.test.fully_qualified_domain_name - pricing_tier = "Basic" - } - - depends_on = [azurerm_sql_active_directory_administrator.test] +} + +resource "azurerm_data_factory_credential_user_managed_identity" "test" { + name = "credential%d" + data_factory_id = azurerm_data_factory.test.id + identity_id = azurerm_user_assigned_identity.test.id +} + +resource "azurerm_sql_server" "test" { + name = "acctestsql%d" + resource_group_name = azurerm_resource_group.test.name + location = azurerm_resource_group.test.location + version = "12.0" + administrator_login = "ssis_catalog_admin" + administrator_login_password = "my-s3cret-p4ssword!" +} + +resource "azurerm_sql_active_directory_administrator" "test" { + server_name = azurerm_sql_server.test.name + resource_group_name = azurerm_resource_group.test.name + login = azurerm_data_factory.test.name + tenant_id = azurerm_user_assigned_identity.test.tenant_id + object_id = azurerm_user_assigned_identity.test.principal_id +} + +resource "azurerm_data_factory_integration_runtime_azure_ssis" "test" { + name = "managed-integration-runtime-%d" + data_factory_id = azurerm_data_factory.test.id + location = azurerm_resource_group.test.location + node_size = "Standard_D8_v3" + user_assigned_identity_credential_name = azurerm_data_factory_credential_user_managed_identity.test.name + + catalog_info { + server_endpoint = azurerm_sql_server.test.fully_qualified_domain_name + pricing_tier = "Basic" } + + depends_on = [azurerm_sql_active_directory_administrator.test] +} `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) } From 10d00699e9d9658d3f5c32829e47a8b594ebabdb Mon Sep 17 00:00:00 2001 From: Bruce Harrison Date: Tue, 23 Jan 2024 09:43:37 -0600 Subject: [PATCH 5/6] rename property --- ...ata_factory_integration_runtime_azure_ssis_resource.go | 8 ++++---- ...actory_integration_runtime_azure_ssis_resource_test.go | 2 +- ...a_factory_integration_runtime_azure_ssis.html.markdown | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource.go b/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource.go index d8066c973ce1..8954bfbd2273 100644 --- a/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource.go +++ b/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource.go @@ -107,7 +107,7 @@ func resourceDataFactoryIntegrationRuntimeAzureSsis() *pluginsdk.Resource { ValidateFunc: validation.IntBetween(1, 16), }, - "user_assigned_identity_credential_name": { + "credential_user_assigned_identity_name": { Type: pluginsdk.TypeString, Optional: true, ValidateFunc: validation.StringIsNotEmpty, @@ -570,8 +570,8 @@ func resourceDataFactoryIntegrationRuntimeAzureSsisRead(d *pluginsdk.ResourceDat return fmt.Errorf("setting `catalog_info`: %+v", err) } - if err := d.Set("user_assigned_identity_credential_name", ssisProps.Credential.ReferenceName); err != nil { - return fmt.Errorf("setting `user_assigned_identity_credential_name`: %+v", err) + if err := d.Set("credential_user_assigned_identity_name", ssisProps.Credential.ReferenceName); err != nil { + return fmt.Errorf("setting `credential_user_assigned_identity_name`: %+v", err) } if err := d.Set("custom_setup_script", flattenDataFactoryIntegrationRuntimeAzureSsisCustomSetupScript(ssisProps.CustomSetupScriptProperties, d)); err != nil { @@ -658,7 +658,7 @@ func expandDataFactoryIntegrationRuntimeAzureSsisProperties(d *pluginsdk.Resourc PackageStores: expandDataFactoryIntegrationRuntimeAzureSsisPackageStore(d.Get("package_store").([]interface{})), } - if credentialName := d.Get("user_assigned_identity_credential_name"); credentialName.(string) != "" { + if credentialName := d.Get("credential_user_assigned_identity_name"); credentialName.(string) != "" { ssisProperties.Credential = &datafactory.CredentialReference{ ReferenceName: utils.String(credentialName.(string)), Type: utils.String("CredentialReference"), diff --git a/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource_test.go b/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource_test.go index bb45f90a73c9..c29b3abba705 100644 --- a/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource_test.go +++ b/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource_test.go @@ -917,7 +917,7 @@ resource "azurerm_data_factory_integration_runtime_azure_ssis" "test" { data_factory_id = azurerm_data_factory.test.id location = azurerm_resource_group.test.location node_size = "Standard_D8_v3" - user_assigned_identity_credential_name = azurerm_data_factory_credential_user_managed_identity.test.name + credential_user_assigned_identity_name = azurerm_data_factory_credential_user_managed_identity.test.name catalog_info { server_endpoint = azurerm_sql_server.test.fully_qualified_domain_name diff --git a/website/docs/r/data_factory_integration_runtime_azure_ssis.html.markdown b/website/docs/r/data_factory_integration_runtime_azure_ssis.html.markdown index 3a828afd4e75..fde2c198f19c 100644 --- a/website/docs/r/data_factory_integration_runtime_azure_ssis.html.markdown +++ b/website/docs/r/data_factory_integration_runtime_azure_ssis.html.markdown @@ -47,7 +47,7 @@ The following arguments are supported: * `number_of_nodes` - (Optional) Number of nodes for the Azure-SSIS Integration Runtime. Max is `10`. Defaults to `1`. -* `user_assigned_identity_credential_name` - (Optional) The name of a Data Factory Credential associated with a User Assigned Managed Identity. See [`azurerm_data_factory_credential_user_managed_identity`](data_factory_credential_user_assigned_managed_identity.html.html) +* `credential_user_assigned_identity_name` - (Optional) The name of a Data Factory Credential associated with a User Assigned Managed Identity. See [`azurerm_data_factory_credential_user_managed_identity`](data_factory_credential_user_assigned_managed_identity.html.html) * `max_parallel_executions_per_node` - (Optional) Defines the maximum parallel executions per node. Defaults to `1`. Max is `1`. From ef04e96e635fb2efd301e526a383003da89aa702 Mon Sep 17 00:00:00 2001 From: Bruce Harrison Date: Wed, 24 Jan 2024 10:19:59 -0600 Subject: [PATCH 6/6] fix failing test, rename credential property --- ...ry_integration_runtime_azure_ssis_resource.go | 16 ++++++++++++---- ...tegration_runtime_azure_ssis_resource_test.go | 10 +++++----- ..._integration_runtime_azure_ssis.html.markdown | 4 +++- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource.go b/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource.go index 8954bfbd2273..ab59b864181f 100644 --- a/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource.go +++ b/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource.go @@ -107,7 +107,7 @@ func resourceDataFactoryIntegrationRuntimeAzureSsis() *pluginsdk.Resource { ValidateFunc: validation.IntBetween(1, 16), }, - "credential_user_assigned_identity_name": { + "credential_name": { Type: pluginsdk.TypeString, Optional: true, ValidateFunc: validation.StringIsNotEmpty, @@ -570,8 +570,8 @@ func resourceDataFactoryIntegrationRuntimeAzureSsisRead(d *pluginsdk.ResourceDat return fmt.Errorf("setting `catalog_info`: %+v", err) } - if err := d.Set("credential_user_assigned_identity_name", ssisProps.Credential.ReferenceName); err != nil { - return fmt.Errorf("setting `credential_user_assigned_identity_name`: %+v", err) + if err := d.Set("credential_name", flattenDataFactoryIntegrationRuntimeUserAssignedCredential(ssisProps.Credential)); err != nil { + return fmt.Errorf("setting `credential_name`: %+v", err) } if err := d.Set("custom_setup_script", flattenDataFactoryIntegrationRuntimeAzureSsisCustomSetupScript(ssisProps.CustomSetupScriptProperties, d)); err != nil { @@ -658,7 +658,7 @@ func expandDataFactoryIntegrationRuntimeAzureSsisProperties(d *pluginsdk.Resourc PackageStores: expandDataFactoryIntegrationRuntimeAzureSsisPackageStore(d.Get("package_store").([]interface{})), } - if credentialName := d.Get("credential_user_assigned_identity_name"); credentialName.(string) != "" { + if credentialName := d.Get("credential_name"); credentialName.(string) != "" { ssisProperties.Credential = &datafactory.CredentialReference{ ReferenceName: utils.String(credentialName.(string)), Type: utils.String("CredentialReference"), @@ -954,6 +954,14 @@ func flattenDataFactoryIntegrationRuntimeAzureSsisProxy(input *datafactory.Integ } } +func flattenDataFactoryIntegrationRuntimeUserAssignedCredential(credentialProperties *datafactory.CredentialReference) *string { + if credentialProperties == nil { + return nil + } + + return credentialProperties.ReferenceName +} + func flattenDataFactoryIntegrationRuntimeAzureSsisCustomSetupScript(customSetupScriptProperties *datafactory.IntegrationRuntimeCustomSetupScriptProperties, d *pluginsdk.ResourceData) []interface{} { if customSetupScriptProperties == nil { return []interface{}{} diff --git a/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource_test.go b/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource_test.go index c29b3abba705..4a0192847678 100644 --- a/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource_test.go +++ b/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource_test.go @@ -913,11 +913,11 @@ resource "azurerm_sql_active_directory_administrator" "test" { } resource "azurerm_data_factory_integration_runtime_azure_ssis" "test" { - name = "managed-integration-runtime-%d" - data_factory_id = azurerm_data_factory.test.id - location = azurerm_resource_group.test.location - node_size = "Standard_D8_v3" - credential_user_assigned_identity_name = azurerm_data_factory_credential_user_managed_identity.test.name + name = "managed-integration-runtime-%d" + data_factory_id = azurerm_data_factory.test.id + location = azurerm_resource_group.test.location + node_size = "Standard_D8_v3" + credential_name = azurerm_data_factory_credential_user_managed_identity.test.name catalog_info { server_endpoint = azurerm_sql_server.test.fully_qualified_domain_name diff --git a/website/docs/r/data_factory_integration_runtime_azure_ssis.html.markdown b/website/docs/r/data_factory_integration_runtime_azure_ssis.html.markdown index fde2c198f19c..2ef869d732a4 100644 --- a/website/docs/r/data_factory_integration_runtime_azure_ssis.html.markdown +++ b/website/docs/r/data_factory_integration_runtime_azure_ssis.html.markdown @@ -47,7 +47,9 @@ The following arguments are supported: * `number_of_nodes` - (Optional) Number of nodes for the Azure-SSIS Integration Runtime. Max is `10`. Defaults to `1`. -* `credential_user_assigned_identity_name` - (Optional) The name of a Data Factory Credential associated with a User Assigned Managed Identity. See [`azurerm_data_factory_credential_user_managed_identity`](data_factory_credential_user_assigned_managed_identity.html.html) +* `credential_name` - (Optional) The name of a Data Factory Credential that the SSIS integration will use to access data sources. For example, [`azurerm_data_factory_credential_user_managed_identity`](data_factory_credential_user_assigned_managed_identity.html.html) + +~> **NOTE** If `credential_name` is omitted, the integration runtime will use the Data Factory assigned identity. * `max_parallel_executions_per_node` - (Optional) Defines the maximum parallel executions per node. Defaults to `1`. Max is `1`.