docker/attest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't use pointers for image interfaces (#51)

Browse Source 
* Don't use pointers for image interfaces

* Also for oci layout

* Remove default case
This commit is contained in:
James Carnegie
2024-06-14 10:28:14 +01:00
committed by GitHub
parent 8ba9656645
commit e44390d2bc
2 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/attestation/referrers_test.go
View File

@@ -130,7 +130,7 @@ func TestReferencesInDifferentRepo(t *testing.T) {
// push signed attestation image to the ref server
for _, img := range signedImages {
// push references using subject-digest.att convention
err = mirror.PushToRegistry(&img.Image, fmt.Sprintf("%s/%s:tag-does-not-matter", refServerUrl.Host, repoName))
err = mirror.PushToRegistry(img.Image, fmt.Sprintf("%s/%s:tag-does-not-matter", refServerUrl.Host, repoName))
require.NoError(t, err)
}
mfs2, err := attIdx.Index.IndexManifest()

25
pkg/mirror/mirror.go
View File

@@ -39,18 +39,16 @@ func PushToRegistry(image any, imageName string) error {
}
// Push the image to the registry
switch image := image.(type) {
case *v1.Image:
if err := remote.Write(ref, *image, remote.WithAuth(auth)); err != nil {
case v1.Image:
if err := remote.Write(ref, image, remote.WithAuth(auth)); err != nil {
return fmt.Errorf("failed to push image %s: %w", imageName, err)
}
case *v1.ImageIndex:
if err := remote.WriteIndex(ref, *image, remote.WithAuth(auth)); err != nil {
case v1.ImageIndex:
if err := remote.WriteIndex(ref, image, remote.WithAuth(auth)); err != nil {
return fmt.Errorf("failed to push image index %s: %w", imageName, err)
}
default:
if err := remote.WriteIndex(ref, image.(v1.ImageIndex), remote.WithAuth(auth)); err != nil {
return fmt.Errorf("failed to push image index %s: %w", imageName, err)
}
return fmt.Errorf("unknown image type")
}
return nil
}
@@ -62,26 +60,23 @@ func SaveAsOCILayout(image any, path string) error {
return fmt.Errorf("failed to create directory: %w", err)
}
switch image := image.(type) {
case *v1.Image:
case v1.Image:
index := empty.Index
l, err := layout.Write(path, index)
if err != nil {
return fmt.Errorf("failed to create index: %w", err)
}
err = l.AppendImage(*image)
err = l.AppendImage(image)
if err != nil {
return fmt.Errorf("failed to append image to index: %w", err)
}
case *v1.ImageIndex:
_, err := layout.Write(path, *image)
case v1.ImageIndex:
_, err := layout.Write(path, image)
if err != nil {
return fmt.Errorf("failed to create index: %w", err)
}
default:
_, err := layout.Write(path, image.(v1.ImageIndex))
if err != nil {
return fmt.Errorf("failed to create index: %w", err)
}
return fmt.Errorf("unknown image type")
}
return nil
}