Fix path issues on win32

Signed-off-by: Christian Dupuis <cd@atomist.com>

Author: cdupuis

registry/read.go

@@ -33,8 +33,8 @@ func ReadImage(name string, path string) (*ImageCache, error) {
 	img, _ := index.Image(hash)
 	skill.Log.Infof("Loaded image")
 	return &ImageCache{
+		Digest:    hash.String(),
 		Name:      name,
-		Path:      path,
 		Image:     &img,
 		ImagePath: path,
 		Ref:       nil,

registry/save.go

@@ -62,8 +62,8 @@ func (i ImageId) String() string {
 }
 
 type ImageCache struct {
+	Digest    string
 	Name      string
-	Path      string
 	Image     *v1.Image
 	ImagePath string
 	Ref       *name.Reference
@@ -134,25 +134,24 @@ func SaveImage(image string, cli command.Cli) (*ImageCache, error) {
 		return nil, errors.Wrapf(err, "failed to parse reference: %s", image)
 	}
 
-	var path string
-	if v, ok := os.LookupEnv("ATOMIST_CACHE_DIR"); ok {
-		path = filepath.Join(v, "docker-index")
-	} else {
-		path = filepath.Join(os.TempDir(), "docker-index")
-	}
-
-	createPaths := func(digest string) (string, string, error) {
-		finalPath := strings.Replace(filepath.Join(path, digest), ":", string(os.PathSeparator), 1)
-		tarPath := filepath.Join(finalPath, uuid.NewString()+".tar")
+	createPaths := func(digest string) (string, error) {
+		var path string
+		if v, ok := os.LookupEnv("ATOMIST_CACHE_DIR"); ok {
+			path = filepath.Join(v, "docker-index")
+		} else {
+			path = filepath.Join(os.TempDir(), "docker-index")
+		}
+		tarPath := filepath.Join(path, "sha256", digest[7:])
+		tarFileName := filepath.Join(tarPath, uuid.NewString()+".tar")
 
 		if _, err := os.Stat(tarPath); !os.IsNotExist(err) {
-			return finalPath, tarPath, nil
+			return tarFileName, nil
 		}
-		err := os.MkdirAll(finalPath, os.ModePerm)
+		err := os.MkdirAll(tarPath, os.ModePerm)
 		if err != nil {
-			return "", "", err
+			return "", err
 		}
-		return finalPath, tarPath, nil
+		return tarFileName, nil
 	}
 
 	desc, err := remote.Get(ref, withAuth())
@@ -165,13 +164,13 @@ func SaveImage(image string, cli command.Cli) (*ImageCache, error) {
 			if err != nil {
 				return nil, errors.Wrapf(err, "failed to get local image: %s", image)
 			}
-			path, imagePath, err := createPaths(im.ID)
+			imagePath, err := createPaths(im.ID)
 			if err != nil {
 				return nil, errors.Wrapf(err, "failed to create cache paths")
 			}
 			return &ImageCache{
+				Digest:    im.ID,
 				Name:      image,
-				Path:      path,
 				Image:     &img,
 				Ref:       &ref,
 				ImagePath: imagePath,
@@ -192,13 +191,13 @@ func SaveImage(image string, cli command.Cli) (*ImageCache, error) {
 			digestHash, _ := img.Digest()
 			digest = digestHash.String()
 		}
-		path, imagePath, err := createPaths(digest)
+		imagePath, err := createPaths(digest)
 		if err != nil {
 			return nil, errors.Wrapf(err, "failed to create cache paths")
 		}
 		return &ImageCache{
+			Digest:    digest,
 			Name:      image,
-			Path:      path,
 			Image:     &img,
 			Ref:       &ref,
 			ImagePath: imagePath,

sbom/index.go

@@ -74,22 +74,10 @@ func IndexImage(image string, cli command.Cli) (*types.Sbom, *v1.Image, error) {
 }
 
 func indexImage(cache *registry.ImageCache, cli command.Cli) (*types.Sbom, *v1.Image, error) {
-	// see if we can re-use an existing sbom
-	sbomPath := filepath.Join(cache.Path, "sbom.json")
-	if _, ok := os.LookupEnv("ATOMIST_NO_CACHE"); !ok {
-		if _, err := os.Stat(sbomPath); !os.IsNotExist(err) {
-			var sbom types.Sbom
-			b, err := os.ReadFile(sbomPath)
-			if err == nil {
-				err := json.Unmarshal(b, &sbom)
-				if err == nil {
-					if sbom.Descriptor.SbomVersion == internal.FromBuild().SbomVersion && sbom.Descriptor.Version == internal.FromBuild().Version {
-						skill.Log.Infof(`Indexed %d packages`, len(sbom.Artifacts))
-						return &sbom, cache.Image, nil
-					}
-				}
-			}
-		}
+	configFilePath := cli.ConfigFile().Filename
+	sbomFilePath := filepath.Join(filepath.Dir(configFilePath), "sbom", "sha256", cache.Digest[7:], "sbom.json")
+	if sbom := cachedSbom(cache, sbomFilePath); sbom != nil {
+		return sbom, cache.Image, nil
 	}
 
 	err := cache.StoreImage()
@@ -99,7 +87,6 @@ func indexImage(cache *registry.ImageCache, cli command.Cli) (*types.Sbom, *v1.I
 	}
 
 	lm := createLayerMapping(*cache.Image)
-	skill.Log.Debugf("Created layer mapping")
 
 	s := internal.StartSpinner("info", "Indexing", cli.Out().IsTerminal())
 	defer s.Stop()
@@ -173,12 +160,39 @@ func indexImage(cache *registry.ImageCache, cli command.Cli) (*types.Sbom, *v1.I
 
 	js, err := json.MarshalIndent(sbom, "", "  ")
 	if err == nil {
-		_ = os.WriteFile(sbomPath, js, 0644)
+		err = os.MkdirAll(filepath.Dir(sbomFilePath), os.ModePerm)
+		if err != nil {
+			return nil, nil, errors.Wrapf(err, "failed create to sbom folder")
+		}
+		err = os.WriteFile(sbomFilePath, js, 0644)
+		if err != nil {
+			return nil, nil, errors.Wrapf(err, "failed to write sbom")
+		}
 	}
 
 	return &sbom, cache.Image, nil
 }
 
+func cachedSbom(cache *registry.ImageCache, sbomFilePath string) *types.Sbom {
+	// see if we can re-use an existing sbom
+	if _, ok := os.LookupEnv("ATOMIST_NO_CACHE"); !ok {
+		if _, err := os.Stat(sbomFilePath); !os.IsNotExist(err) {
+			var sbom types.Sbom
+			b, err := os.ReadFile(sbomFilePath)
+			if err == nil {
+				err := json.Unmarshal(b, &sbom)
+				if err == nil {
+					if sbom.Descriptor.SbomVersion == internal.FromBuild().SbomVersion && sbom.Descriptor.Version == internal.FromBuild().Version {
+						skill.Log.Infof(`Indexed %d packages`, len(sbom.Artifacts))
+						return &sbom
+					}
+				}
+			}
+		}
+	}
+	return nil
+}
+
 func createLayerMapping(img v1.Image) types.LayerMapping {
 	lm := types.LayerMapping{
 		ByDiffId:        make(map[string]string, 0),
@@ -203,5 +217,6 @@ func createLayerMapping(img v1.Image) types.LayerMapping {
 		lm.DigestByOrdinal[i] = layer.Digest.String()
 	}
 
+	skill.Log.Debugf("Created layer mapping")
 	return lm
 }