Merge pull request #595 from ctlong/bump/golangci-lint

Bump golangci-lint to v1.46.2

cloud/cpi_cmd_runner.go

@@ -67,11 +67,10 @@ type CPICmdRunner interface {
 }
 
 type cpiCmdRunner struct {
-	cmdRunner  boshsys.CmdRunner
-	cpi        CPI
-	logger     boshlog.Logger
-	apiVersion int
-	logTag     string
+	cmdRunner boshsys.CmdRunner
+	cpi       CPI
+	logger    boshlog.Logger
+	logTag    string
 }
 
 func NewCPICmdRunner(

cmd/clean_up.go

@@ -20,7 +20,7 @@ func NewCleanUpCmd(ui boshui.UI, director boshdir.Director) CleanUpCmd {
 
 func (c CleanUpCmd) Run(opts CleanUpOpts) error {
 
-	if opts.DryRun == false {
+	if !opts.DryRun {
 		err := c.ui.AskForConfirmation()
 		if err != nil {
 			return err
@@ -77,17 +77,15 @@ func (c CleanUpCmd) PrintCleanUpTable(resp boshdir.CleanUp) {
 		orphanedVmRows(resp.OrphanedVMs),
 	}
 
-	for i, _ := range titles {
+	for i := range titles {
 		table := boshtbl.Table{
 			Title:  titles[i],
 			Header: headers[i],
 			SortBy: []boshtbl.ColumnSort{
 				{Column: 0, Asc: true},
 			},
 		}
-		for _, r := range rows[i] {
-			table.Rows = append(table.Rows, r)
-		}
+		table.Rows = append(table.Rows, rows[i]...)
 		c.ui.PrintTable(table)
 	}
 }

cmd/config/fs_config_test.go

@@ -387,7 +387,7 @@ var _ = Describe("FSConfig", func() {
 		})
 
 		It("returns creds with username/password if environment is found and basic creds are set", func() {
-			updatedConfig, err := config.AliasEnvironment("url", "alias", "") //nolint:ineffassign
+			updatedConfig, err := config.AliasEnvironment("url", "alias", "") //nolint:ineffassign,staticcheck
 			Expect(err).ToNot(HaveOccurred())
 
 			updatedConfig = config.SetCredentials("url", Creds{Client: "user", ClientSecret: "pass"})
@@ -410,7 +410,7 @@ var _ = Describe("FSConfig", func() {
 		})
 
 		It("returns creds with token if environment is found and token is set", func() {
-			updatedConfig, err := config.AliasEnvironment("url", "alias", "") //nolint:ineffassign
+			updatedConfig, err := config.AliasEnvironment("url", "alias", "") //nolint:ineffassign,staticcheck
 			Expect(err).ToNot(HaveOccurred())
 
 			updatedConfig = config.SetCredentials("url", Creds{AccessToken: "access", AccessTokenType: "access-type", RefreshToken: "token"})
@@ -433,7 +433,7 @@ var _ = Describe("FSConfig", func() {
 		})
 
 		It("returns creds for alias if environment is found and token is set", func() {
-			updatedConfig, err := config.AliasEnvironment("url", "alias", "") //nolint:ineffassign
+			updatedConfig, err := config.AliasEnvironment("url", "alias", "") //nolint:ineffassign,staticcheck
 			Expect(err).ToNot(HaveOccurred())
 
 			updatedConfig = config.SetCredentials("alias", Creds{AccessToken: "access", AccessTokenType: "access-type", RefreshToken: "token"})
@@ -456,7 +456,7 @@ var _ = Describe("FSConfig", func() {
 		})
 
 		It("does not update existing config when creds are set", func() {
-			updatedConfig, err := config.AliasEnvironment("url", "alias", "") //nolint:ineffassign
+			updatedConfig, err := config.AliasEnvironment("url", "alias", "") //nolint:ineffassign,staticcheck
 			Expect(err).ToNot(HaveOccurred())
 
 			updatedConfig = config.SetCredentials("url", Creds{Client: "user"})

cmd/deployment_manifest_parser.go

@@ -78,7 +78,7 @@ func (y deploymentManifestParser) getManifest(path string, vars boshtpl.Variable
 			return bosherr.WrapError(err, "Validating deployment manifest")
 		}
 
-		if skipReleaseJobsValidation == false {
+		if !skipReleaseJobsValidation {
 			err = y.deploymentValidator.ValidateReleaseJobs(deploymentManifest, y.releaseManager)
 			if err != nil {
 				return bosherr.WrapError(err, "Validating deployment jobs refer to jobs in release")

cmd/env_factory.go

@@ -56,8 +56,7 @@ type envFactory struct {
 	vmManagerFactory       bivm.ManagerFactory
 	stemcellManagerFactory bistemcell.ManagerFactory
 
-	instanceManagerFactory   biinstance.ManagerFactory
-	deploymentManagerFactory bidepl.ManagerFactory
+	instanceManagerFactory biinstance.ManagerFactory
 
 	agentClientFactory bihttpagent.AgentClientFactory
 	blobstoreFactory   biblobstore.Factory

cmd/opts/opts.go

@@ -48,7 +48,7 @@ type BoshOpts struct {
 	UnaliasEnv   UnaliasEnvOpts   `command:"unalias-env"               description:"Remove an aliased environment"`
 
 	// Authentication
-	LogIn  LogInOpts  `command:"log-in"  alias:"l" alias:"login"  description:"Log in"`
+	LogIn  LogInOpts  `command:"log-in"  alias:"l" alias:"login"  description:"Log in"` //nolint:staticcheck
 	LogOut LogOutOpts `command:"log-out"           alias:"logout" description:"Log out"`
 
 	// Tasks
@@ -83,7 +83,7 @@ type BoshOpts struct {
 
 	// Deployments
 	Deployment       DeploymentOpts       `command:"deployment"        alias:"dep"             description:"Show deployment information"`
-	Deployments      DeploymentsOpts      `command:"deployments"       alias:"ds" alias:"deps" description:"List deployments"`
+	Deployments      DeploymentsOpts      `command:"deployments"       alias:"ds" alias:"deps" description:"List deployments"` //nolint:staticcheck
 	DeleteDeployment DeleteDeploymentOpts `command:"delete-deployment" alias:"deld"            description:"Delete deployment"`
 
 	Deploy   DeployOpts   `command:"deploy"   alias:"d"   description:"Update deployment"`
@@ -136,7 +136,7 @@ type BoshOpts struct {
 	UpdateResurrection UpdateResurrectionOpts `command:"update-resurrection"                            description:"Enable/disable resurrection"`
 	Ignore             IgnoreOpts             `command:"ignore"                                         description:"Ignore an instance"`
 	Unignore           UnignoreOpts           `command:"unignore"                                       description:"Unignore an instance"`
-	CloudCheck         CloudCheckOpts         `command:"cloud-check"     alias:"cck" alias:"cloudcheck" description:"Cloud consistency check and interactive repair"`
+	CloudCheck         CloudCheckOpts         `command:"cloud-check"     alias:"cck" alias:"cloudcheck" description:"Cloud consistency check and interactive repair"` //nolint:staticcheck
 	OrphanedVMs        OrphanedVMsOpts        `command:"orphaned-vms"                                   description:"List all the orphaned VMs in all deployments"`
 
 	// Instance management

cmd/opts/opts_test.go

@@ -14,7 +14,7 @@ import (
 )
 
 var (
-	dupSpaces = regexp.MustCompile("\\s{2,}")
+	dupSpaces = regexp.MustCompile(`\s{2,}`)
 )
 
 func getStructTagForName(field string, opts interface{}) string {

cmd/opts/var_flags.go

@@ -20,19 +20,19 @@ func (f VarFlags) AsVariables() boshtpl.Variables {
 
 	staticVars := boshtpl.StaticVariables{}
 
-	for i, _ := range f.VarsEnvs {
+	for i := range f.VarsEnvs {
 		for k, v := range f.VarsEnvs[i].Vars {
 			staticVars[k] = v
 		}
 	}
 
-	for i, _ := range f.VarsFiles {
+	for i := range f.VarsFiles {
 		for k, v := range f.VarsFiles[i].Vars {
 			staticVars[k] = v
 		}
 	}
 
-	for i, _ := range f.VarFiles {
+	for i := range f.VarFiles {
 		for k, v := range f.VarFiles[i].Vars {
 			staticVars[k] = v
 		}

cmd/run_errand.go

@@ -107,10 +107,3 @@ func (c RunErrandCmd) summarize(errandName string, results []boshdir.ErrandResul
 
 	return errandErr
 }
-
-func (c RunErrandCmd) printOutput(title, output string) {
-	if len(output) > 0 {
-		c.ui.PrintLinef("%s", title)
-		c.ui.PrintLinef("%s", output)
-	}
-}

cmd/session_test.go

@@ -145,8 +145,7 @@ var _ = Describe("SessionImpl", func() {
 							auth := req.Header.Get("Authorization")
 							Expect(auth).To(BeEmpty(), "Authorization header must empty")
 						},
-						ghttp.RespondWith(http.StatusOK, fmt.Sprintf(
-							`{"user_authentication":{"type":"basic","options":{}}}`)),
+						ghttp.RespondWith(http.StatusOK, `{"user_authentication":{"type":"basic","options":{}}}`),
 					),
 					ghttp.CombineHandlers(
 						ghttp.VerifyRequest("GET", "/locks"),

crypto/fakes/fake_digest_calculator.go

@@ -30,7 +30,7 @@ func (c *FakeDigestCalculator) CalculateString(data string) string {
 	}
 
 	var availableData []string
-	for key, _ := range c.CalculateStringInputs {
+	for key := range c.CalculateStringInputs {
 		availableData = append(availableData, key)
 	}
 

deployment/instance/state/builder.go

@@ -93,7 +93,7 @@ func (b *builder) Build(jobName string, instanceID int, deploymentManifest bidep
 		return nil, bosherr.WrapErrorf(err, "Compiling job package dependencies for instance '%s/%d'", jobName, instanceID)
 	}
 
-	compiledDeploymentPackageRefs := make([]PackageRef, len(compiledPackageRefs), len(compiledPackageRefs))
+	compiledDeploymentPackageRefs := make([]PackageRef, len(compiledPackageRefs))
 
 	for i, compiledPackageRef := range compiledPackageRefs {
 		compiledDeploymentPackageRefs[i] = PackageRef{
@@ -107,7 +107,7 @@ func (b *builder) Build(jobName string, instanceID int, deploymentManifest bidep
 	}
 
 	// convert array to array
-	renderedJobRefs := make([]JobRef, len(releaseJobs), len(releaseJobs))
+	renderedJobRefs := make([]JobRef, len(releaseJobs))
 
 	for i, releaseJob := range releaseJobs {
 		renderedJobRefs[i] = JobRef{
@@ -168,7 +168,7 @@ func (b *builder) BuildInitialState(jobName string, instanceID int, deploymentMa
 
 // FIXME: why do i exist here and in installation/state/builder.go??
 func (b *builder) resolveJobs(jobRefs []bideplmanifest.ReleaseJobRef) ([]bireljob.Job, error) {
-	releaseJobs := make([]bireljob.Job, len(jobRefs), len(jobRefs))
+	releaseJobs := make([]bireljob.Job, len(jobRefs))
 	for i, jobRef := range jobRefs {
 		release, err := b.releaseJobResolver.Resolve(jobRef.Name, jobRef.Release)
 		if err != nil {

deployment/instance/state/remote_package_compiler.go

@@ -46,7 +46,7 @@ func (c *remotePackageCompiler) Compile(pkg birelpkg.Compilable) (bistatepkg.Com
 	if !pkg.IsCompiled() {
 		// Resolve dependencies from map of previously compiled packages.
 		// Only install the package's immediate dependencies.
-		packageDependencies := make([]biagentclient.BlobRef, len(pkg.Deps()), len(pkg.Deps()))
+		packageDependencies := make([]biagentclient.BlobRef, len(pkg.Deps()))
 
 		for i, pkgDep := range pkg.Deps() {
 			compiledPackageRecord, found, err := c.packageRepo.Find(pkgDep)

deployment/instance/state/state.go

@@ -81,7 +81,7 @@ func (s *state) CompiledPackages() []PackageRef { return s.compiledPackages }
 func (s *state) RenderedJobListArchive() BlobRef { return s.renderedJobListArchive }
 
 func (s *state) ToApplySpec() bias.ApplySpec {
-	jobTemplateList := make([]bias.Blob, len(s.renderedJobs), len(s.renderedJobs))
+	jobTemplateList := make([]bias.Blob, len(s.renderedJobs))
 	for i, renderedJob := range s.renderedJobs {
 		jobTemplateList[i] = bias.Blob{
 			Name:    renderedJob.Name,

deployment/manifest/parser.go

@@ -197,7 +197,7 @@ func (p *parser) parseDeploymentManifest(depManifest manifest, path string) (Man
 }
 
 func (p *parser) parseJobManifests(rawJobs []job) ([]Job, error) {
-	jobs := make([]Job, len(rawJobs), len(rawJobs))
+	jobs := make([]Job, len(rawJobs))
 	for i, rawJob := range rawJobs {
 		job := Job{
 			Name:               rawJob.Name,
@@ -218,7 +218,7 @@ func (p *parser) parseJobManifests(rawJobs []job) ([]Job, error) {
 		}
 
 		if templates != nil {
-			releaseJobRefs := make([]ReleaseJobRef, len(templates), len(templates))
+			releaseJobRefs := make([]ReleaseJobRef, len(templates))
 			for i, rawJobRef := range templates {
 				ref := ReleaseJobRef{
 					Name:    rawJobRef.Name,
@@ -240,15 +240,15 @@ func (p *parser) parseJobManifests(rawJobs []job) ([]Job, error) {
 		}
 
 		if rawJob.Networks != nil {
-			jobNetworks := make([]JobNetwork, len(rawJob.Networks), len(rawJob.Networks))
+			jobNetworks := make([]JobNetwork, len(rawJob.Networks))
 			for i, rawJobNetwork := range rawJob.Networks {
 				jobNetwork := JobNetwork{
 					Name:      rawJobNetwork.Name,
 					StaticIPs: rawJobNetwork.StaticIPs,
 				}
 
 				if rawJobNetwork.Defaults != nil {
-					networkDefaults := make([]NetworkDefault, len(rawJobNetwork.Defaults), len(rawJobNetwork.Defaults))
+					networkDefaults := make([]NetworkDefault, len(rawJobNetwork.Defaults))
 					for i, rawDefaults := range rawJobNetwork.Defaults {
 						networkDefaults[i] = NetworkDefault(rawDefaults)
 					}
@@ -275,7 +275,7 @@ func (p *parser) parseJobManifests(rawJobs []job) ([]Job, error) {
 }
 
 func (p *parser) parseNetworkManifests(rawNetworks []network) ([]Network, error) {
-	networks := make([]Network, len(rawNetworks), len(rawNetworks))
+	networks := make([]Network, len(rawNetworks))
 	for i, rawNetwork := range rawNetworks {
 		network := Network{
 			Name: rawNetwork.Name,
@@ -310,7 +310,7 @@ func (p *parser) parseNetworkManifests(rawNetworks []network) ([]Network, error)
 }
 
 func (p *parser) parseResourcePoolManifests(rawResourcePools []resourcePool, path string) ([]ResourcePool, error) {
-	resourcePools := make([]ResourcePool, len(rawResourcePools), len(rawResourcePools))
+	resourcePools := make([]ResourcePool, len(rawResourcePools))
 	for i, rawResourcePool := range rawResourcePools {
 		resourcePool := ResourcePool{
 			Name:     rawResourcePool.Name,
@@ -342,7 +342,7 @@ func (p *parser) parseResourcePoolManifests(rawResourcePools []resourcePool, pat
 }
 
 func (p *parser) parseDiskPoolManifests(rawDiskPools []diskPool) ([]DiskPool, error) {
-	diskPools := make([]DiskPool, len(rawDiskPools), len(rawDiskPools))
+	diskPools := make([]DiskPool, len(rawDiskPools))
 	for i, rawDiskPool := range rawDiskPools {
 		diskPool := DiskPool{
 			Name:     rawDiskPool.Name,

deployment/manifest/validator.go

@@ -37,6 +37,7 @@ func (v *validator) Validate(deploymentManifest Manifest, releaseSetManifest bir
 	networksErrors := v.validateNetworks(deploymentManifest.Networks)
 	errs = append(errs, networksErrors...)
 
+	protocolRegex := regexp.MustCompile("^(file|http|https)://")
 	for idx, resourcePool := range deploymentManifest.ResourcePools {
 		if v.isBlank(resourcePool.Name) {
 			errs = append(errs, bosherr.Errorf("resource_pools[%d].name must be provided", idx))
@@ -51,8 +52,8 @@ func (v *validator) Validate(deploymentManifest Manifest, releaseSetManifest bir
 			errs = append(errs, bosherr.Errorf("resource_pools[%d].stemcell.url must be provided", idx))
 		}
 
-		matched, err := regexp.MatchString("^(file|http|https)://", resourcePool.Stemcell.URL)
-		if err != nil || !matched {
+		matched := protocolRegex.MatchString(resourcePool.Stemcell.URL)
+		if !matched {
 			errs = append(errs, bosherr.Errorf("resource_pools[%d].stemcell.url must be a valid URL (file:// or http(s)://)", idx))
 		}
 

deployment/vm/manager.go

@@ -6,7 +6,6 @@ import (
 
 	"code.cloudfoundry.org/clock"
 	biagentclient "github.com/cloudfoundry/bosh-agent/agentclient"
-	bihttpagent "github.com/cloudfoundry/bosh-agent/agentclient/http"
 	bicloud "github.com/cloudfoundry/bosh-cli/cloud"
 	biconfig "github.com/cloudfoundry/bosh-cli/config"
 	bideplmanifest "github.com/cloudfoundry/bosh-cli/deployment/manifest"
@@ -24,17 +23,16 @@ type Manager interface {
 }
 
 type manager struct {
-	vmRepo             biconfig.VMRepo
-	stemcellRepo       biconfig.StemcellRepo
-	diskDeployer       DiskDeployer
-	agentClient        biagentclient.AgentClient
-	agentClientFactory bihttpagent.AgentClientFactory
-	cloud              bicloud.Cloud
-	uuidGenerator      boshuuid.Generator
-	fs                 boshsys.FileSystem
-	logger             boshlog.Logger
-	logTag             string
-	timeService        Clock
+	vmRepo        biconfig.VMRepo
+	stemcellRepo  biconfig.StemcellRepo
+	diskDeployer  DiskDeployer
+	agentClient   biagentclient.AgentClient
+	cloud         bicloud.Cloud
+	uuidGenerator boshuuid.Generator
+	fs            boshsys.FileSystem
+	logger        boshlog.Logger
+	logTag        string
+	timeService   Clock
 }
 
 func NewManager(

director/cloud_configs_test.go

@@ -108,9 +108,7 @@ var _ = Describe("Director", func() {
 	})
 
 	Describe("DiffCloudConfig", func() {
-		var expectedDiffResponse ConfigDiff
-
-		expectedDiffResponse = ConfigDiff{
+		expectedDiffResponse := ConfigDiff{
 			Diff: [][]interface{}{
 				[]interface{}{"azs:", nil},
 				[]interface{}{"- name: az2", "removed"},

director/cpi_configs_test.go

@@ -108,9 +108,7 @@ var _ = Describe("Director", func() {
 	})
 
 	Describe("DiffCPIConfig", func() {
-		var expectedDiffResponse ConfigDiff
-
-		expectedDiffResponse = ConfigDiff{
+		expectedDiffResponse := ConfigDiff{
 			Diff: [][]interface{}{
 				[]interface{}{"cpis:", nil},
 				[]interface{}{"  name: smurf", "removed"},