@@ -2,9 +2,12 @@ package elbv2
22
33import (
44 "context"
5+ "github.com/aws/aws-sdk-go-v2/aws"
56 awssdk "github.com/aws/aws-sdk-go/aws"
67 elbv2sdk "github.com/aws/aws-sdk-go/service/elbv2"
8+ "github.com/aws/aws-sdk-go/service/resourcegroupstaggingapi"
79 "github.com/go-logr/logr"
10+ "github.com/pkg/errors"
811 "k8s.io/apimachinery/pkg/util/sets"
912 "sigs.k8s.io/aws-load-balancer-controller/pkg/algorithm"
1013 "sigs.k8s.io/aws-load-balancer-controller/pkg/aws/services"
@@ -93,26 +96,28 @@ type TaggingManager interface {
9396}
9497
9598// NewDefaultTaggingManager constructs default TaggingManager.
96- func NewDefaultTaggingManager (elbv2Client services.ELBV2 , vpcID string , featureGates config.FeatureGates , logger logr.Logger ) * defaultTaggingManager {
99+ func NewDefaultTaggingManager (elbv2Client services.ELBV2 , vpcID string , featureGates config.FeatureGates , rgt services. RGT , logger logr.Logger ) * defaultTaggingManager {
97100 return & defaultTaggingManager {
98101 elbv2Client : elbv2Client ,
99102 vpcID : vpcID ,
100103 featureGates : featureGates ,
101104 logger : logger ,
102105 describeTagsChunkSize : defaultDescribeTagsChunkSize ,
106+ rgt : rgt ,
103107 }
104108}
105109
106110var _ TaggingManager = & defaultTaggingManager {}
107111
108112// default implementation for TaggingManager
109- // @TODO: use AWS Resource Groups Tagging API to optimize this implementation once it have PrivateLink support.
113+ // @TODO: deprecate ELB API and only use AWS Resource Groups Tagging API to optimize this implementation once RGT has PrivateLink support.
110114type defaultTaggingManager struct {
111115 elbv2Client services.ELBV2
112116 vpcID string
113117 featureGates config.FeatureGates
114118 logger logr.Logger
115119 describeTagsChunkSize int
120+ rgt services.RGT
116121}
117122
118123func (m * defaultTaggingManager ) ReconcileTags (ctx context.Context , arn string , desiredTags map [string ]string , opts ... ReconcileTagsOption ) error {
@@ -123,7 +128,7 @@ func (m *defaultTaggingManager) ReconcileTags(ctx context.Context, arn string, d
123128 reconcileOpts .ApplyOptions (opts )
124129 currentTags := reconcileOpts .CurrentTags
125130 if currentTags == nil {
126- tagsByARN , err := m .describeResourceTags (ctx , []string {arn })
131+ tagsByARN , err := m .describeResourceTagsNative (ctx , []string {arn })
127132 if err != nil {
128133 return err
129134 }
@@ -188,7 +193,7 @@ func (m *defaultTaggingManager) ListListeners(ctx context.Context, lbARN string)
188193 }
189194 var tagsByARN map [string ]map [string ]string
190195 if m .featureGates .Enabled (config .ListenerRulesTagging ) {
191- tagsByARN , err = m .describeResourceTags (ctx , lsARNs )
196+ tagsByARN , err = m .describeResourceTagsNative (ctx , lsARNs )
192197 if err != nil {
193198 return nil , err
194199 }
@@ -221,7 +226,7 @@ func (m *defaultTaggingManager) ListListenerRules(ctx context.Context, lsARN str
221226 }
222227 var tagsByARN map [string ]map [string ]string
223228 if m .featureGates .Enabled (config .ListenerRulesTagging ) {
224- tagsByARN , err = m .describeResourceTags (ctx , lrARNs )
229+ tagsByARN , err = m .describeResourceTagsNative (ctx , lrARNs )
225230 if err != nil {
226231 return nil , err
227232 }
@@ -238,12 +243,64 @@ func (m *defaultTaggingManager) ListListenerRules(ctx context.Context, lsARN str
238243}
239244
240245func (m * defaultTaggingManager ) ListLoadBalancers (ctx context.Context , tagFilters ... tracking.TagFilter ) ([]LoadBalancerWithTags , error ) {
246+ if m .featureGates .Enabled (config .EnableRGTAPI ) {
247+ return m .listLoadBalancersRGT (ctx , tagFilters )
248+ }
249+ return m .listLoadBalancersNative (ctx , tagFilters )
250+ }
251+
252+ func (m * defaultTaggingManager ) ListTargetGroups (ctx context.Context , tagFilters ... tracking.TagFilter ) ([]TargetGroupWithTags , error ) {
253+ if m .featureGates .Enabled (config .EnableRGTAPI ) {
254+ return m .listTargetGroupsRGT (ctx , tagFilters )
255+ }
256+ return m .listTargetGroupsNative (ctx , tagFilters )
257+
258+ }
259+
260+ func (m * defaultTaggingManager ) listLoadBalancersRGT (ctx context.Context , tagFilters []tracking.TagFilter ) ([]LoadBalancerWithTags , error ) {
261+ // use a map to avoid potential duplication in returned resources
262+ resourceTagsByARN := make (map [string ][]* resourcegroupstaggingapi.Tag )
263+ for _ , tagFilter := range tagFilters {
264+ req := & resourcegroupstaggingapi.GetResourcesInput {
265+ TagFilters : convertTagFiltersToRGTTagFilters (tagFilter ),
266+ ResourceTypeFilters : aws .StringSlice ([]string {services .ResourceTypeELBLoadBalancer }),
267+ }
268+ resources , err := m .rgt .GetResourcesAsList (ctx , req )
269+ if err != nil {
270+ return nil , err
271+ }
272+ for _ , resource := range resources {
273+ if _ , exists := resourceTagsByARN [aws .StringValue (resource .ResourceARN )]; ! exists {
274+ resourceTagsByARN [aws .StringValue (resource .ResourceARN )] = resource .Tags
275+ }
276+ }
277+ }
278+ var matchedLBs []LoadBalancerWithTags
279+ for resourceARN , resourceTags := range resourceTagsByARN {
280+ elbv2Req := & elbv2sdk.DescribeLoadBalancersInput {
281+ LoadBalancerArns : []* string {& resourceARN },
282+ }
283+ elbv2Resp , err := m .elbv2Client .DescribeLoadBalancersAsList (ctx , elbv2Req )
284+ if err != nil {
285+ return nil , err
286+ }
287+ if len (elbv2Resp ) == 0 {
288+ return nil , errors .Errorf ("no load balancer found for the arn: %v" , resourceARN )
289+ }
290+ matchedLBs = append (matchedLBs , LoadBalancerWithTags {
291+ LoadBalancer : elbv2Resp [0 ],
292+ Tags : services .ParseRGTTags (resourceTags ),
293+ })
294+ }
295+ return matchedLBs , nil
296+ }
297+
298+ func (m * defaultTaggingManager ) listLoadBalancersNative (ctx context.Context , tagFilters []tracking.TagFilter ) ([]LoadBalancerWithTags , error ) {
241299 req := & elbv2sdk.DescribeLoadBalancersInput {}
242300 lbs , err := m .elbv2Client .DescribeLoadBalancersAsList (ctx , req )
243301 if err != nil {
244302 return nil , err
245303 }
246-
247304 lbARNsWithinVPC := make ([]string , 0 , len (lbs ))
248305 lbByARNWithinVPC := make (map [string ]* elbv2sdk.LoadBalancer , len (lbs ))
249306 for _ , lb := range lbs {
@@ -254,7 +311,7 @@ func (m *defaultTaggingManager) ListLoadBalancers(ctx context.Context, tagFilter
254311 lbARNsWithinVPC = append (lbARNsWithinVPC , lbARN )
255312 lbByARNWithinVPC [lbARN ] = lb
256313 }
257- tagsByARN , err := m .describeResourceTags (ctx , lbARNsWithinVPC )
314+ tagsByARN , err := m .describeResourceTagsNative (ctx , lbARNsWithinVPC )
258315 if err != nil {
259316 return nil , err
260317 }
@@ -279,7 +336,45 @@ func (m *defaultTaggingManager) ListLoadBalancers(ctx context.Context, tagFilter
279336 return matchedLBs , nil
280337}
281338
282- func (m * defaultTaggingManager ) ListTargetGroups (ctx context.Context , tagFilters ... tracking.TagFilter ) ([]TargetGroupWithTags , error ) {
339+ func (m * defaultTaggingManager ) listTargetGroupsRGT (ctx context.Context , tagFilters []tracking.TagFilter ) ([]TargetGroupWithTags , error ) {
340+ // use a map to avoid potential duplication in returned resources
341+ resourceTagsByARN := make (map [string ][]* resourcegroupstaggingapi.Tag )
342+ for _ , tagFilter := range tagFilters {
343+ req := & resourcegroupstaggingapi.GetResourcesInput {
344+ TagFilters : convertTagFiltersToRGTTagFilters (tagFilter ),
345+ ResourceTypeFilters : aws .StringSlice ([]string {services .ResourceTypeELBTargetGroup }),
346+ }
347+ resources , err := m .rgt .GetResourcesAsList (ctx , req )
348+ if err != nil {
349+ return nil , err
350+ }
351+ for _ , resource := range resources {
352+ if _ , exists := resourceTagsByARN [aws .StringValue (resource .ResourceARN )]; ! exists {
353+ resourceTagsByARN [aws .StringValue (resource .ResourceARN )] = resource .Tags
354+ }
355+ }
356+ }
357+ var matchedTGs []TargetGroupWithTags
358+ for resourceARN , resourceTags := range resourceTagsByARN {
359+ elbv2Req := & elbv2sdk.DescribeTargetGroupsInput {
360+ TargetGroupArns : []* string {& resourceARN },
361+ }
362+ elbv2Resp , err := m .elbv2Client .DescribeTargetGroupsAsList (ctx , elbv2Req )
363+ if err != nil {
364+ return nil , err
365+ }
366+ if len (elbv2Resp ) == 0 {
367+ return nil , errors .Errorf ("no target group found for the arn: %v" , resourceARN )
368+ }
369+ matchedTGs = append (matchedTGs , TargetGroupWithTags {
370+ TargetGroup : elbv2Resp [0 ],
371+ Tags : services .ParseRGTTags (resourceTags ),
372+ })
373+ }
374+ return matchedTGs , nil
375+ }
376+
377+ func (m * defaultTaggingManager ) listTargetGroupsNative (ctx context.Context , tagFilters []tracking.TagFilter ) ([]TargetGroupWithTags , error ) {
283378 req := & elbv2sdk.DescribeTargetGroupsInput {}
284379 tgs , err := m .elbv2Client .DescribeTargetGroupsAsList (ctx , req )
285380 if err != nil {
@@ -296,7 +391,7 @@ func (m *defaultTaggingManager) ListTargetGroups(ctx context.Context, tagFilters
296391 tgARNsWithinVPC = append (tgARNsWithinVPC , tgARN )
297392 tgByARNWithinVPC [tgARN ] = tg
298393 }
299- tagsByARN , err := m .describeResourceTags (ctx , tgARNsWithinVPC )
394+ tagsByARN , err := m .describeResourceTagsNative (ctx , tgARNsWithinVPC )
300395 if err != nil {
301396 return nil , err
302397 }
@@ -321,9 +416,9 @@ func (m *defaultTaggingManager) ListTargetGroups(ctx context.Context, tagFilters
321416 return matchedTGs , nil
322417}
323418
324- // describeResourceTags describes tags for elbv2 resources.
419+ // describeResourceTagsNative describes tags for elbv2 resources.
325420// returns tags indexed by resource ARN.
326- func (m * defaultTaggingManager ) describeResourceTags (ctx context.Context , arns []string ) (map [string ]map [string ]string , error ) {
421+ func (m * defaultTaggingManager ) describeResourceTagsNative (ctx context.Context , arns []string ) (map [string ]map [string ]string , error ) {
327422 tagsByARN := make (map [string ]map [string ]string , len (arns ))
328423 arnsChunks := algorithm .ChunkStrings (arns , m .describeTagsChunkSize )
329424 for _ , arnsChunk := range arnsChunks {
@@ -365,3 +460,15 @@ func convertSDKTagsToTags(sdkTags []*elbv2sdk.Tag) map[string]string {
365460 }
366461 return tags
367462}
463+
464+ // convert tagFilters to RGTTagFilters
465+ func convertTagFiltersToRGTTagFilters (tagFilter tracking.TagFilter ) []* resourcegroupstaggingapi.TagFilter {
466+ var RGTTagFilters []* resourcegroupstaggingapi.TagFilter
467+ for k , v := range tagFilter {
468+ RGTTagFilters = append (RGTTagFilters , & resourcegroupstaggingapi.TagFilter {
469+ Key : aws .String (k ),
470+ Values : aws .StringSlice (v ),
471+ })
472+ }
473+ return RGTTagFilters
474+ }
0 commit comments