Skip to content

Commit 0729620

Browse files
fix(lints): fix go var name lint errors (#64)
Signed-off-by: prateekpandey14 <[email protected]>
1 parent 1052092 commit 0729620

File tree

4 files changed

+26
-15
lines changed

4 files changed

+26
-15
lines changed

.github/workflows/pull_request.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,23 @@ jobs:
3535
- name: Checkout
3636
uses: actions/checkout@v2
3737

38+
- name: Set up Go 1.14
39+
uses: actions/setup-go@v2
40+
with:
41+
go-version: 1.14.7
42+
3843
- name: Format test
3944
run: make format
4045

4146
- name: License test
4247
run: make license-check
4348

49+
- name: bootstrap
50+
run: make bootstrap
51+
52+
- name: Lint Check
53+
run: make golint
54+
4455
- name: Shellcheck
4556
uses: reviewdog/action-shellcheck@v1
4657
with:

pkg/lvm/lvm_util.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -466,22 +466,22 @@ func getVGSize(vgname string) string {
466466
// the requested volume size and returns the minimum size as a thin pool size
467467
func getThinPoolSize(vgname, volsize string) string {
468468
outStr := getVGSize(vgname)
469-
vg_free_size, err := strconv.ParseInt(strings.TrimSpace(string(outStr)), 10, 64)
469+
vgFreeSize, err := strconv.ParseInt(strings.TrimSpace(string(outStr)), 10, 64)
470470
if err != nil {
471471
klog.Errorf("failed to convert vg_size to int, got size,:%v , %v", outStr, err)
472472
return ""
473473
}
474474

475-
vol_size, err := strconv.ParseInt(strings.TrimSpace(string(volsize)), 10, 64)
475+
volSize, err := strconv.ParseInt(strings.TrimSpace(string(volsize)), 10, 64)
476476
if err != nil {
477-
klog.Errorf("failed to convert volsize to int, got size,:%v , %v", volsize, err)
477+
klog.Errorf("failed to convert volsize to int, got size,:%v , %v", volSize, err)
478478
return ""
479479
}
480480

481-
if vg_free_size < vol_size {
481+
if vgFreeSize < volSize {
482482
// reducing 268435456 bytes (256Mi) from the total byte size to round off
483483
// blocks extent
484-
return fmt.Sprint(vg_free_size-MinExtentRoundOffSize) + "b"
484+
return fmt.Sprint(vgFreeSize-MinExtentRoundOffSize) + "b"
485485
}
486486
return volsize + "b"
487487
}

tests/pv/buildlist.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,19 @@ import (
2424
// ListBuilder enables building an instance of
2525
// PVlist
2626
type ListBuilder struct {
27-
list *PVList
27+
list *List
2828
filters PredicateList
2929
errs []error
3030
}
3131

3232
// NewListBuilder returns an instance of ListBuilder
3333
func NewListBuilder() *ListBuilder {
34-
return &ListBuilder{list: &PVList{}}
34+
return &ListBuilder{list: &List{}}
3535
}
3636

3737
// ListBuilderForAPIObjects builds the ListBuilder object based on PV api list
3838
func ListBuilderForAPIObjects(pvs *corev1.PersistentVolumeList) *ListBuilder {
39-
b := &ListBuilder{list: &PVList{}}
39+
b := &ListBuilder{list: &List{}}
4040
if pvs == nil {
4141
b.errs = append(b.errs, errors.New("failed to build pv list: missing api list"))
4242
return b
@@ -49,7 +49,7 @@ func ListBuilderForAPIObjects(pvs *corev1.PersistentVolumeList) *ListBuilder {
4949
}
5050

5151
// ListBuilderForObjects builds the ListBuilder object based on PVList
52-
func ListBuilderForObjects(pvs *PVList) *ListBuilder {
52+
func ListBuilderForObjects(pvs *List) *ListBuilder {
5353
b := &ListBuilder{}
5454
if pvs == nil {
5555
b.errs = append(b.errs, errors.New("failed to build pv list: missing object list"))
@@ -62,14 +62,14 @@ func ListBuilderForObjects(pvs *PVList) *ListBuilder {
6262
// List returns the list of pv
6363
// instances that was built by this
6464
// builder
65-
func (b *ListBuilder) List() (*PVList, error) {
65+
func (b *ListBuilder) List() (*List, error) {
6666
if len(b.errs) > 0 {
6767
return nil, errors.Errorf("failed to list pv: %+v", b.errs)
6868
}
6969
if b.filters == nil || len(b.filters) == 0 {
7070
return b.list, nil
7171
}
72-
filteredList := &PVList{}
72+
filteredList := &List{}
7373
for _, pv := range b.list.items {
7474
if b.filters.all(pv) {
7575
filteredList.items = append(filteredList.items, pv)

tests/pv/persistentvolume.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,21 @@ type PV struct {
2929
object *corev1.PersistentVolume
3030
}
3131

32-
// PVList is a wrapper over persistentvolume api
32+
// List is a wrapper over persistentvolume api
3333
// object. It provides build, validations and other common
3434
// logic to be used by various feature specific callers.
35-
type PVList struct {
35+
type List struct {
3636
items []*PV
3737
}
3838

3939
// Len returns the number of items present
4040
// in the PVList
41-
func (p *PVList) Len() int {
41+
func (p *List) Len() int {
4242
return len(p.items)
4343
}
4444

4545
// ToAPIList converts PVList to API PVList
46-
func (p *PVList) ToAPIList() *corev1.PersistentVolumeList {
46+
func (p *List) ToAPIList() *corev1.PersistentVolumeList {
4747
plist := &corev1.PersistentVolumeList{}
4848
for _, pvc := range p.items {
4949
plist.Items = append(plist.Items, *pvc.object)

0 commit comments

Comments
 (0)