fix issue with publish command

fluentci-io · Dec 23, 2023 · 2bebb6a · 2bebb6a
1 parent 2b8f80f
commit 2bebb6a
Show file tree

Hide file tree

Showing 8 changed files with 254 additions and 24 deletions.
diff --git a/deno.lock b/deno.lock
diff --git a/deps.ts b/deps.ts
@@ -14,7 +14,7 @@ export { load } from "https://deno.land/[email protected]/dotenv/mod.ts";
 export { Secret } from "https://deno.land/x/[email protected]/prompt/secret.ts";
 import dir from "https://deno.land/x/[email protected]/mod.ts";
 export { dir };
-export { walkSync } from "https://deno.land/std@0.208.0/fs/walk.ts";
+export { walkSync, walk } from "https://deno.land/std@0.210.0/fs/walk.ts";
 export type { WalkEntry } from "https://deno.land/[email protected]/fs/walk.ts";
 export {
   BlobReader,

diff --git a/src/cmd/aws.ts b/src/cmd/aws.ts
@@ -44,12 +44,16 @@ async function generateAWSCodePipelineConfig(
   }
 
   if (!pipeline.endsWith("_pipeline")) {
-    pipeline = pipeline + "_pipeline";
+    const result = await fetch(`${BASE_URL}/pipeline/${pipeline}`);
+    const data = await result.json();
+    if (!data.name) {
+      pipeline = pipeline + "_pipeline";
+    }
   }
 
   const result = await fetch(`${BASE_URL}/pipeline/${pipeline}`);
   const data = await result.json();
-  if (!data.github_url) {
+  if (!data.github_url && !data.version) {
     console.log(
       `Pipeline template ${green('"')}${green(pipeline)}${green(
         '"'

diff --git a/src/cmd/azure.ts b/src/cmd/azure.ts
@@ -41,12 +41,16 @@ async function generateAzurePipelinesConfig(pipeline?: string, reload = false) {
   }
 
   if (!pipeline.endsWith("_pipeline")) {
-    pipeline = pipeline + "_pipeline";
+    const result = await fetch(`${BASE_URL}/pipeline/${pipeline}`);
+    const data = await result.json();
+    if (!data.name) {
+      pipeline = pipeline + "_pipeline";
+    }
   }
 
   const result = await fetch(`${BASE_URL}/pipeline/${pipeline}`);
   const data = await result.json();
-  if (!data.github_url) {
+  if (!data.github_url && !data.version) {
     console.log(
       `Pipeline template ${green('"')}${green(pipeline)}${green(
         '"'

diff --git a/src/cmd/circleci.ts b/src/cmd/circleci.ts
@@ -43,12 +43,16 @@ async function generateCircleCIConfig(pipeline?: string, reload = false) {
   }
 
   if (!pipeline.endsWith("_pipeline")) {
-    pipeline = pipeline + "_pipeline";
+    const result = await fetch(`${BASE_URL}/pipeline/${pipeline}`);
+    const data = await result.json();
+    if (!data.name) {
+      pipeline = pipeline + "_pipeline";
+    }
   }
 
   const result = await fetch(`${BASE_URL}/pipeline/${pipeline}`);
   const data = await result.json();
-  if (!data.github_url) {
+  if (!data.github_url && !data.version) {
     console.log(
       `Pipeline template ${green('"')}${green(pipeline)}${green(
         '"'

diff --git a/src/cmd/github.ts b/src/cmd/github.ts
@@ -43,12 +43,16 @@ async function generateWorkflow(pipeline?: string, reload = false) {
   }
 
   if (!pipeline.endsWith("_pipeline")) {
-    pipeline = pipeline + "_pipeline";
+    const result = await fetch(`${BASE_URL}/pipeline/${pipeline}`);
+    const data = await result.json();
+    if (!data.name) {
+      pipeline = pipeline + "_pipeline";
+    }
   }
 
   const result = await fetch(`${BASE_URL}/pipeline/${pipeline}`);
   const data = await result.json();
-  if (!data.github_url) {
+  if (!data.github_url && !data.version) {
     console.log(
       `Pipeline template ${green('"')}${green(pipeline)}${green(
         '"'

diff --git a/src/cmd/gitlab.ts b/src/cmd/gitlab.ts
@@ -41,12 +41,16 @@ async function generateGitlabCIConfig(pipeline?: string, reload = false) {
   }
 
   if (!pipeline.endsWith("_pipeline")) {
-    pipeline = pipeline + "_pipeline";
+    const result = await fetch(`${BASE_URL}/pipeline/${pipeline}`);
+    const data = await result.json();
+    if (!data.name) {
+      pipeline = pipeline + "_pipeline";
+    }
   }
 
   const result = await fetch(`${BASE_URL}/pipeline/${pipeline}`);
   const data = await result.json();
-  if (!data.github_url) {
+  if (!data.github_url && !data.version) {
     console.log(
       `Pipeline template ${green('"')}${green(pipeline)}${green(
         '"'

diff --git a/src/cmd/publish.ts b/src/cmd/publish.ts
@@ -1,10 +1,4 @@
-import {
-  walkSync,
-  ZipWriter,
-  BlobWriter,
-  brightGreen,
-  wait,
-} from "../../deps.ts";
+import { walk, ZipWriter, BlobWriter, brightGreen, wait } from "../../deps.ts";
 import { isLogged, getAccessToken } from "../utils.ts";
 import { validatePackage, validateConfigFiles } from "../validate.ts";
 import "https://deno.land/x/[email protected]/mod.ts";
@@ -23,7 +17,7 @@ const publish = async () => {
 
   const accessToken = getAccessToken();
 
-  const entries = walkSync(".", {
+  const entries = walk(".", {
     skip: parseIgnoredFiles(),
   });
   const paths = [];
@@ -94,15 +88,17 @@ const publish = async () => {
 
 const parseIgnoredFiles = () => {
   let ignoredFilesArray: RegExp[] = [
-    new RegExp(".git"),
-    new RegExp(".fluentci"),
+    new RegExp("\\.git"),
+    new RegExp("\\.fluentci"),
   ];
   try {
     // verify if .fluentciignore exists
     if (Deno.statSync(".fluentciignore").isFile) {
       const ignoredFiles = Deno.readTextFileSync(".fluentciignore");
       ignoredFilesArray = ignoredFilesArray.concat(
-        ignoredFiles.split("\n").map((file) => new RegExp(file))
+        ignoredFiles
+          .split("\n")
+          .map((file) => new RegExp(file.replace(".", "\\.")))
       );
     }
   } catch (_e) {