fix: incorrect logic when checking for keys to be removed

jsiebens · jsiebens · commit 629fa24e5d8f · 2022-09-03T17:13:50.000+02:00
diff --git a/pkg/sakeyrotator/rotator.go b/pkg/sakeyrotator/rotator.go
@@ -87,18 +87,14 @@ func (r *Rotator) Rotate(ctx context.Context, serviceAccountEmail, name, bucket
 		if err != nil {
 			return err
 		}
-		validAfter, err := time.Parse(time.RFC3339, k.ValidAfterTime)
-		if err != nil {
-			return err
-		}
 
 		pivotDate := validBefore.AddDate(0, 0, -renewalWindowInDays)
 
 		if now.Before(pivotDate) {
 			createNewKey = false
 		}
 
-		if now.After(validAfter) {
+		if now.After(validBefore) {
 			keysToRemove = append(keysToRemove, k.Name)
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -87,18 +87,14 @@ func (r *Rotator) Rotate(ctx context.Context, serviceAccountEmail, name, bucket`
`87`	`87`	`if err != nil {`
`88`	`88`	`return err`
`89`	`89`	`}`
`90`		`- validAfter, err := time.Parse(time.RFC3339, k.ValidAfterTime)`
`91`		`- if err != nil {`
`92`		`- return err`
`93`		`- }`
`94`	`90`
`95`	`91`	`pivotDate := validBefore.AddDate(0, 0, -renewalWindowInDays)`
`96`	`92`
`97`	`93`	`if now.Before(pivotDate) {`
`98`	`94`	`createNewKey = false`
`99`	`95`	`}`
`100`	`96`
`101`		`- if now.After(validAfter) {`
	`97`	`+ if now.After(validBefore) {`
`102`	`98`	`keysToRemove = append(keysToRemove, k.Name)`
`103`	`99`	`}`
`104`	`100`	`}`