Add check for 403 during rollback to prevent spam (#97)

hashicorp · Sep 15, 2020 · 30af289 · 30af289
1 parent 4005bee
commit 30af289
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/plugin/rollback.go b/plugin/rollback.go
@@ -222,7 +222,7 @@ func (b *backend) deleteServiceAccount(ctx context.Context, iamAdmin *iam.Servic
 	}
 
 	_, err := iamAdmin.Projects.ServiceAccounts.Delete(account.ResourceName()).Do()
-	if err != nil && !isGoogleAccountNotFoundErr(err) {
+	if err != nil && (!isGoogleAccountNotFoundErr(err) || !isGoogleAccountUnauthorizedErr(err)) {
 		return errwrap.Wrapf("unable to delete service account: {{err}}", err)
 	}
 	return nil
@@ -285,6 +285,10 @@ func isGoogleAccountNotFoundErr(err error) bool {
 	return isGoogleApiErrorWithCodes(err, 404)
 }
 
+func isGoogleAccountUnauthorizedErr(err error) bool {
+	return isGoogleApiErrorWithCodes(err, 403)
+}
+
 func isGoogleAccountKeyNotFoundErr(err error) bool {
 	return isGoogleApiErrorWithCodes(err, 403, 404)
 }