@catladder/cli 1.4.5 → 1.5.3

package/package.json

@@ -16,7 +16,7 @@
     "catladder": "./bin/catladder"
   },
   "dependencies": {
-    "@catladder/pipeline": "1.4.5",
+    "@catladder/pipeline": "1.5.3",
     "@kubernetes/client-node": "^0.16.2",
     "child-process-promise": "^2.2.1",
     "command-exists-promise": "^2.0.2",
@@ -29,6 +29,7 @@
     "memoizee": "^0.4.14",
     "node-fetch": "^2.3.0",
     "open": "^8.4.0",
+    "prettier": "^2.5.1",
     "tmp-promise": "^2.0.2",
     "update-notifier": "^2.5.0",
     "vorpal": "^1.12.0",
@@ -54,5 +55,5 @@
     "eslint": "^8.7.0",
     "typescript": "^4.5.4"
   },
-  "version": "1.4.5"
+  "version": "1.5.3"
 }

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/verify/index.ts

@@ -4,7 +4,7 @@ import {
   getProjectConfig,
 } from "../../../config/getProjectConfig";
 import { hasGitlabToken, setupGitlabToken } from "../../../utils/gitlab";
-import { migrateV2 } from "./migration/fromv2";
+import { isV2, migrateV2 } from "./migration/fromv2";
 
 export const verify = async (vorpal: Vorpal) => {
   // check if has all settings
@@ -20,11 +20,7 @@ export const verify = async (vorpal: Vorpal) => {
   try {
     const gitlabCi = getGitlabCi();
 
-    if (!gitlabCi) {
-      vorpal.log("not initialized");
-    }
-
-    if (!projectConfig) {
+    if (gitlabCi && !projectConfig && (await isV2())) {
       vorpal.log("no project config, needs migration");
       await migrateV2(vorpal);
     }

package/src/apps/cli/verify/migration/fromv2.ts

@@ -24,7 +24,11 @@ import { syncBitwarden } from "../../../../utils/passwordstore";
 import { getGitRoot } from "../../../../utils/projects";
 import { writeConfig } from "../../config/writeConfig";
 import { migrateSecrets } from "./migrateSecrets";
-import { detectBuildConfig, OldGitlabCiFile } from "./oldGitlabCi";
+import {
+  detectBuildConfig,
+  isOldInclude,
+  OldGitlabCiFile,
+} from "./oldGitlabCi";
 export const LEGACY_ENVS = [
   "dev-local",
   "dev",
@@ -78,6 +82,11 @@ const transformValues = (
     cronjobs: arrayToRecord(valuesIn?.cronjobs),
   };
 };
+
+export const isV2 = async () => {
+  const gitlabCi = await getGitlabCi<OldGitlabCiFile>();
+  return isOldInclude(gitlabCi);
+};
 export const migrateV2 = async (vorpal: Vorpal) => {
   const gitlabCi = await getGitlabCi<OldGitlabCiFile>();
   const gitRoot = await getGitRoot();
@@ -121,13 +130,14 @@ export const migrateV2 = async (vorpal: Vorpal) => {
         name: "shouldContinue",
         type: "confirm",
       });
-      vorpal.log("");
-      vorpal.log("");
-      vorpal.log("💪😼 ok, let's go...");
-      vorpal.log("");
-      vorpal.log("");
 
       if (shouldContinue) {
+        vorpal.log("");
+        vorpal.log("");
+        vorpal.log("💪😼 ok, let's go...");
+        vorpal.log("");
+        vorpal.log("");
+
         const createComponent = async (
           dir: string,
           ciFile: OldGitlabCiFile
@@ -239,6 +249,10 @@ export const migrateV2 = async (vorpal: Vorpal) => {
         this.log("done!");
 
         this.log("-------------------");
+      } else {
+        this.log(
+          "☝ if you want to use catladder in legacy mode, install @panter/catladder globally and invoke catladder-legacy"
+        );
       }
     });
 

package/src/apps/cli/verify/migration/oldGitlabCi.ts

@@ -16,14 +16,19 @@ export type OldGitlabCiFile = {
   }[];
 };
 
+export const isOldInclude = (gitlabCi: OldGitlabCiFile) => {
+  return gitlabCi.include[0]?.project === "catladder/gitlab-ci";
+};
+
 export const detectBuildConfig = (
   gitlabCi: OldGitlabCiFile
 ): BuildConfig["type"] | "monorepo" => {
-  const firstInclude = gitlabCi.include[0];
-  if (!firstInclude || gitlabCi.include[0]?.project !== "catladder/gitlab-ci") {
+  if (!isOldInclude(gitlabCi)) {
     throw new Error("unsupported gitlab-ci file");
   }
 
+  const firstInclude = gitlabCi.include[0];
+
   if (firstInclude.file === "monorepo.yml") return "monorepo";
 
   if (firstInclude.file === "node-kubernetes.yml") {