make it compatible with Dagger Zenith

.github/workflows/ci.yml

@@ -12,17 +12,17 @@ jobs:
       - uses: actions/checkout@v3
       - uses: denoland/setup-deno@v1
         with:
-          deno-version: v1.36
+          deno-version: v1.37
       - name: Setup Fluent CI CLI
         run: deno install -A -r https://cli.fluentci.io -n fluentci
       - name: Setup Dagger
         run: |
-            curl -L https://dl.dagger.io/dagger/install.sh | DAGGER_VERSION=0.8.1 sh
-            sudo mv bin/dagger /usr/local/bin
-            dagger version
+          curl -L https://dl.dagger.io/dagger/install.sh | DAGGER_VERSION=0.8.8 sh
+          sudo mv bin/dagger /usr/local/bin
+          dagger version
       - name: Run Dagger Pipelines
-        run: dagger run fluentci deno_pipeline fmt lint test
+        run: fluentci run deno_pipeline fmt lint test
       - name: Upload coverage to Codecov
-        run: dagger run fluentci codecov_pipeline
+        run: fluentci run codecov_pipeline
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/example.yml

@@ -17,7 +17,7 @@ jobs:
         run: deno install -A -r https://cli.fluentci.io -n fluentci
       - name: Setup Dagger
         run: |
-          curl -L https://dl.dagger.io/dagger/install.sh | DAGGER_VERSION=0.8.1 sh
+          curl -L https://dl.dagger.io/dagger/install.sh | DAGGER_VERSION=0.8.8 sh
           sudo mv bin/dagger /usr/local/bin
           dagger version
       - name: Run Dagger Pipelines
@@ -26,4 +26,4 @@ jobs:
           dagger run deno run -A ../src/dagger/runner.ts image
         working-directory: example
         env:
-          TRIVY_IMAGE: snyk/snyk:alpine
+          TRIVY_IMAGE: hashicorp/terraform:latest

.github/workflows/zenith.yml

@@ -0,0 +1,23 @@
+# Do not edit this file directly. It is generated by https://deno.land/x/fluent_github_actions
+
+name: Zenith Example
+on:
+  push:
+    branches:
+      - zenith
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Dagger Zenith
+        run: |
+          curl -L https://dl.dagger.io/dagger/install.sh | DAGGER_VERSION=0.8.8 sh
+          sudo mv bin/dagger /usr/local/bin
+          dagger version
+      - name: Run Dagger Pipelines
+        run: |
+          dagger query --doc config.gql
+          dagger query --doc image.gql
+        working-directory: example

README.md

