chore: simplify logic

Signed-off-by: juan131 <juan.ariza@broadcom.com>

Author: juan131

pkg/chartutils/chartutils.go

@@ -161,9 +161,9 @@ func ReadLockFromChart(chartPath string) (*imagelock.ImagesLock, error) {
 	var lock *imagelock.ImagesLock
 	if isTar, _ := utils.IsTarFile(chartPath); isTar {
 		if err := utils.FindFileInTar(context.Background(), chartPath, "Images.lock", func(tr *tar.Reader) error {
-			var lockErr error
-			lock, lockErr = imagelock.FromYAML(tr)
-			return lockErr
+			var err error
+			lock, err = imagelock.FromYAML(tr)
+			return err
 		}, utils.TarConfig{StripComponents: 2}); err != nil {
 			return nil, err
 		}

pkg/chartutils/images_test.go

@@ -24,16 +24,16 @@ func (suite *ChartUtilsTestSuite) TestPullImages() {
 	s := httptest.NewServer(registry.New(registry.Logger(silentLog)))
 	defer s.Close()
 
-	u, urlErr := url.Parse(s.URL)
-	if urlErr != nil {
-		t.Fatal(urlErr)
+	u, err := url.Parse(s.URL)
+	if err != nil {
+		t.Fatal(err)
 	}
 
 	imageName := "test:mytag"
 
-	images, regErr := tu.AddSampleImagesToRegistry(imageName, u.Host)
-	if regErr != nil {
-		t.Fatal(regErr)
+	images, err := tu.AddSampleImagesToRegistry(imageName, u.Host)
+	if err != nil {
+		t.Fatal(err)
 	}
 
 	sb := suite.sb
@@ -120,8 +120,8 @@ func (suite *ChartUtilsTestSuite) TestPushImages() {
 			"linux/amd64",
 			"linux/arm",
 		}
-		craneImgs, err := tu.CreateSampleImages(&imageData, architectures)
 
+		craneImgs, err := tu.CreateSampleImages(&imageData, architectures)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -147,13 +147,12 @@ func (suite *ChartUtilsTestSuite) TestPushImages() {
 			}
 
 			imgFile := filepath.Join(imagesDir, fmt.Sprintf("%s.layout", d.Hex))
-			if craneErr := crane.SaveOCI(img, imgFile); craneErr != nil {
-				t.Fatal(craneErr)
+			if err = crane.SaveOCI(img, imgFile); err != nil {
+				t.Fatal(err)
 			}
 		}
 
 		t.Run("Push images", func(t *testing.T) {
-			require.NoError(err)
 			lock, err := imagelock.FromYAMLFile(filepath.Join(chartDir, "Images.lock"))
 			require.NoError(err)
 			require.NoError(PushImages(lock, imagesDir))