DevFW-CICD/garm
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Cleanup unused struct field

Browse source 
Remove `Pool` field from `CreateInstanceParams` struct, because
this is given as a separate parameter to the `CreateInstance` function.
This commit is contained in:
mihaelabalutoiu 2022-09-15 19:11:37 +03:00
parent 775dd51782
commit e2ada6d1e3
6 changed files with 1 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
database/sql/instances.go
View file

@ -26,7 +26,7 @@ import (
)
func (s *sqlDatabase) CreateInstance(ctx context.Context, poolID string, param params.CreateInstanceParams) (params.Instance, error) {
pool, err := s.getPoolByID(ctx, param.Pool)
pool, err := s.getPoolByID(ctx, poolID)
if err != nil {
return params.Instance{}, errors.Wrap(err, "fetching pool")
}

2
database/sql/instances_test.go
View file

@ -77,7 +77,6 @@ func (s *InstancesTestSuite) SetupTest() {
OSType: "linux",
OSArch: "amd64",
CallbackURL: "https://garm.example.com/",
Pool: pool.ID,
},
)
if err != nil {
@ -103,7 +102,6 @@ func (s *InstancesTestSuite) TestCreateInstance() {
OSType: "linux",
OSArch: "amd64",
CallbackURL: "https://garm.example.com/",
Pool: s.Fixtures.Pool.ID,
}
// call tested function

2
params/requests.go
View file

@ -97,8 +97,6 @@ type CreateInstanceParams struct {
RunnerStatus common.RunnerStatus
CallbackURL string
CreateAttempt int `json:"-"`
Pool string
}
type CreatePoolParams struct {

2
runner/organizations_test.go
View file

@ -465,7 +465,6 @@ func (s *OrgTestSuite) TestDeleteOrgPoolRunnersFailed() {
if err != nil {
s.FailNow(fmt.Sprintf("cannot create org pool: %v", err))
}
s.Fixtures.CreateInstanceParams.Pool = pool.ID
instance, err := s.Fixtures.Store.CreateInstance(s.Fixtures.AdminContext, pool.ID, s.Fixtures.CreateInstanceParams)
if err != nil {
s.FailNow(fmt.Sprintf("cannot create instance: %s", err))
@ -539,7 +538,6 @@ func (s *OrgTestSuite) TestListOrgInstances() {
s.FailNow(fmt.Sprintf("cannot create org pool: %v", err))
}
poolInstances := []params.Instance{}
s.Fixtures.CreateInstanceParams.Pool = pool.ID
for i := 1; i <= 3; i++ {
s.Fixtures.CreateInstanceParams.Name = fmt.Sprintf("test-org-%v", i)
instance, err := s.Fixtures.Store.CreateInstance(s.Fixtures.AdminContext, pool.ID, s.Fixtures.CreateInstanceParams)

1
runner/pool/pool.go
View file

@ -316,7 +316,6 @@ func (r *basePool) AddRunner(ctx context.Context, poolID string) error {
createParams := params.CreateInstanceParams{
Name: name,
Pool: poolID,
Status: providerCommon.InstancePendingCreate,
RunnerStatus: providerCommon.RunnerPending,
OSArch: pool.OSArch,

3
runner/repositories_test.go
View file

@ -467,7 +467,6 @@ func (s *RepoTestSuite) TestDeleteRepoPoolRunnersFailed() {
if err != nil {
s.FailNow(fmt.Sprintf("cannot create repo pool: %s", err))
}
s.Fixtures.CreateInstanceParams.Pool = pool.ID
instance, err := s.Fixtures.Store.CreateInstance(s.Fixtures.AdminContext, pool.ID, s.Fixtures.CreateInstanceParams)
if err != nil {
s.FailNow(fmt.Sprintf("cannot create instance: %s", err))
@ -507,7 +506,6 @@ func (s *RepoTestSuite) TestListPoolInstances() {
s.FailNow(fmt.Sprintf("cannot create repo pool: %v", err))
}
poolInstances := []params.Instance{}
s.Fixtures.CreateInstanceParams.Pool = pool.ID
for i := 1; i <= 3; i++ {
s.Fixtures.CreateInstanceParams.Name = fmt.Sprintf("test-repo-%v", i)
instance, err := s.Fixtures.Store.CreateInstance(s.Fixtures.AdminContext, pool.ID, s.Fixtures.CreateInstanceParams)
@ -569,7 +567,6 @@ func (s *RepoTestSuite) TestListRepoInstances() {
s.FailNow(fmt.Sprintf("cannot create repo pool: %v", err))
}
poolInstances := []params.Instance{}
s.Fixtures.CreateInstanceParams.Pool = pool.ID
for i := 1; i <= 3; i++ {
s.Fixtures.CreateInstanceParams.Name = fmt.Sprintf("test-repo-%v", i)
instance, err := s.Fixtures.Store.CreateInstance(s.Fixtures.AdminContext, pool.ID, s.Fixtures.CreateInstanceParams)