Skip to content

Commit 7471a53

Browse files
Identity platform config (#6983) (#13301)
* Change project to default * Add a custom create method for identity platform config Signed-off-by: Modular Magician <[email protected]> Signed-off-by: Modular Magician <[email protected]>
1 parent 0959456 commit 7471a53

4 files changed

+17
-12
lines changed

.changelog/6983.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
identityplatform: fixed issues with `identity_platform_config` creation
3+
```

google/resource_identity_platform_config.go

+6-10
Original file line numberDiff line numberDiff line change
@@ -70,20 +70,11 @@ func resourceIdentityPlatformConfigCreate(d *schema.ResourceData, meta interface
7070
return err
7171
}
7272

73-
obj := make(map[string]interface{})
74-
autodeleteAnonymousUsersProp, err := expandIdentityPlatformConfigAutodeleteAnonymousUsers(d.Get("autodelete_anonymous_users"), d, config)
75-
if err != nil {
76-
return err
77-
} else if v, ok := d.GetOkExists("autodelete_anonymous_users"); !isEmptyValue(reflect.ValueOf(autodeleteAnonymousUsersProp)) && (ok || !reflect.DeepEqual(v, autodeleteAnonymousUsersProp)) {
78-
obj["autodeleteAnonymousUsers"] = autodeleteAnonymousUsersProp
79-
}
80-
8173
url, err := replaceVars(d, config, "{{IdentityPlatformBasePath}}projects/{{project}}/identityPlatform:initializeAuth")
8274
if err != nil {
8375
return err
8476
}
8577

86-
log.Printf("[DEBUG] Creating new Config: %#v", obj)
8778
billingProject := ""
8879

8980
project, err := getProject(d, config)
@@ -97,7 +88,7 @@ func resourceIdentityPlatformConfigCreate(d *schema.ResourceData, meta interface
9788
billingProject = bp
9889
}
9990

100-
res, err := sendRequestWithTimeout(config, "POST", billingProject, url, userAgent, obj, d.Timeout(schema.TimeoutCreate))
91+
res, err := sendRequestWithTimeout(config, "POST", billingProject, url, userAgent, nil, d.Timeout(schema.TimeoutCreate))
10192
if err != nil {
10293
return fmt.Errorf("Error creating Config: %s", err)
10394
}
@@ -112,6 +103,11 @@ func resourceIdentityPlatformConfigCreate(d *schema.ResourceData, meta interface
112103
}
113104
d.SetId(id)
114105

106+
// Update the resource after initializing auth to set fields.
107+
if err := resourceIdentityPlatformConfigUpdate(d, meta); err != nil {
108+
return err
109+
}
110+
115111
log.Printf("[DEBUG] Finished creating Config %q: %#v", d.Id(), res)
116112

117113
return resourceIdentityPlatformConfigRead(d, meta)

google/resource_identity_platform_config_generated_test.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,13 @@ resource "google_project" "default" {
5353
name = "tf-test%{random_suffix}"
5454
org_id = "%{org_id}"
5555
billing_account = "%{billing_acct}"
56+
labels = {
57+
firebase = "enabled"
58+
}
5659
}
5760
5861
resource "google_project_service" "identitytoolkit" {
59-
project = google_project.project.project_id
62+
project = google_project.default.project_id
6063
service = "identitytoolkit.googleapis.com"
6164
}
6265

website/docs/r/identity_platform_config.html.markdown

+4-1
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,13 @@ resource "google_project" "default" {
4444
name = "tf-test%{random_suffix}"
4545
org_id = "123456789"
4646
billing_account = "000000-0000000-0000000-000000"
47+
labels = {
48+
firebase = "enabled"
49+
}
4750
}
4851
4952
resource "google_project_service" "identitytoolkit" {
50-
project = google_project.project.project_id
53+
project = google_project.default.project_id
5154
service = "identitytoolkit.googleapis.com"
5255
}
5356

0 commit comments

Comments
 (0)