From 8e0f99ef7a3af2725730e97683a35c625273f12f Mon Sep 17 00:00:00 2001 From: carolina valencia Date: Sat, 30 Jul 2022 19:35:45 -0300 Subject: [PATCH 1/2] fix: merge with master- entrypoint --- .vscode/configurationCache.log | 1 + .vscode/dryrun.log | 5 + .vscode/settings.json | 3 + .vscode/targets.log | 323 +++ entrypoint.sh | 14 +- test/data/image-sarif.test | 3357 +------------------------------- test/test.bats | 2 +- 7 files changed, 357 insertions(+), 3348 deletions(-) create mode 100644 .vscode/configurationCache.log create mode 100644 .vscode/dryrun.log create mode 100644 .vscode/settings.json create mode 100644 .vscode/targets.log diff --git a/.vscode/configurationCache.log b/.vscode/configurationCache.log new file mode 100644 index 0000000..9f48169 --- /dev/null +++ b/.vscode/configurationCache.log @@ -0,0 +1 @@ +{"buildTargets":["test"],"launchTargets":[],"customConfigurationProvider":{"workspaceBrowse":{"browsePath":[],"compilerArgs":[]},"fileIndex":[]}} \ No newline at end of file diff --git a/.vscode/dryrun.log b/.vscode/dryrun.log new file mode 100644 index 0000000..645e783 --- /dev/null +++ b/.vscode/dryrun.log @@ -0,0 +1,5 @@ +make --dry-run --always-make --keep-going --print-directory +make: Entering directory '/home/krol/workspace/fork/aquasecurity/trivy-action' +BATS_LIB_PATH=/usr/local/lib/ bats -r . +make: Leaving directory '/home/krol/workspace/fork/aquasecurity/trivy-action' + diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..65e1ec0 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "makefile.extensionOutputFolder": "./.vscode" +} \ No newline at end of file diff --git a/.vscode/targets.log b/.vscode/targets.log new file mode 100644 index 0000000..e3e86e5 --- /dev/null +++ b/.vscode/targets.log @@ -0,0 +1,323 @@ +make all --print-data-base --no-builtin-variables --no-builtin-rules --question +make: *** No rule to make target 'all'. Stop. + +# GNU Make 4.3 +# Built for x86_64-pc-linux-gnu +# Copyright (C) 1988-2020 Free Software Foundation, Inc. +# License GPLv3+: GNU GPL version 3 or later +# This is free software: you are free to change and redistribute it. +# There is NO WARRANTY, to the extent permitted by law. + +# Make data base, printed on Sat Jul 30 19:44:13 2022 + +# Variables + +# environment +GDK_BACKEND = x11 +# environment +LC_ALL = C +# environment +GNOME_SHELL_SESSION_MODE = ubuntu +# environment +SSH_AGENT_LAUNCHER = gnome-keyring +# environment +TERMINATOR_DBUS_NAME = net.tenshu.Terminator23558193cd9818af7fe4d2c2f5bd9d00f +# environment +GJS_DEBUG_OUTPUT = stderr +# environment +MANDATORY_PATH = /usr/share/gconf/ubuntu.mandatory.path +# environment +LC_NAME = pt_BR.UTF-8 +# environment +LC_NUMERIC = pt_BR.UTF-8 +# environment +VSCODE_CWD = /home/krol/workspace/fork/aquasecurity/trivy-action +# environment +WINDOWPATH = 2 +# environment +NVM_DIR = /home/krol/.nvm +# environment +TERMINATOR_UUID = urn:uuid:556cd81e-14f0-4f0c-8748-fdfd65b5629a +# environment +LC_ADDRESS = pt_BR.UTF-8 +# default +MAKE_COMMAND := make +# environment +QT_ACCESSIBILITY = 1 +# environment +GOPATH = /home/krol/go +# automatic +@D = $(patsubst %/,%,$(dir $@)) +# environment +VSCODE_HANDLES_UNCAUGHT_ERRORS = true +# default +.VARIABLES := +# environment +PWD = /home/krol/workspace/fork/aquasecurity/trivy-action +# automatic +%D = $(patsubst %/,%,$(dir $%)) +# environment +LSCOLORS = Gxfxcxdxbxegedabagacad +# environment +XDG_DATA_DIRS = /usr/share/ubuntu:/usr/share/gnome:/usr/local/share/:/usr/share/:/var/lib/snapd/desktop +# environment +OLDPWD = /home/krol/workspace +# automatic +^D = $(patsubst %/,%,$(dir $^)) +# automatic +%F = $(notdir $%) +# environment +VSCODE_CODE_CACHE_PATH = /home/krol/.config/Code/CachedData/3b889b090b5ad5793f524b5d1d39fda662b96a2a +# environment +LANG = C +# environment +XAUTHORITY = /run/user/1000/gdm/Xauthority +# default +.LOADED := +# default +.INCLUDE_DIRS = /usr/local/include /usr/include /usr/include +# makefile +MAKEFLAGS = pqrR +# environment +TERMINATOR_DBUS_PATH = /net/tenshu/Terminator2 +# makefile +CURDIR := /home/krol/workspace/fork/aquasecurity/trivy-action +# environment +APPLICATION_INSIGHTS_NO_DIAGNOSTIC_CHANNEL = true +# automatic +*D = $(patsubst %/,%,$(dir $*)) +# environment +MFLAGS = -pqrR +# environment +SSH_AUTH_SOCK = /run/user/1000/keyring/ssh +# default +.SHELLFLAGS := -c +# environment +XDG_CONFIG_DIRS = /etc/xdg/xdg-ubuntu:/etc/xdg +# automatic ++D = $(patsubst %/,%,$(dir $+)) +# environment +XDG_SESSION_DESKTOP = ubuntu +# makefile (from 'Makefile', line 1) +MAKEFILE_LIST := Makefile +# automatic +@F = $(notdir $@) +# environment +ZSH = /home/krol/.zplugin/plugins +# environment +VSCODE_PID = 185789 +# environment +XDG_SESSION_TYPE = x11 +# automatic +?D = $(patsubst %/,%,$(dir $?)) +# environment +SESSION_MANAGER = local/krol-asus:@/tmp/.ICE-unix/4009,unix/krol-asus:/tmp/.ICE-unix/4009 +# automatic +*F = $(notdir $*) +# environment +IBUS_DISABLE_SNOOPER = 1 +# environment +CHROME_DESKTOP = code-url-handler.desktop +# environment +DBUS_SESSION_BUS_ADDRESS = unix:path=/run/user/1000/bus +# automatic + Date: Sat, 30 Jul 2022 19:47:29 -0300 Subject: [PATCH 2/2] chore: gitignore .vscode --- .gitignore | 1 + .vscode/configurationCache.log | 1 - .vscode/dryrun.log | 5 - .vscode/settings.json | 3 - .vscode/targets.log | 323 --------------------------------- 5 files changed, 1 insertion(+), 332 deletions(-) delete mode 100644 .vscode/configurationCache.log delete mode 100644 .vscode/dryrun.log delete mode 100644 .vscode/settings.json delete mode 100644 .vscode/targets.log diff --git a/.gitignore b/.gitignore index 006da11..bbee341 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ *.test !test/data/*.test trivyignores +.vscode/ \ No newline at end of file diff --git a/.vscode/configurationCache.log b/.vscode/configurationCache.log deleted file mode 100644 index 9f48169..0000000 --- a/.vscode/configurationCache.log +++ /dev/null @@ -1 +0,0 @@ -{"buildTargets":["test"],"launchTargets":[],"customConfigurationProvider":{"workspaceBrowse":{"browsePath":[],"compilerArgs":[]},"fileIndex":[]}} \ No newline at end of file diff --git a/.vscode/dryrun.log b/.vscode/dryrun.log deleted file mode 100644 index 645e783..0000000 --- a/.vscode/dryrun.log +++ /dev/null @@ -1,5 +0,0 @@ -make --dry-run --always-make --keep-going --print-directory -make: Entering directory '/home/krol/workspace/fork/aquasecurity/trivy-action' -BATS_LIB_PATH=/usr/local/lib/ bats -r . -make: Leaving directory '/home/krol/workspace/fork/aquasecurity/trivy-action' - diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 65e1ec0..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "makefile.extensionOutputFolder": "./.vscode" -} \ No newline at end of file diff --git a/.vscode/targets.log b/.vscode/targets.log deleted file mode 100644 index e3e86e5..0000000 --- a/.vscode/targets.log +++ /dev/null @@ -1,323 +0,0 @@ -make all --print-data-base --no-builtin-variables --no-builtin-rules --question -make: *** No rule to make target 'all'. Stop. - -# GNU Make 4.3 -# Built for x86_64-pc-linux-gnu -# Copyright (C) 1988-2020 Free Software Foundation, Inc. -# License GPLv3+: GNU GPL version 3 or later -# This is free software: you are free to change and redistribute it. -# There is NO WARRANTY, to the extent permitted by law. - -# Make data base, printed on Sat Jul 30 19:44:13 2022 - -# Variables - -# environment -GDK_BACKEND = x11 -# environment -LC_ALL = C -# environment -GNOME_SHELL_SESSION_MODE = ubuntu -# environment -SSH_AGENT_LAUNCHER = gnome-keyring -# environment -TERMINATOR_DBUS_NAME = net.tenshu.Terminator23558193cd9818af7fe4d2c2f5bd9d00f -# environment -GJS_DEBUG_OUTPUT = stderr -# environment -MANDATORY_PATH = /usr/share/gconf/ubuntu.mandatory.path -# environment -LC_NAME = pt_BR.UTF-8 -# environment -LC_NUMERIC = pt_BR.UTF-8 -# environment -VSCODE_CWD = /home/krol/workspace/fork/aquasecurity/trivy-action -# environment -WINDOWPATH = 2 -# environment -NVM_DIR = /home/krol/.nvm -# environment -TERMINATOR_UUID = urn:uuid:556cd81e-14f0-4f0c-8748-fdfd65b5629a -# environment -LC_ADDRESS = pt_BR.UTF-8 -# default -MAKE_COMMAND := make -# environment -QT_ACCESSIBILITY = 1 -# environment -GOPATH = /home/krol/go -# automatic -@D = $(patsubst %/,%,$(dir $@)) -# environment -VSCODE_HANDLES_UNCAUGHT_ERRORS = true -# default -.VARIABLES := -# environment -PWD = /home/krol/workspace/fork/aquasecurity/trivy-action -# automatic -%D = $(patsubst %/,%,$(dir $%)) -# environment -LSCOLORS = Gxfxcxdxbxegedabagacad -# environment -XDG_DATA_DIRS = /usr/share/ubuntu:/usr/share/gnome:/usr/local/share/:/usr/share/:/var/lib/snapd/desktop -# environment -OLDPWD = /home/krol/workspace -# automatic -^D = $(patsubst %/,%,$(dir $^)) -# automatic -%F = $(notdir $%) -# environment -VSCODE_CODE_CACHE_PATH = /home/krol/.config/Code/CachedData/3b889b090b5ad5793f524b5d1d39fda662b96a2a -# environment -LANG = C -# environment -XAUTHORITY = /run/user/1000/gdm/Xauthority -# default -.LOADED := -# default -.INCLUDE_DIRS = /usr/local/include /usr/include /usr/include -# makefile -MAKEFLAGS = pqrR -# environment -TERMINATOR_DBUS_PATH = /net/tenshu/Terminator2 -# makefile -CURDIR := /home/krol/workspace/fork/aquasecurity/trivy-action -# environment -APPLICATION_INSIGHTS_NO_DIAGNOSTIC_CHANNEL = true -# automatic -*D = $(patsubst %/,%,$(dir $*)) -# environment -MFLAGS = -pqrR -# environment -SSH_AUTH_SOCK = /run/user/1000/keyring/ssh -# default -.SHELLFLAGS := -c -# environment -XDG_CONFIG_DIRS = /etc/xdg/xdg-ubuntu:/etc/xdg -# automatic -+D = $(patsubst %/,%,$(dir $+)) -# environment -XDG_SESSION_DESKTOP = ubuntu -# makefile (from 'Makefile', line 1) -MAKEFILE_LIST := Makefile -# automatic -@F = $(notdir $@) -# environment -ZSH = /home/krol/.zplugin/plugins -# environment -VSCODE_PID = 185789 -# environment -XDG_SESSION_TYPE = x11 -# automatic -?D = $(patsubst %/,%,$(dir $?)) -# environment -SESSION_MANAGER = local/krol-asus:@/tmp/.ICE-unix/4009,unix/krol-asus:/tmp/.ICE-unix/4009 -# automatic -*F = $(notdir $*) -# environment -IBUS_DISABLE_SNOOPER = 1 -# environment -CHROME_DESKTOP = code-url-handler.desktop -# environment -DBUS_SESSION_BUS_ADDRESS = unix:path=/run/user/1000/bus -# automatic -