update env variables

README.md

@@ -44,12 +44,12 @@ dagger call pages-deploy --src . \
 
 ## 🛠️ Environment Variables
 
-| Variable      | Description                                                  |
-|---------------|--------------------------------------------------------------|
-| CF_API_TOKEN  | Your Cloudflare API Token.                                   |
-| CF_ACCOUNT_ID | Your Cloudflare Account ID.                                  |
-| DIRECTORY     | The directory to deploy to Cloudflare Pages. Defaults to `.` |
-| PROJECT_NAME  | The name of your project.                                    |
+| Variable              | Description                                                  |
+|-----------------------|--------------------------------------------------------------|
+| CLOUDFLARE_API_TOKEN  | Your Cloudflare API Token.                                   |
+| CLOUDFLARE_ACCOUNT_ID | Your Cloudflare Account ID.                                  |
+| DIRECTORY             | The directory to deploy to Cloudflare Pages. Defaults to `.` |
+| PROJECT_NAME          | The name of your project.                                    |
 
 ## ✨ Jobs
 
@@ -83,7 +83,7 @@ import { deploy } from "jsr:@fluentci/cloudflare";
 
 await deploy(
   ".", 
-  Deno.env.get("CF_API_TOKEN")!, 
-  Deno.env.get("CF_ACCOUNT_ID")!
+  Deno.env.get("CLOUDFLARE_API_TOKEN")!, 
+  Deno.env.get("CLOUDFLARE_ACCOUNT_ID")!
 );
 ```

deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluentci/cloudflare",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "exports": "./mod.ts",
   "importMap": "import_map.json",
   "tasks": {
@@ -31,4 +31,4 @@
       "gen/"
     ]
   }
-}
+}

src/dagger/jobs.ts

@@ -32,7 +32,7 @@ export async function deploy(
   const context = await getDirectory(src);
   const secret = await getApiToken(apiToken);
   if (!secret) {
-    console.error("CF_API_TOKEN environment variable is required");
+    console.error("CLOUDFLARE_API_TOKEN environment variable is required");
     exit(1);
     return "";
   }
@@ -50,7 +50,7 @@ export async function deploy(
     .withSecretVariable("CLOUDFLARE_API_TOKEN", secret)
     .withEnvVariable(
       "CLOUDFLARE_ACCOUNT_ID",
-      env.get("CF_ACCOUNT_ID") || accountId || ""
+      env.get("CCLOUDFLARE_ACCOUNT_ID") || env.get("CF_ACCOUNT_ID") || accountId || ""
     )
     .withExec(["bun", "install"])
     .withExec(["bunx", `wrangler@${WRANGLER_VERSION}`, "deploy"]);

src/dagger/lib.ts

@@ -30,16 +30,16 @@ export const getDirectory = async (
 };
 
 export const getApiToken = async (token?: string | Secret) => {
-  if (env.get("CF_API_TOKEN")) {
-    return dag.setSecret("CF_API_TOKEN", env.get("CF_API_TOKEN")!);
+  if (env.get("CLOUDFLARE_API_TOKEN")  || env.get("CF_API_TOKEN")) {
+    return dag.setSecret("CLOUDFLARE_API_TOKEN", env.get("CLOUDFLARE_API_TOKEN") || env.get("CF_API_TOKEN")!);
   }
   if (token && typeof token === "string") {
     try {
       const secret = dag.loadSecretFromID(token as SecretID);
       await secret.id();
       return secret;
     } catch (_) {
-      return dag.setSecret("CF_API_TOKEN", token);
+      return dag.setSecret("CLOUDFLARE_API_TOKEN", token);
     }
   }
   if (token && token instanceof Secret) {