Skip to content

Commit f17d7be

Browse files
fix active directory domain sweeper (#3902) (#2420)
Signed-off-by: Modular Magician <[email protected]>
1 parent e4ab776 commit f17d7be

File tree

5 files changed

+7
-4
lines changed

5 files changed

+7
-4
lines changed

.changelog/3902.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
3+
```

google-beta/resource_active_directory_domain_generated_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func TestAccActiveDirectoryDomain_activeDirectoryDomainBasicExample(t *testing.T
5151
func testAccActiveDirectoryDomain_activeDirectoryDomainBasicExample(context map[string]interface{}) string {
5252
return Nprintf(`
5353
resource "google_active_directory_domain" "ad-domain" {
54-
domain_name = "name%{random_suffix}.org.com"
54+
domain_name = "tfgen%{random_suffix}.org.com"
5555
locations = ["us-central1"]
5656
reserved_ip_range = "192.168.255.0/24"
5757
}

google-beta/resource_active_directory_domain_sweeper_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func testSweepActiveDirectoryDomain(region string) error {
6161
},
6262
}
6363

64-
listTemplate := strings.Split("https://managedidentities.googleapis.com/v1/projects/{{project}}/locations/global/domains?domainName={{domain_name}}", "?")[0]
64+
listTemplate := strings.Split("https://managedidentities.googleapis.com/v1/projects/{{project}}/locations/global/domains", "?")[0]
6565
listUrl, err := replaceVars(d, config, listTemplate)
6666
if err != nil {
6767
log.Printf("[INFO][SWEEPER_LOG] error preparing sweeper list url: %s", err)

google-beta/resource_active_directory_domain_update_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
func TestAccActiveDirectoryDomain_update(t *testing.T) {
1111
t.Parallel()
1212

13-
domain := fmt.Sprintf("mydomain%s.org1.com", randString(t, 5))
13+
domain := fmt.Sprintf("tf-test%s.org1.com", randString(t, 5))
1414
context := map[string]interface{}{
1515
"domain": domain,
1616
"resource_name": "ad-domain",

website/docs/r/active_directory_domain.html.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ To get more information about Domain, see:
4141

4242
```hcl
4343
resource "google_active_directory_domain" "ad-domain" {
44-
domain_name = "name.org.com"
44+
domain_name = "tfgen.org.com"
4545
locations = ["us-central1"]
4646
reserved_ip_range = "192.168.255.0/24"
4747
}

0 commit comments

Comments
 (0)