Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions pkg/imagename/imagename.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,14 @@ const (
ExplicitNamespace
)

const (
// invalidImageNameString used in Stringer method to represent invalid ImageName
invalidImageNameString = "<invalid>"
)

var (
// DefaultGetStringOptions is the default set of options
DefaultGetStringOptions FormatOption = Registry | Tag
DefaultGetStringOptions = Registry | Tag

// ErrNoImageRepository returns when there is there is no image repository
ErrNoImageRepository = errors.New("No image repository specified")
Expand Down Expand Up @@ -121,10 +126,14 @@ func (imageName *ImageName) Enclose(organization string) {
// String returns the string representation of the image using
// the registry and tag formatting.
func (imageName *ImageName) String() string {
result, err := imageName.ToString(Registry | Tag)
// Guard against nil receiver; Stringer implementations should not panic.
if imageName == nil {
return invalidImageNameString
}
result, err := imageName.ToString(DefaultGetStringOptions)

if err != nil {
panic(err)
return invalidImageNameString
}

return result
Expand Down
13 changes: 13 additions & 0 deletions pkg/imagename/imagename_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,19 @@ var _ = Describe("ImageNameParse", func() {
),
)

DescribeTable("String() returns <invalid> for invalid ImageNames",
func(imageName *ImageName, expectedString string) {
// String() should never panic, even for invalid ImageNames
Expect(imageName.String()).To(Equal(expectedString))
},
Entry("nil ImageName", (*ImageName)(nil), invalidImageNameString),
Entry("empty ImageName", &ImageName{}, invalidImageNameString),
Entry("missing repo", &ImageName{Registry: "example.com", Namespace: "namespace", Repo: "", Tag: "latest"}, invalidImageNameString),
Entry("only registry", &ImageName{Registry: "example.com"}, invalidImageNameString),
Entry("only namespace", &ImageName{Namespace: "namespace"}, invalidImageNameString),
Entry("only tag", &ImageName{Tag: "latest"}, invalidImageNameString),
)

DescribeTable("encloses",
func(repo, organization, enclosedRepo, registry, tag string) {
reference := repo
Expand Down
Loading