fix active directory domain sweeper (#3902) (#7106)

Signed-off-by: Modular Magician <[email protected]>
hashicorp · Aug 25, 2020 · 529b0ab · 529b0ab
1 parent b72c658
commit 529b0ab
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/.changelog/3902.txt b/.changelog/3902.txt
@@ -0,0 +1,3 @@
+```release-note:none
+
+```
diff --git a/google/resource_active_directory_domain_generated_test.go b/google/resource_active_directory_domain_generated_test.go
@@ -51,7 +51,7 @@ func TestAccActiveDirectoryDomain_activeDirectoryDomainBasicExample(t *testing.T
 func testAccActiveDirectoryDomain_activeDirectoryDomainBasicExample(context map[string]interface{}) string {
 	return Nprintf(`
 resource "google_active_directory_domain" "ad-domain" {
-  domain_name       = "name%{random_suffix}.org.com"
+  domain_name       = "tfgen%{random_suffix}.org.com"
   locations         = ["us-central1"]
   reserved_ip_range = "192.168.255.0/24" 
 }

diff --git a/google/resource_active_directory_domain_sweeper_test.go b/google/resource_active_directory_domain_sweeper_test.go
@@ -61,7 +61,7 @@ func testSweepActiveDirectoryDomain(region string) error {
 		},
 	}
 
-	listTemplate := strings.Split("https://managedidentities.googleapis.com/v1/projects/{{project}}/locations/global/domains?domainName={{domain_name}}", "?")[0]
+	listTemplate := strings.Split("https://managedidentities.googleapis.com/v1/projects/{{project}}/locations/global/domains", "?")[0]
 	listUrl, err := replaceVars(d, config, listTemplate)
 	if err != nil {
 		log.Printf("[INFO][SWEEPER_LOG] error preparing sweeper list url: %s", err)

diff --git a/google/resource_active_directory_domain_update_test.go b/google/resource_active_directory_domain_update_test.go
@@ -10,7 +10,7 @@ import (
 func TestAccActiveDirectoryDomain_update(t *testing.T) {
 	t.Parallel()
 
-	domain := fmt.Sprintf("mydomain%s.org1.com", randString(t, 5))
+	domain := fmt.Sprintf("tf-test%s.org1.com", randString(t, 5))
 	context := map[string]interface{}{
 		"domain":        domain,
 		"resource_name": "ad-domain",

diff --git a/website/docs/r/active_directory_domain.html.markdown b/website/docs/r/active_directory_domain.html.markdown
@@ -41,7 +41,7 @@ To get more information about Domain, see:
 
 ```hcl
 resource "google_active_directory_domain" "ad-domain" {
-  domain_name       = "name.org.com"
+  domain_name       = "tfgen.org.com"
   locations         = ["us-central1"]
   reserved_ip_range = "192.168.255.0/24" 
 }