Merge pull request #1121 from polyseam/configurator-updates

Configurator updates
polyseam · Feb 8, 2025 · 35193b9 · 35193b9
2 parents d1b3a4f + dd84340
commit 35193b9
Show file tree

Hide file tree

Showing 4 changed files with 112 additions and 79 deletions.
diff --git a/blocks/common/cluster/core-prompts.yaml b/blocks/common/cluster/core-prompts.yaml
@@ -81,13 +81,17 @@
   message: "Please enter your Git Repo URL:"
   type: Input
   default: ""
+  validators:
+    - url
 
 - name: cert_manager_email
   message: >-
     What email address should be used for Let's Encrypt certificate
     registration?
   type: Input
   default: [email protected]
+  validators:
+    - email
 
 - name: enable_external_dns
   message: >-

diff --git a/deno.json b/deno.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.27.3",
+  "version": "2.27.4",
   "deno_version": "2.1.7",
   "tasks": {
     "tar-win-amd64": "tar -czvf dist/release-archives/cndi-win-amd64.tar.gz -C dist/win-amd64/in .",

diff --git a/src/commands/create.ts b/src/commands/create.ts
@@ -69,6 +69,11 @@ type EchoCreateOptions = {
   skipPush?: boolean;
 };
 
+const DEFAULT_RESPONSES_FILE_PATH = path.join(
+  Deno.cwd(),
+  "cndi_responses.yaml",
+);
+
 const echoCreate = (options: EchoCreateOptions, slug?: string) => {
   const cndiCreate = "cndi create";
   const cndiCreateSlug = slug ? ` ${slug}` : "";
@@ -84,8 +89,12 @@ const echoCreate = (options: EchoCreateOptions, slug?: string) => {
     ? ` --deployment-target-label ${options.deploymentTargetLabel}`
     : "";
   const cndiCreateSkipPush = options.skipPush ? " --skip-push" : "";
+  const cndiCreateResponsesFile =
+    options.responsesFile === DEFAULT_RESPONSES_FILE_PATH
+      ? ""
+      : ` --responses-file ${options.responsesFile}`;
   console.log(
-    `${cndiCreate}${cndiCreateSlug}${cndiCreateInteractive}${cndiCreateTemplate}${cndiCreateOutput}${cndiCreateDeploymentTargetLabel}${cndiCreateSet}${cndiCreateSkipPush}\n`,
+    `${cndiCreate}${cndiCreateSlug}${cndiCreateInteractive}${cndiCreateTemplate}${cndiCreateDeploymentTargetLabel}${cndiCreateResponsesFile}${cndiCreateOutput}${cndiCreateSet}${cndiCreateSkipPush}\n`,
   );
 };
 
@@ -108,7 +117,7 @@ const createCommand = new Command()
     "-r, --responses-file <responses_file:string>",
     "Path to YAML 'responses file' to supply to Template prompts.",
     {
-      default: path.join(Deno.cwd(), "cndi_responses.yaml"),
+      default: DEFAULT_RESPONSES_FILE_PATH,
     },
   )
   .option("--skip-push", "Skip pushing to remote repository")
@@ -145,6 +154,101 @@ const createCommand = new Command()
     let template: string | undefined = options?.template;
     let overrides: Record<string, CNDITemplatePromptResponsePrimitive> = {};
 
+    // load responses from file
+    let responsesFileText = "";
+
+    try {
+      console.log("options.responsesFile", options.responsesFile);
+      responsesFileText = await Deno.readTextFile(options.responsesFile);
+    } catch (errLoadingResponsesFile) {
+      if (errLoadingResponsesFile instanceof Deno.errors.NotFound) {
+        // no responses file found, continue with defaults
+      } else {
+        console.error(
+          label,
+          ccolors.error("Error loading"),
+          ccolors.key_name(options.responsesFile),
+          ccolors.error("as responses file"),
+        );
+        ccolors.caught(errLoadingResponsesFile as Error, 1502);
+        console.log(
+          ccolors.warn(
+            "⚠️ continuing with defaults in spite of unexpected error",
+          ),
+        );
+      }
+    }
+
+    const responses: Record<string, CNDITemplatePromptResponsePrimitive> = {};
+
+    if (responsesFileText) {
+      try {
+        const parsed = YAML.parse(responsesFileText) as Record<
+          string,
+          CNDITemplatePromptResponsePrimitive
+        >;
+        for (const [key, value] of Object.entries(parsed)) {
+          if (typeof value === "string") {
+            responses[key] = value;
+          }
+        }
+      } catch (errorParsingResponses) {
+        const err = new ErrOut(
+          [
+            ccolors.error("Error parsing"),
+            ccolors.key_name(options.responsesFile),
+            ccolors.error("as responses file"),
+          ],
+          {
+            label,
+            code: 1503,
+            id: "create/!isValidYAML(responsesFile)",
+            cause: errorParsingResponses as Error,
+          },
+        );
+        await err.out();
+        return;
+      }
+
+      const responseCount = Object.keys(responses).length;
+
+      if (responseCount) {
+        console.log();
+        console.log(
+          ccolors.key_name("cndi"),
+          "is pulling",
+          ccolors.success(responseCount.toString()),
+          "responses from",
+          ccolors.success(options.responsesFile) +
+            "!",
+        );
+        console.log();
+        overrides = responses as Record<
+          string,
+          CNDITemplatePromptResponsePrimitive
+        >;
+      }
+    }
+
+    if (options.set) {
+      for (const set of options.set) {
+        const [key, value] = set.split("=");
+        overrides[key] = value;
+      }
+    }
+
+    if (typeof overrides?.git_repo === "string" && !slug) {
+      try {
+        slug = new URL(overrides.git_repo as string).pathname.slice(1);
+      } catch (_error) {
+        console.log(
+          ccolors.warn("Failed to parse"),
+          ccolors.key_name("git_repo"),
+          ccolors.warn("response as URL!"),
+        );
+      }
+    }
+
     if (!slug) {
       if (interactive) {
         slug = await PromptTypes.Input.prompt({
@@ -222,81 +326,6 @@ const createCommand = new Command()
       return;
     }
 
-    // load responses from file
-    let responsesFileText = "";
-
-    try {
-      responsesFileText = await Deno.readTextFile(options.responsesFile);
-    } catch (errLoadingResponsesFile) {
-      if (errLoadingResponsesFile instanceof Deno.errors.NotFound) {
-        // no responses file found, continue with defaults
-      } else {
-        console.error(
-          label,
-          ccolors.error("Error loading"),
-          ccolors.key_name(options.responsesFile),
-          ccolors.error("as responses file"),
-        );
-        ccolors.caught(errLoadingResponsesFile as Error, 1502);
-        console.log(
-          ccolors.warn(
-            "⚠️ continuing with defaults in spite of unexpected error",
-          ),
-        );
-      }
-    }
-
-    let responses: Record<string, CNDITemplatePromptResponsePrimitive> = {};
-
-    try {
-      responses = YAML.parse(responsesFileText) as Record<
-        string,
-        CNDITemplatePromptResponsePrimitive
-      >;
-    } catch (errorParsingResponses) {
-      const err = new ErrOut(
-        [
-          ccolors.error("Error parsing"),
-          ccolors.key_name(options.responsesFile),
-          ccolors.error("as responses file"),
-        ],
-        {
-          label,
-          code: 1503,
-          id: "create/!isValidYAML(responsesFile)",
-          cause: errorParsingResponses as Error,
-        },
-      );
-      await err.out();
-      return;
-    }
-
-    const responseCount = Object.keys(responses).length;
-
-    if (responseCount) {
-      console.log();
-      console.log(
-        ccolors.key_name("cndi"),
-        "is pulling",
-        ccolors.success(responseCount.toString()),
-        "responses from",
-        ccolors.success(options.responsesFile) +
-          "!",
-      );
-      console.log();
-      overrides = responses as Record<
-        string,
-        CNDITemplatePromptResponsePrimitive
-      >;
-    }
-
-    if (options.set) {
-      for (const set of options.set) {
-        const [key, value] = set.split("=");
-        overrides[key] = value;
-      }
-    }
-
     if (options.deploymentTargetLabel) {
       const slug = options.deploymentTargetLabel.split("/");
 

diff --git a/templates/redis.yaml b/templates/redis.yaml
@@ -52,7 +52,7 @@ prompts:
 
   - name: default_redis_password
     message: "Please enter Redis default user password"
-    default: password
+    default: "{{ $cndi.get_random_string(32) }}"
     type: Secret
 
   - name: cluster_size