From 201f914d37e1dce84c8ecfd6c7c13e6b4663ef4c Mon Sep 17 00:00:00 2001 From: Bruce MacDonald Date: Thu, 15 Sep 2022 10:45:27 -0300 Subject: [PATCH] fix linter and tests --- internal/server/data/providergroup.go | 4 ++-- internal/server/data/providergroup_test.go | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/server/data/providergroup.go b/internal/server/data/providergroup.go index 6b90b2d243..cc2023f256 100644 --- a/internal/server/data/providergroup.go +++ b/internal/server/data/providergroup.go @@ -157,8 +157,8 @@ func ListProviderGroups(tx ReadTxn, opts ListProviderGroupOptions) ([]models.Pro } // load group members - for i, pg := range result { - members, err := listProviderGroupMembers(tx, &pg) + for i := range result { + members, err := listProviderGroupMembers(tx, &result[i]) if err != nil { return nil, fmt.Errorf("retrieve provider group members: %w", err) } diff --git a/internal/server/data/providergroup_test.go b/internal/server/data/providergroup_test.go index e4308dfde2..ece8987c62 100644 --- a/internal/server/data/providergroup_test.go +++ b/internal/server/data/providergroup_test.go @@ -33,7 +33,7 @@ func TestCreateProviderGroup(t *testing.T) { // check that the provider group we fetch from the DB matches what is expected retrieved, err := GetProviderGroup(tx, pg.ProviderID, pg.Name) assert.NilError(t, err) - assert.DeepEqual(t, retrieved, pg) + assert.DeepEqual(t, retrieved, pg, cmpTimeWithDBPrecision) }) t.Run("valid with members", func(t *testing.T) { group := &models.Group{Name: "with members"} @@ -58,7 +58,7 @@ func TestCreateProviderGroup(t *testing.T) { // check that the provider group we fetch from the DB matches what is expected retrieved, err := GetProviderGroup(tx, pg.ProviderID, pg.Name) assert.NilError(t, err) - assert.DeepEqual(t, retrieved, pg) + assert.DeepEqual(t, retrieved, pg, cmpTimeWithDBPrecision) }) t.Run("provider ID not specified fails", func(t *testing.T) { pg := &models.ProviderGroup{ @@ -333,7 +333,7 @@ func TestListProviderGroups(t *testing.T) { result, err := ListProviderGroups(tx, opts) assert.NilError(t, err) - assert.DeepEqual(t, result, expected) + assert.DeepEqual(t, result, expected, cmpTimeWithDBPrecision) // clean up _, err = tx.Exec("DELETE FROM identities") @@ -374,8 +374,8 @@ func setupTestProviderGroups(t *testing.T, tx *Transaction, testProviderGroups [ created := []models.ProviderGroup{} for _, testPg := range testProviderGroups { members := []models.ProviderUser{} - for _, iden := range testPg.Members { - member, err := CreateProviderUser(tx, testPg.Provider, &iden) + for i := range testPg.Members { + member, err := CreateProviderUser(tx, testPg.Provider, &testPg.Members[i]) assert.NilError(t, err) members = append(members, *member) }