Skip to content

Commit 600a93d

Browse files
Add trust to ad domain 5731 (#3798) (#2401)
* 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]>
1 parent 871165e commit 600a93d

8 files changed

+820
-4
lines changed

.changelog/3798.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:new-resource
2+
AD Domain - added new resource `google_active_directory_domain_trust`
3+
```

google-beta/provider.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -708,9 +708,9 @@ func Provider() terraform.ResourceProvider {
708708
return provider
709709
}
710710

711-
// Generated resources: 185
711+
// Generated resources: 186
712712
// Generated IAM resources: 69
713-
// Total generated resources: 254
713+
// Total generated resources: 255
714714
func ResourceMap() map[string]*schema.Resource {
715715
resourceMap, _ := ResourceMapWithErrors()
716716
return resourceMap
@@ -729,6 +729,7 @@ func ResourceMapWithErrors() (map[string]*schema.Resource, error) {
729729
"google_access_context_manager_service_perimeters": resourceAccessContextManagerServicePerimeters(),
730730
"google_access_context_manager_service_perimeter_resource": resourceAccessContextManagerServicePerimeterResource(),
731731
"google_active_directory_domain": resourceActiveDirectoryDomain(),
732+
"google_active_directory_domain_trust": resourceActiveDirectoryDomainTrust(),
732733
"google_app_engine_domain_mapping": resourceAppEngineDomainMapping(),
733734
"google_app_engine_firewall_rule": resourceAppEngineFirewallRule(),
734735
"google_app_engine_standard_app_version": resourceAppEngineStandardAppVersion(),

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 = "mydomain%{random_suffix}.org.com"
54+
domain_name = ".org.com"
5555
locations = ["us-central1"]
5656
reserved_ip_range = "192.168.255.0/24"
5757
}

0 commit comments

Comments
 (0)