Enable stylecheck linter

.golangci.yml

@@ -24,6 +24,10 @@ linters:
     - importas
     - misspell
     - nestif
+    - gci
+    - goprintffuncname
+    - nolintlint
+    - stylecheck
 
 run:
   timeout: 10m                          # golangci-lint run's timeout.
@@ -41,6 +45,7 @@ issues:
         - dupl
         - misspell
         - nestif
+        - stylecheck
 
     - text: "`ctx` is unused"           # Context might not be in use in places, but for consistency, we pass it.
       linters:
@@ -66,3 +71,10 @@ linters-settings:
         alias: crv1alpha1
   nestif:
     min-complexity: 6
+  gci:
+    sections:
+      - standard
+      - default
+      - prefix(github.com/kanisterio/kanister)
+  stylecheck:
+    checks: [ "all", "-ST1001", "-ST1005", "-ST1016", "-ST1023" ]

.goreleaser.yml

@@ -8,9 +8,9 @@ builds:
   main: cmd/kanctl/main.go
   ldflags: &ldflags
   - -extldflags "-static"
-    -X github.com/kanisterio/kanister/pkg/version.VERSION={{.Version}}
-    -X github.com/kanisterio/kanister/pkg/version.GIT_COMMIT={{.Commit}}
-    -X github.com/kanisterio/kanister/pkg/version.BUILD_DATE={{.Date}}
+    -X github.com/kanisterio/kanister/pkg/version.Version={{.Version}}
+    -X github.com/kanisterio/kanister/pkg/version.GitCommit={{.Commit}}
+    -X github.com/kanisterio/kanister/pkg/version.BuildDate={{.Date}}
   env: &env
   - GO111MODULE=on
   - CGO_ENABLED=1

cmd/reposervercontroller/main.go

