Skip to content
Open
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
11 changes: 9 additions & 2 deletions cmd/kbld/kbld.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
package main

import (
"fmt"
"io"
"log"
"math/rand"
Expand All @@ -26,11 +27,17 @@ func main() {
confUI := ui.NewConfUI(ui.NewNoopLogger())
defer confUI.Flush()

command := cmd.NewDefaultKbldCmd(confUI)
options := cmd.NewKbldOptions(confUI)
command := cmd.NewKbldCmd(options)

err := command.Execute()
if err != nil {
confUI.ErrorLinef("kbld: Error: %s", uierrs.NewMultiLineError(err))
multiLineErr := uierrs.NewMultiLineError(err)
if options.UIFlags.JSON {
_, _ = fmt.Fprintf(os.Stderr, "kbld: Error: %s\n", multiLineErr)
} else {
confUI.ErrorLinef("kbld: Error: %s", multiLineErr)
}
os.Exit(1)
}

Expand Down
14 changes: 9 additions & 5 deletions test/e2e/resolve_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
package e2e

import (
"bytes"
"io/ioutil"
"os"
"strings"
Expand Down Expand Up @@ -156,13 +157,16 @@ spec:
- image: nginx@sha256:digest
`

_, err := kbld.RunWithOpts([]string{"-f", "-", "--images-annotation=false"}, RunOpts{
StdinReader: strings.NewReader(input),
AllowError: true,
var stderr bytes.Buffer
out, err := kbld.RunWithOpts([]string{"--json", "-f", "-", "--images-annotation=false"}, RunOpts{
StdinReader: strings.NewReader(input),
StderrWriter: &stderr,
AllowError: true,
})

expectedErr := "Expected valid digest reference, but found 'nginx@sha256:digest', reason: invalid checksum digest length"
require.Contains(t, err.Error(), expectedErr)
require.EqualError(t, err, "Execution error: stdout: '' stderr: '' error: 'exit status 1'")
require.Empty(t, out)
require.Equal(t, "kbld: Error: \n- Resolving image 'nginx@sha256:digest': Expected valid digest reference, but found 'nginx@sha256:digest', reason: invalid checksum digest length\n", stderr.String())
}

func TestResolveUnknownImage(t *testing.T) {
Expand Down
Loading