diff --git a/config/os.go b/config/os.go index e3609d07..f3d98d58 100644 --- a/config/os.go +++ b/config/os.go @@ -151,7 +151,7 @@ func GetEOL(family, release string) (eol EOL, found bool) { //TODO case constant.Alpine: // https://github.com/aquasecurity/trivy/blob/master/pkg/detector/ospkg/alpine/alpine.go#L19 - // https://wiki.alpinelinux.org/wiki/Alpine_Linux:Releases + // https://alpinelinux.org/releases/ eol, found = map[string]EOL{ "2.0": {Ended: true}, "2.1": {Ended: true}, @@ -175,6 +175,8 @@ func GetEOL(family, release string) (eol EOL, found bool) { "3.11": {StandardSupportUntil: time.Date(2021, 11, 1, 23, 59, 59, 0, time.UTC)}, "3.12": {StandardSupportUntil: time.Date(2022, 5, 1, 23, 59, 59, 0, time.UTC)}, "3.13": {StandardSupportUntil: time.Date(2022, 11, 1, 23, 59, 59, 0, time.UTC)}, + "3.14": {StandardSupportUntil: time.Date(2023, 5, 1, 23, 59, 59, 0, time.UTC)}, + "3.15": {StandardSupportUntil: time.Date(2023, 11, 1, 23, 59, 59, 0, time.UTC)}, }[majorDotMinor(release)] case constant.FreeBSD: // https://www.freebsd.org/security/ diff --git a/config/os_test.go b/config/os_test.go index c4b773a2..e06e6c41 100644 --- a/config/os_test.go +++ b/config/os_test.go @@ -342,9 +342,25 @@ func TestEOL_IsStandardSupportEnded(t *testing.T) { found: true, }, { - name: "Alpine 3.14 not found", + name: "Alpine 3.14 supported", fields: fields{family: Alpine, release: "3.14"}, - now: time.Date(2021, 1, 6, 23, 59, 59, 0, time.UTC), + now: time.Date(2022, 5, 1, 23, 59, 59, 0, time.UTC), + stdEnded: false, + extEnded: false, + found: true, + }, + { + name: "Alpine 3.15 supported", + fields: fields{family: Alpine, release: "3.15"}, + now: time.Date(2022, 11, 1, 23, 59, 59, 0, time.UTC), + stdEnded: false, + extEnded: false, + found: true, + }, + { + name: "Alpine 3.16 not found", + fields: fields{family: Alpine, release: "3.16"}, + now: time.Date(2022, 1, 14, 23, 59, 59, 0, time.UTC), stdEnded: false, extEnded: false, found: false,