Fix merge

Signed-off-by: bcmmbaga <bethuelmbaga12@gmail.com>
netbirdio · Jan 2, 2025 · 265b042 · 265b042
1 parent 2028cbd
commit 265b042
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/management/server/http/testing/integration/setupkeys_handler_integration_test.go b/management/server/http/testing/integration/setupkeys_handler_integration_test.go
@@ -925,7 +925,7 @@ func Test_SetupKeys_GetAll(t *testing.T) {
 					return tc.expectedResponse[i].UsageLimit < tc.expectedResponse[j].UsageLimit
 				})
 
-				for i, _ := range tc.expectedResponse {
+				for i := range tc.expectedResponse {
 					validateCreatedKey(t, tc.expectedResponse[i], &got[i])
 
 					key, err := am.GetSetupKey(context.Background(), testing_tools.TestAccountId, testing_tools.TestUserId, got[i].Id)

diff --git a/management/server/http/testing/testing_tools/tools.go b/management/server/http/testing/testing_tools/tools.go
@@ -13,6 +13,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/netbirdio/netbird/management/server/util"
 	"github.com/stretchr/testify/assert"
 	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
 
@@ -218,7 +219,7 @@ func PopulateTestData(b *testing.B, am *server.DefaultAccountManager, peers, gro
 			Id:         fmt.Sprintf("oldkey-%d", i),
 			AccountID:  account.Id,
 			AutoGroups: []string{"someGroupID"},
-			ExpiresAt:  time.Now().Add(ExpiresIn * time.Second),
+			ExpiresAt:  util.ToPtr(time.Now().Add(ExpiresIn * time.Second)),
 			Name:       NewKeyName + strconv.Itoa(i),
 			Type:       "reusable",
 			UsageLimit: 0,