Merge pull request #1555 from OmerKahani/Change_Order_Delete_Before_Create

k8s-ci-robot · web-flow · commit 102228c18138 · 2020-06-10T08:20:51.000-07:00
AWS: change the order of the actions, DELETE before CREATE fixes #1411
diff --git a/provider/aws/aws.go b/provider/aws/aws.go
@@ -592,7 +592,8 @@ func (p *AWSProvider) tagsForZone(ctx context.Context, zoneID string) (map[strin
 
 func batchChangeSet(cs []*route53.Change, batchSize int) [][]*route53.Change {
 	if len(cs) <= batchSize {
-		return [][]*route53.Change{cs}
+		res := sortChangesByActionNameType(cs)
+		return [][]*route53.Change{res}
 	}
 
 	batchChanges := make([][]*route53.Change, 0)
@@ -639,10 +640,10 @@ func batchChangeSet(cs []*route53.Change, batchSize int) [][]*route53.Change {
 
 func sortChangesByActionNameType(cs []*route53.Change) []*route53.Change {
 	sort.SliceStable(cs, func(i, j int) bool {
-		if *cs[i].Action < *cs[j].Action {
+		if *cs[i].Action > *cs[j].Action {
 			return true
 		}
-		if *cs[i].Action > *cs[j].Action {
+		if *cs[i].Action < *cs[j].Action {
 			return false
 		}
 		if *cs[i].ResourceRecordSet.Name < *cs[j].ResourceRecordSet.Name {

Original file line number	Diff line number	Diff line change
`@@ -592,7 +592,8 @@ func (p *AWSProvider) tagsForZone(ctx context.Context, zoneID string) (map[strin`
`592`	`592`
`593`	`593`	`func batchChangeSet(cs []route53.Change, batchSize int) [][]route53.Change {`
`594`	`594`	`if len(cs) <= batchSize {`
`595`		`- return [][]*route53.Change{cs}`
	`595`	`+ res := sortChangesByActionNameType(cs)`
	`596`	`+ return [][]*route53.Change{res}`
`596`	`597`	`}`
`597`	`598`
`598`	`599`	`batchChanges := make([][]*route53.Change, 0)`
`@@ -639,10 +640,10 @@ func batchChangeSet(cs []route53.Change, batchSize int) [][]route53.Change {`
`639`	`640`
`640`	`641`	`func sortChangesByActionNameType(cs []route53.Change) []route53.Change {`
`641`	`642`	`sort.SliceStable(cs, func(i, j int) bool {`
`642`		`- if cs[i].Action < cs[j].Action {`
	`643`	`+ if cs[i].Action > cs[j].Action {`
`643`	`644`	`return true`
`644`	`645`	`}`
`645`		`- if cs[i].Action > cs[j].Action {`
	`646`	`+ if cs[i].Action < cs[j].Action {`
`646`	`647`	`return false`
`647`	`648`	`}`
`648`	`649`	`if cs[i].ResourceRecordSet.Name < cs[j].ResourceRecordSet.Name {`