From 99bf0116c691da26af08b5722e3803cbe099cdbd Mon Sep 17 00:00:00 2001 From: Jochen Rauschenbusch Date: Fri, 12 Jun 2020 13:58:13 +0200 Subject: [PATCH] fixes --- .../services/kusto/kusto_database_principal_resource.go | 8 +++----- .../kusto/tests/kusto_database_principal_resource_test.go | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/azurerm/internal/services/kusto/kusto_database_principal_resource.go b/azurerm/internal/services/kusto/kusto_database_principal_resource.go index 9f5f3f48af8cb..b05d5c06c4357 100644 --- a/azurerm/internal/services/kusto/kusto_database_principal_resource.go +++ b/azurerm/internal/services/kusto/kusto_database_principal_resource.go @@ -150,9 +150,9 @@ func resourceArmKustoDatabasePrincipalCreate(d *schema.ResourceData, meta interf return fmt.Errorf("Error loading Kusto Database %q (Resource Group %q, Cluster %q): %+v", databaseName, resourceGroup, clusterName, err) } - database, ok := resp.Value.AsDatabase() + database, ok := resp.Value.AsReadWriteDatabase() if !ok { - return fmt.Errorf("Exisiting resource is not a Kusto Database %q (Resource Group %q, Cluster %q)", databaseName, resourceGroup, clusterName) + return fmt.Errorf("Exisiting resource is not a Kusto Read/Write Database %q (Resource Group %q, Cluster %q)", databaseName, resourceGroup, clusterName) } resourceID := fmt.Sprintf("%s/Role/%s/FQN/%s", *database.ID, role, fqn) @@ -181,9 +181,7 @@ func resourceArmKustoDatabasePrincipalCreate(d *schema.ResourceData, meta interf Fqn: utils.String(fqn), // These three must be specified or the api returns `The request is invalid.` // For more info: https://github.com/Azure/azure-sdk-for-go/issues/6547 - Email: utils.String(""), - AppID: utils.String(""), - Name: utils.String(""), + Name: utils.String(""), } principals := []kusto.DatabasePrincipal{kustoPrincipal} diff --git a/azurerm/internal/services/kusto/tests/kusto_database_principal_resource_test.go b/azurerm/internal/services/kusto/tests/kusto_database_principal_resource_test.go index 01bf647c1c5e4..45aa15b1ad6d2 100644 --- a/azurerm/internal/services/kusto/tests/kusto_database_principal_resource_test.go +++ b/azurerm/internal/services/kusto/tests/kusto_database_principal_resource_test.go @@ -167,7 +167,7 @@ resource "azurerm_kusto_database_principal" "test" { role = "Viewer" type = "App" client_id = data.azurerm_client_config.current.tenant_id - object_id = data.azurerm_client_config.current.client_id + object_id = data.azurerm_client_config.m.client_id } `, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomInteger) }