From 2a3e4d6563d2757aa1ddcd362b03cdb5b6e5ed5a Mon Sep 17 00:00:00 2001 From: Mario Constanti Date: Tue, 20 Feb 2024 16:39:52 +0100 Subject: [PATCH] fix: pass context.TODO by getting admin context fix linter warnings Signed-off-by: Mario Constanti --- apiserver/controllers/controllers.go | 2 +- runner/enterprises_test.go | 2 +- runner/organizations_test.go | 2 +- runner/pools_test.go | 2 +- runner/repositories_test.go | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apiserver/controllers/controllers.go b/apiserver/controllers/controllers.go index acfee0b9..e5b7db37 100644 --- a/apiserver/controllers/controllers.go +++ b/apiserver/controllers/controllers.go @@ -37,7 +37,7 @@ import ( ) func NewAPIController(r *runner.Runner, authenticator *auth.Authenticator, hub *wsWriter.Hub) (*APIController, error) { - controllerInfo, err := r.GetControllerInfo(auth.GetAdminContext(nil)) + controllerInfo, err := r.GetControllerInfo(auth.GetAdminContext(context.TODO())) if err != nil { return nil, errors.Wrap(err, "failed to get controller info") } diff --git a/runner/enterprises_test.go b/runner/enterprises_test.go index b3bedfdd..400cbddd 100644 --- a/runner/enterprises_test.go +++ b/runner/enterprises_test.go @@ -60,7 +60,7 @@ type EnterpriseTestSuite struct { } func (s *EnterpriseTestSuite) SetupTest() { - adminCtx := auth.GetAdminContext(nil) + adminCtx := auth.GetAdminContext(context.TODO()) // create testing sqlite database dbCfg := garmTesting.GetTestSqliteDBConfig(s.T()) diff --git a/runner/organizations_test.go b/runner/organizations_test.go index 978dfbaa..7d6926c0 100644 --- a/runner/organizations_test.go +++ b/runner/organizations_test.go @@ -60,7 +60,7 @@ type OrgTestSuite struct { } func (s *OrgTestSuite) SetupTest() { - adminCtx := auth.GetAdminContext(nil) + adminCtx := auth.GetAdminContext(context.TODO()) // create testing sqlite database dbCfg := garmTesting.GetTestSqliteDBConfig(s.T()) diff --git a/runner/pools_test.go b/runner/pools_test.go index be1bd4e7..e25a79c6 100644 --- a/runner/pools_test.go +++ b/runner/pools_test.go @@ -47,7 +47,7 @@ type PoolTestSuite struct { } func (s *PoolTestSuite) SetupTest() { - adminCtx := auth.GetAdminContext(nil) + adminCtx := auth.GetAdminContext(context.TODO()) // create testing sqlite database dbCfg := garmTesting.GetTestSqliteDBConfig(s.T()) diff --git a/runner/repositories_test.go b/runner/repositories_test.go index 1ede8d82..8092ca2e 100644 --- a/runner/repositories_test.go +++ b/runner/repositories_test.go @@ -59,7 +59,7 @@ type RepoTestSuite struct { } func (s *RepoTestSuite) SetupTest() { - adminCtx := auth.GetAdminContext(nil) + adminCtx := auth.GetAdminContext(context.TODO()) // create testing sqlite database dbCfg := garmTesting.GetTestSqliteDBConfig(s.T()) @@ -90,7 +90,7 @@ func (s *RepoTestSuite) SetupTest() { var minIdleRunners uint = 20 providerMock := runnerCommonMocks.NewProvider(s.T()) fixtures := &RepoTestFixtures{ - AdminContext: auth.GetAdminContext(nil), + AdminContext: auth.GetAdminContext(context.TODO()), Store: db, StoreRepos: repos, Providers: map[string]common.Provider{