From 4736674a98060d3cda14eb650ad9595bf640b8d3 Mon Sep 17 00:00:00 2001
From: Angel Misevski <amisevsk@gmail.com>
Date: Thu, 8 Feb 2024 10:12:04 -0500
Subject: [PATCH] Clean up imports; fixup a couple missed errors

* Add aliases to oci imports (i.e. use 'ocispec' instead of 'v1')
* Replace functions that create empty structs (same thing as just
  creating the struct directly)
* Catch a missed error in build
---
 pkg/artifact/jozu_file.go   |  4 ----
 pkg/artifact/model-layer.go |  4 ++--
 pkg/artifact/store.go       | 24 ++++++++++++------------
 pkg/cmd/build/build.go      |  4 ++--
 4 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/pkg/artifact/jozu_file.go b/pkg/artifact/jozu_file.go
index f4beb2c1..412c982f 100644
--- a/pkg/artifact/jozu_file.go
+++ b/pkg/artifact/jozu_file.go
@@ -23,10 +23,6 @@ type (
 	}
 )
 
-func NewJozuFile() *JozuFile {
-	return &JozuFile{}
-}
-
 func (jf *JozuFile) LoadModel(file *os.File) error {
 	// Read the file
 	data, err := io.ReadAll(file)
diff --git a/pkg/artifact/model-layer.go b/pkg/artifact/model-layer.go
index f289aa52..44a6ebae 100644
--- a/pkg/artifact/model-layer.go
+++ b/pkg/artifact/model-layer.go
@@ -9,12 +9,12 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/opencontainers/image-spec/specs-go/v1"
+	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )
 
 type ModelLayer struct {
 	ContextDir string
-	Descriptor v1.Descriptor
+	Descriptor ocispec.Descriptor
 }
 
 func NewLayer(context string) *ModelLayer {
diff --git a/pkg/artifact/store.go b/pkg/artifact/store.go
index 6bb9252b..9c274543 100644
--- a/pkg/artifact/store.go
+++ b/pkg/artifact/store.go
@@ -10,8 +10,8 @@ import (
 	_ "crypto/sha512"
 
 	"github.com/opencontainers/go-digest"
-	"github.com/opencontainers/image-spec/specs-go"
-	v1 "github.com/opencontainers/image-spec/specs-go/v1"
+	specs "github.com/opencontainers/image-spec/specs-go"
+	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"oras.land/oras-go/v2/content/oci"
 )
 
@@ -31,7 +31,7 @@ func NewArtifactStore() *Store {
 	}
 }
 
-func (store *Store) saveContentLayer(layer *ModelLayer) (*v1.Descriptor, error) {
+func (store *Store) saveContentLayer(layer *ModelLayer) (*ocispec.Descriptor, error) {
 	ctx := context.Background()
 
 	buf := &bytes.Buffer{}
@@ -41,7 +41,7 @@ func (store *Store) saveContentLayer(layer *ModelLayer) (*v1.Descriptor, error)
 	}
 
 	// Create a descriptor for the layer
-	desc := v1.Descriptor{
+	desc := ocispec.Descriptor{
 		MediaType: ModelLayerMediaType,
 		Digest:    digest.FromBytes(buf.Bytes()),
 		Size:      int64(buf.Len()),
@@ -55,13 +55,13 @@ func (store *Store) saveContentLayer(layer *ModelLayer) (*v1.Descriptor, error)
 	return &desc, nil
 }
 
-func (store *Store) saveConfigFile(model *JozuFile) (*v1.Descriptor, error) {
+func (store *Store) saveConfigFile(model *JozuFile) (*ocispec.Descriptor, error) {
 	ctx := context.Background()
 	buf, err := model.MarshalToJSON()
 	if err != nil {
 		return nil, err
 	}
-	desc := v1.Descriptor{
+	desc := ocispec.Descriptor{
 		MediaType: ModelConfigMediaType,
 		Digest:    digest.FromBytes(buf),
 		Size:      int64(len(buf)),
@@ -73,12 +73,12 @@ func (store *Store) saveConfigFile(model *JozuFile) (*v1.Descriptor, error) {
 	return &desc, nil
 }
 
-func (store *Store) saveModelManifest(model *Model, config *v1.Descriptor) (*v1.Manifest, error) {
+func (store *Store) saveModelManifest(model *Model, config *ocispec.Descriptor) (*ocispec.Manifest, error) {
 	ctx := context.Background()
-	manifest := v1.Manifest{
+	manifest := ocispec.Manifest{
 		Versioned: specs.Versioned{SchemaVersion: 2},
 		Config:    *config,
-		Layers:    []v1.Descriptor{},
+		Layers:    []ocispec.Descriptor{},
 	}
 	// Add the layers to the manifest
 	for _, layer := range model.Layers {
@@ -90,8 +90,8 @@ func (store *Store) saveModelManifest(model *Model, config *v1.Descriptor) (*v1.
 		return nil, err
 	}
 	// Push the manifest to the store
-	desc := v1.Descriptor{
-		MediaType: v1.MediaTypeImageManifest,
+	desc := ocispec.Descriptor{
+		MediaType: ocispec.MediaTypeImageManifest,
 		Digest:    digest.FromBytes(manifestBytes),
 		Size:      int64(len(manifestBytes)),
 	}
@@ -102,7 +102,7 @@ func (store *Store) saveModelManifest(model *Model, config *v1.Descriptor) (*v1.
 	return &manifest, nil
 }
 
-func (store *Store) SaveModel(model *Model) (*v1.Manifest, error) {
+func (store *Store) SaveModel(model *Model) (*ocispec.Manifest, error) {
 	config, err := store.saveConfigFile(model.Config)
 	if err != nil {
 		return nil, err
diff --git a/pkg/cmd/build/build.go b/pkg/cmd/build/build.go
index 36bc915a..8dfbf121 100644
--- a/pkg/cmd/build/build.go
+++ b/pkg/cmd/build/build.go
@@ -57,7 +57,7 @@ func NewCmdBuild() *cobra.Command {
 				fmt.Println(err)
 				return
 			}
-			options.RunBuild()
+			err = options.RunBuild()
 			if err != nil {
 				fmt.Println(err)
 				return
@@ -88,7 +88,7 @@ func (options *BuildOptions) RunBuild() error {
 		return err
 	}
 	defer modelfile.Close()
-	jozufile := artifact.NewJozuFile()
+	jozufile := &artifact.JozuFile{}
 	if err = jozufile.LoadModel(modelfile); err != nil {
 		fmt.Println(err)
 		return err