fix(cli-plugin-deploy-pulumi): update config resolution logic

webiny · Apr 30, 2024 · ced7982 · ced7982
1 parent cdc9bea
commit ced7982
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 9 deletions.
diff --git a/packages/cli-plugin-deploy-pulumi/commands/watch/WebinyConfigFile.js b/packages/cli-plugin-deploy-pulumi/commands/watch/WebinyConfigFile.js
@@ -0,0 +1,40 @@
+const fs = require("fs");
+const path = require("path");
+
+class LocalFile {
+    constructor(filePath) {
+        this.filePath = filePath;
+    }
+
+    exists() {
+        return fs.existsSync(this.filePath);
+    }
+
+    getAbsolutePath() {
+        return this.filePath;
+    }
+}
+
+class WebinyConfigFile {
+    constructor(root) {
+        this.potentialConfigs = [
+            new LocalFile(path.join(root, "webiny.config.ts")),
+            new LocalFile(path.join(root, "webiny.config.js"))
+        ];
+    }
+
+    static forWorkspace(workspace) {
+        return new WebinyConfigFile(path.resolve(workspace));
+    }
+
+    getAbsolutePath() {
+        const file = this.potentialConfigs.find(file => file.exists());
+        if (!file) {
+            return undefined;
+        }
+
+        return file.getAbsolutePath();
+    }
+}
+
+module.exports = { WebinyConfigFile };
diff --git a/packages/cli-plugin-deploy-pulumi/commands/watch/listPackages.js b/packages/cli-plugin-deploy-pulumi/commands/watch/listPackages.js
@@ -1,6 +1,5 @@
 const execa = require("execa");
-const fs = require("fs");
-const path = require("path");
+const { WebinyConfigFile } = require("./WebinyConfigFile");
 
 const listPackages = async ({ inputs }) => {
     let packagesList = [];
@@ -41,9 +40,11 @@ const listPackages = async ({ inputs }) => {
         const packages = [];
         for (const packageName in result) {
             const root = result[packageName];
-            const configPath = fs.existsSync(path.join(root, "webiny.config.ts"))
-                ? path.join(root, "webiny.config.ts")
-                : path.join(root, "webiny.config.js");
+            const configPath = WebinyConfigFile.forWorkspace(root).getAbsolutePath();
+
+            if (!configPath) {
+                continue;
+            }
 
             packages.push({
                 name: packageName,

diff --git a/packages/cli-plugin-deploy-pulumi/commands/watch/watchPackages.js b/packages/cli-plugin-deploy-pulumi/commands/watch/watchPackages.js
@@ -1,9 +1,9 @@
 const path = require("path");
-const fs = require("fs");
 const { Worker } = require("worker_threads");
 const chalk = require("chalk");
 const execa = require("execa");
 const { getRandomColorForString } = require("../../utils");
+const { WebinyConfigFile } = require("./WebinyConfigFile");
 
 const parseMessage = message => {
     try {
@@ -135,9 +135,11 @@ const getPackages = async ({ inputs, context, output }) => {
         const packages = [];
         for (const packageName in result) {
             const root = result[packageName];
-            const configPath = fs.existsSync(path.join(root, "webiny.config.ts"))
-                ? path.join(root, "webiny.config.ts")
-                : path.join(root, "webiny.config.js");
+            const configPath = WebinyConfigFile.forWorkspace(root).getAbsolutePath();
+
+            if (!configPath) {
+                continue;
+            }
 
             try {
                 packages.push({