chore: push meta files into the right directory

Author: MarcStdt

cmd/registry_push_meta.go

@@ -12,7 +12,7 @@ import (
 
 var PushMetaCommand = &cobra.Command{
 	Use:   "meta",
-	Short: "Generate Meta OCI Artifacts and push to a remote registry.",
+	Short: "Push .meta OCI Artifacts from a scroll directory to a remote registry.",
 	Args:  cobra.RangeArgs(1, 2),
 	RunE: func(cmd *cobra.Command, args []string) error {
 
@@ -22,14 +22,14 @@ var PushMetaCommand = &cobra.Command{
 		}
 
 		artifact := args[0]
-		folder := "."
+		scrollDir := "."
 		if len(args) == 2 {
-			folder = args[1]
+			scrollDir = args[1]
 		}
 
-		fullPath := path.Join(cwd, folder)
+		fullPath := path.Join(cwd, scrollDir)
 
-		logger.Log().Info("Pushing "+artifact+" meta to registry", zap.String("path", fullPath))
+		logger.Log().Info("Pushing "+artifact+" meta to registry", zap.String("scrollDir", fullPath))
 
 		ociClient := registry.NewOciClient(credStore)
 

internal/core/services/registry/oci.go

@@ -402,7 +402,7 @@ func (c *OciClient) packFolders(fs *file.Store, dirs []string, artifactType doma
 			zap.String("artifactType", string(artifactType)),
 		)
 
-		fileDescriptor, err := fs.Add(ctx, name, string(artifactType), fullPath)
+		fileDescriptor, err := fs.Add(ctx, fullPath, string(artifactType), fullPath)
 		if err != nil {
 			return []v1.Descriptor{}, err
 		}
@@ -696,7 +696,7 @@ func (c *OciClient) Push(folder string, repo string, tag string, overrides map[s
 	return rootManifestDescriptor, nil
 }
 
-func (c *OciClient) PushMeta(folder string, repo string) (v1.Descriptor, error) {
+func (c *OciClient) PushMeta(scrollDir string, repo string) (v1.Descriptor, error) {
 	ctx := context.Background()
 
 	// Authenticate before doing any expensive local work.
@@ -708,13 +708,13 @@ func (c *OciClient) PushMeta(folder string, repo string) (v1.Descriptor, error)
 		return v1.Descriptor{}, err
 	}
 
-	fs, err := file.New(folder)
+	fs, err := file.New(scrollDir)
 	if err != nil {
 		return v1.Descriptor{}, err
 	}
 	defer fs.Close()
 
-	manifestDescriptors, err := c.createMetaDescriptors(fs, folder, "")
+	manifestDescriptors, err := c.createMetaDescriptors(fs, scrollDir, ".meta")
 	if err != nil {
 		return v1.Descriptor{}, err
 	}