diff --git a/internal/services/kusto/kusto_attached_database_configuration_resource.go b/internal/services/kusto/kusto_attached_database_configuration_resource.go index f562a97af5f1..9a1576214726 100644 --- a/internal/services/kusto/kusto_attached_database_configuration_resource.go +++ b/internal/services/kusto/kusto_attached_database_configuration_resource.go @@ -14,6 +14,7 @@ import ( "github.com/hashicorp/go-azure-sdk/resource-manager/kusto/2023-08-15/attacheddatabaseconfigurations" "github.com/hashicorp/terraform-provider-azurerm/helpers/tf" "github.com/hashicorp/terraform-provider-azurerm/internal/clients" + "github.com/hashicorp/terraform-provider-azurerm/internal/features" "github.com/hashicorp/terraform-provider-azurerm/internal/locks" "github.com/hashicorp/terraform-provider-azurerm/internal/services/kusto/migration" "github.com/hashicorp/terraform-provider-azurerm/internal/services/kusto/validate" @@ -24,7 +25,7 @@ import ( ) func resourceKustoAttachedDatabaseConfiguration() *pluginsdk.Resource { - return &pluginsdk.Resource{ + resource := &pluginsdk.Resource{ Create: resourceKustoAttachedDatabaseConfigurationCreateUpdate, Read: resourceKustoAttachedDatabaseConfigurationRead, Update: resourceKustoAttachedDatabaseConfigurationCreateUpdate, @@ -73,8 +74,7 @@ func resourceKustoAttachedDatabaseConfiguration() *pluginsdk.Resource { ValidateFunc: validation.Any(validate.DatabaseName, validation.StringInSlice([]string{"*"}, false)), }, - // TODO: this should become `cluster_id` in 4.0 - "cluster_resource_id": { + "cluster_id": { Type: pluginsdk.TypeString, Required: true, ForceNew: true, @@ -154,6 +154,26 @@ func resourceKustoAttachedDatabaseConfiguration() *pluginsdk.Resource { }, }, } + + if !features.FivePointOh() { + resource.Schema["cluster_id"] = &pluginsdk.Schema{ + Type: pluginsdk.TypeString, + Optional: true, + Computed: true, + ExactlyOneOf: []string{"cluster_id", "cluster_resource_id"}, + ValidateFunc: commonids.ValidateKustoClusterID, + } + resource.Schema["cluster_resource_id"] = &pluginsdk.Schema{ + Type: pluginsdk.TypeString, + Optional: true, + Computed: true, + ValidateFunc: commonids.ValidateKustoClusterID, + Deprecated: "`cluster_resource_id` has been deprecated in favour of the `cluster_id` property and will be removed in v5.0 of the AzureRM Provider.", + ExactlyOneOf: []string{"cluster_id", "cluster_resource_id"}, + } + } + + return resource } func resourceKustoAttachedDatabaseConfigurationCreateUpdate(d *pluginsdk.ResourceData, meta interface{}) error { @@ -223,11 +243,15 @@ func resourceKustoAttachedDatabaseConfigurationRead(d *pluginsdk.ResourceData, m if parseErr != nil { return parseErr } - d.Set("cluster_resource_id", clusterResourceId.ID()) + d.Set("cluster_id", clusterResourceId.ID()) d.Set("database_name", props.DatabaseName) d.Set("default_principal_modification_kind", props.DefaultPrincipalsModificationKind) d.Set("attached_database_names", props.AttachedDatabaseNames) d.Set("sharing", flattenAttachedDatabaseConfigurationTableLevelSharingProperties(props.TableLevelSharingProperties)) + + if !features.FivePointOh() { + d.Set("cluster_resource_id", clusterResourceId.ID()) + } } } @@ -259,9 +283,14 @@ func resourceKustoAttachedDatabaseConfigurationDelete(d *pluginsdk.ResourceData, func expandKustoAttachedDatabaseConfigurationProperties(d *pluginsdk.ResourceData) *attacheddatabaseconfigurations.AttachedDatabaseConfigurationProperties { AttachedDatabaseConfigurationProperties := &attacheddatabaseconfigurations.AttachedDatabaseConfigurationProperties{} - if clusterResourceID, ok := d.GetOk("cluster_resource_id"); ok { + if clusterResourceID, ok := d.GetOk("cluster_id"); ok { AttachedDatabaseConfigurationProperties.ClusterResourceId = clusterResourceID.(string) } + if !features.FivePointOh() { + if clusterResourceID, ok := d.GetOk("cluster_resource_id"); ok { + AttachedDatabaseConfigurationProperties.ClusterResourceId = clusterResourceID.(string) + } + } if databaseName, ok := d.GetOk("database_name"); ok { AttachedDatabaseConfigurationProperties.DatabaseName = databaseName.(string) diff --git a/internal/services/kusto/kusto_attached_database_configuration_resource_test.go b/internal/services/kusto/kusto_attached_database_configuration_resource_test.go index d50f2624e1bc..86dda889a0f6 100644 --- a/internal/services/kusto/kusto_attached_database_configuration_resource_test.go +++ b/internal/services/kusto/kusto_attached_database_configuration_resource_test.go @@ -12,6 +12,7 @@ import ( "github.com/hashicorp/terraform-provider-azurerm/internal/acceptance" "github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check" "github.com/hashicorp/terraform-provider-azurerm/internal/clients" + "github.com/hashicorp/terraform-provider-azurerm/internal/features" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" ) @@ -32,6 +33,24 @@ func TestAccKustoAttachedDatabaseConfiguration_basic(t *testing.T) { }) } +func TestAccKustoAttachedDatabaseConfiguration_clusterResourceId(t *testing.T) { + if features.FivePointOh() { + t.Skip() + } + data := acceptance.BuildTestData(t, "azurerm_kusto_attached_database_configuration", "test") + r := KustoAttachedDatabaseConfigurationResource{} + + data.ResourceTest(t, r, []acceptance.TestStep{ + { + Config: r.clusterResourceId(data), + Check: acceptance.ComposeTestCheckFunc( + check.That(data.ResourceName).ExistsInAzure(r), + ), + }, + data.ImportStep(), + }) +} + func (KustoAttachedDatabaseConfigurationResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) { id, err := attacheddatabaseconfigurations.ParseAttachedDatabaseConfigurationID(state.ID) if err != nil { @@ -104,7 +123,74 @@ resource "azurerm_kusto_attached_database_configuration" "test" { resource_group_name = azurerm_resource_group.rg.name location = azurerm_resource_group.rg.location cluster_name = azurerm_kusto_cluster.cluster1.name - cluster_resource_id = azurerm_kusto_cluster.cluster2.id + cluster_id = azurerm_kusto_cluster.cluster2.id + database_name = azurerm_kusto_database.test.name + + sharing { + external_tables_to_exclude = ["ExternalTable2"] + external_tables_to_include = ["ExternalTable1"] + materialized_views_to_exclude = ["MaterializedViewTable2"] + materialized_views_to_include = ["MaterializedViewTable1"] + tables_to_exclude = ["Table2"] + tables_to_include = ["Table1"] + } +} +`, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomString, data.RandomInteger, data.RandomInteger, data.RandomInteger) +} + +func (KustoAttachedDatabaseConfigurationResource) clusterResourceId(data acceptance.TestData) string { + return fmt.Sprintf(` +provider "azurerm" { + features {} +} + +resource "azurerm_resource_group" "rg" { + name = "acctestRG-%d" + location = "%s" +} + +resource "azurerm_kusto_cluster" "cluster1" { + name = "acctestkc1%s" + location = azurerm_resource_group.rg.location + resource_group_name = azurerm_resource_group.rg.name + + sku { + name = "Dev(No SLA)_Standard_D11_v2" + capacity = 1 + } +} + +resource "azurerm_kusto_cluster" "cluster2" { + name = "acctestkc2%s" + location = azurerm_resource_group.rg.location + resource_group_name = azurerm_resource_group.rg.name + + sku { + name = "Dev(No SLA)_Standard_D11_v2" + capacity = 1 + } +} + +resource "azurerm_kusto_database" "followed_database" { + name = "acctestkd-%d" + resource_group_name = azurerm_resource_group.rg.name + location = azurerm_resource_group.rg.location + cluster_name = azurerm_kusto_cluster.cluster1.name +} + +resource "azurerm_kusto_database" "test" { + name = "acctestkd2-%d" + resource_group_name = azurerm_resource_group.rg.name + location = azurerm_resource_group.rg.location + cluster_name = azurerm_kusto_cluster.cluster2.name +} + +resource "azurerm_kusto_attached_database_configuration" "test" { + name = "acctestka-%d" + resource_group_name = azurerm_resource_group.rg.name + location = azurerm_resource_group.rg.location + cluster_name = azurerm_kusto_cluster.cluster1.name + cluster_resource_id = azurerm_kusto_cluster.cluster2.id ### <-- Testing this deprecated property database_name = azurerm_kusto_database.test.name sharing { diff --git a/internal/services/kusto/kusto_database_script_resource_test.go b/internal/services/kusto/kusto_database_script_resource_test.go index b0973d3a1c73..4c84cf0961d2 100644 --- a/internal/services/kusto/kusto_database_script_resource_test.go +++ b/internal/services/kusto/kusto_database_script_resource_test.go @@ -178,7 +178,7 @@ resource "azurerm_storage_account" "test" { resource "azurerm_storage_container" "test" { name = "setup-files" - storage_account_name = azurerm_storage_account.test.name + storage_account_id = azurerm_storage_account.test.id container_access_type = "private" } diff --git a/internal/services/kusto/kusto_eventgrid_data_connection_resource.go b/internal/services/kusto/kusto_eventgrid_data_connection_resource.go index 5361aceb5db2..dc9f216b1f47 100644 --- a/internal/services/kusto/kusto_eventgrid_data_connection_resource.go +++ b/internal/services/kusto/kusto_eventgrid_data_connection_resource.go @@ -19,6 +19,7 @@ import ( "github.com/hashicorp/terraform-provider-azurerm/helpers/azure" "github.com/hashicorp/terraform-provider-azurerm/helpers/tf" "github.com/hashicorp/terraform-provider-azurerm/internal/clients" + "github.com/hashicorp/terraform-provider-azurerm/internal/features" eventhubValidate "github.com/hashicorp/terraform-provider-azurerm/internal/services/eventhub/validate" "github.com/hashicorp/terraform-provider-azurerm/internal/services/kusto/migration" "github.com/hashicorp/terraform-provider-azurerm/internal/services/kusto/validate" @@ -29,7 +30,7 @@ import ( ) func resourceKustoEventGridDataConnection() *pluginsdk.Resource { - return &pluginsdk.Resource{ + resource := &pluginsdk.Resource{ Create: resourceKustoEventGridDataConnectionCreateUpdate, Update: resourceKustoEventGridDataConnectionCreateUpdate, Read: resourceKustoEventGridDataConnectionRead, @@ -138,15 +139,13 @@ func resourceKustoEventGridDataConnection() *pluginsdk.Resource { ValidateFunc: validation.StringInSlice(dataconnections.PossibleValuesForDatabaseRouting(), false), }, - // TODO: rename this to `eventgrid_event_subscription_id` in 4.0 - "eventgrid_resource_id": { + "eventgrid_event_subscription_id": { Type: pluginsdk.TypeString, Optional: true, ValidateFunc: eventsubscriptions.ValidateScopedEventSubscriptionID, }, - // TODO: rename this to `managed_identity_id` in 4.0 - "managed_identity_resource_id": { + "managed_identity_id": { Type: pluginsdk.TypeString, Optional: true, ValidateFunc: validation.Any( @@ -156,6 +155,35 @@ func resourceKustoEventGridDataConnection() *pluginsdk.Resource { }, }, } + + if !features.FivePointOh() { + resource.Schema["eventgrid_resource_id"] = &pluginsdk.Schema{ + Type: pluginsdk.TypeString, + Optional: true, + Computed: true, + ValidateFunc: eventsubscriptions.ValidateScopedEventSubscriptionID, + Deprecated: "`eventgrid_resource_id` has been deprecated in favour of the `eventgrid_event_subscription_id` property and will be removed in v5.0 of the AzureRM Provider.", + ConflictsWith: []string{"eventgrid_event_subscription_id"}, + } + resource.Schema["eventgrid_event_subscription_id"].ConflictsWith = []string{"eventgrid_resource_id"} + resource.Schema["eventgrid_event_subscription_id"].Computed = true + + resource.Schema["managed_identity_resource_id"] = &pluginsdk.Schema{ + Type: pluginsdk.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validation.Any( + commonids.ValidateKustoClusterID, + commonids.ValidateUserAssignedIdentityID, + ), + Deprecated: "`managed_identity_resource_id` has been deprecated in favour of the `managed_identity_id` property and will be removed in v5.0 of the AzureRM Provider.", + ConflictsWith: []string{"managed_identity_id"}, + } + resource.Schema["managed_identity_id"].ConflictsWith = []string{"managed_identity_resource_id"} + resource.Schema["managed_identity_id"].Computed = true + } + + return resource } func resourceKustoEventGridDataConnectionCreateUpdate(d *pluginsdk.ResourceData, meta interface{}) error { @@ -211,11 +239,19 @@ func resourceKustoEventGridDataConnectionCreateUpdate(d *pluginsdk.ResourceData, dataConnection.Properties.DatabaseRouting = &databaseRoutingType } - if eventGridRID, ok := d.GetOk("eventgrid_resource_id"); ok { + if eventGridRID, ok := d.GetOk("eventgrid_event_subscription_id"); ok { + dataConnection.Properties.EventGridResourceId = utils.String(eventGridRID.(string)) + } + + if eventGridRID, ok := d.GetOk("eventgrid_resource_id"); !features.FivePointOh() && ok { dataConnection.Properties.EventGridResourceId = utils.String(eventGridRID.(string)) } - if managedIdentityRID, ok := d.GetOk("managed_identity_resource_id"); ok { + if managedIdentityRID, ok := d.GetOk("managed_identity_id"); ok { + dataConnection.Properties.ManagedIdentityResourceId = utils.String(managedIdentityRID.(string)) + } + + if managedIdentityRID, ok := d.GetOk("managed_identity_resource_id"); !features.FivePointOh() && ok { dataConnection.Properties.ManagedIdentityResourceId = utils.String(managedIdentityRID.(string)) } @@ -266,7 +302,11 @@ func resourceKustoEventGridDataConnectionRead(d *pluginsdk.ResourceData, meta in d.Set("mapping_rule_name", props.MappingRuleName) d.Set("data_format", string(pointer.From(props.DataFormat))) d.Set("database_routing_type", string(pointer.From(props.DatabaseRouting))) - d.Set("eventgrid_resource_id", props.EventGridResourceId) + d.Set("eventgrid_event_subscription_id", props.EventGridResourceId) + + if !features.FivePointOh() { + d.Set("eventgrid_resource_id", props.EventGridResourceId) + } managedIdentityResourceId := "" if props.ManagedIdentityResourceId != nil && *props.ManagedIdentityResourceId != "" { @@ -279,11 +319,16 @@ func resourceKustoEventGridDataConnectionRead(d *pluginsdk.ResourceData, meta in if userAssignedIdentityIdErr == nil { managedIdentityResourceId = userAssignedIdentityId.ID() } else { - return fmt.Errorf("parsing `managed_identity_resource_id`: %+v; %+v", clusterIdErr, userAssignedIdentityIdErr) + return fmt.Errorf("parsing `managed_identity_id`: %+v; %+v", clusterIdErr, userAssignedIdentityIdErr) } } } - d.Set("managed_identity_resource_id", managedIdentityResourceId) + + d.Set("managed_identity_id", managedIdentityResourceId) + + if !features.FivePointOh() { + d.Set("managed_identity_resource_id", managedIdentityResourceId) + } } } } diff --git a/internal/services/kusto/kusto_eventgrid_data_connection_resource_test.go b/internal/services/kusto/kusto_eventgrid_data_connection_resource_test.go index 8473fdc3dc4e..98b8956c4e8a 100644 --- a/internal/services/kusto/kusto_eventgrid_data_connection_resource_test.go +++ b/internal/services/kusto/kusto_eventgrid_data_connection_resource_test.go @@ -12,6 +12,7 @@ import ( "github.com/hashicorp/terraform-provider-azurerm/internal/acceptance" "github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check" "github.com/hashicorp/terraform-provider-azurerm/internal/clients" + "github.com/hashicorp/terraform-provider-azurerm/internal/features" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" ) @@ -63,6 +64,26 @@ func TestAccKustoEventGridDataConnection_complete(t *testing.T) { }) } +func TestAccKustoEventGridDataConnection_eventgridResourceId(t *testing.T) { + if features.FivePointOh() { + t.Skip() + } + + data := acceptance.BuildTestData(t, "azurerm_kusto_eventgrid_data_connection", "test") + r := KustoEventGridDataConnectionResource{} + + data.ResourceTest(t, r, []acceptance.TestStep{ + { + Config: r.eventgridResourceId(data), + Check: acceptance.ComposeTestCheckFunc( + check.That(data.ResourceName).ExistsInAzure(r), + check.That(data.ResourceName).Key("database_routing_type").HasValue("Multi"), + ), + }, + data.ImportStep(), + }) +} + func TestAccKustoEventGridDataConnection_mappingRule(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_kusto_eventgrid_data_connection", "test") r := KustoEventGridDataConnectionResource{} @@ -81,7 +102,6 @@ func TestAccKustoEventGridDataConnection_mappingRule(t *testing.T) { func TestAccKustoEventGridDataConnection_userAssignedIdentity(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_kusto_eventgrid_data_connection", "test") r := KustoEventGridDataConnectionResource{} - data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.userAssignedIdentity(data), @@ -108,6 +128,41 @@ func TestAccKustoEventGridDataConnection_systemAssignedIdentity(t *testing.T) { }) } +func TestAccKustoEventGridDataConnection_userAssignedIdentityResourceId(t *testing.T) { + if features.FivePointOh() { + t.Skip() + } + data := acceptance.BuildTestData(t, "azurerm_kusto_eventgrid_data_connection", "test") + r := KustoEventGridDataConnectionResource{} + data.ResourceTest(t, r, []acceptance.TestStep{ + { + Config: r.userAssignedIdentityResourceId(data), + Check: acceptance.ComposeTestCheckFunc( + check.That(data.ResourceName).ExistsInAzure(r), + ), + }, + data.ImportStep(), + }) +} + +func TestAccKustoEventGridDataConnection_systemAssignedIdentityResourceId(t *testing.T) { + if features.FivePointOh() { + t.Skip() + } + data := acceptance.BuildTestData(t, "azurerm_kusto_eventgrid_data_connection", "test") + r := KustoEventGridDataConnectionResource{} + + data.ResourceTest(t, r, []acceptance.TestStep{ + { + Config: r.systemAssignedIdentityResourceId(data), + Check: acceptance.ComposeTestCheckFunc( + check.That(data.ResourceName).ExistsInAzure(r), + ), + }, + data.ImportStep(), + }) +} + func (KustoEventGridDataConnectionResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) { id, err := dataconnections.ParseDataConnectionID(state.ID) if err != nil { @@ -173,6 +228,31 @@ func (r KustoEventGridDataConnectionResource) complete(data acceptance.TestData) return fmt.Sprintf(` %s +resource "azurerm_kusto_eventgrid_data_connection" "test" { + name = "acctestkrgdc-%d" + resource_group_name = azurerm_resource_group.test.name + location = azurerm_resource_group.test.location + cluster_name = azurerm_kusto_cluster.test.name + database_name = azurerm_kusto_database.test.name + storage_account_id = azurerm_storage_account.test.id + eventhub_id = azurerm_eventhub.test.id + eventhub_consumer_group_name = azurerm_eventhub_consumer_group.test.name + + blob_storage_event_type = "Microsoft.Storage.BlobRenamed" + skip_first_record = true + + database_routing_type = "Multi" + eventgrid_event_subscription_id = azurerm_eventgrid_event_subscription.test.id + + depends_on = [azurerm_eventgrid_event_subscription.test] +} +`, r.template(data), data.RandomInteger) +} + +func (r KustoEventGridDataConnectionResource) eventgridResourceId(data acceptance.TestData) string { + return fmt.Sprintf(` +%s + resource "azurerm_kusto_eventgrid_data_connection" "test" { name = "acctestkrgdc-%d" resource_group_name = azurerm_resource_group.test.name @@ -231,7 +311,7 @@ resource "azurerm_kusto_eventgrid_data_connection" "test" { storage_account_id = azurerm_storage_account.test.id eventhub_id = azurerm_eventhub.test.id eventhub_consumer_group_name = azurerm_eventhub_consumer_group.test.name - managed_identity_resource_id = azurerm_user_assigned_identity.test.id + managed_identity_id = azurerm_user_assigned_identity.test.id depends_on = [azurerm_eventgrid_event_subscription.test] } `, r.template(data), data.RandomInteger) @@ -240,6 +320,42 @@ resource "azurerm_kusto_eventgrid_data_connection" "test" { func (r KustoEventGridDataConnectionResource) systemAssignedIdentity(data acceptance.TestData) string { return fmt.Sprintf(` %s +resource "azurerm_kusto_eventgrid_data_connection" "test" { + name = "acctestkrgdc-%d" + resource_group_name = azurerm_resource_group.test.name + location = azurerm_resource_group.test.location + cluster_name = azurerm_kusto_cluster.test.name + database_name = azurerm_kusto_database.test.name + storage_account_id = azurerm_storage_account.test.id + eventhub_id = azurerm_eventhub.test.id + eventhub_consumer_group_name = azurerm_eventhub_consumer_group.test.name + managed_identity_id = azurerm_kusto_cluster.test.id + depends_on = [azurerm_eventgrid_event_subscription.test] +} +`, r.template(data), data.RandomInteger) +} + +func (r KustoEventGridDataConnectionResource) userAssignedIdentityResourceId(data acceptance.TestData) string { + return fmt.Sprintf(` +%s +resource "azurerm_kusto_eventgrid_data_connection" "test" { + name = "acctestkrgdc-%d" + resource_group_name = azurerm_resource_group.test.name + location = azurerm_resource_group.test.location + cluster_name = azurerm_kusto_cluster.test.name + database_name = azurerm_kusto_database.test.name + storage_account_id = azurerm_storage_account.test.id + eventhub_id = azurerm_eventhub.test.id + eventhub_consumer_group_name = azurerm_eventhub_consumer_group.test.name + managed_identity_resource_id = azurerm_user_assigned_identity.test.id + depends_on = [azurerm_eventgrid_event_subscription.test] +} +`, r.template(data), data.RandomInteger) +} + +func (r KustoEventGridDataConnectionResource) systemAssignedIdentityResourceId(data acceptance.TestData) string { + return fmt.Sprintf(` +%s resource "azurerm_kusto_eventgrid_data_connection" "test" { name = "acctestkrgdc-%d" resource_group_name = azurerm_resource_group.test.name @@ -310,11 +426,10 @@ resource "azurerm_eventhub_namespace" "test" { } resource "azurerm_eventhub" "test" { - name = "acctesteventhub-%d" - namespace_name = azurerm_eventhub_namespace.test.name - resource_group_name = azurerm_resource_group.test.name - partition_count = 1 - message_retention = 1 + name = "acctesteventhub-%d" + namespace_id = azurerm_eventhub_namespace.test.id + partition_count = 1 + message_retention = 1 } resource "azurerm_eventhub_consumer_group" "test" { diff --git a/website/docs/5.0-upgrade-guide.html.markdown b/website/docs/5.0-upgrade-guide.html.markdown index 3e3e4dce123e..6d003c3d6239 100644 --- a/website/docs/5.0-upgrade-guide.html.markdown +++ b/website/docs/5.0-upgrade-guide.html.markdown @@ -141,6 +141,15 @@ Please follow the format in the example below for listing breaking changes in re * The deprecated `private_link_fast_path_enabled` property has been removed as it is no longer supported by the resource. +### `azurerm_kusto_eventgrid_data_connection` + +* The deprecated `eventgrid_resource_id` property has been removed in favour of the `eventgrid_event_subscription_id` property. +* The deprecated `managed_identity_resource_id` property has been removed in favour of the `managed_identity_id` property. + +### `azurerm_kusto_attached_database_configuration` + +* The deprecated `cluster_resource_id` property has been removed in favour of the `cluster_id` property. + ### `azurerm_linux_function_app` * The `remote_debugging_version` property no longer accepts `VS2017` and `VS2019` as a value. diff --git a/website/docs/r/kusto_attached_database_configuration.html.markdown b/website/docs/r/kusto_attached_database_configuration.html.markdown index b21caaa8703b..2fd20965d244 100644 --- a/website/docs/r/kusto_attached_database_configuration.html.markdown +++ b/website/docs/r/kusto_attached_database_configuration.html.markdown @@ -85,7 +85,7 @@ The following arguments are supported: * `cluster_name` - (Required) Specifies the name of the Kusto Cluster for which the configuration will be created. Changing this forces a new resource to be created. -* `cluster_resource_id` - (Required) The resource id of the cluster where the databases you would like to attach reside. Changing this forces a new resource to be created. +* `cluster_id` - (Required) The resource id of the cluster where the databases you would like to attach reside. Changing this forces a new resource to be created. * `database_name` - (Required) The name of the database which you would like to attach, use * if you want to follow all current and future databases. Changing this forces a new resource to be created. diff --git a/website/docs/r/kusto_eventgrid_data_connection.html.markdown b/website/docs/r/kusto_eventgrid_data_connection.html.markdown index 2534c1206eda..19f6c15e1f25 100644 --- a/website/docs/r/kusto_eventgrid_data_connection.html.markdown +++ b/website/docs/r/kusto_eventgrid_data_connection.html.markdown @@ -124,9 +124,9 @@ The following arguments are supported: * `database_routing_type` - (Optional) Indication for database routing information from the data connection, by default only database routing information is allowed. Allowed values: `Single`, `Multi`. Changing this forces a new resource to be created. Defaults to `Single`. -* `eventgrid_resource_id` - (Optional) The resource ID of the event grid that is subscribed to the storage account events. +* `eventgrid_event_subscription_id` - (Optional) The resource ID of the event grid that is subscribed to the storage account events. -* `managed_identity_resource_id` - (Optional) Empty for non-managed identity based data connection. For system assigned identity, provide cluster resource Id. For user assigned identity (UAI) provide the UAI resource Id. +* `managed_identity_id` - (Optional) Empty for non-managed identity based data connection. For system assigned identity, provide cluster resource Id. For user assigned identity (UAI) provide the UAI resource Id. * `mapping_rule_name` - (Optional) Specifies the mapping rule used for the message ingestion. Mapping rule must exist before resource is created.