@catladder/cli 1.5.1 → 1.5.5

package/package.json

@@ -16,7 +16,7 @@
     "catladder": "./bin/catladder"
   },
   "dependencies": {
-    "@catladder/pipeline": "1.5.1",
+    "@catladder/pipeline": "1.5.5",
     "@kubernetes/client-node": "^0.16.2",
     "child-process-promise": "^2.2.1",
     "command-exists-promise": "^2.0.2",
@@ -24,7 +24,7 @@
     "dayjs": "^1.10.4",
     "fs-extra": "^7.0.1",
     "gitlab": "^4.4.1",
-    "js-yaml": "^3.12.0",
+    "js-yaml": "^4.1.0",
     "lodash": "^4.17.21",
     "memoizee": "^0.4.14",
     "node-fetch": "^2.3.0",
@@ -55,5 +55,5 @@
     "eslint": "^8.7.0",
     "typescript": "^4.5.4"
   },
-  "version": "1.5.1"
+  "version": "1.5.5"
 }

package/src/apps/cli/commands/shared/index.ts

@@ -24,8 +24,10 @@ export const openGoogleCloudKubernetesDashboard = async (
   googleAuthUserNumber = 0
 ) => {
   //gke_skynet-164509_europe-west1-d_production
+  // ?authuser=1&project=skynet-swiss&pageState=pageState%3D(%22savedViews%22:(%22c%22:%5B%22gke%2Feurope-west6-a%2Fch-production%22%5D,%22n%22:%5B%22pvl-bike2school-review%22%5D,%22i%22:%224e42e0b9cd6147f8a4fba7516752ec48%22))
+  // ?authuser=1&project=skynet-swiss&pageState=(%22savedViews%22:(%22i%22:%2279802e2b154d46d480dff4e086e87875%22,%22c%22:%5B%22gke%2Feurope-west6-a%2Fch-production%22%5D,%22n%22:%5B%22pvl-bike2school-review%22%5D))
 
-  const pageState = `pageState=("savedViews":("c":["gke/${cluster.region}/${cluster.name}"],"n":["${namespace}"],"i":"4e42e0b9cd6147f8a4fba7516752ec48"))`;
+  const pageState = `("savedViews":("c":["gke/${cluster.region}/${cluster.name}"],"n":["${namespace}"],"i":"4e42e0b9cd6147f8a4fba7516752ec48"))`;
   const url = `https://console.cloud.google.com/kubernetes/workload?authuser=${googleAuthUserNumber}&project=${
     cluster.projectId
   }&pageState=${encodeURIComponent(pageState)}`;

package/src/apps/cli/config/writeConfig.ts

@@ -23,6 +23,7 @@ export const writeConfig = async (
   });
   vorpal.log("");
   if (configType === TS) {
+    const file = gitRoot + "/catladder.ts";
     const content = format(
       `
       import type { Config } from "@catladder/pipeline";
@@ -40,19 +41,20 @@ export const writeConfig = async (
       }
     );
 
-    await writeFile(gitRoot + "/catladder.ts", content, {
+    await writeFile(file, content, {
       encoding: "utf-8",
     });
     vorpal.log("adding type @catladder/pipeline....");
-    await spawn("yarn add @catladder/pipeline -DW", {
+    await spawn("yarn add --non-interactive @catladder/pipeline -DW", {
       shell: true,
     });
-    await exec("git add " + gitRoot + "/catladder.ts");
+    await exec("git add " + file);
   } else {
+    const file = gitRoot + "/catladder.yml";
     const content = dump(config);
 
     await writeFile(
-      gitRoot + "/catladder.yml",
+      file,
       content +
         "\n\n" +
         (options.endComment
@@ -62,7 +64,7 @@ export const writeConfig = async (
         encoding: "utf-8",
       }
     );
-    await exec("git add " + gitRoot + "/catladder.ts");
+    await exec("git add " + file);
   }
   vorpal.log("done!");
   vorpal.log("");