Skip to content

Commit 7764742

Browse files
Move sweeper FirebaseAndroidApp to the service package (#8186) (#14978)
* Move sweeper FirebaseAndroidApp to the service package This reverts commit aad16c5. * Append the current sweeper file name to the sweeper name * Create a utility function AddTestSweepers * Hash the file name Signed-off-by: Modular Magician <[email protected]>
1 parent 3eeed81 commit 7764742

File tree

4 files changed

+24
-6
lines changed

4 files changed

+24
-6
lines changed

.changelog/8186.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
3+
```

google/acctest/gcp_sweeper.go

+17
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,13 @@
33
package acctest
44

55
import (
6+
"encoding/hex"
67
"fmt"
8+
"hash/crc32"
9+
"runtime"
710
"strings"
811

12+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
913
transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport"
1014
)
1115

@@ -55,3 +59,16 @@ func IsSweepableTestResource(resourceName string) bool {
5559
}
5660
return false
5761
}
62+
63+
func AddTestSweepers(name string, sweeper func(region string) error) {
64+
_, filename, _, _ := runtime.Caller(0)
65+
hash := crc32.NewIEEE()
66+
hash.Write([]byte(filename))
67+
hashedFilename := hex.EncodeToString(hash.Sum(nil))
68+
uniqueName := name + "_" + hashedFilename
69+
70+
resource.AddTestSweepers(uniqueName, &resource.Sweeper{
71+
Name: name,
72+
F: sweeper,
73+
})
74+
}

google/gcp_sweeper_test.go

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import (
66
"testing"
77

88
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
9+
10+
_ "github.com/hashicorp/terraform-provider-google/google/services/firebase"
911
)
1012

1113
func TestMain(m *testing.M) {

google/resource_firebase_android_app_sweeper_test.go renamed to google/services/firebase/resource_firebase_android_app_sweeper.go

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright (c) HashiCorp, Inc.
22
// SPDX-License-Identifier: MPL-2.0
3-
package google
3+
package firebase
44

55
import (
66
"context"
@@ -9,17 +9,13 @@ import (
99
"strings"
1010
"testing"
1111

12-
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
1312
"github.com/hashicorp/terraform-provider-google/google/acctest"
1413
"github.com/hashicorp/terraform-provider-google/google/tpgresource"
1514
transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport"
1615
)
1716

1817
func init() {
19-
resource.AddTestSweepers("FirebaseAndroidApp", &resource.Sweeper{
20-
Name: "FirebaseAndroidApp",
21-
F: testSweepFirebaseAndroidApp,
22-
})
18+
acctest.AddTestSweepers("FirebaseAndroidApp", testSweepFirebaseAndroidApp)
2319
}
2420

2521
// At the time of writing, the CI only passes us-central1 as the region

0 commit comments

Comments
 (0)