migrated ccloud commands to confluent cli v2.x

Author: tball-dev

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

@@ -322,8 +322,8 @@ private void validateTopics(DesiredStateFile desiredStateFile) {
     }
 
     private boolean isConfluentCloudEnabled(DesiredStateFile desiredStateFile) {
-        if (desiredStateFile.getSettings().isPresent() && desiredStateFile.getSettings().get().getCcloud().isPresent()) {
-            return desiredStateFile.getSettings().get().getCcloud().get().isEnabled();
+        if (desiredStateFile.getSettings().isPresent() && desiredStateFile.getSettings().get().getConfluent().isPresent()) {
+            return desiredStateFile.getSettings().get().getConfluent().get().isEnabled();
         }
         return false;
     }

src/main/java/com/devshawn/kafka/gitops/domain/state/settings/Settings.java

@@ -9,7 +9,7 @@
 @JsonDeserialize(builder = Settings.Builder.class)
 public interface Settings {
 
-    Optional<SettingsCCloud> getCcloud();
+    Optional<SettingsConfluent> getConfluent();
 
     Optional<SettingsTopics> getTopics();
 

src/main/java/com/devshawn/kafka/gitops/domain/state/settings/SettingsCCloud.java renamed to src/main/java/com/devshawn/kafka/gitops/domain/state/settings/SettingsConfluent.java

@@ -4,11 +4,11 @@
 import org.inferred.freebuilder.FreeBuilder;
 
 @FreeBuilder
-@JsonDeserialize(builder = SettingsCCloud.Builder.class)
-public interface SettingsCCloud {
+@JsonDeserialize(builder = SettingsConfluent.Builder.class)
+public interface SettingsConfluent {
 
     boolean isEnabled();
 
-    class Builder extends SettingsCCloud_Builder {
+    class Builder extends SettingsConfluent_Builder {
     }
 }

src/main/java/com/devshawn/kafka/gitops/service/ConfluentCloudService.java

@@ -14,14 +14,15 @@ public class ConfluentCloudService {
     private static org.slf4j.Logger log = LoggerFactory.getLogger(ConfluentCloudService.class);
 
     private final ObjectMapper objectMapper;
+    private static final String confluentExecutable;
     private static final String ccloudExecutable;
 
     public ConfluentCloudService(ObjectMapper objectMapper) {
         this.objectMapper = objectMapper;
     }
 
     public List<ServiceAccount> getServiceAccounts() {
-        log.info("Fetching service account list from Confluent Cloud via ccloud tool.");
+        log.info("Fetching service account list from Confluent Cloud via confluent tool.");
         try {
             String result = execCmd(new String[]{ccloudExecutable, "service-account", "list", "-o", "json"});
             return objectMapper.readValue(result, new TypeReference<List<ServiceAccount>>() {
@@ -33,11 +34,11 @@ public List<ServiceAccount> getServiceAccounts() {
     }
 
     public ServiceAccount createServiceAccount(String name, boolean isUser) {
-        log.info("Creating service account {} in Confluent Cloud via ccloud tool.", name);
+        log.info("Creating service account {} in Confluent Cloud via confluent tool.", name);
         try {
             String serviceName = isUser ? String.format("user-%s", name) : name;
             String description = isUser ? String.format("User: %s", name) : String.format("Service account: %s", name);
-            String result = execCmd(new String[]{ccloudExecutable, "service-account", "create", serviceName, "--description", description, "-o", "json"});
+            String result = execCmd(new String[]{confluentExecutable, "iam", "service-account", "create", serviceName, "--description", description, "-o", "json"});
             return objectMapper.readValue(result, ServiceAccount.class);
         } catch (IOException ex) {
             throw new ConfluentCloudException(String.format("There was an error creating Confluent Cloud service account: %s.", name));
@@ -50,7 +51,9 @@ public static String execCmd(String[] cmd) throws java.io.IOException {
     }
 
     static {
+        confluentExecutable = System.getenv("CONFLUENT_EXECUTABLE_PATH") != null ? System.getenv("CONFLUENT_EXECUTABLE_PATH") : "confluent";
+        log.info("Using confluent executable at: {}", confluentExecutable);
         ccloudExecutable = System.getenv("CCLOUD_EXECUTABLE_PATH") != null ? System.getenv("CCLOUD_EXECUTABLE_PATH") : "ccloud";
-        log.info("Using ccloud executable at: {}", ccloudExecutable);
+        log.info("Using ccloud executable at: {}", confluentExecutable);
     }
 }