@@ -40,7 +40,6 @@ import (
 	"github.com/kanisterio/kanister/pkg/log"
 	"github.com/kanisterio/kanister/pkg/resource"
 	"github.com/kanisterio/kanister/pkg/validatingwebhook"
-	//+kubebuilder:scaffold:imports
 )
 
 var (

pkg/app/bp.go

@@ -19,11 +19,12 @@ import (
 	"strings"
 	"time"
 
+	"k8s.io/apimachinery/pkg/util/rand"
+
 	crv1alpha1 "github.com/kanisterio/kanister/pkg/apis/cr/v1alpha1"
 	bp "github.com/kanisterio/kanister/pkg/blueprint"
 	"github.com/kanisterio/kanister/pkg/field"
 	"github.com/kanisterio/kanister/pkg/log"
-	"k8s.io/apimachinery/pkg/util/rand"
 )
 
 const (

pkg/app/cockroachdb.go

@@ -126,16 +126,16 @@ func (c *CockroachDB) IsReady(ctx context.Context) (bool, error) {
 		return false, errors.Wrapf(err, "Error while Creating ca.crt %s", stderr)
 	}
 
-	createTlsCrtCmd := fmt.Sprintf("echo '%s'>> /cockroach/cockroach-client-certs/client.root.crt", c.tlscrt)
-	createTlsCrt := []string{"sh", "-c", createTlsCrtCmd}
-	_, stderr, err = c.execCommand(ctx, createTlsCrt)
+	createTLSCrtCmd := fmt.Sprintf("echo '%s'>> /cockroach/cockroach-client-certs/client.root.crt", c.tlscrt)
+	createTLSCrt := []string{"sh", "-c", createTLSCrtCmd}
+	_, stderr, err = c.execCommand(ctx, createTLSCrt)
 	if err != nil {
 		return false, errors.Wrapf(err, "Error while Creating tls.crt %s", stderr)
 	}
 
-	createTlsKeyCmd := fmt.Sprintf("echo '%s' >> /cockroach/cockroach-client-certs/client.root.key", c.tlskey)
-	createTlsKey := []string{"sh", "-c", createTlsKeyCmd}
-	_, stderr, err = c.execCommand(ctx, createTlsKey)
+	createTLSKeyCmd := fmt.Sprintf("echo '%s' >> /cockroach/cockroach-client-certs/client.root.key", c.tlskey)
+	createTLSKey := []string{"sh", "-c", createTLSKeyCmd}
+	_, stderr, err = c.execCommand(ctx, createTLSKey)
 	if err != nil {
 		return false, errors.Wrapf(err, "Error while Creating tls.key %s", stderr)
 	}

pkg/app/utils.go

@@ -19,13 +19,14 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/kanisterio/kanister/pkg/aws/ec2"
-	"github.com/kanisterio/kanister/pkg/aws/rds"
 	"github.com/pkg/errors"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/rand"
+
+	"github.com/kanisterio/kanister/pkg/aws/ec2"
+	"github.com/kanisterio/kanister/pkg/aws/rds"
 )
 
 const (

pkg/aws/ec2/ec2.go

@@ -50,20 +50,20 @@ func (e EC2) DescribeSecurityGroup(ctx context.Context, groupName string) (*ec2.
 	return e.DescribeSecurityGroupsWithContext(ctx, sgi)
 }
 
-func (e EC2) CreateSecurityGroup(ctx context.Context, groupName, description, vpcId string) (*ec2.CreateSecurityGroupOutput, error) {
+func (e EC2) CreateSecurityGroup(ctx context.Context, groupName, description, vpcID string) (*ec2.CreateSecurityGroupOutput, error) {
 	sgi := &ec2.CreateSecurityGroupInput{
 		DryRun:      &e.DryRun,
 		Description: &description,
 		GroupName:   &groupName,
-		VpcId:       aws.String(vpcId),
+		VpcId:       aws.String(vpcID),
 	}
 	return e.CreateSecurityGroupWithContext(ctx, sgi)
 }
 
-func (e EC2) AuthorizeSecurityGroupIngress(ctx context.Context, groupId, cidr, protocol string, port int64) (*ec2.AuthorizeSecurityGroupIngressOutput, error) {
+func (e EC2) AuthorizeSecurityGroupIngress(ctx context.Context, groupID, cidr, protocol string, port int64) (*ec2.AuthorizeSecurityGroupIngressOutput, error) {
 	sgi := &ec2.AuthorizeSecurityGroupIngressInput{
 		DryRun:     &e.DryRun,
-		GroupId:    &groupId,
+		GroupId:    &groupID,
 		CidrIp:     &cidr,
 		IpProtocol: &protocol,
 		ToPort:     &port,
@@ -72,20 +72,20 @@ func (e EC2) AuthorizeSecurityGroupIngress(ctx context.Context, groupId, cidr, p
 	return e.AuthorizeSecurityGroupIngressWithContext(ctx, sgi)
 }
 
-func (e EC2) DeleteSecurityGroup(ctx context.Context, groupId string) (*ec2.DeleteSecurityGroupOutput, error) {
+func (e EC2) DeleteSecurityGroup(ctx context.Context, groupID string) (*ec2.DeleteSecurityGroupOutput, error) {
 	sgi := &ec2.DeleteSecurityGroupInput{
 		DryRun:  &e.DryRun,
-		GroupId: aws.String(groupId),
+		GroupId: aws.String(groupID),
 	}
 	return e.DeleteSecurityGroupWithContext(ctx, sgi)
 }
 
-func (e EC2) DescribeSubnets(ctx context.Context, vpcId string) (*ec2.DescribeSubnetsOutput, error) {
+func (e EC2) DescribeSubnets(ctx context.Context, vpcID string) (*ec2.DescribeSubnetsOutput, error) {
 	paramsEC2 := &ec2.DescribeSubnetsInput{
 		Filters: []*ec2.Filter{
 			{
 				Name:   aws.String("vpc-id"),
-				Values: []*string{aws.String(vpcId)},
+				Values: []*string{aws.String(vpcID)},
 			},
 		},
 	}

pkg/aws/rds/rds.go

@@ -23,8 +23,9 @@ import (
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/rds"
-	"github.com/kanisterio/kanister/pkg/poll"
 	"github.com/pkg/errors"
+
+	"github.com/kanisterio/kanister/pkg/poll"
 )
 
 const (

pkg/blockstorage/awsebs/awsebs_test.go

@@ -25,9 +25,8 @@ import (
 	. "gopkg.in/check.v1"
 
 	kaws "github.com/kanisterio/kanister/pkg/aws"
-	envconfig "github.com/kanisterio/kanister/pkg/config"
-
 	"github.com/kanisterio/kanister/pkg/blockstorage"
+	envconfig "github.com/kanisterio/kanister/pkg/config"
 )
 
 // Hook up gocheck into the "go test" runner.

pkg/blockstorage/azure/azuredisk.go

@@ -1,8 +1,5 @@
 // TODO: Switch to using the latest azure sdk and remove nolint.
 // Related Ticket- https://github.com/kanisterio/kanister/issues/1684
-//
-//nolint:staticcheck
-
 package azure
 
 import (
@@ -74,11 +71,11 @@ func (s *AdStorage) VolumeGet(ctx context.Context, id string, zone string) (*blo
 
 func (s *AdStorage) VolumeCreate(ctx context.Context, volume blockstorage.Volume) (*blockstorage.Volume, error) {
 	tags := blockstorage.SanitizeTags(blockstorage.KeyValueToMap(volume.Tags))
-	diskId, err := uuid.NewV1()
+	diskID, err := uuid.NewV1()
 	if err != nil {
 		return nil, errors.Wrap(err, "Failed to create UUID")
 	}
-	diskName := fmt.Sprintf(volumeNameFmt, diskId.String())
+	diskName := fmt.Sprintf(volumeNameFmt, diskID.String())
 
 	diskProperties := &armcompute.DiskProperties{
 		CreationData: &armcompute.CreationData{
@@ -195,11 +192,11 @@ func (s *AdStorage) SnapshotCopyWithArgs(ctx context.Context, from blockstorage.
 	if err != nil {
 		return nil, errors.Wrapf(err, "Failed to copy disk to blob")
 	}
-	snapId, err := uuid.NewV1()
+	snapID, err := uuid.NewV1()
 	if err != nil {
 		return nil, errors.Wrap(err, "Failed to create UUID")
 	}
-	snapName := fmt.Sprintf(snapshotNameFmt, snapId.String())
+	snapName := fmt.Sprintf(snapshotNameFmt, snapID.String())
 	createSnap := getSnapshotObject(blob, from, to, snapName, storageAccountID)
 
 	migrateResourceGroup := s.azCli.ResourceGroup
@@ -295,11 +292,11 @@ func deleteBlob(blob *storage.Blob, blobName string) {
 }
 
 func (s *AdStorage) SnapshotCreate(ctx context.Context, volume blockstorage.Volume, tags map[string]string) (*blockstorage.Snapshot, error) {
-	snapId, err := uuid.NewV1()
+	snapID, err := uuid.NewV1()
 	if err != nil {
 		return nil, errors.Wrap(err, "Failed to create UUID")
 	}
-	snapName := fmt.Sprintf(snapshotNameFmt, snapId.String())
+	snapName := fmt.Sprintf(snapshotNameFmt, snapID.String())
 	tags = blockstorage.SanitizeTags(ktags.GetTags(tags))
 	region, _, err := getLocationInfo(volume.Az)
 	if err != nil {
@@ -423,9 +420,9 @@ func (s *AdStorage) VolumeParse(ctx context.Context, volume interface{}) (*block
 		return nil, errors.New("Volume type is not available")
 	}
 
-	volId := ""
+	volID := ""
 	if vol.ID != nil {
-		volId = blockstorage.StringFromPtr(vol.ID)
+		volID = blockstorage.StringFromPtr(vol.ID)
 	} else {
 		return nil, errors.New("Volume Id is not available")
 	}
@@ -447,7 +444,7 @@ func (s *AdStorage) VolumeParse(ctx context.Context, volume interface{}) (*block
 
 	return &blockstorage.Volume{
 		Type:         s.Type(),
-		ID:           volId,
+		ID:           volID,
 		Encrypted:    encrypted,
 		SizeInBytes:  diskSize,
 		Az:           az,
@@ -466,15 +463,15 @@ func (s *AdStorage) SnapshotParse(ctx context.Context, snapshot interface{}) (*b
 }
 
 func (s *AdStorage) snapshotParse(ctx context.Context, snap armcompute.Snapshot) (*blockstorage.Snapshot, error) {
-	snapId := ""
+	snapID := ""
 	if snap.ID != nil {
-		snapId = *snap.ID
+		snapID = *snap.ID
 	} else {
 		return nil, errors.New("Snapshot ID is missing")
 	}
 	vol := &blockstorage.Volume{
 		Type: s.Type(),
-		ID:   snapId,
+		ID:   snapID,
 	}
 
 	snapCreationTime := time.Now()
@@ -504,7 +501,7 @@ func (s *AdStorage) snapshotParse(ctx context.Context, snap armcompute.Snapshot)
 	}
 	return &blockstorage.Snapshot{
 		Encrypted:         encrypted,
-		ID:                snapId,
+		ID:                snapID,
 		Region:            region,
 		SizeInBytes:       blockstorage.Int64(diskSize),
 		Tags:              blockstorage.MapToKeyValue(tags),
@@ -573,11 +570,11 @@ func (s *AdStorage) VolumeCreateFromSnapshot(ctx context.Context, snapshot block
 		return nil, err
 	}
 
-	diskId, err := uuid.NewV1()
+	diskID, err := uuid.NewV1()
 	if err != nil {
 		return nil, errors.Wrap(err, "Failed to create UUID")
 	}
-	diskName := fmt.Sprintf(volumeNameFmt, diskId.String())
+	diskName := fmt.Sprintf(volumeNameFmt, diskID.String())
 	tags = blockstorage.SanitizeTags(tags)
 	createDisk := armcompute.Disk{
 		Name:     blockstorage.StringPtr(diskName),

pkg/blockstorage/azure/client.go

@@ -14,8 +14,6 @@
 
 // TODO: Switch to using the latest azure sdk and remove nolint.
 // Related Ticket- https://github.com/kanisterio/kanister/issues/168
-//
-//nolint:staticcheck
 package azure
 
 import (

pkg/blockstorage/gcepd/gcepd.go

@@ -187,12 +187,12 @@ func (s *GpdStorage) SnapshotCopyWithArgs(ctx context.Context, from blockstorage
 
 // SnapshotCreate is part of blockstorage.Provider
 func (s *GpdStorage) SnapshotCreate(ctx context.Context, volume blockstorage.Volume, tags map[string]string) (*blockstorage.Snapshot, error) {
-	rbId, uerr := uuid.NewV1()
+	rbID, uerr := uuid.NewV1()
 	if uerr != nil {
 		return nil, errors.Wrap(uerr, "Failed to create UUID")
 	}
 	rb := &compute.Snapshot{
-		Name:   fmt.Sprintf(snapshotNameFmt, rbId.String()),
+		Name:   fmt.Sprintf(snapshotNameFmt, rbID.String()),
 		Labels: blockstorage.SanitizeTags(ktags.GetTags(tags)),
 	}
 	var err error
@@ -381,12 +381,12 @@ func (s *GpdStorage) VolumeCreateFromSnapshot(ctx context.Context, snapshot bloc
 			tags[tag.Key] = tag.Value
 		}
 	}
-	createDiskId, err := uuid.NewV1()
+	createDiskID, err := uuid.NewV1()
 	if err != nil {
 		return nil, errors.Wrap(err, "Failed to create UUID")
 	}
 	createDisk := &compute.Disk{
-		Name:           fmt.Sprintf(volumeNameFmt, createDiskId.String()),
+		Name:           fmt.Sprintf(volumeNameFmt, createDiskID.String()),
 		SizeGb:         blockstorage.SizeInGi(snapshot.Volume.SizeInBytes),
 		Type:           snapshot.Volume.VolumeType,
 		Labels:         blockstorage.SanitizeTags(ktags.GetTags(tags)),

pkg/blockstorage/zone/zone_test.go

@@ -21,12 +21,13 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/kanisterio/kanister/pkg/kube"
 	. "gopkg.in/check.v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/kubernetes/fake"
+
+	"github.com/kanisterio/kanister/pkg/kube"
 )
 
 // Hook up gocheck into the "go test" runner.

pkg/blueprint/validate/validate.go

@@ -17,12 +17,13 @@ package validate
 import (
 	"fmt"
 
+	"github.com/pkg/errors"
+
 	kanister "github.com/kanisterio/kanister/pkg"
 	crv1alpha1 "github.com/kanisterio/kanister/pkg/apis/cr/v1alpha1"
 	_ "github.com/kanisterio/kanister/pkg/function"
 	"github.com/kanisterio/kanister/pkg/param"
 	"github.com/kanisterio/kanister/pkg/utils"
-	"github.com/pkg/errors"
 )
 
 const (

pkg/chronicle/chronicle_pull.go

@@ -19,9 +19,10 @@ import (
 	"context"
 	"io"
 
+	"github.com/pkg/errors"
+
 	"github.com/kanisterio/kanister/pkg/location"
 	"github.com/kanisterio/kanister/pkg/param"
-	"github.com/pkg/errors"
 )
 
 func Pull(ctx context.Context, target io.Writer, p param.Profile, manifest string) error {