Skip to content

Commit 5fc2064

Browse files
authored
fix: Fixes config flaky tests (#1680)
* check role count in singular ds
1 parent d71180f commit 5fc2064

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

internal/service/atlasuser/data_source_atlas_user_test.go

+8-4
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func TestAccConfigDSAtlasUser_ByUserID(t *testing.T) {
2828
{
2929
Config: testAccDSMongoDBAtlasUserByUserID(userID),
3030
Check: resource.ComposeTestCheckFunc(
31-
dataSourceChecksForUser(dataSourceName, "", user)...,
31+
dataSourceChecksForUser(dataSourceName, "", user, true)...,
3232
),
3333
},
3434
},
@@ -49,14 +49,18 @@ func TestAccConfigDSAtlasUser_ByUsername(t *testing.T) {
4949
{
5050
Config: testAccDSMongoDBAtlasUserByUsername(username),
5151
Check: resource.ComposeTestCheckFunc(
52-
dataSourceChecksForUser(dataSourceName, "", user)...,
52+
dataSourceChecksForUser(dataSourceName, "", user, true)...,
5353
),
5454
},
5555
},
5656
})
5757
}
5858

59-
func dataSourceChecksForUser(dataSourceName, attrPrefix string, user *admin.CloudAppUser) []resource.TestCheckFunc {
59+
func dataSourceChecksForUser(dataSourceName, attrPrefix string, user *admin.CloudAppUser, hasToCheckCountRoles bool) []resource.TestCheckFunc {
60+
roleCheck := resource.TestCheckResourceAttrSet(dataSourceName, fmt.Sprintf("%sroles.#", attrPrefix))
61+
if hasToCheckCountRoles {
62+
roleCheck = resource.TestCheckResourceAttr(dataSourceName, fmt.Sprintf("%sroles.#", attrPrefix), fmt.Sprintf("%d", len(user.Roles)))
63+
}
6064
return []resource.TestCheckFunc{
6165
resource.TestCheckResourceAttr(dataSourceName, fmt.Sprintf("%susername", attrPrefix), user.Username),
6266
resource.TestCheckResourceAttr(dataSourceName, fmt.Sprintf("%suser_id", attrPrefix), *user.Id),
@@ -66,9 +70,9 @@ func dataSourceChecksForUser(dataSourceName, attrPrefix string, user *admin.Clou
6670
resource.TestCheckResourceAttr(dataSourceName, fmt.Sprintf("%smobile_number", attrPrefix), user.MobileNumber),
6771
resource.TestCheckResourceAttr(dataSourceName, fmt.Sprintf("%scountry", attrPrefix), user.Country),
6872
resource.TestCheckResourceAttr(dataSourceName, fmt.Sprintf("%screated_at", attrPrefix), *conversion.TimePtrToStringPtr(user.CreatedAt)),
69-
resource.TestCheckResourceAttr(dataSourceName, fmt.Sprintf("%sroles.#", attrPrefix), fmt.Sprintf("%d", len(user.Roles))),
7073
resource.TestCheckResourceAttr(dataSourceName, fmt.Sprintf("%steam_ids.#", attrPrefix), fmt.Sprintf("%d", len(user.TeamIds))),
7174
resource.TestCheckResourceAttr(dataSourceName, fmt.Sprintf("%slinks.#", attrPrefix), fmt.Sprintf("%d", len(user.Links))),
75+
roleCheck,
7276
}
7377
}
7478

internal/service/atlasuser/data_source_atlas_users_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ func dataSourceChecksForUsers(dataSourceName, orgID string, users *admin.Paginat
223223
resource.TestCheckResourceAttr(dataSourceName, "total_count", fmt.Sprintf("%d", totalCountValue)),
224224
}
225225
for i := range users.Results {
226-
checks = append(checks, dataSourceChecksForUser(dataSourceName, fmt.Sprintf("results.%d.", i), &users.Results[i])...)
226+
checks = append(checks, dataSourceChecksForUser(dataSourceName, fmt.Sprintf("results.%d.", i), &users.Results[i], false)...)
227227
}
228228

229229
return checks

0 commit comments

Comments
 (0)