@catladder/cli 1.145.0 → 1.146.1

package/src/apps/cli/commands/project/setup/setupKubernetes.ts

@@ -15,7 +15,7 @@ import ensureNamespace from "../utils/ensureNamespace";
 
 export const setupKubernetes = async (
   instance: CommandInstance,
-  context: Context
+  context: Context,
 ) => {
   const deployConfig = context.componentConfig.deploy;
   if (!isOfDeployType(deployConfig, "kubernetes")) {
@@ -25,16 +25,16 @@ export const setupKubernetes = async (
   const { id: projectId } = await getProjectInfo(instance);
   const deploy_tokens = await doGitlabRequest(
     instance,
-    `projects/${projectId}/deploy_tokens`
+    `projects/${projectId}/deploy_tokens`,
   );
 
   if (
     !deploy_tokens.find(
-      (v: { name: string }) => v.name === "gitlab-deploy-token"
+      (v: { name: string }) => v.name === "gitlab-deploy-token",
     )
   ) {
     instance.log(
-      "I will setup the 'GitLab Deploy Token', so Kubernetes can pull images from this project."
+      "I will setup the 'GitLab Deploy Token', so Kubernetes can pull images from this project.",
     );
 
     await doGitlabRequest(
@@ -45,7 +45,7 @@ export const setupKubernetes = async (
         name: "gitlab-deploy-token",
         scopes: ["read_registry"],
       },
-      "POST"
+      "POST",
     );
   }
 
@@ -65,26 +65,26 @@ export const setupKubernetes = async (
   instance.log("ensuring service accounts...");
   const serviceAccountName = `cl-${context.componentName}-deploy`;
   const KUBE_URL = await exec(
-    `TERM=dumb kubectl cluster-info | grep -E 'Kubernetes master|Kubernetes control plane' | awk '/http/ {print $NF}'`
+    `TERM=dumb kubectl cluster-info | grep -E 'Kubernetes master|Kubernetes control plane' | awk '/http/ {print $NF}'`,
   ).then((s) => s.stdout.trim());
 
   // first upsert service acount in the ns
   try {
     await exec(
-      `kubectl delete serviceaccount --namespace ${namespace} ${serviceAccountName}`
+      `kubectl delete serviceaccount --namespace ${namespace} ${serviceAccountName}`,
     );
     await exec(
-      `kubectl delete rolebinding --namespace ${namespace} ${serviceAccountName}`
+      `kubectl delete rolebinding --namespace ${namespace} ${serviceAccountName}`,
     );
     await exec(
-      `kubectl delete role --namespace ${namespace} ${serviceAccountName}`
+      `kubectl delete role --namespace ${namespace} ${serviceAccountName}`,
     );
   } catch (e) {
     // ignore
   }
 
   await exec(
-    `kubectl create serviceaccount --namespace ${namespace} ${serviceAccountName}`
+    `kubectl create serviceaccount --namespace ${namespace} ${serviceAccountName}`,
   );
 
   // upsert role in the ns
@@ -132,10 +132,10 @@ EOF
   `);
 
   const KUBE_CA_PEM = await exec(
-    `kubectl get secret ${secretName} --namespace ${namespace} -o jsonpath="{['data']['ca\\.crt']}"`
+    `kubectl get secret ${secretName} --namespace ${namespace} -o jsonpath="{['data']['ca\\.crt']}"`,
   ).then((c) => c.stdout.trim());
   const KUBE_TOKEN = await exec(
-    `kubectl get secret ${secretName} --namespace ${namespace} -o jsonpath="{['data']['token']}" | base64 --decode`
+    `kubectl get secret ${secretName} --namespace ${namespace} -o jsonpath="{['data']['token']}" | base64 --decode`,
   ).then((c) => c.stdout.trim());
 
   const vars = {
@@ -151,7 +151,7 @@ EOF
         missing.map((m) => m[0]).join(", ") +
         ". Check whether your local kubectl is still working for '" +
         fullName +
-        "'"
+        "'",
     );
   }
 
@@ -165,7 +165,7 @@ EOF
     vars,
     context.environment.shortName,
     context.componentName,
-    false // no backup
+    false, // no backup
   );
   instance.log("done!");
 };

package/src/apps/cli/commands/project/setup/setupTopic.ts

@@ -1,22 +1,17 @@
 import type { CommandInstance } from "vorpal";
 import { doGitlabRequest, getProjectInfo } from "../../../../../utils/gitlab";
 
-const catladderTopic = "catladder"
+const catladderTopic = "catladder";
 
 export const setupTopic = async (instance: CommandInstance) => {
-  const { id: projectId } = await getProjectInfo(
-    instance
-  );
+  const { id: projectId } = await getProjectInfo(instance);
 
-  const { topics } = await doGitlabRequest(
-    instance,
-    `projects/${projectId}`
-  );
+  const { topics } = await doGitlabRequest(instance, `projects/${projectId}`);
 
   await doGitlabRequest(
     instance,
     `projects/${projectId}`,
     { topics: [catladderTopic, ...topics] },
-    "PUT"
+    "PUT",
   );
 };

package/src/apps/cli/commands/project/utils/autocompletions.ts

@@ -17,7 +17,7 @@ export const envAndComponents = async () => {
 
   return allEnvAndcomponents.reduce<string[]>(
     (acc, { env, componentName }) => [...acc, env + ":" + componentName],
-    []
+    [],
   );
 };
 

package/src/apps/cli/commands/project/utils/ensureCluster.ts

@@ -17,13 +17,13 @@ export default async function (envComponent: string) {
     throw new Error("can't ensure cluster for non-kubernetes deployments");
   }
   const cluster = getFullKubernetesClusterName(
-    context.componentConfig.deploy.cluster
+    context.componentConfig.deploy.cluster,
   );
   const connectedClusterName = await getCurrentConnectedClusterName();
 
   if (cluster !== connectedClusterName) {
     this.log(
-      `you are currently connected to cluster '${connectedClusterName}'`
+      `you are currently connected to cluster '${connectedClusterName}'`,
     );
     this.log(`but the project requires cluster '${cluster}'`);
     const { shouldContinue } = await this.prompt({

package/src/apps/cli/commands/project/utils/ensureNamespace.ts

@@ -1,4 +1,4 @@
-import type { Context} from "@catladder/pipeline";
+import type { Context } from "@catladder/pipeline";
 import { getKubernetesNamespace } from "@catladder/pipeline";
 import type { V1ObjectMeta } from "@kubernetes/client-node";
 import { V1Namespace } from "@kubernetes/client-node";
@@ -7,7 +7,7 @@ import { getk8sApi } from "../../../../../k8sApi";
 export default async function (context: Context) {
   const namespace = getKubernetesNamespace(
     context.fullConfig,
-    context.environment.shortName
+    context.environment.shortName,
   );
   const namespaceBody = new V1Namespace();
   const metadata: V1ObjectMeta = {
@@ -25,8 +25,8 @@ export default async function (context: Context) {
           ([componentName, config]) => [
             "buildType_" + componentName,
             config.build.type,
-          ]
-        )
+          ],
+        ),
       ),
       ...(context.fullConfig.meta?.labels ?? {}),
     },
@@ -44,7 +44,7 @@ export default async function (context: Context) {
       undefined,
       undefined,
       undefined,
-      { headers: { "content-type": "application/merge-patch+json" } } // see https://github.com/kubernetes-client/javascript/issues/443
+      { headers: { "content-type": "application/merge-patch+json" } }, // see https://github.com/kubernetes-client/javascript/issues/443
     ); // update meta data
   } catch (e) {
     if (e.response?.body?.reason === "NotFound") {

package/src/apps/cli/utils/getGoogleAuthUserNumber.ts

@@ -8,7 +8,7 @@ const KEY = "googleAuthUserNumber";
 export const getGoogleAuthUserNumber = async function () {
   if (!(await hasPreference(KEY))) {
     this.log(
-      "Please type in your google auth user number (0 if you have only one google account or maybe 1 if you have multiple)"
+      "Please type in your google auth user number (0 if you have only one google account or maybe 1 if you have multiple)",
     );
 
     const { authUserNumber } = await this.prompt({

package/src/config/getProjectConfig.ts

@@ -50,7 +50,7 @@ export const getProjectComponents = async () => {
 
 export const getPipelineContextByChoice = async (
   env: string,
-  componentName: string
+  componentName: string,
 ) => {
   const config = await getProjectConfig();
   return await createContext({
@@ -67,7 +67,7 @@ export const getAllComponentsWithAllEnvsFlat = async (): Promise<
     return [];
   }
   return Object.keys(config.components).flatMap((componentName) =>
-    getAllEnvs(config, componentName).map((env) => ({ env, componentName }))
+    getAllEnvs(config, componentName).map((env) => ({ env, componentName })),
   );
 };
 
@@ -83,7 +83,7 @@ export const getAllComponentsWithAllEnvsHierarchical = async (): Promise<{
     Object.keys(config.components).map((componentName) => [
       componentName,
       getAllEnvs(config, componentName),
-    ])
+    ]),
   );
 };
 
@@ -92,8 +92,8 @@ export const getAllPipelineContexts = async () => {
     (await getAllComponentsWithAllEnvsFlat())
       .filter((c) => c.env !== "local")
       .map(({ env, componentName }) =>
-        getPipelineContextByChoice(env, componentName)
-      )
+        getPipelineContextByChoice(env, componentName),
+      ),
   );
 };
 
@@ -107,7 +107,7 @@ export const getGitlabVar = async (
   vorpal: CommandInstance,
   env: string,
   componentName: string,
-  variableName: string
+  variableName: string,
 ) => {
   const rawVariableName = getSecretVarName(env, componentName, variableName);
   return await getVariableValueByRawName(vorpal, rawVariableName);
@@ -115,7 +115,7 @@ export const getGitlabVar = async (
 
 const resolveSecrets = async (
   vorpal: CommandInstance | null,
-  varSets: EnvironmentEnvVars[]
+  varSets: EnvironmentEnvVars[],
 ): Promise<Record<string, string>> => {
   const allVariablesInGitlab = await getAllVariables(vorpal);
 
@@ -136,15 +136,15 @@ const resolveSecrets = async (
           }
           return [key, value];
         })
-        .filter(Boolean)
-    )
+        .filter(Boolean),
+    ),
   );
 };
 
 export const getEnvVarsResolved = async (
   vorpal: CommandInstance | null,
   env: string,
-  componentName: string | null
+  componentName: string | null,
 ) => {
   if (!componentName) {
     return {};
@@ -173,7 +173,7 @@ export const getEnvVarsResolved = async (
 export const getJobOnlyEnvVarsResolved = async (
   vorpal: CommandInstance,
   env: string,
-  componentName: string
+  componentName: string,
 ) => {
   try {
     const envionment = await getEnvironment(env, componentName);

package/src/gcloud/artifactsRegistry.ts

@@ -7,7 +7,7 @@ export const upsertGcloudArtifactsRegistry = async (config: {
 }) => {
   try {
     await exec(
-      `gcloud artifacts repositories create catladder-deploy --project="${config.projectId}" --repository-format=docker --location=${config.region}`
+      `gcloud artifacts repositories create catladder-deploy --project="${config.projectId}" --repository-format=docker --location=${config.region}`,
     );
   } catch (e) {
     // probably already exists

package/src/gcloud/cloudRun/getCloudRunDomainSuffix.ts

@@ -20,7 +20,7 @@ export const getCloudRunDomainSuffix = async (config: DeployConfigCloudRun) => {
   const dummyServiceName = "cl-dummy-service-delete-me";
 
   const existingServices = await exec(
-    `gcloud run services list --format=json  --project="${config.projectId}"  --region=${config.region} --limit=1`
+    `gcloud run services list --format=json  --project="${config.projectId}"  --region=${config.region} --limit=1`,
   ).then((r) => JSON.parse(r.stdout));
 
   if (existingServices.length > 0) {
@@ -28,7 +28,7 @@ export const getCloudRunDomainSuffix = async (config: DeployConfigCloudRun) => {
   }
 
   const result = await exec(
-    `gcloud run deploy ${dummyServiceName} --region=${config.region} --allow-unauthenticated --project ${config.projectId} --image=us-docker.pkg.dev/cloudrun/container/hello --format=json`
+    `gcloud run deploy ${dummyServiceName} --region=${config.region} --allow-unauthenticated --project ${config.projectId} --image=us-docker.pkg.dev/cloudrun/container/hello --format=json`,
   ).then((r) => JSON.parse(r.stdout));
 
   return await getSuffixFromService(result);

package/src/gcloud/cloudRun/openCloudRunDashboards.ts

@@ -5,7 +5,7 @@ import { openGoogleCloudDashboard } from "../openDashboard";
 
 export const openGoogleCloudRunDashboard = async (
   instance: CommandInstance,
-  context: Context
+  context: Context,
 ) => {
   if (!isOfDeployType(context.componentConfig.deploy, "google-cloudrun")) {
     throw new Error("deploy type is not google-cloudrun ");
@@ -17,6 +17,6 @@ export const openGoogleCloudRunDashboard = async (
     `run/detail/${region}/${fullName}/metrics`,
     {
       project: projectId,
-    }
+    },
   );
 };

package/src/gcloud/cloudSql/copyDb.ts

@@ -41,7 +41,7 @@ const createCopyDbScript = ({
       pg_dump --dbname=postgres://${sourceUsername}:${sourcePassword}@localhost:${sourcePort}/${sourceDbName} --no-owner --no-privileges > $dumptmp
       echo "dump done"
       ${targetPSQL(
-        `-c 'drop database "${targetDbName}" WITH (FORCE)' 1> /dev/null || true`
+        `-c 'drop database "${targetDbName}" WITH (FORCE)' 1> /dev/null || true`,
       )}
       ${targetPSQL(`-c 'create database "${targetDbName}"' 1> /dev/null`)}
           echo "Restoring dump..."

package/src/gcloud/cloudSql/startProxy.ts

@@ -19,10 +19,10 @@ const getProxyCommandSpawnArgs = async ({
   const commandString = (await commandExists("cloud-sql-proxy"))
     ? `cloud-sql-proxy --port ${localPort} ${instanceName}`
     : (await commandExists(
-        "cloud_sql_proxy" // v1
-      ))
-    ? `cloud_sql_proxy -instances ${instanceName}=tcp:${localPort}`
-    : null;
+          "cloud_sql_proxy", // v1
+        ))
+      ? `cloud_sql_proxy -instances ${instanceName}=tcp:${localPort}`
+      : null;
   if (!commandString) {
     throw new Error(ERROR_NOT_INSTALLED);
   }
@@ -32,7 +32,7 @@ const getProxyCommandSpawnArgs = async ({
 };
 
 export const startCloudSqlProxyInCurrentShell = async (
-  opts: CloudSqlProxyOptions
+  opts: CloudSqlProxyOptions,
 ) => {
   const { cmd, args } = await getProxyCommandSpawnArgs(opts);
 
@@ -43,7 +43,7 @@ export const startCloudSqlProxyInCurrentShell = async (
 };
 
 export const startCloudSqlProxyInBackground = async (
-  opts: CloudSqlProxyOptions
+  opts: CloudSqlProxyOptions,
 ): Promise<CloudSqlBackgroundProxy> => {
   const { cmd, args } = await getProxyCommandSpawnArgs(opts);
 
@@ -57,7 +57,7 @@ export const startCloudSqlProxyInBackground = async (
         echo -n "."
       done 2>/dev/null`,
     [],
-    { shell: "bash" }
+    { shell: "bash" },
   );
   const stop = () => {
     proxyPromise.catch(() => {

package/src/gcloud/enableServices.ts

@@ -4,11 +4,11 @@ export const enableGCloudServices = async (
   services: string[],
   config: {
     projectId: string;
-  }
+  },
 ) => {
   for (const service of services) {
     await exec(
-      `gcloud services enable ${service} --project=${config.projectId}`
+      `gcloud services enable ${service} --project=${config.projectId}`,
     );
   }
 };

package/src/gcloud/openDashboard.ts

@@ -4,7 +4,7 @@ import open from "open";
 export const openGoogleCloudDashboard = async (
   instance: CommandInstance,
   path: string,
-  params: Record<string, string>
+  params: Record<string, string>,
 ) => {
   const url = new URL("https://console.cloud.google.com/");
   url.pathname = path;

package/src/gcloud/serviceAccounts.ts

@@ -23,7 +23,7 @@ type ServiceAccount = {
 };
 const upsertGcloudServiceAccount = async (
   context: Context,
-  account: ServiceAccount
+  account: ServiceAccount,
 ): Promise<string> => {
   const { projectId, name, displayName, roles, description } = account;
 
@@ -45,13 +45,13 @@ const upsertGcloudServiceAccount = async (
 
   if (!existing) {
     await exec(
-      `gcloud iam service-accounts create ${fullName} --display-name="${fullDisplayName}" --project="${projectId}"  --description="${description}"`
+      `gcloud iam service-accounts create ${fullName} --display-name="${fullDisplayName}" --project="${projectId}"  --description="${description}"`,
     );
   }
   const memberName = `serviceAccount:${fullIdentifier}`;
   for (const role of roles) {
     await exec(
-      `gcloud projects add-iam-policy-binding ${projectId} --member=${memberName} --role=${role} `
+      `gcloud projects add-iam-policy-binding ${projectId} --member=${memberName} --role=${role} `,
     );
   }
 
@@ -59,18 +59,18 @@ const upsertGcloudServiceAccount = async (
 
   // delete first all keys
   const keys = await exec(
-    `gcloud iam service-accounts keys list --iam-account=${fullIdentifier} --managed-by=user --format=json`
+    `gcloud iam service-accounts keys list --iam-account=${fullIdentifier} --managed-by=user --format=json`,
   ).then((o) => JSON.parse(o.stdout));
 
   for (const key of keys) {
     await exec(
-      `gcloud iam service-accounts keys delete ${key.name} --quiet --iam-account=${fullIdentifier}`
+      `gcloud iam service-accounts keys delete ${key.name} --quiet --iam-account=${fullIdentifier}`,
     );
   }
 
   return await exec(
     // on some platforms /dev/stdout is not available without the pipe
-    `gcloud iam service-accounts keys create /dev/stdout --iam-account=${fullIdentifier} | cat`
+    `gcloud iam service-accounts keys create /dev/stdout --iam-account=${fullIdentifier} | cat`,
   ).then((o) => o.stdout);
 };
 
@@ -78,7 +78,7 @@ export const upsertGcloudServiceAccountAndSaveSecret = async (
   instance: CommandInstance,
   context: Context,
   account: ServiceAccount,
-  secretName: string
+  secretName: string,
 ): Promise<void> => {
   instance.log("upserting service account " + account.name + "...");
   const key = await upsertGcloudServiceAccount(context, account);
@@ -89,7 +89,7 @@ export const upsertGcloudServiceAccountAndSaveSecret = async (
       [secretName]: key,
     },
     context.environment.shortName,
-    context.componentName
+    context.componentName,
   );
   instance.log("done!");
 };

package/src/kubernetes/index.ts

@@ -9,7 +9,7 @@ export const getProjectPods = async (envComponent: string) => {
 
   const { componentName } = parseChoice(envComponent);
   return res.body.items.filter((item) =>
-    componentName ? item.metadata?.name?.includes(componentName + "-") : true
+    componentName ? item.metadata?.name?.includes(componentName + "-") : true,
   );
 };
 

package/src/kubernetes/openKubernetesDashboards.ts

@@ -5,7 +5,7 @@ import { openGoogleCloudDashboard } from "../gcloud/openDashboard";
 
 export const openGoogleCloudLogs = async (
   instance: CommandInstance,
-  context: Context
+  context: Context,
 ) => {
   const deployConfig = context.componentConfig.deploy;
   if (!isOfDeployType(deployConfig, "kubernetes")) {
@@ -31,7 +31,7 @@ export const openGoogleCloudLogs = async (
 
 export const openGoogleCloudKubernetesDashboard = async (
   instance: CommandInstance,
-  context: Context
+  context: Context,
 ) => {
   const deployConfig = context.componentConfig.deploy;
   if (!isOfDeployType(deployConfig, "kubernetes")) {

package/src/kubernetes/portForward.ts

@@ -4,12 +4,12 @@ export const startKubePortForward = async (
   podname: string,
   localPort: number,
   remotePort: number,
-  namespace: string
+  namespace: string,
 ) => {
   const name = `kube/${namespace}/${podname}/${localPort}:${remotePort}`;
 
   await startPortForwardCommand(
     name,
-    `kubectl port-forward ${podname} ${localPort}:${remotePort} -n ${namespace}`
+    `kubectl port-forward ${podname} ${localPort}:${remotePort} -n ${namespace}`,
   );
 };

package/src/types/child-process-promise.d.ts

@@ -5,7 +5,7 @@ declare module "child-process-promise" {
     cmd: string,
     options?: {
       env?: Record<string, string>;
-    }
+    },
   ): Promise<{
     stdout: string;
   }>;
@@ -19,7 +19,7 @@ declare module "child-process-promise" {
 
   function spawn(
     cmd: string,
-    options?: SpawnOptions
+    options?: SpawnOptions,
   ): Promise<{
     stdout: string;
   }>;
@@ -27,7 +27,7 @@ declare module "child-process-promise" {
   function spawn(
     cmd: string,
     args: string[],
-    options?: SpawnOptions
+    options?: SpawnOptions,
   ): Promise<unknown> & {
     childProcess: {
       stdout: ReadStream;

package/src/utils/editAsFile.ts

@@ -6,7 +6,7 @@ import getEditor from "./getEditor";
 
 export const editAsFile = async <T>(
   inObject: T,
-  preamble?: string
+  preamble?: string,
 ): Promise<T> => {
   const fullPreamble = preamble
     ? `#
@@ -25,7 +25,7 @@ export const editAsFile = async <T>(
       await (await getEditor()).open(tmpFilePath);
       newContent = parse((await readFile(tmpFilePath)).toString("utf-8")) as T;
     },
-    { postfix: ".yml" }
+    { postfix: ".yml" },
   );
 
   return newContent;