backport of commit 2dced0a (#17850)

This pull request was automerged via backport-assistant
hashicorp · Jul 7, 2023 · 6eb22d8 · 6eb22d8
1 parent 9702b8e
commit 6eb22d8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.changelog/17847.txt b/.changelog/17847.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+consul: Fixed a bug where Nomad would repeatedly try to revoke successfully revoked SI tokens
+```
diff --git a/nomad/consul.go b/nomad/consul.go
@@ -416,8 +416,10 @@ func (c *consulACLsAPI) singleRevoke(ctx context.Context, accessor *structs.SITo
 		return err
 	}
 
-	// Consul will no-op the deletion of a non-existent token (no error)
 	_, err := c.aclClient.TokenDelete(accessor.AccessorID, &api.WriteOptions{Namespace: accessor.ConsulNamespace})
+	if err != nil && strings.Contains(err.Error(), "Cannot find token to delete") {
+		return nil // Consul will error when deleting a non-existent token
+	}
 	return err
 }