Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix active directory domain sweeper #7106

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix active directory domain sweeper (#3902)
Signed-off-by: Modular Magician <magic-modules@google.com>
  • Loading branch information
modular-magician committed Aug 25, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit a90dd41084a7041d959bfc8dbcc9ebf354f200ee
3 changes: 3 additions & 0 deletions .changelog/3902.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:none

```
2 changes: 1 addition & 1 deletion google/resource_active_directory_domain_generated_test.go
Original file line number Diff line number Diff line change
@@ -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"
}
2 changes: 1 addition & 1 deletion google/resource_active_directory_domain_sweeper_test.go
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 1 addition & 1 deletion google/resource_active_directory_domain_update_test.go
Original file line number Diff line number Diff line change
@@ -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",
2 changes: 1 addition & 1 deletion website/docs/r/active_directory_domain.html.markdown
Original file line number Diff line number Diff line change
@@ -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"
}