fix: Don't ask "Do you want to enable disk encryption?" for configured environment (#307)

Author: adskyiproger

infrastructure/environments/setup-environment.ts

@@ -270,23 +270,57 @@ ALL_QUESTIONS.push(
 )
 
 ; (async () => {
+    log('\n', kleur.bold().underline('Github'), '\n')
+    const { githubOrganisation, githubRepository } = await prompts(
+      githubQuestions.map(questionToPrompt),
+      {
+        onCancel: () => {
+          process.exit(1)
+        }
+      }
+    )
 
-  const environment = await selectWithCustom(
-        {
-        message: 'Choose a name and purpose for the environment?',
-        choices: [
-          { name: 'Development', value: 'development' },
-          { name: 'Quality assurance (no PII data)', value: 'qa' },
-          {
-            name: 'Staging (hosts PII data, no backups)',
-            value: 'staging'
-          },
+    const { githubToken } = await promptAndStoreAnswer(
+      '',
+      githubTokenQuestion,
+      []
+    )
+
+    const octokit = new Octokit({
+      auth: githubToken
+    })
+    log(kleur.green('\nSuccessfully logged in to Github\n'))
+    let existingEnvironments = await getRepositoryEnvironments(octokit, githubOrganisation, githubRepository);
+
+    let defaultChoices = [
+            { name: 'Development', value: 'development' },
+            { name: 'Quality assurance (no PII data)', value: 'qa' },
+            {
+              name: 'Staging (hosts PII data, no backups)',
+              value: 'staging'
+            },
+            {
+              name: 'Production (hosts PII data, requires frequent backups)',
+              value: 'production'
+            },
+          ]
+    // Add only environments that are not already present
+    const choices = [
+      ...defaultChoices,
+      ...existingEnvironments
+        .filter(
+          (env) => !defaultChoices.some((choice) => choice.value === env)
+        )
+        .map((env) => ({
+          name: env,
+          value: env
+        }))
+    ];
+    const environment = await selectWithCustom(
           {
-            name: 'Production (hosts PII data, requires frequent backups)',
-            value: 'production'
-          },
-        ]
-      }
+          message: 'Choose a name and purpose for the environment?',
+          choices: choices
+        }
     )
     let environment_type = 'non-production'
     if (['development', 'qa'].includes(environment)) {
@@ -304,6 +338,9 @@ ALL_QUESTIONS.push(
           }
         )
     }
+    const environment_exists = existingEnvironments
+      .map((e) => e.trim())
+      .includes(environment);
     if (!environment) {
         process.exit(1)
       }
@@ -312,29 +349,6 @@ ALL_QUESTIONS.push(
       path: `${process.cwd()}/.env.${environment}`
     })
 
-    log('\n', kleur.bold().underline('Github'), '\n')
-
-    const { githubOrganisation, githubRepository } = await prompts(
-      githubQuestions.map(questionToPrompt),
-      {
-        onCancel: () => {
-          process.exit(1)
-        }
-      }
-    )
-
-    const { githubToken } = await promptAndStoreAnswer(
-      '',
-      githubTokenQuestion,
-      []
-    )
-
-    const octokit = new Octokit({
-      auth: githubToken
-    })
-
-    let existingEnvironments = await getRepositoryEnvironments(octokit, githubOrganisation, githubRepository);
-
     await createEnvironment(
       octokit,
       environment,
@@ -392,8 +406,6 @@ ALL_QUESTIONS.push(
         existingEnvironmentSecrets.length,
         'secrets'
       )
-    } else {
-      log(kleur.green('\nSuccessfully logged in to Github\n'))
     }
     if (environment_type === 'production') {
       log('\n', kleur.yellow().bold(
@@ -447,17 +459,16 @@ ALL_QUESTIONS.push(
       ssl_answers = await askQuestionWithEditor(staticSSLCertQuestions, existingEnvironmentSecrets)
     }
 
-    log('\n', kleur.bold().underline('Storage'))
+    log('\n', kleur.bold().underline('Storage'), '\n')
 
-    let enableEncryption = true
+    let enableEncryption = false
     const encryption_key_defined = findExistingValue(
       'ENCRYPTION_KEY',
       'SECRET',
       'ENVIRONMENT',
       existingValues
     )
-
-    if (!encryption_key_defined) {
+    if (!encryption_key_defined && !environment_exists) {
       const answers_enable_encryption = await prompts(
         [
           {
@@ -471,7 +482,7 @@ ALL_QUESTIONS.push(
       )
       enableEncryption = answers_enable_encryption.enableEncryption
     }
-    if (enableEncryption && !encryption_key_defined) {
+    if (enableEncryption && !encryption_key_defined && !environment_exists) {
       log(kleur.bold().green('✔'), kleur.bold().yellow(' Disk encryption is enabled'))
       await promptAndStoreAnswer(environment, diskQuestions, existingValues)
     } else {
@@ -481,7 +492,11 @@ ALL_QUESTIONS.push(
         'ENVIRONMENT',
         existingValues
       )
-      log(kleur.bold().green('✔'), kleur.bold().yellow('Variable DISK_SPACE is read-only variable:'), DISK_SPACE?.value)
+      if (!DISK_SPACE) {
+        log(kleur.bold().green('✔'), kleur.bold().grey('All available disk space at /data will be used'))
+      } else {
+        log(kleur.bold().green('✔'), kleur.bold().yellow('Variable DISK_SPACE is read-only variable:'), DISK_SPACE?.value)
+      }
     }
 
     // Backup and restore configuration