Skip to content

Commit e02de4f

Browse files
Eslam-NawaraEslam-Nawara
committed
fix linter
1 parent e52b85b commit e02de4f

File tree

21 files changed

+110
-160
lines changed

21 files changed

+110
-160
lines changed

‎farmerbot/internal/farmerbot.go‎

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ func (f *FarmerBot) serve(ctx context.Context) error {
185185
return nil, fmt.Errorf("failed to include node with id %d with error: %w", nodeID, err)
186186
}
187187

188-
f.state.addNode(node)
188+
f.addNode(node)
189189
return nil, nil
190190
})
191191

@@ -206,7 +206,7 @@ func (f *FarmerBot) serve(ctx context.Context) error {
206206
// Exclude node from farmerbot management
207207
// (It is not allowed if we tried to power on a node the farmer decided to power off)
208208
// the farmer should include it again if he wants to the bot to manage it
209-
f.state.deleteNode(nodeID)
209+
f.deleteNode(nodeID)
210210
return nil, nil
211211
})
212212

@@ -227,7 +227,7 @@ func (f *FarmerBot) serve(ctx context.Context) error {
227227
// Exclude node from farmerbot management
228228
// (It is not allowed if we tried to power off a node the farmer decided to power on)
229229
// the farmer should include it again if he wants to the bot to manage it
230-
f.state.deleteNode(nodeID)
230+
f.deleteNode(nodeID)
231231
return nil, nil
232232
})
233233

@@ -240,7 +240,6 @@ func (f *FarmerBot) serve(ctx context.Context) error {
240240
peer.WithSession(fmt.Sprintf("farmerbot-%d", f.farm.ID)),
241241
peer.WithKeyType(f.keyType),
242242
)
243-
244243
if err != nil {
245244
return fmt.Errorf("failed to create farmerbot direct peer with error: %w", err)
246245
}
@@ -253,28 +252,28 @@ func (f *FarmerBot) iterateOnNodes(ctx context.Context, subConn Substrate) error
253252
var wakeUpCalls uint8
254253

255254
log.Debug().Msg("Fetch nodes")
256-
farmNodes, err := subConn.GetNodes(uint32(f.state.farm.ID))
255+
farmNodes, err := subConn.GetNodes(uint32(f.farm.ID))
257256
if err != nil {
258257
return err
259258
}
260259

