assets: move asset store impl to own package

Tests are being created that use the asset store implementation to
validate restoring assets from the state file and disk. The tests are
much easier when they have access to the private fields of the asset
store. Rather than exposing more public fields and methods on the store,
the tests will be placed in the same package as the store. Unfortunately,
this creates cyclic imports between the base asset package and the
various packages containing the targeted assets. To rectify this,
the concrete asset store implementation has been moved to a new
pkg/asset/store package.

Changes for https://jira.coreos.com/browse/CORS-940

cmd/openshift-install/create.go

@@ -32,6 +32,7 @@ import (
 	"github.com/openshift/installer/pkg/asset/installconfig"
 	"github.com/openshift/installer/pkg/asset/kubeconfig"
 	"github.com/openshift/installer/pkg/asset/manifests"
+	assetstore "github.com/openshift/installer/pkg/asset/store"
 	"github.com/openshift/installer/pkg/asset/templates"
 	"github.com/openshift/installer/pkg/asset/tls"
 	destroybootstrap "github.com/openshift/installer/pkg/destroy/bootstrap"
@@ -154,7 +155,7 @@ func newCreateCmd() *cobra.Command {
 
 func runTargetCmd(targets ...asset.WritableAsset) func(cmd *cobra.Command, args []string) {
 	runner := func(directory string) error {
-		assetStore, err := asset.NewStore(directory)
+		assetStore, err := assetstore.NewStore(directory)
 		if err != nil {
 			return errors.Wrapf(err, "failed to create asset store")
 		}

cmd/openshift-install/destroy.go

@@ -5,7 +5,7 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 
-	"github.com/openshift/installer/pkg/asset"
+	assetstore "github.com/openshift/installer/pkg/asset/store"
 	"github.com/openshift/installer/pkg/destroy"
 	"github.com/openshift/installer/pkg/destroy/bootstrap"
 	_ "github.com/openshift/installer/pkg/destroy/libvirt"
@@ -52,7 +52,7 @@ func runDestroyCmd(directory string) error {
 		return errors.Wrap(err, "Failed to destroy cluster")
 	}
 
-	store, err := asset.NewStore(directory)
+	store, err := assetstore.NewStore(directory)
 	if err != nil {
 		return errors.Wrapf(err, "failed to create asset store")
 	}

pkg/asset/asset.go

@@ -58,9 +58,9 @@ func PersistToFile(asset WritableAsset, directory string) error {
 	return nil
 }
 
-// deleteAssetFromDisk removes all the files for asset from disk.
+// DeleteAssetFromDisk removes all the files for asset from disk.
 // this is function is not safe for calling concurrently on the same directory.
-func deleteAssetFromDisk(asset WritableAsset, directory string) error {
+func DeleteAssetFromDisk(asset WritableAsset, directory string) error {
 	logrus.Debugf("Purging asset %q from disk", asset.Name())
 	for _, f := range asset.Files() {
 		path := filepath.Join(directory, f.Filename)

pkg/asset/filefetcher.go

@@ -1,11 +1,5 @@
 package asset
 
-import (
-	"io/ioutil"
-	"path/filepath"
-	"sort"
-)
-
 //go:generate mockgen -source=./filefetcher.go -destination=./mock/filefetcher_generated.go -package=mock
 
 // FileFetcher fetches the asset files from disk.
@@ -15,45 +9,3 @@ type FileFetcher interface {
 	// FetchByPattern returns the files whose name match the given glob.
 	FetchByPattern(pattern string) ([]*File, error)
 }
-
-type fileFetcher struct {
-	directory string
-}
-
-// FetchByName returns the file with the given name.
-func (f *fileFetcher) FetchByName(name string) (*File, error) {
-	data, err := ioutil.ReadFile(filepath.Join(f.directory, name))
-	if err != nil {
-		return nil, err
-	}
-	return &File{Filename: name, Data: data}, nil
-}
-
-// FetchByPattern returns the files whose name match the given regexp.
-func (f *fileFetcher) FetchByPattern(pattern string) (files []*File, err error) {
-	matches, err := filepath.Glob(filepath.Join(f.directory, pattern))
-	if err != nil {
-		return nil, err
-	}
-
-	files = make([]*File, 0, len(matches))
-	for _, path := range matches {
-		data, err := ioutil.ReadFile(path)
-		if err != nil {
-			return nil, err
-		}
-
-		filename, err := filepath.Rel(f.directory, path)
-		if err != nil {
-			return nil, err
-		}
-
-		files = append(files, &File{
-			Filename: filename,
-			Data:     data,
-		})
-	}
-
-	sort.Slice(files, func(i, j int) bool { return files[i].Filename < files[j].Filename })
-	return files, nil
-}