Bug fixes:

1. Made dependencies specified in plugins as soft dependencies
2. Fixed stderr bug on plugin-process. Stderr does not mean error.
3. Fixed in-degree bug on topological sort

Author: kevinwang5658

src/entities/project.ts

@@ -32,8 +32,14 @@ export class Project {
     const resourceMap = new Map(this.resourceConfigs.map((r) => [r.id, r] as const));
 
     this.resourceConfigs.forEach((r) => {
-      r.parseDependenciesFromParameters((id) => resourceMap.has(id));
-      r.addDependencies(dependencyMap.get(r.id) ?? []);
+      // User specified dependencies are hard dependencies. They must be present.
+      r.addDependenciesBasedOnParameters((id) => resourceMap.has(id));
+
+      // Plugin dependencies are soft dependencies. They only activate if the dependent resource is present.
+      r.addDependencies(dependencyMap.get(r.id)
+          ?.filter((id) => resourceMap.has(id))
+        ?? []
+      );
     })
   }
 

src/entities/resource-config.ts

@@ -60,7 +60,7 @@ export class ResourceConfig implements ConfigBlock {
     return this.name === null || this.name === undefined ? this.type : `${this.type}.${this.name}`;
   }
 
-  parseDependenciesFromParameters(resourceExists: (id: string) => boolean) {
+  addDependenciesBasedOnParameters(resourceExists: (id: string) => boolean) {
     // TODO: Only string dependencies are supported currently
     const parametersWithDependencies = Object.entries(this.parameters)
       .filter(([, v]) => typeof v === 'string')

src/plugins/plugin-collection.ts

@@ -54,7 +54,6 @@ export class PluginCollection {
 
       const planResult = await this.plugins.get(pluginName)!.plan(config);
 
-
       result.push(planResult);
     }
 

src/plugins/plugin-process.ts

@@ -45,7 +45,6 @@ export class PluginProcess {
       const handler = new SendMessageForResultHandler(message, this.process, resolve, reject);
 
       this.process.on('message', handler.messageListener);
-      this.process.stderr!.on('data', handler.reject);
       this.process.send(message);
     });
   }
@@ -94,7 +93,6 @@ class SendMessageForResultHandler {
     }
 
     this.process.removeListener('message', this.messageListener);
-    this.process.stderr!.removeListener('data', this.reject);
     this.promiseReject(err);
   }
 
@@ -104,12 +102,11 @@ class SendMessageForResultHandler {
     }
 
     this.process.removeListener('message', this.messageListener);
-    this.process.stderr!.removeListener('data', this.reject);
     this.promiseResolve(value);
   }
 
   private setResultTimeout = (timeout: number) => setTimeout(() => {
-    this.reject(new Error(`Plugin did not respond in 10s to call: ${this.messageToSend.cmd}`))
+    this.reject(new Error(`Plugin did not respond in 10 minutes to call: ${this.messageToSend.cmd}`))
   }, timeout);
 
   private validateIpcMessage(response: unknown): response is IpcMessage {

src/utils/dependency-graph-resolver.ts

@@ -45,86 +45,16 @@ export class DependencyGraphResolver {
       }
 
       node.dependencies.forEach((parentNode) => {
-        if (--parentNode.indegree) {
+        if (--parentNode.indegree === 0) {
           queue.push(parentNode);
         }
       });
       result.push(node);
     }
 
-    // const { resourceConfigs } = project;
-    // const resourceMap = new Map<string, ResourceConfig>(
-    //   resourceConfigs.map((r) => [r.id, r] as const)
-    // );
-    //
-    // const resourceReferenceRegex = /\${([\w.]+)}/g
-    //
-    // // TODO: Support named resources in the future
-    //
-    // for (const config of resourceConfigs) {
-    //   const referenceParameters = findParametersWithReferences(new Map(Object.entries(config.parameters)))
-    //
-    //   for (const [name, match] of referenceParameters) {
-    //     const parts = match.split('.');
-    //     if (parts.length < 2) {
-    //       throw new Error(`Only resource parameter references are allowed. ${match}`);
-    //     }
-    //
-    //     const referencedId = findId(parts);
-    //     if (!referencedId) {
-    //       throw new Error(`Unable to find resource being referenced. ${match}`);
-    //     }
-    //
-    //     const referencedResource = resourceMap.get(referencedId)
-    //     if (!referencedResource) {
-    //       throw new Error(`Unable to find resource being referenced. ${match}`);
-    //     }
-    //
-    //     const referencedParameterName = findParameterName(parts, referencedId);
-    //     const referencedParameter = referencedResource.parameters.get(referencedParameterName);
-    //     if (!referencedParameter) {
-    //       throw new Error(`Un-able to find parameter being referenced. ${match}`);
-    //     }
-    //
-    //     // TODO: Add recursive check for parameters of type parameter
-    //
-    //     config.dependencies.push(referencedResource);
-    //
-    //     // Substitute with actual value
-    //     config.parameters.set(name,
-    //       String(config.parameters.get(name)).replace(`\${${match}}`, String(referencedParameter))
-    //     );
-    //   }
-
     return result.map((n) => n.val);
   }
 
-  // function findParametersWithReferences(parameters: Record<string, unknown>) {
-  //   return [...parameters.entries()]
-  //     .map(([name, value]) => [name, String(value), String(value).matchAll(resourceReferenceRegex)] as const)
-  //     .filter(([, _, match]) => match)
-  //     .flatMap(([name, _, matches]) =>
-  //       [...matches].map(match => [name, match[1]] as const)
-  //     );
-  // }
-  //
-  // function findId(parts: string[]): null | string {
-  //   if (applyableGraph.has(parts[0])) {
-  //     return parts[0];
-  //   }
-  //
-  //   if (applyableGraph.has(parts[0] + '.' + parts[1])) {
-  //     return parts[0] + '.' + parts[1];
-  //   }
-  //
-  //   return null;
-  // }
-  //
-  // function findParameterName(parts: string[], id: string): string {
-  //   return id.split('.').length === 1 ? parts[1] : parts[2];
-  // }
-  // };
-
   private static populateNodeDependencies<T>(nodeMap: Map<string, Node<T>>, getDependencyIds: (t: T) => string[]) {
     [...nodeMap.values()].forEach((n) => {
       const dependencies = getDependencyIds(n.val)