Skip to content

Commit 71b0c4a

Browse files
modular-magicianmodular-magician
authored
Fix FirebaseApp sweepers (#7279) (#5209)
* Fix firebase app sweepers * Fix test override quotes * Fix delete urls in sweeper Signed-off-by: Modular Magician <[email protected]>
1 parent 6b524d4 commit 71b0c4a

15 files changed

+42
-49
lines changed

‎.changelog/7279.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/data_source_google_firebase_android_app_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ func TestAccDataSourceGoogleFirebaseAndroidApp(t *testing.T) {
1212
context := map[string]interface{}{
1313
"project_id": getTestProjectFromEnv(),
1414
"package_name": "android.package.app" + randString(t, 4),
15-
"display_name": "Display Name AndroidApp DataSource",
15+
"display_name": "tf-test Display Name AndroidApp DataSource",
1616
}
1717

1818
resourceName := "data.google_firebase_android_app.my_app"

‎google-beta/data_source_google_firebase_apple_app_config_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ func TestAccDataSourceGoogleFirebaseAppleAppConfig(t *testing.T) {
1414
context := map[string]interface{}{
1515
"project_id": getTestProjectFromEnv(),
1616
"bundle_id": "apple.app." + randString(t, 5),
17-
"display_name": "Display Name AppleAppConfig DataSource",
17+
"display_name": "tf-test Display Name AppleAppConfig DataSource",
1818
"app_store_id": 12345,
1919
"team_id": 1234567890,
2020
}

‎google-beta/data_source_google_firebase_apple_app_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ func TestAccDataSourceGoogleFirebaseAppleApp(t *testing.T) {
1212
context := map[string]interface{}{
1313
"project_id": getTestProjectFromEnv(),
1414
"bundle_id": "apple.app." + randString(t, 5),
15-
"display_name": "Display Name AppleApp DataSource",
15+
"display_name": "tf-test Display Name AppleApp DataSource",
1616
"app_store_id": 12345,
1717
"team_id": 1234567890,
1818
}

‎google-beta/resource_firebase_android_app_generated_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ func TestAccFirebaseAndroidApp_firebaseAndroidAppBasicExample(t *testing.T) {
3030
"org_id": getTestOrgFromEnv(t),
3131
"project_id": getTestProjectFromEnv(),
3232
"package_name": "android.package.app" + randString(t, 4),
33+
"display_name": "tf-test Display Name Basic",
3334
"random_suffix": randString(t, 10),
3435
}
3536

@@ -56,7 +57,7 @@ func testAccFirebaseAndroidApp_firebaseAndroidAppBasicExample(context map[string
5657
resource "google_firebase_android_app" "basic" {
5758
provider = google-beta
5859
project = "%{project_id}"
59-
display_name = "Display Name Basic%{random_suffix}"
60+
display_name = "%{display_name}"
6061
package_name = "%{package_name}"
6162
sha1_hashes = ["2145bdf698b8715039bd0e83f2069bed435ac21c"]
6263
sha256_hashes = ["2145bdf698b8715039bd0e83f2069bed435ac21ca1b2c3d4e5f6123456789abc"]

‎google-beta/resource_firebase_android_app_sweeper_test.go‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ package google
88

99
import (
1010
"context"
11+
"fmt"
1112
"log"
1213
"strings"
1314
"testing"
@@ -66,7 +67,7 @@ func testSweepFirebaseAndroidApp(region string) error {
6667
return nil
6768
}
6869

69-
resourceList, ok := res["androidApps"]
70+
resourceList, ok := res["apps"]
7071
if !ok {
7172
log.Printf("[INFO][SWEEPER_LOG] Nothing found in response.")
7273
return nil
@@ -79,31 +80,25 @@ func testSweepFirebaseAndroidApp(region string) error {
7980
nonPrefixCount := 0
8081
for _, ri := range rl {
8182
obj := ri.(map[string]interface{})
82-
if obj["name"] == nil {
83+
if obj["displayName"] == nil {
8384
log.Printf("[INFO][SWEEPER_LOG] %s resource name was nil", resourceName)
8485
return nil
8586
}
8687

87-
name := GetResourceNameFromSelfLink(obj["name"].(string))
8888
// Skip resources that shouldn't be sweeped
89-
if !isSweepableTestResource(name) {
89+
if !isSweepableTestResource(obj["displayName"].(string)) {
9090
nonPrefixCount++
9191
continue
9292
}
9393

94-
deleteTemplate := "https://firebase.googleapis.com/v1beta1/{{name}}:remove"
95-
deleteUrl, err := replaceVars(d, config, deleteTemplate)
96-
if err != nil {
97-
log.Printf("[INFO][SWEEPER_LOG] error preparing delete url: %s", err)
98-
return nil
99-
}
100-
deleteUrl = deleteUrl + name
94+
name := obj["name"].(string)
95+
deleteUrl := fmt.Sprintf("https://firebase.googleapis.com/v1beta1/%s:remove", name)
10196

10297
body := make(map[string]interface{})
10398
body["immediate"] = true
10499

105100
// Don't wait on operations as we may have a lot to delete
106-
_, err = sendRequest(config, "DELETE", config.Project, deleteUrl, config.userAgent, body)
101+
_, err = sendRequest(config, "POST", config.Project, deleteUrl, config.userAgent, body)
107102
if err != nil {
108103
log.Printf("[INFO][SWEEPER_LOG] Error deleting for url %s : %s", deleteUrl, err)
109104
} else {

‎google-beta/resource_firebase_android_app_update_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ func TestAccFirebaseAndroidApp_update(t *testing.T) {
1212
"project_id": getTestProjectFromEnv(),
1313
"package_name": "android.package.app" + randString(t, 4),
1414
"random_suffix": randString(t, 10),
15-
"display_name": "Display Name N",
15+
"display_name": "tf-test Display Name N",
1616
}
1717
vcrTest(t, resource.TestCase{
1818
PreCheck: func() { testAccPreCheck(t) },

‎google-beta/resource_firebase_apple_app_generated_test.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ func TestAccFirebaseAppleApp_firebaseAppleAppBasicExample(t *testing.T) {
2929
context := map[string]interface{}{
3030
"org_id": getTestOrgFromEnv(t),
3131
"project_id": getTestProjectFromEnv(),
32+
"display_name": "tf-test Display Name Basic",
3233
"random_suffix": randString(t, 10),
3334
}
3435

@@ -54,7 +55,7 @@ func testAccFirebaseAppleApp_firebaseAppleAppBasicExample(context map[string]int
5455
resource "google_firebase_apple_app" "default" {
5556
provider = google-beta
5657
project = "%{project_id}"
57-
display_name = "Display Name Basic%{random_suffix}"
58+
display_name = "%{display_name}"
5859
bundle_id = "apple.app.12345%{random_suffix}"
5960
}
6061
`, context)
@@ -68,6 +69,7 @@ func TestAccFirebaseAppleApp_firebaseAppleAppFullExample(t *testing.T) {
6869
"project_id": getTestProjectFromEnv(),
6970
"app_store_id": 12345,
7071
"team_id": 9987654321,
72+
"display_name": "tf-test Display Name Full",
7173
"random_suffix": randString(t, 10),
7274
}
7375

@@ -94,7 +96,7 @@ func testAccFirebaseAppleApp_firebaseAppleAppFullExample(context map[string]inte
9496
resource "google_firebase_apple_app" "full" {
9597
provider = google-beta
9698
project = "%{project_id}"
97-
display_name = "Display Name Full%{random_suffix}"
99+
display_name = "%{display_name}"
98100
bundle_id = "apple.app.12345%{random_suffix}"
99101
app_store_id = "%{app_store_id}"
100102
team_id = "%{team_id}"

‎google-beta/resource_firebase_apple_app_sweeper_test.go‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ package google
88

99
import (
1010
"context"
11+
"fmt"
1112
"log"
1213
"strings"
1314
"testing"
@@ -66,7 +67,7 @@ func testSweepFirebaseAppleApp(region string) error {
6667
return nil
6768
}
6869

69-
resourceList, ok := res["appleApps"]
70+
resourceList, ok := res["apps"]
7071
if !ok {
7172
log.Printf("[INFO][SWEEPER_LOG] Nothing found in response.")
7273
return nil
@@ -79,31 +80,25 @@ func testSweepFirebaseAppleApp(region string) error {
7980
nonPrefixCount := 0
8081
for _, ri := range rl {
8182
obj := ri.(map[string]interface{})
82-
if obj["name"] == nil {
83+
if obj["displayName"] == nil {
8384
log.Printf("[INFO][SWEEPER_LOG] %s resource name was nil", resourceName)
8485
return nil
8586
}
8687

87-
name := GetResourceNameFromSelfLink(obj["name"].(string))
8888
// Skip resources that shouldn't be sweeped
89-
if !isSweepableTestResource(name) {
89+
if !isSweepableTestResource(obj["displayName"].(string)) {
9090
nonPrefixCount++
9191
continue
9292
}
9393

94-
deleteTemplate := "https://firebase.googleapis.com/v1beta1/projects/{{project}}/iosApps/{{app_id}}:remove"
95-
deleteUrl, err := replaceVars(d, config, deleteTemplate)
96-
if err != nil {
97-
log.Printf("[INFO][SWEEPER_LOG] error preparing delete url: %s", err)
98-
return nil
99-
}
100-
deleteUrl = deleteUrl + name
94+
name := obj["name"].(string)
95+
deleteUrl := fmt.Sprintf("https://firebase.googleapis.com/v1beta1/%s:remove", name)
10196

10297
body := make(map[string]interface{})
10398
body["immediate"] = true
10499

105100
// Don't wait on operations as we may have a lot to delete
106-
_, err = sendRequest(config, "DELETE", config.Project, deleteUrl, config.userAgent, body)
101+
_, err = sendRequest(config, "POST", config.Project, deleteUrl, config.userAgent, body)
107102
if err != nil {
108103
log.Printf("[INFO][SWEEPER_LOG] Error deleting for url %s : %s", deleteUrl, err)
109104
} else {

‎google-beta/resource_firebase_apple_app_update_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ func TestAccFirebaseAppleApp_update(t *testing.T) {
1212
"project_id": getTestProjectFromEnv(),
1313
"bundle_id": "apple.app.12345",
1414
"random_suffix": randString(t, 10),
15-
"display_name": "Display Name N",
15+
"display_name": "tf-test Display Name N",
1616
}
1717
vcrTest(t, resource.TestCase{
1818
PreCheck: func() { testAccPreCheck(t) },

0 commit comments

Comments
 (0)