Skip to content

Commit 98e28c6

Browse files
committed
add ACLs before removing ACLs
1 parent a9f725f commit 98e28c6

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/main/java/com/devshawn/kafka/gitops/manager/ApplyManager.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.devshawn.kafka.gitops.manager;
22

33
import com.devshawn.kafka.gitops.config.ManagerConfig;
4+
import com.devshawn.kafka.gitops.domain.plan.AclPlan;
45
import com.devshawn.kafka.gitops.domain.plan.DesiredPlan;
56
import com.devshawn.kafka.gitops.domain.plan.TopicConfigPlan;
67
import com.devshawn.kafka.gitops.domain.plan.TopicPlan;
@@ -63,7 +64,9 @@ private void applyTopicConfiguration(TopicPlan topicPlan, TopicConfigPlan topicC
6364
}
6465

6566
public void applyAcls(DesiredPlan desiredPlan) {
66-
desiredPlan.getAclPlans().forEach(aclPlan -> {
67+
List<AclPlan> modifiableAclPlan = new ArrayList<>(desiredPlan.getAclPlans());
68+
modifiableAclPlan.sort(Comparator.comparing(AclPlan::getAction));
69+
modifiableAclPlan.forEach(aclPlan -> {
6770
if (aclPlan.getAction() == PlanAction.ADD) {
6871
LogUtil.printAclPreApply(aclPlan);
6972
kafkaService.createAcl(aclPlan.getAclDetails().toAclBinding());

0 commit comments

Comments
 (0)