Add //nolint:... to appease golangci-lint

Signed-off-by: aram price <pricear@vmware.com>

src/light-stemcell-builder/collection/ami_collection.go

@@ -1,8 +1,9 @@
 package collection
 
 import (
-	"light-stemcell-builder/resources"
 	"sync"
+
+	"light-stemcell-builder/resources"
 )
 
 type Ami struct {

src/light-stemcell-builder/collection/collection_suite_test.go

@@ -1,10 +1,10 @@
 package collection_test
 
 import (
+	"testing"
+
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-
-	"testing"
 )
 
 func TestCollection(t *testing.T) {

src/light-stemcell-builder/collection/error_collection_test.go

@@ -2,6 +2,7 @@ package collection_test
 
 import (
 	"errors"
+
 	"light-stemcell-builder/collection"
 
 	. "github.com/onsi/ginkgo/v2"

src/light-stemcell-builder/config/config.go

@@ -5,7 +5,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 
 	uuid "github.com/satori/go.uuid"
 )
@@ -60,7 +59,7 @@ type Config struct {
 func NewFromReader(r io.Reader) (Config, error) {
 	c := Config{}
 
-	b, err := ioutil.ReadAll(r)
+	b, err := io.ReadAll(r)
 	if err != nil {
 		return Config{}, err
 	}

src/light-stemcell-builder/config/config_suite_test.go

@@ -1,10 +1,10 @@
 package config_test
 
 import (
+	"testing"
+
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-
-	"testing"
 )
 
 func TestConfig(t *testing.T) {

src/light-stemcell-builder/config/config_test.go

@@ -3,6 +3,7 @@ package config_test
 import (
 	"bytes"
 	"encoding/json"
+
 	"light-stemcell-builder/config"
 
 	. "github.com/onsi/ginkgo/v2"
@@ -11,7 +12,7 @@ import (
 
 type configModifier func(*config.Config)
 
-func identityModifier(c *config.Config) { return }
+func identityModifier(_ *config.Config) {}
 
 func parseConfig(s string, modify configModifier) (config.Config, error) {
 	configJSON := []byte(s)

src/light-stemcell-builder/driver/copy_ami_driver.go

@@ -4,11 +4,12 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"light-stemcell-builder/config"
-	"light-stemcell-builder/resources"
 	"log"
 	"time"
 
+	"light-stemcell-builder/config"
+	"light-stemcell-builder/resources"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/request"
 	"github.com/aws/aws-sdk-go/aws/session"
@@ -110,7 +111,7 @@ func (d *SDKCopyAmiDriver) Create(driverConfig resources.AmiDriverConfig) (resou
 	}
 	if driverConfig.Accessibility == resources.PublicAmiAccessibility {
 		d.logger.Printf("making AMI: %s public", *amiIDptr)
-		ec2Client.ModifyImageAttribute(&ec2.ModifyImageAttributeInput{
+		ec2Client.ModifyImageAttribute(&ec2.ModifyImageAttributeInput{ //nolint:errcheck
 			ImageId: amiIDptr,
 			LaunchPermission: &ec2.LaunchPermissionModifications{
 				Add: []*ec2.LaunchPermission{

src/light-stemcell-builder/driver/copy_ami_driver_test.go

@@ -2,18 +2,19 @@ package driver_test
 
 import (
 	"fmt"
+	"os"
+	"strings"
+
 	"light-stemcell-builder/config"
 	"light-stemcell-builder/driverset"
 	"light-stemcell-builder/resources"
-	"os"
-	"strings"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"github.com/satori/go.uuid"
+	uuid "github.com/satori/go.uuid"
 )
 
 var _ = Describe("CopyAmiDriver", func() {
@@ -64,7 +65,7 @@ var _ = Describe("CopyAmiDriver", func() {
 		copiedAmi, err := amiCopyDriver.Create(amiDriverConfig)
 		Expect(err).ToNot(HaveOccurred())
 
-		ec2Client := ec2.New(session.New(), &aws.Config{Region: aws.String(dstRegion)})
+		ec2Client := ec2.New(session.New(), &aws.Config{Region: aws.String(dstRegion)}) //nolint:staticcheck
 		reqOutput, err := ec2Client.DescribeImages(&ec2.DescribeImagesInput{ImageIds: []*string{aws.String(copiedAmi.ID)}})
 		Expect(err).ToNot(HaveOccurred())
 

src/light-stemcell-builder/driver/create_ami_driver.go

@@ -4,13 +4,14 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"light-stemcell-builder/config"
-	"light-stemcell-builder/driver/reqinputs"
-	"light-stemcell-builder/resources"
 	"log"
 	"sort"
 	"time"
 
+	"light-stemcell-builder/config"
+	"light-stemcell-builder/driver/reqinputs"
+	"light-stemcell-builder/resources"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ec2"
@@ -151,7 +152,7 @@ func (d *SDKCreateAmiDriver) Create(driverConfig resources.AmiDriverConfig) (res
 
 	if driverConfig.Accessibility == resources.PublicAmiAccessibility {
 		d.logger.Printf("making AMI: %s public", *amiIDptr)
-		d.ec2Client.ModifyImageAttribute(&ec2.ModifyImageAttributeInput{
+		d.ec2Client.ModifyImageAttribute(&ec2.ModifyImageAttributeInput{ //nolint:errcheck
 			ImageId: amiIDptr,
 			LaunchPermission: &ec2.LaunchPermissionModifications{
 				Add: []*ec2.LaunchPermission{
@@ -172,7 +173,7 @@ func (d *SDKCreateAmiDriver) Create(driverConfig resources.AmiDriverConfig) (res
 	return ami, nil
 }
 
-func (d *SDKCreateAmiDriver) findLatestKernelImage() (string, error) {
+func (d *SDKCreateAmiDriver) findLatestKernelImage() (string, error) { //nolint:unused
 	describeImagesOutput, err := d.ec2Client.DescribeImages(&ec2.DescribeImagesInput{
 		Owners: []*string{aws.String(amazonOwner)},
 		Filters: []*ec2.Filter{
@@ -196,20 +197,20 @@ func (d *SDKCreateAmiDriver) findLatestKernelImage() (string, error) {
 	return *images[0].ImageId, nil
 }
 
-type imageList []*ec2.Image
+type imageList []*ec2.Image //nolint:unused
 
-func (l imageList) Len() int {
+func (l imageList) Len() int { //nolint:unused
 	return len(l)
 }
 
-func (l imageList) Less(i, j int) bool {
+func (l imageList) Less(i, j int) bool { //nolint:unused
 	iCreationTime, _ := time.Parse(time.RFC3339Nano, *l[i].CreationDate) // swallow error as not supported by sortable interface
 	jCreationTime, _ := time.Parse(time.RFC3339Nano, *l[j].CreationDate) // swallow error as not supported by sortable interface
 	return iCreationTime.After(jCreationTime)                            // ensure oldest time is first
 
 }
 
-func (l imageList) Swap(i, j int) {
+func (l imageList) Swap(i, j int) { //nolint:unused
 	temp := l[i]
 	l[i] = l[j]
 	l[j] = temp

src/light-stemcell-builder/driver/create_ami_driver_test.go

@@ -2,14 +2,15 @@ package driver_test
 
 import (
 	"fmt"
-	"light-stemcell-builder/config"
-	"light-stemcell-builder/driverset"
-	"light-stemcell-builder/resources"
 	"log"
 	"os"
 	"strings"
 	"time"
 
+	"light-stemcell-builder/config"
+	"light-stemcell-builder/driverset"
+	"light-stemcell-builder/resources"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ec2"

src/light-stemcell-builder/driver/create_machine_image_driver.go

@@ -3,12 +3,13 @@ package driver
 import (
 	"fmt"
 	"io"
-	"light-stemcell-builder/config"
-	"light-stemcell-builder/resources"
 	"log"
 	"os"
 	"time"
 
+	"light-stemcell-builder/config"
+	"light-stemcell-builder/resources"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/s3"
@@ -35,7 +36,7 @@ func NewCreateMachineImageDriver(logDest io.Writer, creds config.Credentials) *S
 
 	awsConfig.Retryer = s3Retryer
 
-	s3Session := session.New(awsConfig)
+	s3Session := session.New(awsConfig) //nolint:staticcheck
 	s3Client := s3.New(s3Session)
 
 	return &SDKCreateMachineImageDriver{

src/light-stemcell-builder/driver/create_machine_image_manifest_driver.go

@@ -6,14 +6,15 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"light-stemcell-builder/config"
-	"light-stemcell-builder/driver/manifests"
-	"light-stemcell-builder/resources"
 	"log"
 	"math"
 	"os"
 	"time"
 
+	"light-stemcell-builder/config"
+	"light-stemcell-builder/driver/manifests"
+	"light-stemcell-builder/resources"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/s3"
@@ -26,7 +27,7 @@ const gbInBytes = 1 << 30
 type SDKCreateMachineImageManifestDriver struct {
 	s3Client    *s3.S3
 	logger      *log.Logger
-	genManifest bool
+	genManifest bool //nolint:unused
 }
 
 // NewCreateMachineImageManifestDriver creates a MachineImageDriver machine image manifest generation
@@ -43,7 +44,7 @@ func NewCreateMachineImageManifestDriver(logDest io.Writer, creds config.Credent
 
 	awsConfig.Retryer = s3Retryer
 
-	s3Session := session.New(awsConfig)
+	s3Session := session.New(awsConfig) //nolint:staticcheck
 	s3Client := s3.New(s3Session)
 
 	return &SDKCreateMachineImageManifestDriver{
@@ -112,7 +113,7 @@ func (d *SDKCreateMachineImageManifestDriver) Create(driverConfig resources.Mach
 		return resources.MachineImage{}, fmt.Errorf("Failed to generate machine image manifest: %s", err)
 	}
 
-	manifestURL, err := d.uploadManifest(driverConfig.BucketName, driverConfig.ServerSideEncryption, m)
+	manifestURL, err := d.uploadManifest(driverConfig.BucketName, driverConfig.ServerSideEncryption, m) //nolint:ineffassign,staticcheck
 
 	machineImage := resources.MachineImage{
 		GetURL:     manifestURL,

src/light-stemcell-builder/driver/create_volume_driver.go

@@ -4,15 +4,15 @@ import (
 	"encoding/xml"
 	"fmt"
 	"io"
-	"io/ioutil"
-	"light-stemcell-builder/config"
-	"light-stemcell-builder/driver/manifests"
-	"light-stemcell-builder/resources"
 	"log"
 	"net/http"
 	"strings"
 	"time"
 
+	"light-stemcell-builder/config"
+	"light-stemcell-builder/driver/manifests"
+	"light-stemcell-builder/resources"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/request"
 	"github.com/aws/aws-sdk-go/aws/session"
@@ -34,7 +34,7 @@ func NewCreateVolumeDriver(logDest io.Writer, creds config.Credentials) *SDKCrea
 		WithRegion(creds.Region).
 		WithLogger(newDriverLogger(logger))
 
-	ec2Client := ec2.New(session.New(), awsConfig)
+	ec2Client := ec2.New(session.New(), awsConfig) //nolint:staticcheck
 	return &SDKCreateVolumeDriver{ec2Client: ec2Client, logger: logger}
 }
 
@@ -47,7 +47,7 @@ func (d *SDKCreateVolumeDriver) Create(driverConfig resources.VolumeDriverConfig
 
 	availabilityZoneOutput, err := d.ec2Client.DescribeAvailabilityZones(&ec2.DescribeAvailabilityZonesInput{
 		Filters: []*ec2.Filter{
-			&ec2.Filter{Name: aws.String("state"), Values: []*string{aws.String("available")}},
+			{Name: aws.String("state"), Values: []*string{aws.String("available")}},
 		},
 	})
 	if err != nil {
@@ -64,8 +64,8 @@ func (d *SDKCreateVolumeDriver) Create(driverConfig resources.VolumeDriverConfig
 		return resources.Volume{}, fmt.Errorf("fetching import volume manifest: %s", err)
 	}
 
-	defer fetchManifestResp.Body.Close()
-	manifestBytes, err := ioutil.ReadAll(fetchManifestResp.Body)
+	defer fetchManifestResp.Body.Close() //nolint:errcheck
+	manifestBytes, err := io.ReadAll(fetchManifestResp.Body)
 	if err != nil {
 		return resources.Volume{}, fmt.Errorf("reading import volume manifest from response: %s", err)
 	}
@@ -130,7 +130,7 @@ func (d *SDKCreateVolumeDriver) Create(driverConfig resources.VolumeDriverConfig
 
 	d.logger.Printf("waiting for volume to be available: %s\n", *volumeIDptr)
 	waitStartTime = time.Now()
-	err = d.ec2Client.WaitUntilVolumeAvailable(&ec2.DescribeVolumesInput{VolumeIds: []*string{volumeIDptr}})
+	err = d.ec2Client.WaitUntilVolumeAvailable(&ec2.DescribeVolumesInput{VolumeIds: []*string{volumeIDptr}}) //nolint:ineffassign,staticcheck
 	d.logger.Printf("waited on volume %s for %f seconds\n", *volumeIDptr, time.Since(waitStartTime).Seconds())
 
 	return resources.Volume{ID: *volumeIDptr}, nil

src/light-stemcell-builder/driver/creds.go

@@ -15,7 +15,7 @@ func awsCreds(creds config.Credentials) *credentials.Credentials {
 		return credentials.NewStaticCredentials(creds.AccessKey, creds.SecretKey, "")
 	} else {
 		return credentials.NewCredentials(&ec2rolecreds.EC2RoleProvider{
-			Client: ec2metadata.New(session.New(&aws.Config{})),
+			Client: ec2metadata.New(session.New(&aws.Config{})), //nolint:staticcheck
 		})
 	}
 }

src/light-stemcell-builder/driver/delete_machine_image_driver.go

@@ -3,14 +3,14 @@ package driver
 import (
 	"fmt"
 	"io"
-	"io/ioutil"
-	"light-stemcell-builder/config"
-	"light-stemcell-builder/resources"
 	"log"
 	"net/http"
 	"strings"
 	"time"
 
+	"light-stemcell-builder/config"
+	"light-stemcell-builder/resources"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/s3"
@@ -31,7 +31,7 @@ func NewDeleteMachineImageDriver(logDest io.Writer, creds config.Credentials) *S
 		WithRegion(creds.Region).
 		WithLogger(newDriverLogger(logger))
 
-	s3Session := session.New(awsConfig)
+	s3Session := session.New(awsConfig) //nolint:staticcheck
 	s3Client := s3.New(s3Session)
 
 	return &SDKDeleteMachineImageDriver{
@@ -64,8 +64,8 @@ func (d *SDKDeleteMachineImageDriver) Delete(machineImage resources.MachineImage
 			return fmt.Errorf("Failed to delete resource '%s': %s", deleteURL, err)
 		}
 		if resp.StatusCode < 200 || resp.StatusCode >= 300 {
-			defer resp.Body.Close()
-			respBody, _ := ioutil.ReadAll(resp.Body) // ignore ReadAll err, return http status code err instead
+			defer resp.Body.Close()              //nolint:errcheck
+			respBody, _ := io.ReadAll(resp.Body) // ignore ReadAll err, return http status code err instead
 			return fmt.Errorf("Received invalid response code '%d' deleting resource '%s': %s", resp.StatusCode, deleteURL, respBody)
 		}
 	}