Stage/vuls
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(os): support Amazon Linux 2023 (#1621)

Browse Source
This commit is contained in:
MaineK00n
2023-03-16 17:31:57 +09:00
committed by GitHub
parent 984debe929
commit 6682232b5c
5 changed files with 188 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
config/os.go
View File

@@ -41,8 +41,12 @@ func GetEOL(family, release string) (eol EOL, found bool) {
case constant.Amazon:
eol, found = map[string]EOL{
"1": {StandardSupportUntil: time.Date(2023, 6, 30, 23, 59, 59, 0, time.UTC)},
"2": {StandardSupportUntil: time.Date(2024, 6, 30, 23, 59, 59, 0, time.UTC)},
"2": {StandardSupportUntil: time.Date(2025, 6, 30, 23, 59, 59, 0, time.UTC)},
"2022": {StandardSupportUntil: time.Date(2026, 6, 30, 23, 59, 59, 0, time.UTC)},
"2023": {StandardSupportUntil: time.Date(2027, 6, 30, 23, 59, 59, 0, time.UTC)},
"2025": {StandardSupportUntil: time.Date(2029, 6, 30, 23, 59, 59, 0, time.UTC)},
"2027": {StandardSupportUntil: time.Date(2031, 6, 30, 23, 59, 59, 0, time.UTC)},
"2029": {StandardSupportUntil: time.Date(2033, 6, 30, 23, 59, 59, 0, time.UTC)},
}[getAmazonLinuxVersion(release)]
case constant.RedHat:
// https://access.redhat.com/support/policy/updates/errata
@@ -328,9 +332,25 @@ func majorDotMinor(osVer string) (majorDotMinor string) {
}
func getAmazonLinuxVersion(osRelease string) string {
ss := strings.Fields(osRelease)
if len(ss) == 1 {
switch s := strings.Fields(osRelease)[0]; s {
case "1":
return "1"
case "2":
return "2"
case "2022":
return "2022"
case "2023":
return "2023"
case "2025":
return "2025"
case "2027":
return "2027"
case "2029":
return "2029"
default:
if _, err := time.Parse("2006.01", s); err == nil {
return "1"
}
return "unknown"
}
return ss[0]
}

75
config/os_test.go
View File

@@ -54,8 +54,16 @@ func TestEOL_IsStandardSupportEnded(t *testing.T) {
found: true,
},
{
name: "amazon linux 2024 not found",
fields: fields{family: Amazon, release: "2024 (Amazon Linux)"},
name: "amazon linux 2023 supported",
fields: fields{family: Amazon, release: "2023"},
now: time.Date(2023, 7, 1, 23, 59, 59, 0, time.UTC),
stdEnded: false,
extEnded: false,
found: true,
},
{
name: "amazon linux 2031 not found",
fields: fields{family: Amazon, release: "2031"},
now: time.Date(2023, 7, 1, 23, 59, 59, 0, time.UTC),
stdEnded: false,
extEnded: false,
@@ -347,6 +355,14 @@ func TestEOL_IsStandardSupportEnded(t *testing.T) {
stdEnded: false,
extEnded: false,
},
// {
// name: "Ubuntu 23.04 supported",
// fields: fields{family: Ubuntu, release: "23.04"},
// now: time.Date(2023, 3, 16, 23, 59, 59, 0, time.UTC),
// found: true,
// stdEnded: false,
// extEnded: false,
// },
//Debian
{
name: "Debian 9 supported",
@@ -672,3 +688,58 @@ func Test_majorDotMinor(t *testing.T) {
})
}
}
func Test_getAmazonLinuxVersion(t *testing.T) {
tests := []struct {
release string
want string
}{
{
release: "2017.09",
want: "1",
},
{
release: "2018.03",
want: "1",
},
{
release: "1",
want: "1",
},
{
release: "2",
want: "2",
},
{
release: "2022",
want: "2022",
},
{
release: "2023",
want: "2023",
},
{
release: "2025",
want: "2025",
},
{
release: "2027",
want: "2027",
},
{
release: "2029",
want: "2029",
},
{
release: "2031",
want: "unknown",
},
}
for _, tt := range tests {
t.Run(tt.release, func(t *testing.T) {
if got := getAmazonLinuxVersion(tt.release); got != tt.want {
t.Errorf("getAmazonLinuxVersion() = %v, want %v", got, tt.want)
}
})
}
}