deploy-stack 0.9.2 → 0.9.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deploy-stack",
-  "version": "0.9.2",
+  "version": "0.9.4",
   "description": "Provision production-ready AWS infrastructure and CI/CD pipelines in seconds.",
   "type": "module",
   "bin": {

package/src/commands/init.js

@@ -27,25 +27,13 @@ export async function mainStack() {
     // 1. Start the CLI
     intro(color.bgCyan(color.black(' deploy-stack ☁️  ')));
 
-    // 2. Ask the user for project configuration
-    const setupType = await select({
-        message: 'Choose your setup mode:',
-        options: [
-            { value: 'quick', label: '⚡ Quickstart (Recommended)', hint: 'Production defaults, minimal prompts' },
-            { value: 'advanced', label: '🛠️  Advanced Configuration', hint: 'Customize health checks, task count, branch, etc.' },
-        ],
-    });
-
-    if (typeof setupType === 'symbol') {
-        cancel('Operation cancelled.');
-        process.exit(0);
-    }
-
+    // 2. Ask for the target directory FIRST
     const projectName = await text({
-        message: 'What is the name of your project? (Type "." to use current directory)',
-        placeholder: 'my-web-app',
+        message: 'Where should we generate the infrastructure? (Type "." for current directory)',
+        placeholder: '.',
+        initialValue: '.',
         validate: (value) => {
-            if (!value) return 'Please enter a name.';
+            if (!value) return 'Please enter a name or directory.';
             if (value !== '.' && value.includes(' ')) return 'Name cannot contain spaces.';
         },
     });
@@ -88,7 +76,32 @@ export async function mainStack() {
         }
     }
 
-    // 2.7 Set intelligent defaults
+    // --- DJANGO SPECIFIC PROMPT ---
+    let djangoWsgi = 'core.wsgi';
+    if (finalFramework === 'django') {
+        djangoWsgi = await text({
+            message: 'What is the Python module path to your Django wsgi.py?',
+            placeholder: 'core.wsgi',
+            initialValue: 'core.wsgi',
+        });
+        if (typeof djangoWsgi === 'symbol') process.exit(0);
+    }
+
+    // 3. Prompt for Setup Mode
+    const setupType = await select({
+        message: 'Choose your setup mode:',
+        options: [
+            { value: 'quick', label: '⚡ Quickstart (Recommended)', hint: 'Production defaults, minimal prompts' },
+            { value: 'advanced', label: '🛠️  Advanced Configuration', hint: 'Customize health checks, task count, branch, etc.' },
+        ],
+    });
+
+    if (typeof setupType === 'symbol') {
+        cancel('Operation cancelled.');
+        process.exit(0);
+    }
+
+    // 4. Set intelligent defaults & check current Git branch
     let defaultPort = '3000';
 
     if (finalFramework === 'static') defaultPort = '8080';
@@ -96,7 +109,6 @@ export async function mainStack() {
     if (finalFramework === 'rails') defaultPort = '3000';
     if (finalFramework === 'go') defaultPort = '8080';
 
-    // 2.8 Check current Git branch
     let currentGitBranch = 'main';
     try {
         currentGitBranch = execSync('git symbolic-ref --short HEAD', { cwd: targetDir, stdio: 'pipe' }).toString().trim();
@@ -104,7 +116,7 @@ export async function mainStack() {
         // Not a git repo yet, fallback to 'main'
     }
 
-    // 2.9 Ask for Managed Database (Only for Backend/Fullstack Frameworks)
+    // 5. Ask for Managed Database (Only for Backend/Fullstack Frameworks)
     let needsDatabase = false;
     const isBackendFramework = ['node', 'nextjs', 'nuxt', 'python', 'django', 'rails', 'go'].includes(finalFramework);
 
@@ -121,7 +133,7 @@ export async function mainStack() {
         needsDatabase = dbChoice;
     }
 
-    // 3. Prompt Configuration Group
+    // 6. Prompt Configuration Group
     const project = await group(
         {
             region: () =>
@@ -186,7 +198,7 @@ export async function mainStack() {
         }
     );
 
-    // 4. Map the user's choices and update the variables
+    // 7. Map the user's choices and update the variables
     const cpu = project.size === 'small' ? '512' : '256';
     const memory = project.size === 'small' ? '1024' : '512';
 
@@ -202,7 +214,7 @@ export async function mainStack() {
     const deployBranch = project.branch || currentGitBranch;
     const buildDir = detectedFramework?.buildDir || 'dist';
 
-    // 4.5. The Pre-Flight Cost Estimator
+    // 7.5. The Pre-Flight Cost Estimator
     // We explicitly ask for financial consent to eliminate AWS billing anxiety.
     console.log(''); // Add a blank line for visual pacing
     const costConsent = await confirm({
@@ -215,13 +227,13 @@ export async function mainStack() {
         process.exit(0);
     }
 
-    // 5. Safely handle existing files (Backup and auto-prune)
+    // 8. Safely handle existing files (Backup and auto-prune)
     await handleExistingFiles(targetDir);
 
     const s = spinner();
     s.start('Provisioning infrastructure...');
 
-    // 6. Provision S3 bucket for Terraform state & enable versioning
+    // 9. Provision S3 bucket for Terraform state & enable versioning
     let awsAccountId, stateBucketName;
     try {
         const bucketData = await provisionStateBucket(project.region, actualProjectName);
@@ -237,7 +249,7 @@ export async function mainStack() {
 
     s.message('Synthesizing Terraform templates...');
 
-    // 7. Generate all templates and directories
+    // 10. Generate all templates and directories
     await generateTemplates(targetDir, {
         PROJECT_NAME: actualProjectName,
         REGION: project.region,
@@ -253,10 +265,11 @@ export async function mainStack() {
         DEPLOY_BRANCH: deployBranch,
         BUILD_DIR: buildDir,
         finalFramework: finalFramework,
-        NEEDS_DATABASE: needsDatabase
+        NEEDS_DATABASE: needsDatabase,
+        DJANGO_WSGI: djangoWsgi
     });
 
-    // 8. Track the event in telemetry
+    // 11. Track the event in telemetry
     trackEvent('project_provisioned', {
         projectName: actualProjectName,
         framework: finalFramework,
@@ -270,7 +283,7 @@ export async function mainStack() {
 
     s.stop('Infrastructure provisioned successfully!');
 
-    // 9. Provide the Outro, Framework Warnings and Next Steps
+    // 12. Provide the Outro, Framework Warnings and Next Steps
     let frameworkWarnings = '';
     if (!(finalFramework === 'static' && detectedFramework?.buildDir)) {
         frameworkWarnings = getFrameworkWarning(finalFramework);
@@ -310,6 +323,6 @@ export async function mainStack() {
     ${color.underline('https://calendly.com/anton-codes-iac/15min')}
     `);
 
-    // 10.Ensure all analytics are sent before the CLI terminates
+    // 13.Ensure all analytics are sent before the CLI terminates
     await flushTelemetry();
 }

package/src/utils/generator.js

@@ -65,7 +65,7 @@ export async function generateTemplates(targetDir, config) {
     } else {
         const existingGitignore = await fs.readFile(targetGitignore, 'utf-8');
         if (!existingGitignore.includes('terraform/.terraform/')) {
-            const appendIgnore = '\n# Added by deploy-stack (Terraform)\nterraform/.terraform/\nterraform/*.tfstate\nterraform/*.tfstate.backup\nterraform/.terraform.lock.hcl\nterraform/secret_keys.json\nterraform/.terraform.*\n.env\n';
+            const appendIgnore = '\n# Added by deploy-stack (Terraform)\n**/.terraform/*\n**/*.tfstate\n**/*.tfstate.backup\n**/.terraform.lock.hcl\n**/secret_keys.json\n.env\n';
             await fs.appendFile(targetGitignore, appendIgnore);
         }
     }
@@ -74,12 +74,11 @@ export async function generateTemplates(targetDir, config) {
 function getGitignoreContent(framework) {
     const baseIgnore = `
 # Infrastructure (deploy-stack)
-terraform/.terraform/
-terraform/*.tfstate
-terraform/*.tfstate.backup
-terraform/.terraform.lock.hcl
-terraform/secret_keys.json
-terraform/.terraform.*
+**/.terraform/*
+**/*.tfstate
+**/*.tfstate.backup
+**/.terraform.lock.hcl
+**/secret_keys.json
 .env
 
 # OS

package/templates/docker/django.Dockerfile

@@ -8,6 +8,9 @@ RUN groupadd -g 1001 appgroup && \
     useradd -u 1001 -g appgroup -s /bin/sh -m appuser
 
 COPY requirements.txt .
+
+# Patch core python packaging tools to resolve CVEs
+RUN pip install --upgrade pip setuptools wheel jaraco.context
 RUN pip install --no-cache-dir -r requirements.txt gunicorn
 
 # Copy code with explicit ownership
@@ -16,4 +19,5 @@ COPY --chown=appuser:appgroup . .
 USER appuser
 EXPOSE {{PORT}}
 
-CMD ["gunicorn", "--bind", "0.0.0.0:{{PORT}}", "--workers", "3", "your_project.wsgi:application"]
+# Run Gunicorn using the dynamically injected WSGI module
+CMD ["gunicorn", "--bind", "0.0.0.0:{{PORT}}", "--workers", "3", "{{DJANGO_WSGI}}:application"]