add get-ingress function

Signed-off-by: Jean-Christophe Sirot <jcsirot@gmail.com>

Author: jcsirot

.github/workflows/deploy-with-dagger.yaml

@@ -32,3 +32,14 @@ jobs:
           verb: call
           args: deploy --image=${{ steps.publish.outputs.output }} --aws-access-key-id=env://AWS_ACCESS_KEY_ID --aws-secret-access-key=env://AWS_SECRET_ACCESS_KEY --cluster-name ${{ vars.CLUSTER_NAME }}
           cloud-token: ${{ secrets.DAGGER_CLOUD_TOKEN }}
+
+      - name: Get Public URL
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        uses: dagger/dagger-for-github@v7
+        with:
+          version: "latest"
+          verb: call
+          args: get-ingress --image=${{ steps.publish.outputs.output }} --aws-access-key-id=env://AWS_ACCESS_KEY_ID --aws-secret-access-key=env://AWS_SECRET_ACCESS_KEY --cluster-name ${{ vars.CLUSTER_NAME }}
+          cloud-token: ${{ secrets.DAGGER_CLOUD_TOKEN }}

ci/src/main/java/io/dagger/modules/ci/Ci.java

@@ -5,7 +5,6 @@
 
 import io.dagger.client.AwsCli;
 import io.dagger.client.CacheVolume;
-import io.dagger.client.Client.AwsCliArguments;
 import io.dagger.client.Container;
 import io.dagger.client.Container.PublishArguments;
 import io.dagger.client.DaggerQueryException;
@@ -114,8 +113,6 @@ public String deploy(@DefaultPath(".") Directory source, String image, String cl
       Secret awsAccessKeyId, Secret awsSecretAccessKey, @Default("eu-west-1") String region)
       throws ExecutionException, DaggerQueryException, InterruptedException {
     String appYaml = envsubst(source.file("src/main/kube/app.yaml").contents(), "IMAGE_TAG", image);
-    /* String appYaml = source.file("src/main/kube/app.yaml").contents()
-        .replace("${IMAGE_TAG}", image); */
     return kubectl(clusterName, region, awsAccessKeyId, awsSecretAccessKey)
         .withNewFile("/tmp/app.yaml", appYaml)
         .withExec(List.of("kubectl", "apply", "-f", "/tmp/app.yaml"))
@@ -130,9 +127,10 @@ public String deploy(@DefaultPath(".") Directory source, String image, String cl
   public String getIngress(String clusterName, Secret awsAccessKeyId, Secret awsSecretAccessKey,
       @Default("eu-west-1") String region)
       throws ExecutionException, DaggerQueryException, InterruptedException {
-    return kubectl(clusterName, region, awsAccessKeyId, awsSecretAccessKey)
-        .withExec(List.of("kubectl", "-n", "devoxxfr-dagger", "get", "ingress", "-o", "jsonpath='{.items[0].status.loadBalancer.ingress[0].hostname}'"))
+    String host = kubectl(clusterName, region, awsAccessKeyId, awsSecretAccessKey)
+        .withExec(List.of("kubectl", "-n", "devoxxfr-dagger", "get", "ingress", "-o", "jsonpath={.items[0].status.loadBalancer.ingress[0].hostname}"))
         .stdout();
+    return "http://%s".formatted(host);
   }
 
   /** Build a ready-to-use development environment */