261260
// remove nodes that don't exist anymore in the farm
262-
for _, node := range f.state.nodes {
261+
for _, node := range f.nodes {
263262
if !slices.Contains(farmNodes, uint32(node.ID)) {
264-
f.state.deleteNode(uint32(node.ID))
263+
f.deleteNode(uint32(node.ID))
265264
}
266265
}
267266

268-
farmNodes = addPriorityToNodes(f.state.config.PriorityNodes, farmNodes)
267+
farmNodes = addPriorityToNodes(f.config.PriorityNodes, farmNodes)
269268

270269
for _, nodeID := range farmNodes {
271-
if slices.Contains(f.state.config.ExcludedNodes, nodeID) {
270+
if slices.Contains(f.config.ExcludedNodes, nodeID) {
272271
continue
273272
}
274273

275274
// if the user specified included nodes or
276275
// no nodes are specified so all nodes will be added (except excluded)
277-
if !slices.Contains(f.state.config.IncludedNodes, nodeID) && len(f.state.config.IncludedNodes) > 0 {
276+
if !slices.Contains(f.config.IncludedNodes, nodeID) && len(f.config.IncludedNodes) > 0 {
278277
continue
279278
}
280279

@@ -284,7 +283,7 @@ func (f *FarmerBot) iterateOnNodes(ctx context.Context, subConn Substrate) error
284283
log.Error().Err(err).Send()
285284
}
286285

287-
_, node, err := f.state.getNode(nodeID)
286+
_, node, err := f.getNode(nodeID)
288287
if err != nil {
289288
log.Error().Err(err).Send()
290289
}
@@ -300,14 +299,14 @@ func (f *FarmerBot) iterateOnNodes(ctx context.Context, subConn Substrate) error
300299
if roundStart.Day() == 1 && roundStart.Hour() == 1 && roundStart.Minute() < int(timeoutUpdate.Minutes()) {
301300
log.Debug().Uint32("nodeID", nodeID).Msg("Reset random wake-up times the first day of the month")
302301
node.timesRandomWakeUps = 0
303-
err = f.state.updateNode(node)
302+
err = f.updateNode(node)
304303
if err != nil {
305304
log.Error().Err(err).Send()
306305
}
307306
}
308307

309308
if f.shouldWakeUp(ctx, &node, roundStart, wakeUpCalls) {
310-
err = f.state.updateNode(node)
309+
err = f.updateNode(node)
311310
if err != nil {
312311
log.Error().Err(err).Send()
313312
}
@@ -355,14 +354,14 @@ func addPriorityToNodes(priorityNodes, farmNodes []uint32) []uint32 {
355354
}
356355

357356
func (f *FarmerBot) addOrUpdateNode(ctx context.Context, subConn Substrate, nodeID uint32) error {
358-
neverShutDown := slices.Contains(f.state.config.NeverShutDownNodes, nodeID)
357+
neverShutDown := slices.Contains(f.config.NeverShutDownNodes, nodeID)
359358

360-
_, oldNode, err := f.state.getNode(nodeID)
359+
_, oldNode, err := f.getNode(nodeID)
361360
if err == nil { // node exists
362-
updateErr := oldNode.update(ctx, subConn, f.rmbNodeClient, neverShutDown, f.state.farm.DedicatedFarm, f.config.ContinueOnPoweringOnErr)
361+
updateErr := oldNode.update(ctx, subConn, f.rmbNodeClient, neverShutDown, f.farm.DedicatedFarm, f.config.ContinueOnPoweringOnErr)
363362

364363
// update old node state even if it failed
365-
if err := f.state.updateNode(oldNode); err != nil {
364+
if err := f.updateNode(oldNode); err != nil {
366365
return fmt.Errorf("failed to update node state %d with error: %w", uint32(oldNode.ID), err)
367366
}
368367

@@ -375,12 +374,12 @@ func (f *FarmerBot) addOrUpdateNode(ctx context.Context, subConn Substrate, node
375374
}
376375

377376
// if node doesn't exist, we should add it
378-
nodeObj, err := getNode(ctx, subConn, f.rmbNodeClient, nodeID, f.config.ContinueOnPoweringOnErr, neverShutDown, false, f.state.farm.DedicatedFarm, on)
377+
nodeObj, err := getNode(ctx, subConn, f.rmbNodeClient, nodeID, f.config.ContinueOnPoweringOnErr, neverShutDown, false, f.farm.DedicatedFarm, on)
379378
if err != nil {
380379
return fmt.Errorf("failed to get node %d: %w", nodeID, err)
381380
}
382381

383-
f.state.addNode(nodeObj)
382+
f.addNode(nodeObj)
384383
log.Debug().Uint32("nodeID", nodeID).Msg("Node is added with latest changes successfully")
385384
return nil
386385
}

‎go.work.sum‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -498,6 +498,7 @@ github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod h1:2oa8n
498498
github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0BsqsP2LwDJ9aOkm/6J86V6lyAXCoQWGw3K50=
499499
github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE=
500500
github.com/bwesterb/go-ristretto v1.2.3 h1:1w53tCkGhCQ5djbat3+MH0BAQ5Kfgbt56UZQ/JMzngw=
501+
github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
501502
github.com/c-bata/go-prompt v0.2.2/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOCSiVIqS34=
502503
github.com/campoy/embedmd v1.0.0/go.mod h1:oxyr9RCiSXg0M3VJ3ks0UGfp98BpSSGr0kpiX3MzVl8=
503504
github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=

‎grid-client/deployer/deployer_test.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
proxyTypes "github.com/threefoldtech/tfgrid-sdk-go/grid-proxy/pkg/types"
2121
"github.com/threefoldtech/zosbase/pkg/gridtypes"
2222
"github.com/threefoldtech/zosbase/pkg/gridtypes/zos"
23-
"github.com/vedhavyas/go-subkey"
23+
subkey "github.com/vedhavyas/go-subkey"
2424
)
2525

2626
var (
@@ -227,15 +227,15 @@ func TestDeployer(t *testing.T) {
227227
cl.EXPECT().
228228
Call(gomock.Any(), uint32(13), "zos.deployment.changes", gomock.Any(), gomock.Any()).
229229
DoAndReturn(func(ctx context.Context, twin uint32, fn string, data, result interface{}) error {
230-
var res *[]zosTypes.Workload = result.(*[]zosTypes.Workload)
230+
res := result.(*[]zosTypes.Workload)
231231
*res = dl1.Workloads
232232
return nil
233233
})
234234

235235
cl.EXPECT().
236236
Call(gomock.Any(), uint32(23), "zos.deployment.changes", gomock.Any(), gomock.Any()).
237237
DoAndReturn(func(ctx context.Context, twin uint32, fn string, data, result interface{}) error {
238-
var res *[]zosTypes.Workload = result.(*[]zosTypes.Workload)
238+
res := result.(*[]zosTypes.Workload)
239239
*res = dl2.Workloads
240240
return nil
241241
})
@@ -281,7 +281,7 @@ func TestDeployer(t *testing.T) {
281281
cl.EXPECT().
282282
Call(gomock.Any(), uint32(13), "zos.deployment.get", gomock.Any(), gomock.Any()).
283283
DoAndReturn(func(ctx context.Context, twin uint32, fn string, data, result interface{}) error {
284-
var res *zosTypes.Deployment = result.(*zosTypes.Deployment)
284+
res := result.(*zosTypes.Deployment)
285285
*res = oldDl
286286
return nil
287287
}).AnyTimes()
@@ -308,7 +308,7 @@ func TestDeployer(t *testing.T) {
308308
cl.EXPECT().
309309
Call(gomock.Any(), uint32(13), "zos.deployment.changes", gomock.Any(), gomock.Any()).
310310
DoAndReturn(func(ctx context.Context, twin uint32, fn string, data, result interface{}) error {
311-
var res *[]zosTypes.Workload = result.(*[]zosTypes.Workload)
311+
res := result.(*[]zosTypes.Workload)
312312
*res = versionedDl.Workloads
313313
return nil
314314
}).AnyTimes()
@@ -435,63 +435,63 @@ func TestDeployer(t *testing.T) {
435435
cl.EXPECT().
436436
Call(gomock.Any(), uint32(13), "zos.deployment.changes", gomock.Any(), gomock.Any()).
437437
DoAndReturn(func(ctx context.Context, twin uint32, fn string, data, result interface{}) error {
438-
var res *[]zosTypes.Workload = result.(*[]zosTypes.Workload)
438+
res := result.(*[]zosTypes.Workload)
439439
*res = dl1.Workloads
440440
return nil
441441
}).AnyTimes()
442442

443443
cl.EXPECT().
444444
Call(gomock.Any(), uint32(23), "zos.deployment.changes", gomock.Any(), gomock.Any()).
445445
DoAndReturn(func(ctx context.Context, twin uint32, fn string, data, result interface{}) error {
446-
var res *[]zosTypes.Workload = result.(*[]zosTypes.Workload)
446+
res := result.(*[]zosTypes.Workload)
447447
*res = dl2.Workloads
448448
return nil
449449
}).AnyTimes()
450450

451451
cl.EXPECT().
452452
Call(gomock.Any(), uint32(33), "zos.deployment.changes", gomock.Any(), gomock.Any()).
453453
DoAndReturn(func(ctx context.Context, twin uint32, fn string, data, result interface{}) error {
454-
var res *[]zosTypes.Workload = result.(*[]zosTypes.Workload)
454+
res := result.(*[]zosTypes.Workload)
455455
*res = dl4.Workloads
456456
return nil
457457
}).AnyTimes()
458458

459459
cl.EXPECT().
460460
Call(gomock.Any(), uint32(43), "zos.deployment.changes", gomock.Any(), gomock.Any()).
461461
DoAndReturn(func(ctx context.Context, twin uint32, fn string, data, result interface{}) error {
462-
var res *[]zosTypes.Workload = result.(*[]zosTypes.Workload)
462+
res := result.(*[]zosTypes.Workload)
463463
*res = dl5.Workloads
464464
return nil
465465
}).AnyTimes()
466466

467467
cl.EXPECT().
468468
Call(gomock.Any(), uint32(13), "zos.deployment.get", gomock.Any(), gomock.Any()).
469469
DoAndReturn(func(ctx context.Context, twin uint32, fn string, data, result interface{}) error {
470-
var res *zosTypes.Deployment = result.(*zosTypes.Deployment)
470+
res := result.(*zosTypes.Deployment)
471471
*res = dl1
472472
return nil
473473
}).AnyTimes()
474474

475475
cl.EXPECT().
476476
Call(gomock.Any(), uint32(23), "zos.deployment.get", gomock.Any(), gomock.Any()).
477477
DoAndReturn(func(ctx context.Context, twin uint32, fn string, data, result interface{}) error {
478-
var res *zosTypes.Deployment = result.(*zosTypes.Deployment)
478+
res := result.(*zosTypes.Deployment)
479479
*res = dl2
480480
return nil
481481
}).AnyTimes()
482482

483483
cl.EXPECT().
484484
Call(gomock.Any(), uint32(33), "zos.deployment.get", gomock.Any(), gomock.Any()).
485485
DoAndReturn(func(ctx context.Context, twin uint32, fn string, data, result interface{}) error {
486-
var res *zosTypes.Deployment = result.(*zosTypes.Deployment)
486+
res := result.(*zosTypes.Deployment)
487487
*res = dl4
488488
return nil
489489
}).AnyTimes()
490490

491491
cl.EXPECT().
492492
Call(gomock.Any(), uint32(43), "zos.deployment.get", gomock.Any(), gomock.Any()).
493493
DoAndReturn(func(ctx context.Context, twin uint32, fn string, data, result interface{}) error {
494-
var res *zosTypes.Deployment = result.(*zosTypes.Deployment)
494+
res := result.(*zosTypes.Deployment)
495495
*res = dl5
496496
return nil
497497
}).AnyTimes()

‎grid-client/deployer/deployment_deployer_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ func TestDeploymentDeployerDeploy(t *testing.T) {
348348
cl.EXPECT().
349349
Call(gomock.Any(), twinID, "zos.network.list_private_ips", gomock.Any(), gomock.Any()).
350350
DoAndReturn(func(ctx context.Context, twin uint32, fn string, data, result interface{}) error {
351-
var res *[]string = result.(*[]string)
351+
res := result.(*[]string)
352352
*res = []string{}
353353
return nil
354354
}).AnyTimes()
@@ -511,7 +511,7 @@ func TestDeploymentDeployerSync(t *testing.T) {
511511
cl.EXPECT().
512512
Call(gomock.Any(), twinID, "zos.deployment.get", gomock.Any(), gomock.Any()).
513513
DoAndReturn(func(ctx context.Context, twin uint32, fn string, data, result interface{}) error {
514-
var res *zosTypes.Deployment = result.(*zosTypes.Deployment)
514+
res := result.(*zosTypes.Deployment)
515515
*res = networkDl
516516
return nil
517517
}).AnyTimes()
@@ -523,7 +523,7 @@ func TestDeploymentDeployerSync(t *testing.T) {
523523
cl.EXPECT().
524524
Call(gomock.Any(), twinID, "zos.network.list_private_ips", gomock.Any(), gomock.Any()).
525525
DoAndReturn(func(ctx context.Context, twin uint32, fn string, data, result interface{}) error {
526-
var res *[]string = result.(*[]string)
526+
res := result.(*[]string)
527527
*res = []string{}
528528
return nil
529529
})

‎grid-client/deployer/gateway_fqdn_deployer_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ func mockValidation(identity substrate.Identity, cl *mocks.RMBMockClient, sub *m
100100
gomock.Any(),
101101
gomock.Any()).
102102
DoAndReturn(func(ctx context.Context, twin uint32, fn string, data, result interface{}) error {
103-
var res *client.PublicConfig = result.(*client.PublicConfig)
103+
res := result.(*client.PublicConfig)
104104
cfg := client.PublicConfig{IPv4: gridtypes.IPNet{IPNet: net.IPNet{IP: net.ParseIP("192.168.1.10")}}}
105105
*res = cfg
106106
return nil

‎grid-client/deployer/k8s_deployer.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -301,18 +301,20 @@ func (d *K8sDeployer) UpdateFromRemote(ctx context.Context, k8sCluster *workload
301301
diskSize := make(map[string]uint64)
302302
for node, dl := range currentDeployments {
303303
for _, w := range dl.Workloads {
304-
if w.Type == zosTypes.ZMachineType {
304+
switch w.Type {
305+
case zosTypes.ZMachineType:
305306
workloadNodeID[w.Name] = node
306307
workloadObj[w.Name] = *w.Workload()
307308

308-
} else if w.Type == zosTypes.PublicIPType {
309+
case zosTypes.PublicIPType:
309310
ipResult := zos.PublicIPResult{}
310311
if err := json.Unmarshal(w.Result.Data, &d); err != nil {
311312
return d.tfPluginClient.sentry.error(errors.Wrap(err, "failed to load public ip data"))
312313
}
313314
publicIPs[w.Name] = ipResult.IP.String()
314315
publicIP6s[w.Name] = ipResult.IPv6.String()
315-
} else if w.Type == zosTypes.ZMountType {
316+
317+
case zosTypes.ZMountType:
316318
wl, err := w.Workload().WorkloadData()
317319
if err != nil {
318320
return d.tfPluginClient.sentry.error(errors.Wrap(err, "failed to load disk data"))

‎grid-client/state/state_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func SetupLoaderTests(t *testing.T, wls []zosTypes.Workload) *State {
4545
cl.EXPECT().
4646
Call(gomock.Any(), uint32(13), "zos.deployment.list", gomock.Any(), gomock.Any()).
4747
DoAndReturn(func(ctx context.Context, twin uint32, fn string, data, result interface{}) error {
48-
var res *[]zosTypes.Deployment = result.(*[]zosTypes.Deployment)
48+
res := result.(*[]zosTypes.Deployment)
4949
dl1.Metadata = "{\"type\":\"\",\"name\":\"testName\",\"projectName\":\"\"}"
5050
*res = []zosTypes.Deployment{dl1}
5151
return nil

‎grid-client/subi/contract.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ type Contract struct {
1010

1111
// IsDeleted checks if contract is deleted
1212
func (c *Contract) IsDeleted() bool {
13-
return c.Contract.State.IsDeleted
13+
return c.State.IsDeleted
1414
}
1515

1616
// IsCreated checks if contract is created
1717
func (c *Contract) IsCreated() bool {
18-
return c.Contract.State.IsCreated
18+
return c.State.IsCreated
1919
}
2020

2121
// TwinID returns contract's twin ID
@@ -25,5 +25,5 @@ func (c *Contract) TwinID() uint32 {
2525

2626
// PublicIPCount returns contract's public IPs count
2727
func (c *Contract) PublicIPCount() uint32 {
28-
return uint32(c.Contract.ContractType.NodeContract.PublicIPsCount)
28+
return uint32(c.ContractType.NodeContract.PublicIPsCount)
2929
}

‎grid-client/subi/substrate_manager.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func NewManager(url ...string) Manager {
2929

3030
// SubstrateExt returns a substrate implementation to be used
3131
func (m *Manager) SubstrateExt() (*SubstrateImpl, error) {
32-
sub, err := m.Manager.Substrate()
32+
sub, err := m.Substrate()
3333
return &SubstrateImpl{Substrate: sub}, err
3434
}
3535

@@ -101,7 +101,7 @@ func (s *SubstrateImpl) GetPricingPolicy(policyID uint32) (pricingPolicy substra
101101

102102
// GetNodeTwin returns the twin ID for a node ID
103103
func (s *SubstrateImpl) GetNodeTwin(nodeID uint32) (uint32, error) {
104-
node, err := s.Substrate.GetNode(nodeID)
104+
node, err := s.GetNode(nodeID)
105105
if err != nil {
106106
return 0, normalizeNotFoundErrors(err)
107107
}
@@ -110,7 +110,7 @@ func (s *SubstrateImpl) GetNodeTwin(nodeID uint32) (uint32, error) {
110110

111111
// GetTwinPK returns twin's public key
112112
func (s *SubstrateImpl) GetTwinPK(id uint32) ([]byte, error) {
113-
twin, err := s.Substrate.GetTwin(id)
113+
twin, err := s.GetTwin(id)
114114
if err != nil {
115115
return nil, normalizeNotFoundErrors(err)
116116
}

‎grid-client/workloads/vm.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ func mounts(mounts []zosTypes.MachineMount) []Mount {
157157

158158
func pubIP(dl *zosTypes.Deployment, name string) (zos.PublicIPResult, error) {
159159
pubIPWl, err := dl.Get(name)
160-
if err != nil || !pubIPWl.Workload.Result.State.IsOkay() {
160+
if err != nil || !pubIPWl.Result.State.IsOkay() {
161161
pubIPWl = nil
162162
return zos.PublicIPResult{}, err
163163
}

0 commit comments

Comments
 (0)