refactor: remove internal/runkit

Put everything under exported runkit package Signed-off-by: Yves Brissaud <[email protected]>
eunomie · Oct 10, 2024 · 306d155 · 306d155
1 parent 2adfd76
commit 306d155
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/runkit/decorate.go b/runkit/decorate.go
@@ -13,7 +13,6 @@ import (
 	"github.com/google/go-containerregistry/pkg/v1/types"
 
 	"github.com/eunomie/docker-runx/internal/registry"
-	"github.com/eunomie/docker-runx/internal/runkit"
 )
 
 func Decorate(ctx context.Context, src, dest string, runxConfig, runxDoc []byte) error {
@@ -23,7 +22,7 @@ func Decorate(ctx context.Context, src, dest string, runxConfig, runxDoc []byte)
 		remoteOpts               = registry.WithOptions(ctx, nil)
 		ref, _                   = name.ParseReference(src)
 		destRef, _               = name.ParseReference(dest)
-		runxImage, runxDesc, err = runkit.Image(runxConfig, runxDoc)
+		runxImage, runxDesc, err = Image(runxConfig, runxDoc)
 	)
 
 	if err != nil {
@@ -78,7 +77,7 @@ func Decorate(ctx context.Context, src, dest string, runxConfig, runxDoc []byte)
 			// remove existing runx manifest
 			manifests, _ := index.IndexManifest()
 			for _, manifest := range manifests.Manifests {
-				if _, ok := manifest.Annotations[runkit.RunxManifestType]; ok {
+				if _, ok := manifest.Annotations[RunxManifestType]; ok {
 					index = mutate.RemoveManifests(index, match.Digests(manifest.Digest))
 				}
 			}

diff --git a/internal/runkit/image.go → runkit/image.go b/internal/runkit/image.go → runkit/image.go
diff --git a/runkit/read.go b/runkit/read.go
@@ -14,7 +14,6 @@ import (
 	"gopkg.in/yaml.v3"
 
 	"github.com/eunomie/docker-runx/internal/registry"
-	"github.com/eunomie/docker-runx/internal/runkit"
 )
 
 type Files struct {
@@ -60,7 +59,7 @@ func Get(ctx context.Context, src string) (*RunKit, error) {
 	found := false
 	manifests, _ := index.IndexManifest()
 	for _, m := range manifests.Manifests {
-		if a, ok := m.Annotations[runkit.RunxAnnotation]; ok && a == runkit.RunxManifestType {
+		if a, ok := m.Annotations[RunxAnnotation]; ok && a == RunxManifestType {
 			manifest = m
 			found = true
 			break
@@ -85,7 +84,7 @@ func Get(ctx context.Context, src string) (*RunKit, error) {
 		if err != nil {
 			continue
 		}
-		if mt == runkit.RunxConfigType {
+		if mt == RunxConfigType {
 			dataReader, err := l.Uncompressed()
 			if err != nil {
 				return nil, fmt.Errorf("could not read runx config %s: %w", src, err)
@@ -94,7 +93,7 @@ func Get(ctx context.Context, src string) (*RunKit, error) {
 			if err != nil {
 				return nil, fmt.Errorf("could not read runx config %s: %w", src, err)
 			}
-		} else if mt == runkit.RunxDocType {
+		} else if mt == RunxDocType {
 			dataReader, err := l.Uncompressed()
 			if err != nil {
 				return nil, fmt.Errorf("could not read runx config %s: %w", src, err)