fix(do/swarm): fix do-swarm generator

dzangolab · Feb 13, 2025 · f876f60 · f876f60
1 parent c4716e2
commit f876f60
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 30 deletions.
diff --git a/generators/app/index.js b/generators/app/index.js
@@ -64,10 +64,6 @@ export default class IaCGenerator extends Generator {
 
       {
         choices: [
-          {
-            name: "DigitalOcean swarm",
-            value: "do-swarm"
-          },
           {
             name: "Ansible for DigitalOcean swarm",
             value: "ansible-do"
@@ -171,6 +167,10 @@ export default class IaCGenerator extends Generator {
             name: "DigitalOcean SSH keys",
             value: "do-ssh-keys"
           },
+          {
+            name: "DigitalOcean swarm",
+            value: "do-swarm"
+          },
           { type: "separator" },
           {
             name: "Pulumi S3 Backend",

diff --git a/generators/aws-resources/index.js b/generators/aws-resources/index.js
@@ -12,7 +12,13 @@ export default class AWSResourcesGenerator extends PulumiGenerator {
     this.option("environment", {
       type: String,
       default: "staging",
-      desc: "environment."
+      desc: "environment"
+    });
+
+    this.option("projectName", {
+      default: this._getDefaultProjectName(),
+      desc: "Pulumi project name",
+      type: String,
     });
   }
 

diff --git a/generators/do-swarm/index.js b/generators/do-swarm/index.js
@@ -1,20 +1,21 @@
 import chalk from "chalk";
 
-import Generator from "yeoman-generator";
+import PulumiGenerator from "../pulumi/index.js";
 
-export default class DigitalOceanDockerSwarmGenerator extends Generator {
+export default class DigitalOceanDockerSwarmGenerator extends PulumiGenerator {
   constructor(args, opts) {
     super(args, opts);
 
     this.displayName = "DigitalOcean swarm";
     this.name = "do-swarm";
     this.resourcesList = [
       "aws-credentials",
-      "aws-resources",
-      "do-resources",
-      "do-swarm-leader",
-      "cloudflare-dns",
-      "ansible-do"
+      // "aws-resources",
+      // "do-resources",
+      // "do-nfs-server",
+      // "do-swarm-leader",
+      // "cloudflare-dns",
+      // "ansible-do"
     ];
   }
 
@@ -28,7 +29,7 @@ export default class DigitalOceanDockerSwarmGenerator extends Generator {
       },
       {
         default: "sgp1",
-        message: "Enter the name of the do-resrouces and do-swarm-leader DigitalOcean region",
+        message: "In what region should the resources be provisioned?",
         name: "region",
         type: "input",
       },
@@ -39,19 +40,16 @@ export default class DigitalOceanDockerSwarmGenerator extends Generator {
         type: "input",
       },
       {
-        default: "USERNAME",
         message: "Enter the username for the user of the swarm-leader and ansible",
         name: "username",
         type: "input",
       },
       {
-        default: "DOMAIN",
         message: "Enter the domain name for cloudflare-dns and ansible",
         name: "domain",
         type: "input",
       },
       {
-        default: "",
         message: "Enter the traefik ACME email for ansible",
         name: "email",
         type: "input",
@@ -65,17 +63,22 @@ export default class DigitalOceanDockerSwarmGenerator extends Generator {
 
     // Define specific properties for each generator
     const generatorsProps = {
+      "aws-resources": {
+        ...this.options,
+        ...this.props,
+        projectName: `${this.options.prefix}-aws-resources`,
+      },
       "aws-credentials": {
         environment: this.props.environment,
         timestamp: this.props.nameSuffix,
       },
-      "aws-resources": {
-        environment: this.props.environment,
-      },
       "do-resources": {
         environment: this.props.environment,
         nameSuffix: this.props.nameSuffix,
         region: this.props.region,
+      },
+      "do-nfs-server": {
+
       },
       "do-swarm-leader": {
         environment: this.props.environment,

diff --git a/generators/pulumi/index.js b/generators/pulumi/index.js
@@ -7,6 +7,17 @@ class PulumiGenerator extends Generator {
   constructor(args, opts) {
     super(args, opts);
 
+    this.option("createStackConfig", {
+      type: Boolean,
+      defaults: true,
+      desc: "Whether to generate the stack config."
+    });
+
+    this.option("environment", {
+      type: String,
+      desc: "Environment (stack)."
+    });
+
     this.option("prefix", {
       type: String,
       required: false,
@@ -19,17 +30,6 @@ class PulumiGenerator extends Generator {
       defaults: false,
       desc: "Whether to use the prefix in the project folder name."
     });
-
-    this.option("environment", {
-      type: String,
-      desc: "Environment (stack)."
-    });
-
-    this.option("createStackConfig", {
-      type: Boolean,
-      defaults: true,
-      desc: "Whether to generate the stack config."
-    });
   }
 
   async prompting() {