@vaharoni/devops 1.3.3 → 1.3.5

package/dist/devops.js

@@ -358,21 +358,12 @@ function deleteImageVersion(monorepoEnv, image2) {
   return updateImageConfigMap(monorepoEnv, image2, rest);
 }
 function setK8sScale(monorepoEnv, workspaceName, replicaCount) {
-  const workspaceData = getWorkspace(workspaceName);
-  const serviceName = workspaceData.packageDataEntries.find((x) => x.deployment?.service_name)?.deployment?.service_name;
-  if (!serviceName) {
-    console.error(
-      `Workspace ${workspaceName} must have a service_name defined in its deployment key in package.json. Skipping.`
-    );
-    return false;
-  }
   new CommandExecutor(
     kubectlCommand(
       `scale deployment ${workspaceName} --replicas=${replicaCount}`,
       { monorepoEnv }
     )
   ).exec();
-  return true;
 }
 function setWorkspaceScale(monorepoEnv, image2, workspaceName, replicaCount) {
   const workspaceData = getWorkspace(workspaceName);
@@ -386,8 +377,7 @@ function setWorkspaceScale(monorepoEnv, image2, workspaceName, replicaCount) {
   }
   const { scale: _scale, ...rest } = getImageConfigMap(monorepoEnv, image2);
   const parsedScale = deserializeImageConfigMapKey(monorepoEnv, image2, "scale");
-  const isApplicable = setK8sScale(monorepoEnv, workspaceName, replicaCount);
-  if (!isApplicable) return;
+  setK8sScale(monorepoEnv, workspaceName, replicaCount);
   updateImageConfigMap(monorepoEnv, image2, {
     ...rest,
     scale: JSON.stringify({
@@ -2096,8 +2086,13 @@ function copyRegistrySecretToNamespace(monorepoEnv) {
     metadata: { name, namespace: envToNamespace(monorepoEnv) },
     type
   };
+  const redactedParts = {
+    ...relevantParts,
+    data: "**REDACTED**"
+  };
   const copyCmd = `echo '${JSON.stringify(relevantParts)}' | kubectl apply -f -`;
-  new CommandExecutor(copyCmd, { quiet: true }).exec();
+  const redactedCommand = `echo '${JSON.stringify(redactedParts)}' | kubectl apply -f -`;
+  new CommandExecutor(copyCmd, { quiet: true, redactedCommand }).exec();
 }
 function patchServiceAccountImagePullSecret(monorepoEnv) {
   const secretName2 = getSecretName();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vaharoni/devops",
   "type": "module",
-  "version": "1.3.3",
+  "version": "1.3.5",
   "description": "Devops utility",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

package/src/libs/k8s-image-config.ts

@@ -77,21 +77,12 @@ function setK8sScale(
   workspaceName: string,
   replicaCount: number
 ) {
-  const workspaceData = getWorkspace(workspaceName);
-  const serviceName = workspaceData.packageDataEntries.find(x => x.deployment?.service_name)?.deployment?.service_name;
-  if (!serviceName) {
-    console.error(
-      `Workspace ${workspaceName} must have a service_name defined in its deployment key in package.json. Skipping.`
-    );
-    return false;
-  }
   new CommandExecutor(
     kubectlCommand(
       `scale deployment ${workspaceName} --replicas=${replicaCount}`,
       { monorepoEnv }
     )
   ).exec();
-  return true;
 }
 
 // Returns the old version prior to setting
@@ -112,8 +103,7 @@ export function setWorkspaceScale(
   }
   const { scale: _scale, ...rest } = getImageConfigMap(monorepoEnv, image);
   const parsedScale = deserializeImageConfigMapKey<number>(monorepoEnv, image, "scale");
-  const isApplicable = setK8sScale(monorepoEnv, workspaceName, replicaCount);
-  if (!isApplicable) return;
+  setK8sScale(monorepoEnv, workspaceName, replicaCount);
   updateImageConfigMap(monorepoEnv, image, {
     ...rest,
     scale: JSON.stringify({

package/src/libs/registry/image-pull-secret.ts

@@ -35,9 +35,15 @@ export function copyRegistrySecretToNamespace(monorepoEnv: string) {
     metadata: { name, namespace: envToNamespace(monorepoEnv) },
     type,
   };
+  const redactedParts = {
+    ...relevantParts,
+    data: "**REDACTED**",
+  };
   // prettier-ignore
   const copyCmd = `echo '${JSON.stringify(relevantParts)}' | kubectl apply -f -`;
-  new CommandExecutor(copyCmd, { quiet: true }).exec();
+  // prettier-ignore
+  const redactedCommand = `echo '${JSON.stringify(redactedParts)}' | kubectl apply -f -`;
+  new CommandExecutor(copyCmd, { quiet: true, redactedCommand }).exec();
 }
 
 export function patchServiceAccountImagePullSecret(monorepoEnv: string) {