@@ -1,7 +1,7 @@
 # Trivy Pipeline
 
 [![fluentci pipeline](https://img.shields.io/badge/dynamic/json?label=pkg.fluentci.io&labelColor=%23000&color=%23460cf1&url=https%3A%2F%2Fapi.fluentci.io%2Fv1%2Fpipeline%2Ftrivy_pipeline&query=%24.version)](https://pkg.fluentci.io/trivy_pipeline)
-![deno compatibility](https://shield.deno.dev/deno/^1.34)
+![deno compatibility](https://shield.deno.dev/deno/^1.37)
 [![](https://img.shields.io/codecov/c/gh/fluent-ci-templates/trivy-pipeline)](https://codecov.io/gh/fluent-ci-templates/trivy-pipeline)
 
 A ready-to-use CI/CD Pipeline for scanning vulnerabilities using [Trivy](https://trivy.dev/).
@@ -46,19 +46,35 @@ fluentci run .
 | image    | Scan a container image                        |
 | sbom     | Scan a software bill of materials             |
 
+```graphql
+config(exitCode: Int!, src: String!): String
+
+fs(exitCode: Int!, src: String!): String
+
+image(
+  exitCode: Int!, 
+  image: String!, 
+  src: String!
+): String
+
+repo(
+  exitCode: Int!, 
+  repoUrl: String!, 
+  src: String!
+): String
+
+sbom(
+  exitCode: Int!, 
+  path: String!, 
+  src: String!
+): String
+```
 ## Programmatic usage
 
 You can also use this pipeline programmatically:
 
 ```ts
-import Client, { connect } from "https://sdk.fluentci.io/v0.1.9/mod.ts";
-import { fs } from "https://pkg.fluentci.io/trivy_pipeline@v0.1.0/mod.ts";
-
-function pipeline(src = ".") {
-  connect(async (client: Client) => {
-    await fs(client, src);
-  });
-}
+import { fs } from "https://pkg.fluentci.io/trivy_pipeline@v0.2.0/mod.ts";
 
-pipeline();
+await fs();
 ```

ci.ts

@@ -1,10 +1,3 @@
-import Client, { connect } from "https://sdk.fluentci.io/v0.1.9/mod.ts";
-import { fs } from "https://pkg.fluentci.io/trivy_pipeline@v0.1.0/mod.ts";
+import { fs } from "https://pkg.fluentci.io/trivy_pipeline@v0.2.0/mod.ts";
 
-function pipeline(src = ".") {
-  connect(async (client: Client) => {
-    await fs(client, src);
-  });
-}
-
-pipeline();
+await fs();

dagger.json

@@ -0,0 +1,5 @@
+{
+  "root": "",
+  "name": "trivy",
+  "sdkRuntime": "tsiry/dagger-sdk-deno"
+}

deno.json

@@ -3,15 +3,29 @@
   "tasks": {
     "esm:add": "deno run -A https://esm.sh/v128 add",
     "esm:update": "deno run -A https://esm.sh/v128 update",
-    "esm:remove": "deno run -A https://esm.sh/v128 remove"
+    "esm:remove": "deno run -A https://esm.sh/v128 remove",
+    "schema": "deno run -A src/dagger/schema.ts",
+    "clean": "rm -rf gen schema.graphql"
   },
   "fmt": {
-    "exclude": ["example/", ".fluentci/"]
+    "exclude": [
+      "example/",
+      ".fluentci/",
+      "gen/"
+    ]
   },
   "lint": {
-    "exclude": ["example/", ".fluentci/"]
+    "exclude": [
+      "example/",
+      ".fluentci/",
+      "gen/"
+    ]
   },
   "test": {
-    "exclude": ["example/", ".fluentci/"]
+    "exclude": [
+      "example/",
+      ".fluentci/",
+      "gen/"
+    ]
   }
-}
+}

deps.ts

@@ -1,11 +1,31 @@
 export { assertEquals } from "https://deno.land/std@0.191.0/testing/asserts.ts";
-import Client from "https://sdk.fluentci.io/v0.1.9/mod.ts";
+import Client from "https://sdk.fluentci.io/z1/mod.ts";
 export default Client;
 
-export { connect, uploadContext } from "https://sdk.fluentci.io/v0.1.9/mod.ts";
+export {
+  connect,
+  uploadContext,
+  CacheSharingMode,
+} from "https://sdk.fluentci.io/z1/mod.ts";
 export { brightGreen } from "https://deno.land/std@0.191.0/fmt/colors.ts";
-export { withDevbox } from "https://nix.fluentci.io/v0.5.1/src/dagger/steps.ts";
+export { withDevbox } from "https://nix.fluentci.io/zenith/src/dagger/steps.ts";
 export { stringifyTree } from "https://esm.sh/stringify-tree@1.1.1";
+import gql from "https://esm.sh/graphql-tag@2.12.6";
+export { gql };
+
+export {
+  arg,
+  queryType,
+  stringArg,
+  intArg,
+  nonNull,
+  makeSchema,
+} from "npm:nexus";
+export {
+  dirname,
+  join,
+  resolve,
+} from "https://deno.land/std@0.203.0/path/mod.ts";
 
 export * as FluentGitlabCI from "https://deno.land/x/fluent_gitlab_ci@v0.4.2/mod.ts";
 export * as FluentGithubActions from "https://deno.land/x/fluent_github_actions@v0.2.1/mod.ts";

example/.fluentci/.fluentci/.devcontainer/devcontainer.json

@@ -0,0 +1,25 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/debian
+{
+  "name": "Debian",
+  // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+  "image": "mcr.microsoft.com/devcontainers/base:bullseye",
+  "features": {
+    "ghcr.io/devcontainers/features/github-cli:1": {},
+    "ghcr.io/devcontainers/features/nix:1": {}
+  },
+
+  // Features to add to the dev container. More info: https://containers.dev/features.
+  // "features": {},
+
+  // Use 'forwardPorts' to make a list of ports inside the container available locally.
+  // "forwardPorts": [],
+
+  // Use 'postCreateCommand' to run commands after the container is created.
+  "postCreateCommand": "nix develop --experimental-features \"nix-command flakes\""
+  // Configure tool-specific properties.
+  // "customizations": {},
+
+  // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+  // "remoteUser": "root"
+}

example/.fluentci/.fluentci/.fluentci/.devcontainer/devcontainer.json

@@ -0,0 +1,25 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/debian
+{
+  "name": "Debian",
+  // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+  "image": "mcr.microsoft.com/devcontainers/base:bullseye",
+  "features": {
+    "ghcr.io/devcontainers/features/github-cli:1": {},
+    "ghcr.io/devcontainers/features/nix:1": {}
+  },
+
+  // Features to add to the dev container. More info: https://containers.dev/features.
+  // "features": {},
+
+  // Use 'forwardPorts' to make a list of ports inside the container available locally.
+  // "forwardPorts": [],
+
+  // Use 'postCreateCommand' to run commands after the container is created.
+  "postCreateCommand": "nix develop --experimental-features \"nix-command flakes\""
+  // Configure tool-specific properties.
+  // "customizations": {},
+
+  // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+  // "remoteUser": "root"
+}

example/.fluentci/.fluentci/.fluentci/.fluentci/.devcontainer/devcontainer.json

@@ -0,0 +1,25 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/debian
+{
+  "name": "Debian",
+  // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+  "image": "mcr.microsoft.com/devcontainers/base:bullseye",
+  "features": {
+    "ghcr.io/devcontainers/features/github-cli:1": {},
+    "ghcr.io/devcontainers/features/nix:1": {}
+  },
+
+  // Features to add to the dev container. More info: https://containers.dev/features.
+  // "features": {},
+
+  // Use 'forwardPorts' to make a list of ports inside the container available locally.
+  // "forwardPorts": [],
+
+  // Use 'postCreateCommand' to run commands after the container is created.
+  "postCreateCommand": "nix develop --experimental-features \"nix-command flakes\""
+  // Configure tool-specific properties.
+  // "customizations": {},
+
+  // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+  // "remoteUser": "root"
+}