make token argument required

fluent-ci-templates · Dec 1, 2023 · 6130313 · 6130313
1 parent de9a5b9
commit 6130313
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 22 deletions.
diff --git a/example/.fluentci/src/dagger/jobs.ts b/example/.fluentci/src/dagger/jobs.ts
@@ -16,7 +16,7 @@ export const exclude = ["target", ".git", ".fluentci"];
  * @returns {string}
  */
 export async function build(
-  src: string | Directory = "."
+  src: string | Directory
 ): Promise<Directory | string> {
   let id = "";
   await connect(async (client: Client) => {
@@ -66,10 +66,10 @@ export async function build(
  * @returns {string}
  */
 export async function deploy(
-  src: string | Directory | undefined = ".",
+  src: string | Directory,
+  authToken: string | Secret,
   cachePath = "/app/target",
-  cacheKey = "spin-target-cache",
-  authToken?: string | Secret
+  cacheKey = "spin-target-cache"
 ): Promise<string> {
   const cache = [
     {
@@ -122,11 +122,14 @@ export async function deploy(
   return "done";
 }
 
-export type JobExec = (
-  src?: string
-) =>
-  | Promise<Directory | string>
-  | ((src?: string, cachePath?: string, cacheKey?: string) => Promise<string>);
+export type JobExec =
+  | ((src: string) => Promise<Directory | string>)
+  | ((
+      src: string,
+      token: string | Secret,
+      cachePath?: string,
+      cacheKey?: string
+    ) => Promise<string>);
 
 export const runnableJobs: Record<Job, JobExec> = {
   [Job.build]: build,

diff --git a/example/.fluentci/src/dagger/pipeline.ts b/example/.fluentci/src/dagger/pipeline.ts
@@ -12,7 +12,7 @@ export default async function pipeline(src = ".", args: string[] = []) {
     return;
   }
   await build(src);
-  await deploy(src);
+  await deploy(src, Deno.env.get("SPIN_AUTH_TOKEN")!);
 }
 
 async function runSpecificJobs(args: jobs.Job[]) {
@@ -21,6 +21,6 @@ async function runSpecificJobs(args: jobs.Job[]) {
     if (!job) {
       throw new Error(`Job ${name} not found`);
     }
-    await job();
+    await job(".", Deno.env.get("SPIN_AUTH_TOKEN")!);
   }
 }
diff --git a/src/dagger/jobs.ts b/src/dagger/jobs.ts
@@ -16,7 +16,7 @@ export const exclude = ["target", ".git", ".fluentci"];
  * @returns {string}
  */
 export async function build(
-  src: string | Directory = "."
+  src: string | Directory
 ): Promise<Directory | string> {
   let id = "";
   await connect(async (client: Client) => {
@@ -66,10 +66,10 @@ export async function build(
  * @returns {string}
  */
 export async function deploy(
-  src: string | Directory | undefined = ".",
+  src: string | Directory,
+  authToken: string | Secret,
   cachePath = "/app/target",
-  cacheKey = "spin-target-cache",
-  authToken?: string | Secret
+  cacheKey = "spin-target-cache"
 ): Promise<string> {
   const cache = [
     {
@@ -122,11 +122,14 @@ export async function deploy(
   return "done";
 }
 
-export type JobExec = (
-  src?: string
-) =>
-  | Promise<Directory | string>
-  | ((src?: string, cachePath?: string, cacheKey?: string) => Promise<string>);
+export type JobExec =
+  | ((src: string) => Promise<Directory | string>)
+  | ((
+      src: string,
+      token: string | Secret,
+      cachePath?: string,
+      cacheKey?: string
+    ) => Promise<string>);
 
 export const runnableJobs: Record<Job, JobExec> = {
   [Job.build]: build,

diff --git a/src/dagger/pipeline.ts b/src/dagger/pipeline.ts
@@ -12,7 +12,7 @@ export default async function pipeline(src = ".", args: string[] = []) {
     return;
   }
   await build(src);
-  await deploy(src);
+  await deploy(src, Deno.env.get("SPIN_AUTH_TOKEN")!);
 }
 
 async function runSpecificJobs(args: jobs.Job[]) {
@@ -21,6 +21,6 @@ async function runSpecificJobs(args: jobs.Job[]) {
     if (!job) {
       throw new Error(`Job ${name} not found`);
     }
-    await job();
+    await job(".", Deno.env.get("SPIN_AUTH_TOKEN")!);
   }
 }