link: fix edge case where links are not tracked correctly with new

linking system
sst · Jul 17, 2024 · 64cd149 · 64cd149
1 parent a2083c2
commit 64cd149
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 13 deletions.
diff --git a/pkg/project/stack.go b/pkg/project/stack.go
@@ -852,16 +852,13 @@ func getCompletedEvent(ctx context.Context, stack auto.Stack) (*CompleteEvent, e
 		if hint, ok := outputs["_hint"].(string); ok {
 			complete.Hints[string(resource.URN)] = hint
 		}
-	}
 
-	outputs := decrypt(deployment.Resources[0].Outputs).(map[string]interface{})
-	linksOutput, ok := outputs["_links"]
-	if ok {
-		for key, value := range linksOutput.(map[string]interface{}) {
-			complete.Links[key] = value
+		if resource.Type == "sst:sst:LinkRef" && outputs["target"] != nil && outputs["properties"] != nil {
+			complete.Links[outputs["target"].(string)] = outputs["properties"].(map[string]interface{})
 		}
 	}
 
+	outputs := decrypt(deployment.Resources[0].Outputs).(map[string]interface{})
 	for key, value := range outputs {
 		if strings.HasPrefix(key, "_") {
 			continue

diff --git a/platform/src/auto/run.ts b/platform/src/auto/run.ts
@@ -34,7 +34,6 @@ export async function run(program: automation.PulumiFn) {
   });
   Link.reset();
   const outputs = (await program()) || {};
-  outputs._links = Link.list();
   return outputs;
 }
 

diff --git a/platform/src/components/link.ts b/platform/src/components/link.ts
@@ -1,11 +1,35 @@
-import { Input, Output, runtime, output, all } from "@pulumi/pulumi";
+import {
+  Input,
+  Output,
+  runtime,
+  output,
+  all,
+  ComponentResource,
+} from "@pulumi/pulumi";
 import { FunctionPermissionArgs } from "./aws/function.js";
 
 export module Link {
   export interface Definition {
     properties: Input<Record<string, any>>;
   }
 
+  class LinkRef extends ComponentResource {
+    constructor(target: string, properties: any) {
+      super(
+        "sst:sst:LinkRef",
+        target + "LinkRef",
+        {
+          properties,
+        },
+        {},
+      );
+      this.registerOutputs({
+        target: output(target),
+        properties: output(properties),
+      });
+    }
+  }
+
   let links: Record<string, Record<string, any>> = {};
   export function reset() {
     links = {};
@@ -18,12 +42,8 @@ export module Link {
           if (links[args.name]) {
             throw new Error(`Component name ${args.name} is not unique`);
           }
-
           const link = resource.getSSTLink();
-          links[args.name] = output(link.properties).apply((props) => ({
-            type: args.type.replaceAll(":", "."),
-            ...props,
-          }));
+          new LinkRef(args.name, link.properties);
         }
       });
       return {