Skip to content
This repository has been archived by the owner on Jul 19, 2022. It is now read-only.

Commit

Permalink
Improve test coverage
Browse files Browse the repository at this point in the history
  • Loading branch information
glyn committed Oct 16, 2019
1 parent 8acb4ca commit 9bb5077
Show file tree
Hide file tree
Showing 6 changed files with 389 additions and 67 deletions.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ gen-mocks: check-counterfeiter
counterfeiter -o pkg/registry/ggcrfakes/fake_image_index.go github.com/google/go-containerregistry/pkg/v1.ImageIndex
counterfeiter pkg/registry LayoutPath
counterfeiter pkg/registry Image
counterfeiter pkg/registry/ggcr RegistryClient

irel: $(GO_SOURCES)
GO111MODULE=on go build -o $(OUTPUT) cmd/irel/main.go
Expand Down
40 changes: 0 additions & 40 deletions pkg/registry/client.go

This file was deleted.

18 changes: 16 additions & 2 deletions pkg/registry/ggcr/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ package ggcr

import (
"fmt"

v1 "github.com/google/go-containerregistry/pkg/v1"

"github.com/pivotal/image-relocation/pkg/image"
"github.com/pivotal/image-relocation/pkg/registry"
)
Expand All @@ -33,7 +35,7 @@ type client struct {
}

// NewRegistryClient returns a new Client.
func NewRegistryClient() registry.Client {
func NewRegistryClient() *client {
return &client{
readRemoteImage: readRemoteImage(writeRemoteImage, writeRemoteIndex),
writeRemoteImage: writeRemoteImage,
Expand Down Expand Up @@ -68,10 +70,22 @@ func (r *client) Copy(source image.Name, target image.Name) (image.Digest, int64

targetDigest, s, err := img.Write(target)
if err != nil {
return image.EmptyDigest, 0 , fmt.Errorf("failed to write image %v: %v", target, err)
return image.EmptyDigest, 0, fmt.Errorf("failed to write image %v: %v", target, err)
}
if sourceDigest != targetDigest {
return image.EmptyDigest, 0, fmt.Errorf("failed to preserve digest of image %v: source digest %v, target digest %v", source, sourceDigest, targetDigest)
}
return targetDigest, s, err
}

func (r *client) ReadRemoteImage(n image.Name) (registry.Image, error) {
return r.readRemoteImage(n)
}

func (r *client) WriteRemoteImage(i v1.Image, n image.Name) error {
return r.writeRemoteImage(i, n)
}

func (r *client) WriteRemoteIndex(i v1.ImageIndex, n image.Name) error {
return r.writeRemoteIndex(i, n)
}
268 changes: 268 additions & 0 deletions pkg/registry/ggcr/ggcrfakes/fake_registry_client.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 9bb5077

Please sign in to comment.