Move LoadMetadata to separate package

Moves LoadMetadata to a separate package to allow implementers of
the infrastructure provider interface to utilize the function. The
cluster asset/package does not use LoadMetadata but does depend on
the implementers of the interface. Moving to a separate package
breaks the dependency loop.

Author: patrickdillon

pkg/asset/cluster/metadata.go

@@ -2,8 +2,6 @@ package cluster
 
 import (
 	"encoding/json"
-	"os"
-	"path/filepath"
 
 	"github.com/pkg/errors"
 
@@ -15,6 +13,7 @@ import (
 	"github.com/openshift/installer/pkg/asset/cluster/gcp"
 	"github.com/openshift/installer/pkg/asset/cluster/ibmcloud"
 	"github.com/openshift/installer/pkg/asset/cluster/libvirt"
+	clustermetadata "github.com/openshift/installer/pkg/asset/cluster/metadata"
 	"github.com/openshift/installer/pkg/asset/cluster/nutanix"
 	"github.com/openshift/installer/pkg/asset/cluster/openstack"
 	"github.com/openshift/installer/pkg/asset/cluster/ovirt"
@@ -39,10 +38,6 @@ import (
 	vspheretypes "github.com/openshift/installer/pkg/types/vsphere"
 )
 
-const (
-	metadataFileName = "metadata.json"
-)
-
 // Metadata contains information needed to destroy clusters.
 type Metadata struct {
 	File *asset.File
@@ -119,7 +114,7 @@ func (m *Metadata) Generate(parents asset.Parents) (err error) {
 	}
 
 	m.File = &asset.File{
-		Filename: metadataFileName,
+		Filename: clustermetadata.FileName,
 		Data:     data,
 	}
 
@@ -139,19 +134,3 @@ func (m *Metadata) Files() []*asset.File {
 func (m *Metadata) Load(f asset.FileFetcher) (found bool, err error) {
 	return false, nil
 }
-
-// LoadMetadata loads the cluster metadata from an asset directory.
-func LoadMetadata(dir string) (*types.ClusterMetadata, error) {
-	path := filepath.Join(dir, metadataFileName)
-	raw, err := os.ReadFile(path)
-	if err != nil {
-		return nil, err
-	}
-
-	var metadata *types.ClusterMetadata
-	if err = json.Unmarshal(raw, &metadata); err != nil {
-		return nil, errors.Wrapf(err, "failed to Unmarshal data from %q to types.ClusterMetadata", path)
-	}
-
-	return metadata, err
-}

pkg/asset/cluster/metadata/metadata.go

@@ -0,0 +1,31 @@
+package metadata
+
+import (
+	"encoding/json"
+	"fmt"
+	"os"
+	"path/filepath"
+
+	"github.com/openshift/installer/pkg/types"
+)
+
+const (
+	// FileName is the filename for the cluster metadata.json file.
+	FileName = "metadata.json"
+)
+
+// Load loads the cluster metadata from an asset directory.
+func Load(dir string) (*types.ClusterMetadata, error) {
+	path := filepath.Join(dir, FileName)
+	raw, err := os.ReadFile(path)
+	if err != nil {
+		return nil, err
+	}
+
+	var metadata *types.ClusterMetadata
+	if err = json.Unmarshal(raw, &metadata); err != nil {
+		return nil, fmt.Errorf("failed to Unmarshal data from %q to types.ClusterMetadata: %w", path, err)
+	}
+
+	return metadata, err
+}

pkg/destroy/bootstrap/bootstrap.go

@@ -14,7 +14,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	configv1 "github.com/openshift/api/config/v1"
-	"github.com/openshift/installer/pkg/asset/cluster"
+	"github.com/openshift/installer/pkg/asset/cluster/metadata"
 	openstackasset "github.com/openshift/installer/pkg/asset/cluster/openstack"
 	"github.com/openshift/installer/pkg/asset/manifests/capiutils"
 	"github.com/openshift/installer/pkg/clusterapi"
@@ -30,7 +30,7 @@ import (
 
 // Destroy uses Terraform to remove bootstrap resources.
 func Destroy(ctx context.Context, dir string) (err error) {
-	metadata, err := cluster.LoadMetadata(dir)
+	metadata, err := metadata.Load(dir)
 	if err != nil {
 		return err
 	}

pkg/destroy/destroyer.go

@@ -4,13 +4,13 @@ import (
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 
-	"github.com/openshift/installer/pkg/asset/cluster"
+	"github.com/openshift/installer/pkg/asset/cluster/metadata"
 	"github.com/openshift/installer/pkg/destroy/providers"
 )
 
 // New returns a Destroyer based on `metadata.json` in `rootDir`.
 func New(logger logrus.FieldLogger, rootDir string) (providers.Destroyer, error) {
-	metadata, err := cluster.LoadMetadata(rootDir)
+	metadata, err := metadata.Load(rootDir)
 	if err != nil {
 		return nil, err
 	}

pkg/gather/gather.go

@@ -11,13 +11,13 @@ import (
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 
-	"github.com/openshift/installer/pkg/asset/cluster"
+	"github.com/openshift/installer/pkg/asset/cluster/metadata"
 	"github.com/openshift/installer/pkg/gather/providers"
 )
 
 // New returns a Gather based on `metadata.json` in `rootDir`.
 func New(logger logrus.FieldLogger, serialLogBundle string, bootstrap string, masters []string, rootDir string) (providers.Gather, error) {
-	metadata, err := cluster.LoadMetadata(rootDir)
+	metadata, err := metadata.Load(rootDir)
 	if err != nil {
 		return nil, err
 	}