fix(aws): report EC2 reservation platform, tenancy and scope so dedupe can match them

providers/aws/go.mod

@@ -3,7 +3,7 @@ module github.com/LeanerCloud/cloud-commitments-go/providers/aws
 go 1.26.9
 
 require (
-	github.com/LeanerCloud/cloud-commitments-go/pkg v0.0.0-20261015085730-498b74f31f01
+	github.com/LeanerCloud/cloud-commitments-go/pkg v0.0.0-20261016194019-89772cf80f67
 	github.com/aws/aws-sdk-go-v2 v1.41.5
 	github.com/aws/aws-sdk-go-v2/config v1.29.12
 	github.com/aws/aws-sdk-go-v2/credentials v1.17.65

providers/aws/go.sum

@@ -1,5 +1,5 @@
-github.com/LeanerCloud/cloud-commitments-go/pkg v0.0.0-20261015085730-498b74f31f01 h1:R2EQAvwLAxPrdlZXmF+bI7ioQYh1CxBkethx5hq6WWA=
-github.com/LeanerCloud/cloud-commitments-go/pkg v0.0.0-20261015085730-498b74f31f01/go.mod h1:8RTmzPazA8IeVZfn7wNaU7ILx0VK5eHZQozO21Mvtq8=
+github.com/LeanerCloud/cloud-commitments-go/pkg v0.0.0-20261016194019-89772cf80f67 h1:zpr+lPSdlXeA9ySU7FqHtgn4ADinmRhfJ5Y6jm9ankw=
+github.com/LeanerCloud/cloud-commitments-go/pkg v0.0.0-20261016194019-89772cf80f67/go.mod h1:SCDEgHG6evjPh0RsoXof+J3aMmGXNFMrwbJIle7rMpQ=
 github.com/aws/aws-sdk-go-v2 v1.41.5 h1:dj5kopbwUsVUVFgO4Fi5BIT3t4WyqIDjGKCangnV/yY=
 github.com/aws/aws-sdk-go-v2 v1.41.5/go.mod h1:mwsPRE8ceUUpiTgF7QmQIJ7lgsKUPQOUl3o72QBrE1o=
 github.com/aws/aws-sdk-go-v2/config v1.29.12 h1:Y/2a+jLPrPbHpFkpAAYkVEtJmxORlXoo5k2g1fa2sUo=

providers/aws/services/ec2/client.go

@@ -113,6 +113,11 @@ func (c *Client) GetExistingCommitments(ctx context.Context) ([]common.Commitmen
 			State:          common.CommitmentState(ri.State),
 			StartDate:      aws.ToTime(ri.Start),
 			EndDate:        aws.ToTime(ri.End),
+			// Raw SDK values; pkg/common normalizes them when matching.
+			Platform:         string(ri.ProductDescription),
+			Tenancy:          string(ri.InstanceTenancy),
+			Scope:            string(ri.Scope),
+			AvailabilityZone: aws.ToString(ri.AvailabilityZone),
 		}
 
 		commitments = append(commitments, commitment)

providers/aws/services/ec2/client_listing_dims_test.go

@@ -0,0 +1,106 @@
+package ec2
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	"github.com/LeanerCloud/cloud-commitments-go/pkg/common"
+	"github.com/LeanerCloud/cloud-commitments-go/pkg/recfilter"
+	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go-v2/service/ec2"
+	"github.com/aws/aws-sdk-go-v2/service/ec2/types"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
+)
+
+func sdkRI(id, product string, tenancy types.Tenancy, scope types.Scope, az *string) types.ReservedInstances {
+	return types.ReservedInstances{
+		ReservedInstancesId: aws.String(id),
+		InstanceType:        types.InstanceTypeM5Large,
+		InstanceCount:       aws.Int32(2),
+		State:               types.ReservedInstanceStateActive,
+		Start:               aws.Time(time.Now().Add(-time.Hour)),
+		End:                 aws.Time(time.Now().Add(24 * time.Hour)),
+		ProductDescription:  types.RIProductDescription(product),
+		InstanceTenancy:     tenancy,
+		Scope:               scope,
+		AvailabilityZone:    az,
+	}
+}
+
+func listingClient(ris ...types.ReservedInstances) *Client {
+	m := &MockEC2Client{}
+	m.On("DescribeReservedInstances", mock.Anything, mock.Anything).
+		Return(&ec2.DescribeReservedInstancesOutput{ReservedInstances: ris}, nil)
+	return &Client{client: m, region: "us-east-1"}
+}
+
+func TestGetExistingCommitments_ReportsPlatformTenancyScope(t *testing.T) {
+	client := listingClient(
+		sdkRI("ri-regional", "Linux/UNIX", types.TenancyDefault, types.ScopeRegional, nil),
+		sdkRI("ri-zonal", "Windows", types.TenancyDedicated, types.ScopeAvailabilityZone, aws.String("us-east-1a")),
+		types.ReservedInstances{ReservedInstancesId: aws.String("ri-nil")},
+	)
+	got, err := client.GetExistingCommitments(context.Background())
+	require.NoError(t, err)
+	require.Len(t, got, 3)
+
+	assert.Equal(t, "Linux/UNIX", got[0].Platform)
+	assert.Equal(t, "default", got[0].Tenancy)
+	assert.Equal(t, "Region", got[0].Scope)
+	assert.Empty(t, got[0].AvailabilityZone)
+
+	assert.Equal(t, "Windows", got[1].Platform)
+	assert.Equal(t, "dedicated", got[1].Tenancy)
+	assert.Equal(t, "Availability Zone", got[1].Scope)
+	assert.Equal(t, "us-east-1a", got[1].AvailabilityZone)
+
+	assert.Empty(t, got[2].Platform)
+	assert.Empty(t, got[2].Tenancy)
+	assert.Empty(t, got[2].Scope)
+	assert.Empty(t, got[2].AvailabilityZone)
+}
+
+// parserRec mirrors the ComputeDetails parseEC2Details builds from Cost Explorer.
+func parserRec(scope, az string) common.Recommendation {
+	return common.Recommendation{
+		Provider: common.ProviderAWS, Service: common.ServiceEC2, ResourceType: "m5.large",
+		Region: "us-east-1", Count: 1,
+		Details: &common.ComputeDetails{InstanceType: "m5.large", Platform: "Linux/UNIX",
+			Tenancy: "default", Scope: scope, AvailabilityZone: az},
+	}
+}
+
+func TestListingFeedsDuplicateChecker(t *testing.T) {
+	linuxRegional := sdkRI("ri-1", "Linux/UNIX", types.TenancyDefault, types.ScopeRegional, nil)
+	windowsRegional := sdkRI("ri-2", "Windows", types.TenancyDefault, types.ScopeRegional, nil)
+	linuxZonal := sdkRI("ri-3", "Linux/UNIX", types.TenancyDefault, types.ScopeAvailabilityZone, aws.String("us-east-1a"))
+
+	tests := []struct {
+		name     string
+		ri       types.ReservedInstances
+		rec      common.Recommendation
+		suppress bool
+	}{
+		{"windows RI does not suppress linux rec", windowsRegional, parserRec("Region", ""), false},
+		{"zonal RI does not suppress regional rec", linuxZonal, parserRec("Region", ""), false},
+		{"regional RI suppresses zonal rec", linuxRegional, parserRec("Availability Zone", "us-east-1a"), true},
+		{"matching linux regional RI suppresses", linuxRegional, parserRec("Region", ""), true},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			passed, filtered, err := recfilter.NewDuplicateChecker(0).
+				AdjustRecommendationsForExisting(context.Background(), []common.Recommendation{tt.rec}, listingClient(tt.ri))
+			require.NoError(t, err)
+			if tt.suppress {
+				assert.Empty(t, passed)
+				assert.Len(t, filtered, 1)
+			} else {
+				assert.Len(t, passed, 1)
+				assert.Empty(t, filtered)
+			}
+		})
+	}
+}