diff --git a/cliv2/go.mod b/cliv2/go.mod index bca9be2876f..3bf4af76f39 100644 --- a/cliv2/go.mod +++ b/cliv2/go.mod @@ -8,7 +8,7 @@ require ( github.com/google/uuid v1.3.0 github.com/pkg/errors v0.9.1 github.com/snyk/cli-extension-sbom v0.0.0-20221212093410-6b474ed1a42a - github.com/snyk/go-application-framework v0.0.0-20221215182111-b2d10cf1e146 + github.com/snyk/go-application-framework v0.0.0-20221229122623-b3cc236e9f58 github.com/snyk/go-httpauth v0.0.0-20220915135832-0edf62cf8cdd github.com/spf13/cobra v1.6.0 github.com/spf13/pflag v1.0.5 diff --git a/cliv2/go.sum b/cliv2/go.sum index a8e7fb41e86..ac8e92423c7 100644 --- a/cliv2/go.sum +++ b/cliv2/go.sum @@ -184,8 +184,8 @@ github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZV github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/snyk/cli-extension-sbom v0.0.0-20221212093410-6b474ed1a42a h1:kImXWA4kbwaREeC+kaJ8H0aOukWzpK8K/UzAsExj6MU= github.com/snyk/cli-extension-sbom v0.0.0-20221212093410-6b474ed1a42a/go.mod h1:ohrrgC94Gx82/cgSiac02JQrsMjFtggvhAvXGuGjDGU= -github.com/snyk/go-application-framework v0.0.0-20221215182111-b2d10cf1e146 h1:V5kc8tSGVhyiPNuEXkZ9CVmwWiYlMmaQGpjRbORuqlU= -github.com/snyk/go-application-framework v0.0.0-20221215182111-b2d10cf1e146/go.mod h1:5hLGqObbxLWnZkhn3Xc5PblESjQOfjN509ucQ4dtqz8= +github.com/snyk/go-application-framework v0.0.0-20221229122623-b3cc236e9f58 h1:lRYloO4hulZTT3391WYezDJgpXj7uUb0vndFHqJCB68= +github.com/snyk/go-application-framework v0.0.0-20221229122623-b3cc236e9f58/go.mod h1:5hLGqObbxLWnZkhn3Xc5PblESjQOfjN509ucQ4dtqz8= github.com/snyk/go-httpauth v0.0.0-20220915135832-0edf62cf8cdd h1:zjDhcQ642rIVI8aIjfG5uVcw+OGotQtX2l9VHe7IqCQ= github.com/snyk/go-httpauth v0.0.0-20220915135832-0edf62cf8cdd/go.mod h1:v6t6wKizOcHXT3p4qKn6Bda7yNIjCQ54Xyl31NjgXkY= github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw= diff --git a/cliv2/internal/cliv2/cliv2.go b/cliv2/internal/cliv2/cliv2.go index 347f5ddef36..37990b10c17 100644 --- a/cliv2/internal/cliv2/cliv2.go +++ b/cliv2/internal/cliv2/cliv2.go @@ -11,13 +11,14 @@ import ( "os" "os/exec" "path" + "regexp" "strings" "github.com/snyk/cli/cliv2/internal/constants" "github.com/snyk/cli/cliv2/internal/embedded" "github.com/snyk/cli/cliv2/internal/embedded/cliv1" "github.com/snyk/cli/cliv2/internal/proxy" - "github.com/snyk/cli/cliv2/internal/utils" + "github.com/snyk/go-application-framework/pkg/utils" ) type Handler int @@ -249,7 +250,16 @@ func PrepareV1EnvironmentVariables(input []string, integrationName string, integ inputAsMap[constants.SNYK_HTTPS_PROXY_ENV] = proxyAddress inputAsMap[constants.SNYK_HTTP_PROXY_ENV] = proxyAddress inputAsMap[constants.SNYK_CA_CERTIFICATE_LOCATION_ENV] = caCertificateLocation - inputAsMap[constants.SNYK_HTTP_NO_PROXY_ENV] = constants.SNYK_INTERNAL_NO_PROXY + + // merge user defined (external) and internal no_proxy configuration + if len(inputAsMap[constants.SNYK_HTTP_NO_PROXY_ENV_SYSTEM]) > 0 { + internalNoProxy := strings.Split(constants.SNYK_INTERNAL_NO_PROXY, ",") + externalNoProxy := regexp.MustCompile("[,;]").Split(inputAsMap[constants.SNYK_HTTP_NO_PROXY_ENV_SYSTEM], -1) + mergedNoProxy := utils.Merge(internalNoProxy, externalNoProxy) + inputAsMap[constants.SNYK_HTTP_NO_PROXY_ENV] = strings.Join(mergedNoProxy, ",") + } else { + inputAsMap[constants.SNYK_HTTP_NO_PROXY_ENV] = constants.SNYK_INTERNAL_NO_PROXY + } result = utils.ToSlice(inputAsMap, "=") } @@ -268,8 +278,6 @@ func PrepareV1Command(cmd string, args []string, proxyInfo *proxy.ProxyInfo, int } func (c *CLI) executeV1Default(proxyInfo *proxy.ProxyInfo, passthroughArgs []string) error { - c.DebugLogger.Println("launching snyk with path: ", c.v1BinaryLocation) - c.DebugLogger.Println("CertificateLocation:", proxyInfo.CertificateLocation) snykCmd, err := PrepareV1Command( c.v1BinaryLocation, @@ -279,6 +287,30 @@ func (c *CLI) executeV1Default(proxyInfo *proxy.ProxyInfo, passthroughArgs []str GetFullVersion(), ) + if c.DebugLogger.Writer() != io.Discard { + c.DebugLogger.Println("Launching: ") + c.DebugLogger.Println(" ", c.v1BinaryLocation) + c.DebugLogger.Println(" With Arguments:") + c.DebugLogger.Println(" ", strings.Join(passthroughArgs, ", ")) + c.DebugLogger.Println(" With Environment: ") + + variablesMap := utils.ToKeyValueMap(snykCmd.Env, "=") + listedEnvironmentVariables := []string{ + constants.SNYK_CA_CERTIFICATE_LOCATION_ENV, + constants.SNYK_HTTPS_PROXY_ENV, + constants.SNYK_HTTP_PROXY_ENV, + constants.SNYK_HTTP_NO_PROXY_ENV, + constants.SNYK_HTTPS_PROXY_ENV_SYSTEM, + constants.SNYK_HTTP_PROXY_ENV_SYSTEM, + constants.SNYK_HTTP_NO_PROXY_ENV_SYSTEM, + } + + for _, key := range listedEnvironmentVariables { + c.DebugLogger.Println(" ", key, "=", variablesMap[key]) + } + + } + snykCmd.Stdin = c.stdin snykCmd.Stdout = c.stdout snykCmd.Stderr = c.stderr @@ -295,8 +327,6 @@ func (c *CLI) executeV1Default(proxyInfo *proxy.ProxyInfo, passthroughArgs []str } func (c *CLI) Execute(proxyInfo *proxy.ProxyInfo, passthroughArgs []string) error { - c.DebugLogger.Println("passthroughArgs", passthroughArgs) - var err error handler := determineHandler(passthroughArgs) diff --git a/cliv2/internal/cliv2/cliv2_test.go b/cliv2/internal/cliv2/cliv2_test.go index 4b574c5d916..7ec89d27bab 100644 --- a/cliv2/internal/cliv2/cliv2_test.go +++ b/cliv2/internal/cliv2/cliv2_test.go @@ -41,7 +41,7 @@ func Test_PrepareV1EnvironmentVariables_Fill_and_Filter(t *testing.T) { "SNYK_SYSTEM_NO_PROXY=noProxy", "SNYK_SYSTEM_HTTP_PROXY=httpProxy", "SNYK_SYSTEM_HTTPS_PROXY=httpsProxy", - "NO_PROXY=" + constants.SNYK_INTERNAL_NO_PROXY, + "NO_PROXY=" + constants.SNYK_INTERNAL_NO_PROXY + ",noProxy", } actual, err := cliv2.PrepareV1EnvironmentVariables(input, "foo", "bar", "proxy", "cacertlocation") @@ -93,7 +93,7 @@ func Test_PrepareV1EnvironmentVariables_OverrideProxyAndCerts(t *testing.T) { "SNYK_SYSTEM_NO_PROXY=312123", "SNYK_SYSTEM_HTTP_PROXY=exists", "SNYK_SYSTEM_HTTPS_PROXY=already", - "NO_PROXY=" + constants.SNYK_INTERNAL_NO_PROXY, + "NO_PROXY=" + constants.SNYK_INTERNAL_NO_PROXY + ",312123", } actual, err := cliv2.PrepareV1EnvironmentVariables(input, "foo", "bar", "proxy", "cacertlocation") diff --git a/cliv2/internal/utils/api_tokens.go b/cliv2/internal/utils/api_tokens.go deleted file mode 100644 index fa62b9f8b31..00000000000 --- a/cliv2/internal/utils/api_tokens.go +++ /dev/null @@ -1,22 +0,0 @@ -package utils - -import ( - "fmt" - - "github.com/snyk/go-application-framework/pkg/configuration" -) - -func GetAuthHeader(config configuration.Configuration) string { - - bearerToken := config.GetString(configuration.AUTHENTICATION_BEARER_TOKEN) - if len(bearerToken) > 0 { - return fmt.Sprintf("Bearer %s", bearerToken) - } - - token := config.GetString(configuration.AUTHENTICATION_TOKEN) - if len(token) > 0 { - return fmt.Sprintf("token %s", token) - } - - return "" -} diff --git a/cliv2/internal/utils/array.go b/cliv2/internal/utils/array.go deleted file mode 100644 index e365b2fb187..00000000000 --- a/cliv2/internal/utils/array.go +++ /dev/null @@ -1,93 +0,0 @@ -package utils - -import ( - "fmt" - "strings" -) - -func Contains(list []string, element string) bool { - for _, a := range list { - if a == element { - return true - } - } - return false -} - -func RemoveSimilar(list []string, element string) []string { - filteredArgs := []string{} - - for _, a := range list { - if !strings.Contains(a, element) { - filteredArgs = append(filteredArgs, a) - } - } - - return filteredArgs -} - -func ToKeyValueMap(input []string, splitBy string) map[string]string { - result := make(map[string]string) - - for _, a := range input { - splittedString := strings.SplitN(a, splitBy, 2) - if len(splittedString) == 2 { - key := splittedString[0] - value := splittedString[1] - result[key] = value - } - } - - return result -} - -func ToSlice(input map[string]string, combineBy string) []string { - result := []string{} - - for key, value := range input { - entry := fmt.Sprintf("%s%s%s", key, combineBy, value) - result = append(result, entry) - } - - return result -} - -// Removes a given key from the input map and uses FindKeyCaseInsensitive() for this. The resulting map is being returned. -func Remove(input map[string]string, key string) map[string]string { - found := false - key, found = FindKeyCaseInsensitive(input, key) - if found { - delete(input, key) - } - return input -} - -// This method determines whether the given key is in the input map, it therefore looks for the exact match and the key in all capital or lower case letters. -// If the key in any of these versions was found, it'll be returned alongside with a boolean indicating whether or not it was found. -func FindKeyCaseInsensitive(input map[string]string, key string) (string, bool) { - - found := false - - // look for exact match - _, found = input[key] - - // look for lower case match - if !found { - key = strings.ToLower(key) - _, found = input[key] - } - - // look for upper case match - if !found { - key = strings.ToUpper(key) - _, found = input[key] - } - - return key, found -} - -func FindValueCaseInsensitive(input map[string]string, key string) (string, bool) { - key, found := FindKeyCaseInsensitive(input, key) - value := input[key] - return value, found -} diff --git a/cliv2/pkg/basic_workflows/legacycli.go b/cliv2/pkg/basic_workflows/legacycli.go index c4b71d84ed0..333e75f43b3 100644 --- a/cliv2/pkg/basic_workflows/legacycli.go +++ b/cliv2/pkg/basic_workflows/legacycli.go @@ -10,6 +10,7 @@ import ( "github.com/snyk/cli/cliv2/internal/proxy" "github.com/snyk/cli/cliv2/internal/utils" "github.com/snyk/go-application-framework/pkg/configuration" + pkg_utils "github.com/snyk/go-application-framework/pkg/utils" "github.com/snyk/go-application-framework/pkg/workflow" "github.com/snyk/go-httpauth/pkg/httpauth" "github.com/spf13/pflag" @@ -38,7 +39,7 @@ func FilteredArgs(args []string) []string { elementsToFilter := []string{"--" + PROXY_NOAUTH} filteredArgs := args for _, element := range elementsToFilter { - filteredArgs = utils.RemoveSimilar(filteredArgs, element) + filteredArgs = pkg_utils.RemoveSimilar(filteredArgs, element) } return filteredArgs } diff --git a/package-lock.json b/package-lock.json index 9621eaa1365..3bb7db067b0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -66,7 +66,7 @@ "semver": "^6.0.0", "snyk-config": "4.0.0", "snyk-cpp-plugin": "2.20.1", - "snyk-docker-plugin": "^5.7.1", + "snyk-docker-plugin": "5.7.2", "snyk-go-plugin": "^1.19.4", "snyk-gradle-plugin": "3.24.6", "snyk-module": "3.1.0", @@ -2224,9 +2224,9 @@ "link": true }, "node_modules/@snyk/rpm-parser": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@snyk/rpm-parser/-/rpm-parser-2.3.2.tgz", - "integrity": "sha512-PgaxivAmyw4J5vOai6BBYmujSqA98mhw/cTHn7WD+7WcVJFKns1YEe48zNeV/n3D3E8WArQREOp5LJXDIPKZuQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@snyk/rpm-parser/-/rpm-parser-3.0.0.tgz", + "integrity": "sha512-j3zUfoQGj3llkEJig5JaYJXfnTFBwsP8OO7ZWwYIafZ97v1E+VxpRdeImUBkNSnPHjk/Q9j+0MnRFqlrYkEtoA==", "dependencies": { "event-loop-spinner": "^2.2.0", "sql.js": "^1.7.0" @@ -16669,13 +16669,13 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "node_modules/snyk-docker-plugin": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-5.7.1.tgz", - "integrity": "sha512-C/8jUW9X0mqa5frgPwi7fc7vNLNrFjeYsjT/q6wVNv7ZIj79OBC5RtQR0xWQURRicifRkPm19/138y+yAeIpfg==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-5.7.2.tgz", + "integrity": "sha512-+AlOI5mQ5n1tf37BxBZjJI+vebZOmG7HS1eobOUs+dhrMtSvlmPYEmO+UMCsDPrjk+rdQz9JqDrmlpCj0ZUCjA==", "dependencies": { "@snyk/composer-lockfile-parser": "^1.4.1", "@snyk/dep-graph": "^2.3.0", - "@snyk/rpm-parser": "^2.3.2", + "@snyk/rpm-parser": "3.0.0", "@snyk/snyk-docker-pull": "^3.7.5", "adm-zip": "^0.5.5", "chalk": "^2.4.2", @@ -16733,22 +16733,6 @@ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==" }, - "node_modules/snyk-docker-plugin/node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" - }, - "node_modules/snyk-docker-plugin/node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, "node_modules/snyk-docker-plugin/node_modules/lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -16807,33 +16791,6 @@ "node": ">=10" } }, - "node_modules/snyk-docker-plugin/node_modules/snyk-nodejs-lockfile-parser": { - "version": "1.45.1", - "resolved": "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.45.1.tgz", - "integrity": "sha512-uj3dGoruveEZ1l/i5Qv4RS+dTBgAfmXXvTEmvH14fNuTEzDzb/PFe6+H1VPExrihwjrjHci1WIUhm9lQpYZZCQ==", - "dependencies": { - "@snyk/dep-graph": "^2.3.0", - "@snyk/graphlib": "2.1.9-patch.3", - "@yarnpkg/core": "^2.4.0", - "@yarnpkg/lockfile": "^1.1.0", - "event-loop-spinner": "^2.0.0", - "js-yaml": "^4.1.0", - "lodash.clonedeep": "^4.5.0", - "lodash.flatmap": "^4.5.0", - "lodash.isempty": "^4.4.0", - "lodash.topairs": "^4.3.0", - "semver": "^7.3.5", - "snyk-config": "^4.0.0-rc.2", - "tslib": "^1.9.3", - "uuid": "^8.3.0" - }, - "bin": { - "parse-nodejs-lockfile": "bin/index.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/snyk-docker-plugin/node_modules/tmp": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", @@ -17728,9 +17685,9 @@ "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==" }, "node_modules/sql.js": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/sql.js/-/sql.js-1.7.0.tgz", - "integrity": "sha512-qAfft3xkSgHqmmfNugWTp/59PsqIw8gbeao5TZmpmzQQsAJ49de3iDDKuxVixidYs6dkHNksY8m27v2dZNn2jw==" + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/sql.js/-/sql.js-1.8.0.tgz", + "integrity": "sha512-3HD8pSkZL+5YvYUI8nlvNILs61ALqq34xgmF+BHpqxe68yZIJ1H+sIVIODvni25+CcxHUxDyrTJUL0lE/m7afw==" }, "node_modules/ssh2": { "version": "1.4.0", @@ -22084,9 +22041,9 @@ } }, "@snyk/rpm-parser": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@snyk/rpm-parser/-/rpm-parser-2.3.2.tgz", - "integrity": "sha512-PgaxivAmyw4J5vOai6BBYmujSqA98mhw/cTHn7WD+7WcVJFKns1YEe48zNeV/n3D3E8WArQREOp5LJXDIPKZuQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@snyk/rpm-parser/-/rpm-parser-3.0.0.tgz", + "integrity": "sha512-j3zUfoQGj3llkEJig5JaYJXfnTFBwsP8OO7ZWwYIafZ97v1E+VxpRdeImUBkNSnPHjk/Q9j+0MnRFqlrYkEtoA==", "requires": { "event-loop-spinner": "^2.2.0", "sql.js": "^1.7.0" @@ -33294,13 +33251,13 @@ } }, "snyk-docker-plugin": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-5.7.1.tgz", - "integrity": "sha512-C/8jUW9X0mqa5frgPwi7fc7vNLNrFjeYsjT/q6wVNv7ZIj79OBC5RtQR0xWQURRicifRkPm19/138y+yAeIpfg==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-5.7.2.tgz", + "integrity": "sha512-+AlOI5mQ5n1tf37BxBZjJI+vebZOmG7HS1eobOUs+dhrMtSvlmPYEmO+UMCsDPrjk+rdQz9JqDrmlpCj0ZUCjA==", "requires": { "@snyk/composer-lockfile-parser": "^1.4.1", "@snyk/dep-graph": "^2.3.0", - "@snyk/rpm-parser": "^2.3.2", + "@snyk/rpm-parser": "3.0.0", "@snyk/snyk-docker-pull": "^3.7.5", "adm-zip": "^0.5.5", "chalk": "^2.4.2", @@ -33354,19 +33311,6 @@ } } }, - "argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" - }, - "js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "requires": { - "argparse": "^2.0.1" - } - }, "lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -33401,27 +33345,6 @@ "lru-cache": "^6.0.0" } }, - "snyk-nodejs-lockfile-parser": { - "version": "1.45.1", - "resolved": "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.45.1.tgz", - "integrity": "sha512-uj3dGoruveEZ1l/i5Qv4RS+dTBgAfmXXvTEmvH14fNuTEzDzb/PFe6+H1VPExrihwjrjHci1WIUhm9lQpYZZCQ==", - "requires": { - "@snyk/dep-graph": "^2.3.0", - "@snyk/graphlib": "2.1.9-patch.3", - "@yarnpkg/core": "^2.4.0", - "@yarnpkg/lockfile": "^1.1.0", - "event-loop-spinner": "^2.0.0", - "js-yaml": "^4.1.0", - "lodash.clonedeep": "^4.5.0", - "lodash.flatmap": "^4.5.0", - "lodash.isempty": "^4.4.0", - "lodash.topairs": "^4.3.0", - "semver": "^7.3.5", - "snyk-config": "^4.0.0-rc.2", - "tslib": "^1.9.3", - "uuid": "^8.3.0" - } - }, "tmp": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", @@ -34195,9 +34118,9 @@ "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==" }, "sql.js": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/sql.js/-/sql.js-1.7.0.tgz", - "integrity": "sha512-qAfft3xkSgHqmmfNugWTp/59PsqIw8gbeao5TZmpmzQQsAJ49de3iDDKuxVixidYs6dkHNksY8m27v2dZNn2jw==" + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/sql.js/-/sql.js-1.8.0.tgz", + "integrity": "sha512-3HD8pSkZL+5YvYUI8nlvNILs61ALqq34xgmF+BHpqxe68yZIJ1H+sIVIODvni25+CcxHUxDyrTJUL0lE/m7afw==" }, "ssh2": { "version": "1.4.0", diff --git a/package.json b/package.json index 61f09c2e5b0..b877c8450b5 100644 --- a/package.json +++ b/package.json @@ -113,7 +113,7 @@ "semver": "^6.0.0", "snyk-config": "4.0.0", "snyk-cpp-plugin": "2.20.1", - "snyk-docker-plugin": "^5.7.1", + "snyk-docker-plugin": "5.7.2", "snyk-go-plugin": "^1.19.4", "snyk-gradle-plugin": "3.24.6", "snyk-module": "3.1.0",