@@ -19,8 +19,8 @@ import (
1919
2020 ackv1alpha1 "github.com/aws-controllers-k8s/runtime/apis/core/v1alpha1"
2121 ackrtlog "github.com/aws-controllers-k8s/runtime/pkg/runtime/log"
22+ svcsdk "github.com/aws/aws-sdk-go-v2/service/sqs"
2223 "github.com/aws/aws-sdk-go/aws/arn"
23- svcsdk "github.com/aws/aws-sdk-go/service/sqs"
2424)
2525
2626// syncTags examines the Tags in the supplied Queue and calls the
@@ -34,35 +34,35 @@ func (rm *resourceManager) syncTags(
3434 rlog := ackrtlog .FromContext (ctx )
3535 exit := rlog .Trace ("rm.syncTags" )
3636 defer func () { exit (err ) }()
37- toAdd := map [string ]* string {}
38- toDelete := []* string {}
37+ toAdd := map [string ]string {}
38+ toDelete := []string {}
3939
4040 existingTags := latest .ko .Spec .Tags
4141
4242 for k , v := range desired .ko .Spec .Tags {
4343 if ev , found := existingTags [k ]; ! found || * ev != * v {
44- toAdd [k ] = v
44+ toAdd [k ] = * v
4545 }
4646 }
4747
4848 for k , _ := range existingTags {
4949 if _ , found := desired .ko .Spec .Tags [k ]; ! found {
5050 deleteKey := k
51- toDelete = append (toDelete , & deleteKey )
51+ toDelete = append (toDelete , deleteKey )
5252 }
5353 }
5454
5555 if len (toAdd ) > 0 {
5656 for k , v := range toAdd {
57- rlog .Debug ("adding tag to queue" , "key" , k , "value" , * v )
57+ rlog .Debug ("adding tag to queue" , "key" , k , "value" , v )
5858 }
5959 if err = rm .addTags (ctx , desired , toAdd ); err != nil {
6060 return err
6161 }
6262 }
6363 if len (toDelete ) > 0 {
6464 for _ , k := range toDelete {
65- rlog .Debug ("removing tag from queue" , "key" , * k )
65+ rlog .Debug ("removing tag from queue" , "key" , k )
6666 }
6767 if err = rm .removeTags (ctx , desired , toDelete ); err != nil {
6868 return err
@@ -76,7 +76,7 @@ func (rm *resourceManager) syncTags(
7676func (rm * resourceManager ) getTags (
7777 ctx context.Context ,
7878 r * resource ,
79- ) (map [string ]* string , error ) {
79+ ) (map [string ]string , error ) {
8080 var err error
8181 var resp * svcsdk.ListQueueTagsOutput
8282 rlog := ackrtlog .FromContext (ctx )
@@ -88,7 +88,7 @@ func (rm *resourceManager) getTags(
8888
8989 // NOTE(jaypipes): Unlike many other ListTags APIs, SQS's is not
9090 // paginated...
91- resp , err = rm .sdkapi .ListQueueTagsWithContext (ctx , input )
91+ resp , err = rm .sdkapi .ListQueueTags (ctx , input )
9292 rm .metrics .RecordAPICall ("READ_MANY" , "ListQueueTags" , err )
9393 if err != nil || resp == nil {
9494 return nil , err
@@ -102,7 +102,7 @@ func (rm *resourceManager) getTags(
102102func (rm * resourceManager ) addTags (
103103 ctx context.Context ,
104104 r * resource ,
105- tags map [string ]* string ,
105+ tags map [string ]string ,
106106) (err error ) {
107107 rlog := ackrtlog .FromContext (ctx )
108108 exit := rlog .Trace ("rm.addTag" )
@@ -112,7 +112,7 @@ func (rm *resourceManager) addTags(
112112 input .QueueUrl = r .ko .Status .QueueURL
113113 input .Tags = tags
114114
115- _ , err = rm .sdkapi .TagQueueWithContext (ctx , input )
115+ _ , err = rm .sdkapi .TagQueue (ctx , input )
116116 rm .metrics .RecordAPICall ("UPDATE" , "TagQueue" , err )
117117 return err
118118}
@@ -121,7 +121,7 @@ func (rm *resourceManager) addTags(
121121func (rm * resourceManager ) removeTags (
122122 ctx context.Context ,
123123 r * resource ,
124- tagKeys []* string , // the set of tag keys to delete
124+ tagKeys []string , // the set of tag keys to delete
125125) (err error ) {
126126 rlog := ackrtlog .FromContext (ctx )
127127 exit := rlog .Trace ("rm.removeTag" )
@@ -131,7 +131,7 @@ func (rm *resourceManager) removeTags(
131131 input .QueueUrl = r .ko .Status .QueueURL
132132 input .TagKeys = tagKeys
133133
134- _ , err = rm .sdkapi .UntagQueueWithContext (ctx , input )
134+ _ , err = rm .sdkapi .UntagQueue (ctx , input )
135135 rm .metrics .RecordAPICall ("UPDATE" , "UntagQueue" , err )
136136 return err
137137}
0 commit comments