summaryrefslogtreecommitdiffstats
path: root/controller-api
diff options
context:
space:
mode:
authorOla Aunrønning <olaa@yahooinc.com>2023-01-09 13:03:15 +0100
committerGitHub <noreply@github.com>2023-01-09 13:03:15 +0100
commit7059bb6f5f3f578e4cd040a3b6dfdfe8f3e925b6 (patch)
tree30d240b995695b7ae5e13ce87319d72fb3c3a42a /controller-api
parent2f5cde872e7b7ed289fc9a16925a782fa02b343b (diff)
parent5a31fa784fe7c76da24a35eee81f256d4ce87c27 (diff)
Merge pull request #25452 from vespa-engine/olaa/remove-policy-assertions
Implement mock role policy rule deletion
Diffstat (limited to 'controller-api')
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZmsClientMock.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZmsClientMock.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZmsClientMock.java
index 91ca763abb6..f6dc52294e0 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZmsClientMock.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZmsClientMock.java
@@ -186,7 +186,9 @@ public class ZmsClientMock implements ZmsClient {
@Override
public boolean deletePolicyRule(AthenzDomain athenzDomain, String athenzPolicy, String action, AthenzResourceName resourceName, AthenzRole athenzRole) {
- return false;
+ var assertion = new AthenzDbMock.Assertion(athenzRole.roleName(), action, resourceName.toResourceNameString());
+ var policy = athenz.getOrCreateDomain(athenzDomain).policies.get(athenzPolicy);
+ return policy.assertions.remove(assertion);
}
@Override