fix: nil pointer at asset upload (#213)

Author: eksrha

.vscode/extensions.json

@@ -1,7 +1,3 @@
 {
-    "recommendations": [
-        "golang.go",
-        "esbenp.prettier-vscode",
-        "asciidoctor.asciidoctor-vscode"
-    ]
-}
+  "recommendations": ["golang.go", "esbenp.prettier-vscode"]
+}

internal/app/awesome-ci/scm-portal/github/release.go

@@ -3,6 +3,7 @@ package github
 import (
 	"errors"
 	"fmt"
+	"os"
 	"time"
 
 	"github.com/fullstack-devops/awesome-ci/internal/pkg/tools"
@@ -94,24 +95,27 @@ func (ghrc *GitHubRichClient) PublishRelease(
 	if len(uploadArtifacts) > 0 {
 		releaseBodyAssets = "### Assets\n"
 
-		for _, fileAndInfo := range uploadArtifacts {
-			logrus.Infof("uploading %s as asset to release\n", fileAndInfo.Name)
+		for _, asset := range uploadArtifacts {
+			logrus.Infof("uploading %s as asset to release\n", asset.Name)
+			file, err := os.Open(asset.FilePath)
+			if err != nil {
+				return releaseAssets, err
+			}
 			// Upload assets to GitHub Release
 			relAsset, _, err := ghrc.Client.Repositories.UploadReleaseAsset(
 				ctx,
 				ghrc.Owner,
 				ghrc.Repository,
 				releaseID,
 				&github.UploadOptions{
-					Name: fileAndInfo.Name,
+					Name: asset.Name,
 				},
-				&fileAndInfo.File)
+				file)
 			if err != nil {
 				logrus.Warnln("error at uploading asset to release: ", err)
 			} else {
 				// add asset to release body
-				releaseBodyAssets = fmt.Sprintf("%s\n- [%s](%s) `%s`\n  Sha256: `%x`", releaseBodyAssets, fileAndInfo.Name, *relAsset.BrowserDownloadURL, fileAndInfo.Infos.ModTime().Format(time.RFC3339), fileAndInfo.Hash)
-
+				releaseBodyAssets = fmt.Sprintf("%s\n- [%s](%s) `%s`\n  Sha256: `%x`", releaseBodyAssets, asset.Name, *relAsset.BrowserDownloadURL, asset.ModTime.Format(time.RFC3339), asset.Hash)
 				releaseAssets = append(releaseAssets, relAsset)
 			}
 		}

internal/app/awesome-ci/service/release.go

@@ -65,7 +65,7 @@ func ReleaseCreate(args *ReleaseArgs) {
 	}
 }
 
-func ReleasePublish(args *ReleaseArgs, releaseID int64, assets []string) {
+func ReleasePublish(args *ReleaseArgs, releaseID int64, assetsStr []string) {
 	scmLayer, err := scmportal.LoadSCMPortalLayer()
 	if err != nil {
 		log.Fatalln(err)
@@ -80,17 +80,17 @@ func ReleasePublish(args *ReleaseArgs, releaseID int64, assets []string) {
 		}
 	}
 
-	var assetsEncoded []uploadasset.UploadAsset
-	if len(assets) > 0 {
-		for _, asset := range assets {
-			assetInfo, err := uploadasset.GetAsset(asset)
+	var assets []uploadasset.UploadAsset
+	if len(assetsStr) > 0 {
+		for _, asset := range assetsStr {
+			newAsset, err := uploadasset.GetAsset(asset)
 			if err != nil {
 				log.Fatalln("not all specified assets available, please check", err)
 			}
-			assetsEncoded = append(assetsEncoded, *assetInfo)
+			assets = append(assets, newAsset)
 		}
 	}
-	log.Infof("will upload %d assets", len(assets))
+	log.Infof("will upload %d assets", len(assetsStr))
 
 	body, err := tools.ReadFileToString(args.Body)
 	if err != nil {
@@ -101,7 +101,7 @@ func ReleasePublish(args *ReleaseArgs, releaseID int64, assets []string) {
 		log.Infof("Would publishing release: %s", version)
 	} else {
 		log.Infof("Publishing release: %s - %d", version, releaseID)
-		_, err := scmLayer.PublishRelease(version, releasePrefix, args.ReleaseBranch, body, releaseID, assetsEncoded)
+		_, err := scmLayer.PublishRelease(version, releasePrefix, args.ReleaseBranch, body, releaseID, assets)
 		if err != nil {
 			log.Fatalln(err)
 		}

internal/pkg/uploadasset/asset.go

@@ -7,17 +7,17 @@ import (
 	"crypto/sha256"
 	"fmt"
 	"io"
-	"io/fs"
 	"os"
 	"path/filepath"
 	"strings"
+	"time"
 )
 
 type UploadAsset struct {
-	File  os.File
-	Name  string
-	Infos fs.FileInfo
-	Hash  []byte
+	Name     string
+	ModTime  time.Time
+	FilePath string
+	Hash     []byte
 }
 
 // GetAsset takes a string as argument which must be in the format `<assetformat>=<filename>`.
@@ -34,33 +34,32 @@ type UploadAsset struct {
 //
 // An error will be returned if the asset format is not supported or if an
 // error occurs while creating the asset.
-func GetAsset(assetLocation string) (asset *UploadAsset, err error) {
+func GetAsset(assetLocation string) (asset UploadAsset, err error) {
 	assetName := strings.Split(assetLocation, "=")
 
 	switch assetName[0] {
-
 	case "file":
 		file, err := os.OpenFile(assetName[1], os.O_RDWR, 0644)
 		if err != nil {
-			return nil, err
+			return UploadAsset{}, err
 		}
 		if err := asset.New(assetName[1], file); err != nil {
-			return nil, err
+			return UploadAsset{}, err
 		}
 		return asset, nil
 	case "zip":
 		return createZipFile(assetName[1])
 	case "tgz":
 		return createTgzFile(assetName[1])
 	default:
-		return nil, fmt.Errorf("not an valid asset format")
+		return UploadAsset{}, fmt.Errorf("not an valid asset format")
 	}
 }
 
-func createZipFile(name string) (asset *UploadAsset, err error) {
-	tmpFile, err := os.CreateTemp("awesome-ci", "upload-asset-")
+func createZipFile(name string) (asset UploadAsset, err error) {
+	tmpFile, err := os.CreateTemp("awesome-ci", "upload-asset-*")
 	if err != nil {
-		return nil, err
+		return UploadAsset{}, err
 	}
 	defer tmpFile.Close()
 	zipWriter := zip.NewWriter(tmpFile)
@@ -88,24 +87,24 @@ func createZipFile(name string) (asset *UploadAsset, err error) {
 		return nil
 	})
 	if err != nil {
-		return nil, err
+		return UploadAsset{}, err
 	}
 	err = zipWriter.Close()
 	if err != nil {
-		return nil, err
+		return UploadAsset{}, err
 	}
 
-	if err := asset.New(fmt.Sprintf("%s.zip", filepath.Base(name)), tmpFile); err != nil {
-		return nil, err
+	if err := asset.New(fmt.Sprintf("%s.zip", name), tmpFile); err != nil {
+		return UploadAsset{}, err
 	}
 
 	return
 }
 
-func createTgzFile(name string) (asset *UploadAsset, err error) {
-	tmpFile, err := os.CreateTemp("awesome-ci", "upload-asset-")
+func createTgzFile(name string) (asset UploadAsset, err error) {
+	tmpFile, err := os.CreateTemp("awesome-ci", "upload-asset-*")
 	if err != nil {
-		return nil, err
+		return UploadAsset{}, err
 	}
 	defer tmpFile.Close()
 	gzipWriter := gzip.NewWriter(tmpFile)
@@ -138,19 +137,19 @@ func createTgzFile(name string) (asset *UploadAsset, err error) {
 		return nil
 	})
 	if err != nil {
-		return nil, err
+		return UploadAsset{}, err
 	}
 	err = tarWriter.Close()
 	if err != nil {
-		return nil, err
+		return UploadAsset{}, err
 	}
 	err = gzipWriter.Close()
 	if err != nil {
-		return nil, err
+		return UploadAsset{}, err
 	}
 
-	if err := asset.New(fmt.Sprintf("%s.tgz", filepath.Base(name)), tmpFile); err != nil {
-		return nil, err
+	if err := asset.New(fmt.Sprintf("%s.tgz", name), tmpFile); err != nil {
+		return UploadAsset{}, err
 	}
 
 	return
@@ -169,9 +168,9 @@ func (ua *UploadAsset) New(name string, file *os.File) (err error) {
 	}
 
 	// set values
-	ua.Name = name
-	ua.File = *file
-	ua.Infos = info
+	ua.Name = info.Name()
+	ua.FilePath = name
+	ua.ModTime = info.ModTime()
 	ua.Hash = h.Sum(nil)
 	return nil
 }