Skip to content

Commit 1e47feb

Browse files
authored
fix: added command option to skip acls (#54)
* fix: added command option to skip acls * fix: added default for the skip argument in other command classes * refactor: made --skip-acls a global arg
1 parent a7f3b13 commit 1e47feb

File tree

7 files changed

+16
-1
lines changed

7 files changed

+16
-1
lines changed

src/main/java/com/devshawn/kafka/gitops/MainCommand.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ public class MainCommand implements Callable<Integer> {
3030
@Option(names = {"--no-delete"}, description = "Disable the ability to delete resources.")
3131
private boolean deleteDisabled = false;
3232

33+
@Option(names = {"--skip-acls"}, description = "Do not take ACL into account in the plan file.")
34+
private boolean skipAcls = false;
35+
3336
@Option(names = {"-h", "--help"}, usageHelp = true, description = "Display this help message.")
3437
private boolean helpRequested = false;
3538

@@ -65,6 +68,10 @@ public boolean isDeleteDisabled() {
6568
return deleteDisabled;
6669
}
6770

71+
public boolean areAclsDisabled() {
72+
return skipAcls;
73+
}
74+
6875
public static void main(String[] args) {
6976
int exitCode = new CommandLine(new MainCommand()).execute(args);
7077
System.exit(exitCode);

src/main/java/com/devshawn/kafka/gitops/StateManager.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,9 @@ public DesiredPlan plan() {
8686
private DesiredPlan generatePlan() {
8787
DesiredState desiredState = getDesiredState();
8888
DesiredPlan.Builder desiredPlan = new DesiredPlan.Builder();
89-
planManager.planAcls(desiredState, desiredPlan);
89+
if (!managerConfig.isSkipAclsDisabled()) {
90+
planManager.planAcls(desiredState, desiredPlan);
91+
}
9092
planManager.planTopics(desiredState, desiredPlan);
9193
return desiredPlan.build();
9294
}

src/main/java/com/devshawn/kafka/gitops/cli/AccountCommand.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ private ManagerConfig generateStateManagerConfig() {
4545
.setVerboseRequested(parent.isVerboseRequested())
4646
.setDeleteDisabled(parent.isDeleteDisabled())
4747
.setIncludeUnchangedEnabled(false)
48+
.setSkipAclsDisabled(parent.areAclsDisabled())
4849
.setStateFile(parent.getFile())
4950
.build();
5051
}

src/main/java/com/devshawn/kafka/gitops/cli/ApplyCommand.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ private ManagerConfig generateStateManagerConfig() {
5454
.setVerboseRequested(parent.isVerboseRequested())
5555
.setDeleteDisabled(parent.isDeleteDisabled())
5656
.setIncludeUnchangedEnabled(false)
57+
.setSkipAclsDisabled(parent.areAclsDisabled())
5758
.setStateFile(parent.getFile())
5859
.setNullablePlanFile(planFile)
5960
.build();

src/main/java/com/devshawn/kafka/gitops/cli/PlanCommand.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ private ManagerConfig generateStateManagerConfig() {
5959
.setDeleteDisabled(parent.isDeleteDisabled())
6060
.setIncludeUnchangedEnabled(includeUnchanged)
6161
.setStateFile(parent.getFile())
62+
.setSkipAclsDisabled(parent.areAclsDisabled())
6263
.setNullablePlanFile(outputFile)
6364
.build();
6465
}

src/main/java/com/devshawn/kafka/gitops/cli/ValidateCommand.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ private ManagerConfig generateStateManagerConfig() {
3737
.setVerboseRequested(parent.isVerboseRequested())
3838
.setDeleteDisabled(parent.isDeleteDisabled())
3939
.setIncludeUnchangedEnabled(false)
40+
.setSkipAclsDisabled(parent.areAclsDisabled())
4041
.setStateFile(parent.getFile())
4142
.build();
4243
}

src/main/java/com/devshawn/kafka/gitops/config/ManagerConfig.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ public interface ManagerConfig {
1616

1717
boolean isIncludeUnchangedEnabled();
1818

19+
boolean isSkipAclsDisabled();
20+
1921
File getStateFile();
2022

2123
Optional<File> getPlanFile();

0 commit comments

Comments
 (0)