use global dag client

Author: tsirysndr

.github/workflows/ci.yml

@@ -13,7 +13,9 @@ jobs:
       - name: Setup Fluent CI
         uses: fluentci-io/setup-fluentci@v4
       - name: Run Dagger Pipelines
-        run: fluentci run deno_pipeline fmt lint test
+        run: |
+          fluentci run deno_pipeline fmt lint test
+          dagger -m github.com/fluent-ci-templates/github-pipeline@main functions
       - name: Upload to Codecov
         run: fluentci run codecov_pipeline
         env:

README.md

@@ -60,7 +60,7 @@ releaseUpload(
 You can also use this pipeline programmatically:
 
 ```typescript
-import { releaseUpload } from "https://pkg.fluentci.io/[email protected].3/mod.ts";
+import { releaseUpload } from "https://pkg.fluentci.io/[email protected].4/mod.ts";
 
 await releaseUpload(
   ".",

ci.ts

@@ -1,3 +1,3 @@
-import { releaseUpload } from "https://pkg.fluentci.io/[email protected].3/mod.ts";
+import { releaseUpload } from "https://pkg.fluentci.io/[email protected].4/mod.ts";
 
 await releaseUpload();

src/dagger/jobs.ts

@@ -1,5 +1,5 @@
-import Client, { Directory, Secret } from "../../deps.ts";
-import { connect } from "../../sdk/connect.ts";
+import { dag } from "../../sdk/client.gen.ts";
+import { Directory, Secret } from "../../deps.ts";
 import { getDirectory, getGithubToken } from "./lib.ts";
 
 export enum Job {
@@ -23,34 +23,30 @@ export async function releaseUpload(
   file: string,
   token: string | Secret
 ): Promise<string> {
-  await connect(async (client: Client) => {
-    const TAG = Deno.env.get("TAG") || tag || "latest";
-    const FILE = Deno.env.get("FILE") || file!;
-    const context = await getDirectory(client, src);
-    const secret = await getGithubToken(client, token);
+  const TAG = Deno.env.get("TAG") || tag || "latest";
+  const FILE = Deno.env.get("FILE") || file!;
+  const context = await getDirectory(src);
+  const secret = await getGithubToken(token);
 
-    if (!secret) {
-      console.error("GH_TOKEN is required");
-      Deno.exit(1);
-    }
+  if (!secret) {
+    console.error("GH_TOKEN is required");
+    Deno.exit(1);
+  }
 
-    const ctr = client
-      .pipeline(Job.releaseUpload)
-      .container()
-      .from("pkgxdev/pkgx:latest")
-      .withExec(["apt-get", "update"])
-      .withExec(["apt-get", "install", "-y", "ca-certificates"])
-      .withExec(["pkgx", "install", "gh", "git"])
-      .withMountedCache("/assets", client.cacheVolume("gh-release-assets"))
-      .withDirectory("/app", context)
-      .withWorkdir("/app")
-      .withSecretVariable("GH_TOKEN", secret)
-      .withExec(["gh", "release", "upload", TAG, FILE]);
+  const ctr = dag
+    .pipeline(Job.releaseUpload)
+    .container()
+    .from("pkgxdev/pkgx:latest")
+    .withExec(["apt-get", "update"])
+    .withExec(["apt-get", "install", "-y", "ca-certificates"])
+    .withExec(["pkgx", "install", "gh", "git"])
+    .withMountedCache("/assets", dag.cacheVolume("gh-release-assets"))
+    .withDirectory("/app", context)
+    .withWorkdir("/app")
+    .withSecretVariable("GH_TOKEN", secret)
+    .withExec(["gh", "release", "upload", TAG, FILE]);
 
-    await ctr.stdout();
-  });
-
-  return "Done";
+  return ctr.stdout();
 }
 
 export type JobExec = (

src/dagger/lib.ts

@@ -1,47 +1,39 @@
-import Client, {
-  Directory,
-  DirectoryID,
-  Secret,
-  SecretID,
-} from "../../deps.ts";
+import { Directory, DirectoryID, Secret, SecretID } from "../../deps.ts";
+import { dag } from "../../sdk/client.gen.ts";
 
 export const getDirectory = async (
-  client: Client,
   src: string | Directory | undefined = "."
 ) => {
   if (src instanceof Directory) {
     return src;
   }
   if (typeof src === "string") {
     try {
-      const directory = client.loadDirectoryFromID(src as DirectoryID);
+      const directory = dag.loadDirectoryFromID(src as DirectoryID);
       await directory.id();
       return directory;
     } catch (_) {
-      return client.host
-        ? client.host().directory(src)
-        : client.currentModule().source().directory(src);
+      return dag.host
+        ? dag.host().directory(src)
+        : dag.currentModule().source().directory(src);
     }
   }
-  return client.host
-    ? client.host().directory(src)
-    : client.currentModule().source().directory(src);
+  return dag.host
+    ? dag.host().directory(src)
+    : dag.currentModule().source().directory(src);
 };
 
-export const getGithubToken = async (
-  client: Client,
-  token?: string | Secret
-) => {
+export const getGithubToken = async (token?: string | Secret) => {
   if (Deno.env.get("GH_TOKEN")) {
-    return client.setSecret("GH_TOKEN", Deno.env.get("GH_TOKEN")!);
+    return dag.setSecret("GH_TOKEN", Deno.env.get("GH_TOKEN")!);
   }
   if (token && typeof token === "string") {
     try {
-      const secret = client.loadSecretFromID(token as SecretID);
+      const secret = dag.loadSecretFromID(token as SecretID);
       await secret.id();
       return secret;
     } catch (_) {
-      return client.setSecret("GH_TOKEN", token);
+      return dag.setSecret("GH_TOKEN", token);
     }
   }
   if (token && token instanceof Secret) {