Skip to content

Commit

Permalink
Add trust to ad domain 5731 (#3798) (#7056)
Browse files Browse the repository at this point in the history
* AD Domain resource added

* fmt issue fixed

* validation regex and input flag added

* Trust resouce attributes added to api.yaml

* ad domain trust resource added

* ad domain trust resource added

* post_create attribute added

* nested_query attribute added - work in progress

* work in progress - peer review

* encoder and decoder added - wip

* custom encoders and decoders added for update and delete resource

* comment removed

* comment added

* comment syntax corrected

* comments added as PR review comments

Signed-off-by: Modular Magician <[email protected]>
  • Loading branch information
modular-magician authored Aug 18, 2020
1 parent e6400e4 commit 955f4b4
Show file tree
Hide file tree
Showing 8 changed files with 820 additions and 4 deletions.
3 changes: 3 additions & 0 deletions .changelog/3798.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:new-resource
AD Domain - added new resource `google_active_directory_domain_trust`
```
5 changes: 3 additions & 2 deletions google/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -615,9 +615,9 @@ func Provider() terraform.ResourceProvider {
return provider
}

// Generated resources: 154
// Generated resources: 155
// Generated IAM resources: 60
// Total generated resources: 214
// Total generated resources: 215
func ResourceMap() map[string]*schema.Resource {
resourceMap, _ := ResourceMapWithErrors()
return resourceMap
Expand All @@ -636,6 +636,7 @@ func ResourceMapWithErrors() (map[string]*schema.Resource, error) {
"google_access_context_manager_service_perimeters": resourceAccessContextManagerServicePerimeters(),
"google_access_context_manager_service_perimeter_resource": resourceAccessContextManagerServicePerimeterResource(),
"google_active_directory_domain": resourceActiveDirectoryDomain(),
"google_active_directory_domain_trust": resourceActiveDirectoryDomainTrust(),
"google_app_engine_domain_mapping": resourceAppEngineDomainMapping(),
"google_app_engine_firewall_rule": resourceAppEngineFirewallRule(),
"google_app_engine_standard_app_version": resourceAppEngineStandardAppVersion(),
Expand Down
2 changes: 1 addition & 1 deletion google/resource_active_directory_domain_generated_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "mydomain%{random_suffix}.org.com"
domain_name = ".org.com"
locations = ["us-central1"]
reserved_ip_range = "192.168.255.0/24"
}
Expand Down
Loading

0 comments on commit 955f4b4

Please sign in to comment.