diff --git a/cmd/hauler/cli/store/save.go b/cmd/hauler/cli/store/save.go index 22827dfe..886d74fa 100644 --- a/cmd/hauler/cli/store/save.go +++ b/cmd/hauler/cli/store/save.go @@ -171,7 +171,7 @@ func writeExportsManifest(ctx context.Context, dir string, platformStr string) e return err } - return oci.WriteFile(consts.OCIImageManifestFile, buf.Bytes(), 0666) + return oci.WriteFile(consts.ImageManifestFile, buf.Bytes(), 0666) } func (x *exports) describe() tarball.Manifest { diff --git a/internal/mapper/mappers.go b/internal/mapper/mappers.go index 1cfb5867..154daefb 100644 --- a/internal/mapper/mappers.go +++ b/internal/mapper/mappers.go @@ -36,7 +36,7 @@ func Images() map[string]Fn { m := make(map[string]Fn) manifestMapperFn := Fn(func(desc ocispec.Descriptor) (string, error) { - return consts.OCIImageManifestFile, nil + return consts.ImageManifestFile, nil }) for _, l := range []string{consts.DockerManifestSchema2, consts.DockerManifestListSchema2, consts.OCIManifestSchema1} { @@ -52,7 +52,7 @@ func Images() map[string]Fn { } configMapperFn := Fn(func(desc ocispec.Descriptor) (string, error) { - return consts.OCIImageConfigFile, nil + return consts.ImageConfigFile, nil }) for _, l := range []string{consts.DockerConfigJSON} { diff --git a/pkg/consts/consts.go b/pkg/consts/consts.go index a2922588..454ba194 100644 --- a/pkg/consts/consts.go +++ b/pkg/consts/consts.go @@ -68,11 +68,11 @@ const ( HaulerIgnoreErrors = "HAULER_IGNORE_ERRORS" // container files and directories - OCIImageIndexFile = "index.json" - OCIImageManifestFile = "manifest.json" - OCIImageConfigFile = "config.json" - OCIImageLayoutFile = "oci-layout" - OCIImageBlobsDir = "blobs" + OCIImageIndexFile = "index.json" + OCIImageLayoutFile = "oci-layout" + OCIImageBlobsDir = "blobs" + ImageManifestFile = "manifest.json" + ImageConfigFile = "config.json" // other constraints CarbideRegistry = "rgcrprod.azurecr.us"