Volumemgr refactoring

.revive.toml

@@ -15,7 +15,7 @@ warningCode = 0
 [rule.increment-decrement]
 [rule.var-naming]
 [rule.var-declaration]
-[rule.package-comments]
+#[rule.package-comments]
 [rule.range]
 [rule.receiver-naming]
 [rule.time-naming]

pkg/pillar/cas/cas.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"strings"
 
 	"github.com/lf-edge/edge-containers/pkg/resolver"
 	"github.com/lf-edge/eve/pkg/pillar/types"
@@ -147,6 +148,11 @@ var knownCASHandlers = map[string]casDesc{
 	"containerd": {constructor: newContainerdCAS},
 }
 
+// CheckAndCorrectBlobHash checks if the blobHash has hash algo sha256 as prefix. If not then it'll prepend it.
+func CheckAndCorrectBlobHash(blobHash string) string {
+	return fmt.Sprintf("sha256:%s", strings.TrimPrefix(blobHash, "sha256:"))
+}
+
 // NewCAS returns new CAS object with a new client of underlying implementor(selectedCAS).
 // It's the caller/user's responsibility to close the respective client after use by calling CAS.CloseClient().
 func NewCAS(selectedCAS string) (CAS, error) {

pkg/pillar/cmd/domainmgr/domainmgr.go

@@ -1455,8 +1455,8 @@ func doActivate(ctx *domainContext, config types.DomainConfig,
 			}
 		default:
 			// assume everything else to be disk formats
-			_, _, format, _, err := utils.GetVolumeSize(log, ctx.casClient, ds.FileLocation)
-			if err == nil && format != strings.ToLower(ds.Format.String()) {
+			format, err := utils.GetVolumeFormat(log, ds.FileLocation)
+			if err == nil && format != ds.Format {
 				err = fmt.Errorf("Disk format mismatch, format in config %v and output of qemu-img/zfs get %v\n"+
 					"Note: Format mismatch may be because of disk corruption also.",
 					ds.Format, format)

pkg/pillar/cmd/volumemgr/artifact.go

@@ -57,8 +57,7 @@ func getManifestsForBareBlob(ctx *volumemgrContext, image, rootHash string, size
 	}
 
 	//Adding config blob to blobStatuses list
-	configBlobStatus := lookupBlobStatus(ctx,
-		strings.Replace(desc[0].Digest.String(), "sha256:", "", 1))
+	configBlobStatus := ctx.LookupBlobStatus(strings.Replace(desc[0].Digest.String(), "sha256:", "", 1))
 	if configBlobStatus != nil {
 		blobStatuses = append(blobStatuses, configBlobStatus)
 	}

pkg/pillar/cmd/volumemgr/blob.go

@@ -382,14 +382,13 @@ func resolveManifestSize(ctx *volumemgrContext, blob types.BlobStatus) int64 {
 	return size
 }
 
-// lookupBlobStatus look for a BlobStatus. Does not attempt to recreate one
+// LookupBlobStatus look for a BlobStatus. Does not attempt to recreate one
 // from VerifyImageStatus
-func lookupBlobStatus(ctx *volumemgrContext, blobSha string) *types.BlobStatus {
-
+func (ctxPtr *volumemgrContext) LookupBlobStatus(blobSha string) *types.BlobStatus {
 	if blobSha == "" {
 		return nil
 	}
-	pub := ctx.pubBlobStatus
+	pub := ctxPtr.pubBlobStatus
 	s, _ := pub.Get(blobSha)
 	if s == nil {
 		log.Tracef("lookupBlobStatus(%s) not found", blobSha)
@@ -407,7 +406,7 @@ func lookupOrCreateBlobStatus(ctx *volumemgrContext, blobSha string) *types.Blob
 		return nil
 	}
 	// Does it already exist?
-	blob := lookupBlobStatus(ctx, blobSha)
+	blob := ctx.LookupBlobStatus(blobSha)
 	if blob != nil {
 		return blob
 	}
@@ -494,7 +493,7 @@ func unpublishBlobStatus(ctx *volumemgrContext, blobs ...*types.BlobStatus) {
 		}
 		//If blob is loaded, then remove it from CAS
 		if blob.State == types.LOADED {
-			if err := ctx.casClient.RemoveBlob(checkAndCorrectBlobHash(blob.Sha256)); err != nil {
+			if err := ctx.casClient.RemoveBlob(cas.CheckAndCorrectBlobHash(blob.Sha256)); err != nil {
 				err := fmt.Errorf("unpublishBlobStatus: Exception while removing loaded blob %s: %s",
 					blob.Sha256, err.Error())
 				log.Errorf(err.Error())
@@ -537,7 +536,7 @@ func populateInitBlobStatus(ctx *volumemgrContext) {
 			log.Functionf("populateInitBlobStatus: blob %s in CAS could not get mediaType", blobInfo.Digest)
 			continue
 		}
-		if lookupBlobStatus(ctx, blobInfo.Digest) == nil {
+		if ctx.LookupBlobStatus(blobInfo.Digest) == nil {
 			log.Functionf("populateInitBlobStatus: Found blob %s in CAS", blobInfo.Digest)
 			blobStatus := &types.BlobStatus{
 				Sha256:                 strings.TrimPrefix(blobInfo.Digest, "sha256:"),
@@ -608,11 +607,6 @@ func gcImagesFromCAS(ctx *volumemgrContext) {
 	}
 }
 
-// checkAndCorrectBlobHash checks if the blobHash has hash algo sha256 as prefix. If not then it'll prepend it.
-func checkAndCorrectBlobHash(blobHash string) string {
-	return fmt.Sprintf("sha256:%s", strings.TrimPrefix(blobHash, "sha256:"))
-}
-
 // lookupImageCAS check if an image reference exists
 func lookupImageCAS(reference string, client cas.CAS) bool {
 	hash, err := client.GetImageHash(reference)