Azure: go lint

openshift · Mar 8, 2024 · bce2c88 · bce2c88
1 parent b9f38a0
commit bce2c88
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 15 deletions.
diff --git a/pkg/asset/machines/azure/azuremachines.go b/pkg/asset/machines/azure/azuremachines.go
@@ -45,7 +45,7 @@ func GenerateMachines(platform *azure.Platform, pool *types.MachinePool, userDat
 		return nil, fmt.Errorf("failed to create machineapi.TagSpecifications from UserTags: %w", err)
 	}
 
-	image := &capz.Image{}
+	var image *capz.Image
 	osImage := mpool.OSImage
 	galleryName := strings.ReplaceAll(clusterID, "-", "_")
 

diff --git a/pkg/infrastructure/azure/compute.go b/pkg/infrastructure/azure/compute.go
@@ -15,7 +15,7 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-// CreateImageGalleryInput contains the input paramters for creating a image
+// CreateImageGalleryInput contains the input parameters for creating a image
 // gallery.
 type CreateImageGalleryInput struct {
 	SubscriptionID     string
@@ -34,7 +34,7 @@ type CreateImageGalleryOutput struct {
 	Gallery              *armcompute.Gallery
 }
 
-// CreateImageGallery creates a image gallery
+// CreateImageGallery creates a image gallery.
 func CreateImageGallery(ctx context.Context, in *CreateImageGalleryInput) (*CreateImageGalleryOutput, error) {
 	computeClientFactory, err := armcompute.NewClientFactory(
 		in.SubscriptionID,
@@ -79,7 +79,7 @@ func CreateImageGallery(ctx context.Context, in *CreateImageGalleryInput) (*Crea
 	}, nil
 }
 
-// CreateGalleryImageInput contains the input paramters for creating a gallery
+// CreateGalleryImageInput contains the input parameters for creating a gallery
 // image.
 type CreateGalleryImageInput struct {
 	ResourceGroupName    string
@@ -104,7 +104,7 @@ type CreateGalleryImageOutput struct {
 	GalleryImage *armcompute.GalleryImage
 }
 
-// CreateGalleryImage creates a gallery image
+// CreateGalleryImage creates a gallery image.
 func CreateGalleryImage(ctx context.Context, in *CreateGalleryImageInput) (*CreateGalleryImageOutput, error) {
 	galleryImagesClient := in.ComputeClientFactory.NewGalleryImagesClient()
 
@@ -143,10 +143,9 @@ func CreateGalleryImage(ctx context.Context, in *CreateGalleryImageInput) (*Crea
 	return &CreateGalleryImageOutput{
 		GalleryImage: to.Ptr(galleryImage),
 	}, nil
-
 }
 
-// CreateGalleryImageVersionInput contains the input paramters for creating a
+// CreateGalleryImageVersionInput contains the input parameters for creating a
 // gallery image version.
 type CreateGalleryImageVersionInput struct {
 	ResourceGroupName       string
@@ -167,7 +166,7 @@ type CreateGalleryImageVersionOutput struct {
 	GalleryImageVersion *armcompute.GalleryImageVersion
 }
 
-// CreateGalleryImageVersion creates a gallery image version
+// CreateGalleryImageVersion creates a gallery image version.
 func CreateGalleryImageVersion(ctx context.Context, in *CreateGalleryImageVersionInput) (*CreateGalleryImageVersionOutput, error) {
 	galleryImageVersionsClient := in.ComputeClientFactory.NewGalleryImageVersionsClient()
 

diff --git a/pkg/infrastructure/azure/storage.go b/pkg/infrastructure/azure/storage.go
@@ -230,12 +230,12 @@ func doUploadPagesFromURL(ctx context.Context, pageBlobClient *pageblob.Client,
 	// Azure only allows 4MB chunks, See
 	// https://docs.microsoft.com/rest/api/storageservices/put-page-from-url
 	pageSize := int64(1024 * 1024 * 4)
-	leftOverBytes := int64(imageLength % pageSize)
+	leftOverBytes := imageLength % pageSize
 	offset := int64(0)
 	pages := int64(0)
 
 	if imageLength > pageSize {
-		pages = int64(imageLength / pageSize)
+		pages = imageLength / pageSize
 		if imageLength%pageSize > 0 {
 			pages++
 		}
@@ -254,10 +254,9 @@ func doUploadPagesFromURL(ctx context.Context, pageBlobClient *pageblob.Client,
 		threadGroups++
 	}
 
-	//var mutex sync.Mutex
 	var wg sync.WaitGroup
 	var threadError error
-	var res error = nil
+	var res error
 
 	pagesLeft := pages
 	for threadGroup := int64(0); threadGroup < threadGroups; threadGroup++ {
@@ -275,16 +274,13 @@ func doUploadPagesFromURL(ctx context.Context, pageBlobClient *pageblob.Client,
 			if offset+pageSize >= imageLength && leftOverBytes > 0 {
 				pageSize = leftOverBytes
 				leftOverBytes = 0
-
 			} else if offset > imageLength {
 				break
 			}
 
 			wg.Add(1)
 			go func(ctx context.Context, source string, thread, sourceOffset, destOffset, count int64, wg *sync.WaitGroup) {
 				defer wg.Done()
-				//logrus.Debugf("threadGroup=%d thread=%d sourceOffset=%d destOffset=%d count=%d",
-				//	threadGroup, thread, sourceOffset, destOffset, count)
 				_, err := pageBlobClient.UploadPagesFromURL(ctx, imageURL, sourceOffset, destOffset, count, nil)
 				errors <- err
 				results <- thread