Gitea DevService Request and Org (#158)

* feat: allow control of gitea dev service via build items

* feat: allow creating an organization in gitea

* refactor: allow specifying multiple organizations

* Debug StdOut when creating an org

---------

Co-authored-by: George Gastaldi <[email protected]>

Author: iocanel

deployment/src/main/java/io/quarkus/jgit/deployment/GiteaContainer.java

@@ -4,11 +4,12 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 
 import org.jboss.logging.Logger;
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.Network;
 
 import com.github.dockerjava.api.command.InspectContainerResponse;
 
@@ -18,21 +19,34 @@ class GiteaContainer extends GenericContainer<GiteaContainer> {
      * Logger which will be used to capture container STDOUT and STDERR.
      */
     private static final Logger log = Logger.getLogger(GiteaContainer.class);
-    private static final int HTTP_PORT = 3000;
+    static final int HTTP_PORT = 3000;
 
     private JGitBuildTimeConfig.DevService devServiceConfig;
+    private Optional<GiteaDevServiceRequestBuildItem> devServiceRequest;
+
+    private List<String> organizations = new ArrayList<>();
     private List<String> repositories = new ArrayList<>();
 
-    GiteaContainer(JGitBuildTimeConfig.DevService devServiceConfig) {
+    GiteaContainer(JGitBuildTimeConfig.DevService devServiceConfig,
+            Optional<GiteaDevServiceRequestBuildItem> devServiceRequest) {
         super("gitea/gitea:latest-rootless");
         this.devServiceConfig = devServiceConfig;
+        this.devServiceRequest = devServiceRequest;
         withEnv("GITEA__security__INSTALL_LOCK", "true");
         withEnv("GITEA__server__DISABLE_SSH", "true");
         withExposedPorts(HTTP_PORT);
         withReuse(devServiceConfig.reuse());
         waitingFor(forListeningPorts(HTTP_PORT));
         // Needed for podman (see https://github.com/testcontainers/testcontainers-java/issues/7310)
         withStartupAttempts(2);
+
+        Optional<String> networkAlias = devServiceConfig.networkAlias()
+                .or(() -> devServiceRequest.map(GiteaDevServiceRequestBuildItem::getAlias));
+        networkAlias.ifPresent(alias -> {
+            withNetworkAliases(alias);
+            withNetwork(Network.SHARED);
+        });
+
         devServiceConfig.httpPort().ifPresent(port -> addFixedExposedPort(port, HTTP_PORT));
         if (devServiceConfig.showLogs()) {
             withLogConsumer(new JBossLoggingConsumer(log));
@@ -44,8 +58,23 @@ protected void containerIsStarted(InspectContainerResponse containerInfo, boolea
         if (!reused) {
             try {
                 createAdminUser();
-                for (String repository : devServiceConfig.repositories().orElse(Collections.emptyList())) {
-                    createRepository(this, repository);
+                List<String> organizations = new ArrayList<>();
+                List<String> repositories = new ArrayList<>();
+
+                devServiceConfig.organizations().ifPresent(o -> organizations.addAll(o));
+                devServiceConfig.repositories().ifPresent(r -> repositories.addAll(r));
+
+                devServiceRequest.map(GiteaDevServiceRequestBuildItem::getOrganizations)
+                        .ifPresent(o -> organizations.addAll(o));
+                devServiceRequest.map(GiteaDevServiceRequestBuildItem::getRepositories)
+                        .ifPresent(r -> repositories.addAll(r));
+
+                for (String org : organizations) {
+                    createOrganization(org);
+                }
+
+                for (String repository : repositories) {
+                    createRepository(repository);
                 }
             } catch (IOException | InterruptedException e) {
                 throw new RuntimeException("Failed to create admin user", e);
@@ -70,15 +99,56 @@ private void createAdminUser() throws IOException, InterruptedException {
         };
         log.debug(String.join(" ", cmd));
         ExecResult execResult = execInContainer(cmd);
-        log.info(execResult.getStdout());
+        log.debug(execResult.getStdout());
         if (execResult.getExitCode() != 0) {
             throw new RuntimeException("Failed to create admin user: " + execResult.getStderr());
         }
     }
 
-    private void createRepository(GiteaContainer giteaContainer, String repository)
+    private void createOrganization(String org)
+            throws UnsupportedOperationException, IOException, InterruptedException {
+        String httpUrl = "http://localhost:" + GiteaContainer.HTTP_PORT + "/api/v1/orgs";
+        String data = """
+                {"username":"%s"}
+                """
+                .formatted(org);
+
+        String[] cmd = {
+                "/usr/bin/curl",
+                "-X",
+                "POST",
+                "--user",
+                devServiceConfig.adminUsername() + ":" + devServiceConfig.adminPassword(),
+                "-H",
+                "Content-Type: application/json",
+                "-d",
+                data,
+                httpUrl
+        };
+
+        log.debug(String.join(" ", cmd));
+        ExecResult execResult = execInContainer(cmd);
+        log.debug(execResult.getStdout());
+        if (execResult.getExitCode() != 0) {
+            throw new RuntimeException("Failed to create organization: " + org + ":" + execResult.getStderr());
+        }
+        organizations.add(org);
+        log.info("Created organization: " + org);
+    }
+
+    private void createRepository(String repository) throws UnsupportedOperationException, IOException, InterruptedException {
+        if (repository.contains("/")) {
+            String orgName = repository.substring(0, repository.indexOf("/"));
+            String repoName = repository.substring(repository.indexOf("/") + 1);
+            createOrgRepository(orgName, repoName);
+        } else {
+            createUserRepository(repository);
+        }
+    }
+
+    private void createUserRepository(String repository)
             throws UnsupportedOperationException, IOException, InterruptedException {
-        String httpUrl = "http://localhost:" + GiteaContainer.HTTP_PORT;
+        String httpUrl = "http://localhost:" + GiteaContainer.HTTP_PORT + "/api/v1/user/repos";
         String data = """
                 {"name":"%s", "private":false, "auto_init":true, "readme":"Default"}
                 """
@@ -94,17 +164,81 @@ private void createRepository(GiteaContainer giteaContainer, String repository)
                 "Content-Type: application/json",
                 "-d",
                 data,
-                httpUrl + "/api/v1/user/repos"
+                httpUrl
         };
 
         log.debug(String.join(" ", cmd));
-        ExecResult execResult = giteaContainer.execInContainer(cmd);
-        log.info(execResult.getStdout());
+        ExecResult execResult = execInContainer(cmd);
+        log.debug(execResult.getStdout());
         if (execResult.getExitCode() != 0) {
             throw new RuntimeException("Failed to create repository: " + repository + ":" + execResult.getStderr());
         }
         repositories.add(repository);
-        log.info("Created repository: " + repository);
+        log.info("Created user repository: " + repository);
+    }
+
+    private void createOrgRepository(String org, String repository)
+            throws UnsupportedOperationException, IOException, InterruptedException {
+
+        if (!organizationExists(org)) {
+            createOrganization(org);
+        }
+
+        String httpUrl = "http://localhost:" + GiteaContainer.HTTP_PORT + "/api/v1/orgs/" + org + "/repos";
+        String data = """
+                {"name":"%s", "private":false, "auto_init":true, "readme":"Default"}
+                """
+                .formatted(repository);
+
+        String[] cmd = {
+                "/usr/bin/curl",
+                "-X",
+                "POST",
+                "--user",
+                devServiceConfig.adminUsername() + ":" + devServiceConfig.adminPassword(),
+                "-H",
+                "Content-Type: application/json",
+                "-d",
+                data,
+                httpUrl
+        };
+
+        log.debug(String.join(" ", cmd));
+        ExecResult execResult = execInContainer(cmd);
+        log.debug(execResult.getStdout());
+        if (execResult.getExitCode() != 0) {
+            throw new RuntimeException("Failed to create repository: " + repository + ":" + execResult.getStderr());
+        }
+        repositories.add(org + "/" + repository);
+        log.info("Created org repository: " + org + "/" + repository);
+    }
+
+    private boolean organizationExists(String org) throws IOException, InterruptedException {
+        String httpUrl = "http://localhost:" + GiteaContainer.HTTP_PORT + "/api/v1/orgs/" + org;
+
+        String[] cmd = {
+                "/usr/bin/curl",
+                "-X",
+                "GET",
+                "--user",
+                devServiceConfig.adminUsername() + ":" + devServiceConfig.adminPassword(),
+                "-H",
+                "Content-Type: application/json",
+                httpUrl
+        };
+
+        log.debug(String.join(" ", cmd));
+        ExecResult execResult = execInContainer(cmd);
+
+        if (execResult.getExitCode() == 0) {
+            log.debug("Organization exists: " + org);
+            return true;
+        } else if (execResult.getExitCode() == 404) {
+            log.debug("Organization does not exist: " + org);
+            return false;
+        } else {
+            throw new RuntimeException("Error checking organization existence: " + execResult.getStderr());
+        }
     }
 
     public String getHttpUrl() {
@@ -118,4 +252,8 @@ public int getHttpPort() {
     public List<String> getRepositories() {
         return repositories;
     }
+
+    public List<String> getOrganizations() {
+        return organizations;
+    }
 }

deployment/src/main/java/io/quarkus/jgit/deployment/GiteaDevServiceInfoBuildItem.java

@@ -1,6 +1,8 @@
 package io.quarkus.jgit.deployment;
 
 import java.util.List;
+import java.util.Optional;
+import java.util.OptionalInt;
 
 import io.quarkus.builder.item.SimpleBuildItem;
 
@@ -11,15 +13,29 @@ public final class GiteaDevServiceInfoBuildItem extends SimpleBuildItem {
 
     private final String host;
     private final int httpPort;
+
+    private final Optional<String> sharedNetworkHost;
+    private final OptionalInt sharedNetworkHttpPort;
+
     private final String adminUsername;
     private final String adminPassword;
+    private final List<String> organizations;
     private final List<String> repositories;
 
     public GiteaDevServiceInfoBuildItem(String host, int httpPort, String adminUsername, String adminPassword,
+            List<String> organizations, List<String> repositories) {
+        this(host, httpPort, Optional.empty(), OptionalInt.empty(), adminUsername, adminPassword, organizations, repositories);
+    }
+
+    public GiteaDevServiceInfoBuildItem(String host, int httpPort, Optional<String> sharedNetworkHost,
+            OptionalInt sharedNetworkHttpPort, String adminUsername, String adminPassword, List<String> organizations,
             List<String> repositories) {
         this.host = host;
         this.httpPort = httpPort;
+        this.sharedNetworkHost = sharedNetworkHost;
+        this.sharedNetworkHttpPort = sharedNetworkHttpPort;
         this.adminUsername = adminUsername;
+        this.organizations = organizations;
         this.adminPassword = adminPassword;
         this.repositories = repositories;
     }
@@ -40,7 +56,19 @@ public String adminPassword() {
         return adminPassword;
     }
 
+    public List<String> organizations() {
+        return organizations;
+    }
+
     public List<String> repositories() {
         return repositories;
     }
+
+    public Optional<String> sharedNetworkHost() {
+        return sharedNetworkHost;
+    }
+
+    public OptionalInt sharedNetworkHttpPort() {
+        return sharedNetworkHttpPort;
+    }
 }

deployment/src/main/java/io/quarkus/jgit/deployment/GiteaDevServiceRequestBuildItem.java

@@ -0,0 +1,36 @@
+package io.quarkus.jgit.deployment;
+
+import java.util.List;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+
+/**
+ * A build item that requests the creation of a Gitea dev service, if not already configured.
+ */
+public final class GiteaDevServiceRequestBuildItem extends SimpleBuildItem {
+
+    private String alias = "gitea-dev-service";
+    private List<String> organizations;
+    private List<String> repositories;
+
+    public GiteaDevServiceRequestBuildItem() {
+    }
+
+    public GiteaDevServiceRequestBuildItem(String alias, List<String> organizations, List<String> repositories) {
+        this.alias = alias;
+        this.organizations = organizations;
+        this.repositories = repositories;
+    }
+
+    public String getAlias() {
+        return alias;
+    }
+
+    public List<String> getOrganizations() {
+        return organizations;
+    }
+
+    public List<String> getRepositories() {
+        return repositories;
+    }
+}

deployment/src/main/java/io/quarkus/jgit/deployment/JGitBuildTimeConfig.java

@@ -48,8 +48,17 @@ interface DevService {
         @WithDefault("quarkus")
         String adminPassword();
 
+        /**
+         * The organization to be created when the Dev Service starts.
+         */
+        Optional<List<String>> organizations();
+
         /**
          * Repositories to be created when the Dev Service starts.
+         * A repository may optionally include an organization reference.
+         * For example, "my-org/my-repo" will create a repository named "my-repo" in the "my-org" organization.
+         * The organization will be created if missing.
+         * If no organization is specified, the repository will be created as a user repository.
          */
         @WithDefault("${quarkus.application.name}")
         Optional<List<String>> repositories();
@@ -59,5 +68,11 @@ interface DevService {
          */
         @WithDefault("false")
         boolean reuse();
+
+        /**
+         * The network alias for the container.
+         * Other containers in the same network can use this alias to connect to this container.
+         */
+        Optional<String> networkAlias();
     }
 }