Skip to content

Commit d357c94

Browse files
committed
try fix docker integration tests
1 parent bb93b62 commit d357c94

File tree

2 files changed

+16
-13
lines changed

2 files changed

+16
-13
lines changed

buildtools/cli.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -977,11 +977,6 @@ func dockerScanCmd(c *cli.Context, imageTag string) error {
977977
if show, err := cliutils.ShowGenericCmdHelpIfNeeded(c, c.Args(), securityCLI.DockerScanCmdHiddenName); show || err != nil {
978978
return err
979979
}
980-
if imageTag == "" {
981-
return commonCliUtils.PrintHelpAndReturnError("a docker image name must be provided", func() error {
982-
return cli.ShowCommandHelp(c, securityCLI.DockerScanCmdHiddenName)
983-
})
984-
}
985980
convertedCtx, err := components.ConvertContext(c, securityDocs.GetCommandFlags(securityDocs.DockerScan)...)
986981
if err != nil {
987982
return err

docker_test.go

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package main
22

33
import (
44
"context"
5+
"errors"
56
"fmt"
6-
tests2 "github.com/jfrog/jfrog-cli-artifactory/utils/tests"
77
"os"
88
"os/exec"
99
"path"
@@ -12,6 +12,8 @@ import (
1212
"testing"
1313
"time"
1414

15+
tests2 "github.com/jfrog/jfrog-cli-artifactory/utils/tests"
16+
1517
"github.com/docker/docker/api/types/mount"
1618

1719
biutils "github.com/jfrog/build-info-go/utils"
@@ -601,17 +603,23 @@ func TestNativeDockerFlagParsing(t *testing.T) {
601603
defer cleanup()
602604

603605
dockerTestCases := []struct {
604-
name string
605-
args []string
606+
name string
607+
args []string
608+
expectedErr error
606609
}{
607-
{"docker", []string{"docker"}},
608-
{"docker version", []string{"docker", "version"}},
609-
{"docker scan", []string{"docker", "scan"}},
610-
{"cli flags after args", []string{"docker", "version", "--build-name=d", "--build-number=1", "--module=1"}},
611-
{"cli flags before args", []string{"docker", "--build-name=d", "--build-number=1", "--module=1", "version"}},
610+
{"docker", []string{"docker"}, nil},
611+
{"docker version", []string{"docker", "version"}, nil},
612+
{"docker scan", []string{"docker", "scan", "--min-severity=low"}, errors.New("a docker image name must be provided")},
613+
{"cli flags after args", []string{"docker", "version", "--build-name=d", "--build-number=1", "--module=1"}, nil},
614+
{"cli flags before args", []string{"docker", "--build-name=d", "--build-number=1", "--module=1", "version"}, nil},
612615
}
613616
for _, testCase := range dockerTestCases {
614617
t.Run(testCase.name, func(t *testing.T) {
618+
if testCase.expectedErr != nil {
619+
err := runJfrogCliWithoutAssertion(testCase.args...)
620+
assert.EqualError(t, err, testCase.expectedErr.Error())
621+
return
622+
}
615623
runCmdWithRetries(t, jfCliTask(testCase.args...))
616624
})
617625
}

0 commit comments

Comments
 (0)