test fixes

hashicorp · Mar 4, 2021 · 4a1d77e · 4a1d77e
1 parent 27fe6c3
commit 4a1d77e
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 14 deletions.
diff --git a/.teamcity/components/generated/services.kt b/.teamcity/components/generated/services.kt
@@ -2,6 +2,7 @@
 //       to re-generate this file, run 'make generate' in the root of the repository
 var services = mapOf(
         "apimanagement" to "API Management",
+        "domainservices" to "AadMgmt",
         "advisor" to "Advisor",
         "analysisservices" to "Analysis Services",
         "appconfiguration" to "App Configuration",

diff --git a/azurerm/internal/services/domainservices/active_directory_domain_service_data_source.go b/azurerm/internal/services/domainservices/active_directory_domain_service_data_source.go
@@ -3,6 +3,8 @@ package domainservices
 import (
 	"fmt"
 
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts"
+
 	"github.com/Azure/azure-sdk-for-go/services/domainservices/mgmt/2020-01-01/aad"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
@@ -237,7 +239,8 @@ func dataSourceArmActiveDirectoryDomainService() *schema.Resource {
 
 func dataSourceArmActiveDirectoryDomainServiceRead(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*clients.Client).DomainServices.DomainServicesClient
-	ctx := meta.(*clients.Client).StopContext
+	ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d)
+	defer cancel()
 
 	name := d.Get("name").(string)
 	resourceGroup := d.Get("resource_group_name").(string)

diff --git a/...Azure/azure-sdk-for-go/services/domainservices/mgmt/2020-01-01/aad/CHANGELOG.md b/...Azure/azure-sdk-for-go/services/domainservices/mgmt/2020-01-01/aad/CHANGELOG.md
diff --git a/....com/Azure/azure-sdk-for-go/services/domainservices/mgmt/2020-01-01/aad/domainservices.go b/....com/Azure/azure-sdk-for-go/services/domainservices/mgmt/2020-01-01/aad/domainservices.go
diff --git a/...hub.com/Azure/azure-sdk-for-go/services/domainservices/mgmt/2020-01-01/aad/oucontainer.go b/...hub.com/Azure/azure-sdk-for-go/services/domainservices/mgmt/2020-01-01/aad/oucontainer.go
diff --git a/website/allowed-subcategories b/website/allowed-subcategories
@@ -7,6 +7,7 @@ Application Insights
 Attestation
 Authorization
 Automation
+Azure Active Directory Management
 Azure Stack HCI
 Base
 Batch