Skip to content

fix(cmd): respect LifecycleSupportEndDate in extended-support check #1234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cristim merged 3 commits into from
Jul 17, 2026
Merged

fix(cmd): respect LifecycleSupportEndDate in extended-support check #1234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a1cead9
fix(cmd): respect LifecycleSupportEndDate in extended-support check
cristim Jun 11, 2026
a068c3c
refactor(cmd): use SDK enum constants for LifecycleSupportName in tests
cristim Jun 19, 2026
2d1cd07
refactor(cmd): use SDK enum constants in remaining lifecycle tests
cristim Jun 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cmd/multi_service_coverage_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ func TestIsInExtendedSupport_EdgeCases(t *testing.T) {
MajorEngineVersion: "5.7",
SupportedEngineLifecycles: []EngineLifecycleInfo{
{
LifecycleSupportName: "open-source-rds-extended-support",
LifecycleSupportName: string(rdstypes.LifecycleSupportNameOpenSourceRdsExtendedSupport),
LifecycleSupportStartDate: pastDate,
LifecycleSupportEndDate: futureDate,
},
Expand All @@ -257,7 +257,7 @@ func TestIsInExtendedSupport_EdgeCases(t *testing.T) {
MajorEngineVersion: "8.0",
SupportedEngineLifecycles: []EngineLifecycleInfo{
{
LifecycleSupportName: "open-source-rds-standard-support",
LifecycleSupportName: string(rdstypes.LifecycleSupportNameOpenSourceRdsStandardSupport),
LifecycleSupportStartDate: now.AddDate(-2, 0, 0),
LifecycleSupportEndDate: futureDate,
},
Expand Down Expand Up @@ -318,7 +318,7 @@ func TestAdjustRecommendationForExcludedVersions_AdditionalCases(t *testing.T) {
MajorEngineVersion: "5.7",
SupportedEngineLifecycles: []EngineLifecycleInfo{
{
LifecycleSupportName: "open-source-rds-extended-support",
LifecycleSupportName: string(rdstypes.LifecycleSupportNameOpenSourceRdsExtendedSupport),
LifecycleSupportStartDate: pastDate,
LifecycleSupportEndDate: futureDate,
},
Expand Down
16 changes: 11 additions & 5 deletions cmd/multi_service_engine_versions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,11 +399,17 @@ func isInExtendedSupport(engine, fullVersion string, versionInfo map[string]Majo
// Check if current date falls within extended support period
now := time.Now()
for _, lifecycle := range info.SupportedEngineLifecycles {
if lifecycle.LifecycleSupportName == "open-source-rds-extended-support" {
// Check if we're past the start date of extended support
if now.After(lifecycle.LifecycleSupportStartDate) || now.Equal(lifecycle.LifecycleSupportStartDate) {
return true
}
if lifecycle.LifecycleSupportName != string(rdstypes.LifecycleSupportNameOpenSourceRdsExtendedSupport) {
continue
}
// Not in extended support before its start date
if now.Before(lifecycle.LifecycleSupportStartDate) {
continue
}
// Past the end date means extended support is over; a zero end date
// is open-ended (issue #1182)
if lifecycle.LifecycleSupportEndDate.IsZero() || now.Before(lifecycle.LifecycleSupportEndDate) {
return true
}
}

Expand Down
2 changes: 1 addition & 1 deletion cmd/multi_service_engine_versions_paginate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func rdsMajorVersion(engine, major string) rdstypes.DBMajorEngineVersion { //nol
MajorEngineVersion: aws.String(major),
SupportedEngineLifecycles: []rdstypes.SupportedEngineLifecycle{
{
LifecycleSupportName: "open-source-rds-extended-support",
LifecycleSupportName: rdstypes.LifecycleSupportNameOpenSourceRdsExtendedSupport,
LifecycleSupportStartDate: aws.Time(time.Now().AddDate(-1, 0, 0)),
LifecycleSupportEndDate: aws.Time(time.Now().AddDate(2, 0, 0)),
},
Expand Down
54 changes: 46 additions & 8 deletions cmd/multi_service_engine_versions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"time"

"github.com/LeanerCloud/CUDly/pkg/common"
rdstypes "github.com/aws/aws-sdk-go-v2/service/rds/types"
"github.com/stretchr/testify/assert"
)

Expand Down Expand Up @@ -134,7 +135,7 @@ func TestAdjustRecommendationForExcludedVersions(t *testing.T) {
MajorEngineVersion: "5.7",
SupportedEngineLifecycles: []EngineLifecycleInfo{
{
LifecycleSupportName: "open-source-rds-extended-support",
LifecycleSupportName: string(rdstypes.LifecycleSupportNameOpenSourceRdsExtendedSupport),
LifecycleSupportStartDate: time.Now().AddDate(0, -6, 0),
LifecycleSupportEndDate: time.Now().AddDate(3, 0, 0),
},
Expand Down Expand Up @@ -213,7 +214,7 @@ func TestAdjustRecommendationForExcludedVersions_MultipleVersionsInExtendedSuppo
MajorEngineVersion: "5.6",
SupportedEngineLifecycles: []EngineLifecycleInfo{
{
LifecycleSupportName: "open-source-rds-extended-support",
LifecycleSupportName: string(rdstypes.LifecycleSupportNameOpenSourceRdsExtendedSupport),
LifecycleSupportStartDate: time.Now().AddDate(0, -12, 0),
LifecycleSupportEndDate: time.Now().AddDate(2, 0, 0),
},
Expand All @@ -224,7 +225,7 @@ func TestAdjustRecommendationForExcludedVersions_MultipleVersionsInExtendedSuppo
MajorEngineVersion: "5.7",
SupportedEngineLifecycles: []EngineLifecycleInfo{
{
LifecycleSupportName: "open-source-rds-extended-support",
LifecycleSupportName: string(rdstypes.LifecycleSupportNameOpenSourceRdsExtendedSupport),
LifecycleSupportStartDate: time.Now().AddDate(0, -6, 0),
LifecycleSupportEndDate: time.Now().AddDate(3, 0, 0),
},
Expand Down Expand Up @@ -518,7 +519,7 @@ func TestIsInExtendedSupport(t *testing.T) {
MajorEngineVersion: "5.7",
SupportedEngineLifecycles: []EngineLifecycleInfo{
{
LifecycleSupportName: "open-source-rds-extended-support",
LifecycleSupportName: string(rdstypes.LifecycleSupportNameOpenSourceRdsExtendedSupport),
LifecycleSupportStartDate: pastDate,
LifecycleSupportEndDate: futureDate,
},
Expand All @@ -537,7 +538,7 @@ func TestIsInExtendedSupport(t *testing.T) {
MajorEngineVersion: "8.0",
SupportedEngineLifecycles: []EngineLifecycleInfo{
{
LifecycleSupportName: "open-source-rds-standard-support",
LifecycleSupportName: string(rdstypes.LifecycleSupportNameOpenSourceRdsStandardSupport),
LifecycleSupportStartDate: now.AddDate(-2, 0, 0),
LifecycleSupportEndDate: futureDate,
},
Expand Down Expand Up @@ -575,7 +576,7 @@ func TestIsInExtendedSupport(t *testing.T) {
MajorEngineVersion: "5.7",
SupportedEngineLifecycles: []EngineLifecycleInfo{
{
LifecycleSupportName: "open-source-rds-extended-support",
LifecycleSupportName: string(rdstypes.LifecycleSupportNameOpenSourceRdsExtendedSupport),
LifecycleSupportStartDate: futureDate,
LifecycleSupportEndDate: futureDate.AddDate(1, 0, 0),
},
Expand All @@ -594,7 +595,7 @@ func TestIsInExtendedSupport(t *testing.T) {
MajorEngineVersion: "11.19",
SupportedEngineLifecycles: []EngineLifecycleInfo{
{
LifecycleSupportName: "open-source-rds-extended-support",
LifecycleSupportName: string(rdstypes.LifecycleSupportNameOpenSourceRdsExtendedSupport),
LifecycleSupportStartDate: now,
LifecycleSupportEndDate: futureDate,
},
Expand All @@ -603,6 +604,43 @@ func TestIsInExtendedSupport(t *testing.T) {
},
expected: true,
},
{
name: "Extended support already ended",
engine: "mysql",
version: "5.7.44",
versionInfo: map[string]MajorEngineVersionInfo{
"mysql:5.7": {
Engine: "mysql",
MajorEngineVersion: "5.7",
SupportedEngineLifecycles: []EngineLifecycleInfo{
{
LifecycleSupportName: string(rdstypes.LifecycleSupportNameOpenSourceRdsExtendedSupport),
LifecycleSupportStartDate: now.AddDate(-3, 0, 0),
LifecycleSupportEndDate: pastDate,
},
},
},
},
expected: false,
},
{
name: "Zero end date treated as open-ended",
engine: "mysql",
version: "5.7.44",
versionInfo: map[string]MajorEngineVersionInfo{
"mysql:5.7": {
Engine: "mysql",
MajorEngineVersion: "5.7",
SupportedEngineLifecycles: []EngineLifecycleInfo{
{
LifecycleSupportName: string(rdstypes.LifecycleSupportNameOpenSourceRdsExtendedSupport),
LifecycleSupportStartDate: pastDate,
},
},
},
},
expected: true,
},
{
name: "Engine name normalization with spaces",
engine: "Aurora MySQL",
Expand All @@ -613,7 +651,7 @@ func TestIsInExtendedSupport(t *testing.T) {
MajorEngineVersion: "5.7",
SupportedEngineLifecycles: []EngineLifecycleInfo{
{
LifecycleSupportName: "open-source-rds-extended-support",
LifecycleSupportName: string(rdstypes.LifecycleSupportNameOpenSourceRdsExtendedSupport),
LifecycleSupportStartDate: pastDate,
LifecycleSupportEndDate: futureDate,
},
Expand Down
7 changes: 4 additions & 3 deletions cmd/multi_service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (

"github.com/LeanerCloud/CUDly/pkg/common"
"github.com/aws/aws-sdk-go-v2/aws"
rdstypes "github.com/aws/aws-sdk-go-v2/service/rds/types"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
Expand Down Expand Up @@ -1828,12 +1829,12 @@ func createTestVersionInfo() map[string]MajorEngineVersionInfo {
MajorEngineVersion: "5.7",
SupportedEngineLifecycles: []EngineLifecycleInfo{
{
LifecycleSupportName: "open-source-rds-standard-support",
LifecycleSupportName: string(rdstypes.LifecycleSupportNameOpenSourceRdsStandardSupport),
LifecycleSupportStartDate: now.AddDate(-5, 0, 0),
LifecycleSupportEndDate: pastDate,
},
{
LifecycleSupportName: "open-source-rds-extended-support",
LifecycleSupportName: string(rdstypes.LifecycleSupportNameOpenSourceRdsExtendedSupport),
LifecycleSupportStartDate: pastDate,
LifecycleSupportEndDate: futureDate,
},
Expand All @@ -1844,7 +1845,7 @@ func createTestVersionInfo() map[string]MajorEngineVersionInfo {
MajorEngineVersion: "8.0",
SupportedEngineLifecycles: []EngineLifecycleInfo{
{
LifecycleSupportName: "open-source-rds-standard-support",
LifecycleSupportName: string(rdstypes.LifecycleSupportNameOpenSourceRdsStandardSupport),
LifecycleSupportStartDate: now.AddDate(-2, 0, 0),
LifecycleSupportEndDate: futureDate,
},
Expand Down
Loading