Fix flakey test race condition; remove unused cleanup func

G-Research · Nov 26, 2024 · 9419793 · 9419793
1 parent 3e558f8
commit 9419793
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/app/lib/clients/vault/policy.rb b/app/lib/clients/vault/policy.rb
@@ -21,8 +21,10 @@ def assign_entity_policy(identity, policy_name)
 
       def assign_groups_policy(groups, policy_name)
         groups.each do |group|
-          put_group(group, [ policy_name ])
-          put_group_alias(group, group, "oidc")
+          Domain.with_advisory_lock(group) do
+            put_group(group, [ policy_name ])
+            put_group_alias(group, group, "oidc")
+          end
         end
       end
 

diff --git a/test/integration/secrets_test.rb b/test/integration/secrets_test.rb
@@ -75,8 +75,4 @@ def create_secret(jwt = jwt_authorized, path = "top/secret/#{SecureRandom.hex}")
          params: { secret: { path: path, data: { password: "sicr3t" }, groups: "read_group" } }
     path
   end
-
-  def remove_pki_engine
-    vault_client.sys.unmount "pki_astral"
-  end
 end