support imported edges (#960)

Author: jhsinger-klotho

pkg/engine/operational_eval/vertex_path_expand.go

@@ -47,6 +47,20 @@ func (v *pathExpandVertex) Key() Key {
 }
 
 func (v *pathExpandVertex) Evaluate(eval *Evaluator) error {
+	// if both the source and target are imported resources we can skip the evaluation since its just for context
+	// we will ensure the edge remains
+	sourceRes, err := eval.Solution.RawView().Vertex(v.SatisfactionEdge.Source)
+	if err != nil {
+		return fmt.Errorf("could not find source resource %s: %w", v.SatisfactionEdge.Source, err)
+	}
+	targetRes, err := eval.Solution.RawView().Vertex(v.SatisfactionEdge.Target)
+	if err != nil {
+		return fmt.Errorf("could not find target resource %s: %w", v.SatisfactionEdge.Target, err)
+	}
+	if sourceRes.Imported && targetRes.Imported {
+		return eval.Solution.RawView().AddEdge(v.SatisfactionEdge.Source, v.SatisfactionEdge.Target)
+	}
+
 	runner := &pathExpandVertexRunner{Eval: eval}
 	edgeExpander := &path_selection.EdgeExpand{Ctx: eval.Solution}
 	return v.runEvaluation(eval, runner, edgeExpander)

pkg/engine/solution_context.go

@@ -101,6 +101,20 @@ func (ctx solutionContext) LoadGraph(graph construct.Graph) error {
 	}
 	for _, edge := range edges {
 		edgeTemplate := ctx.KB.GetEdgeTemplate(edge.Source, edge.Target)
+		src, err := graph.Vertex(edge.Source)
+		if err != nil {
+			return err
+		}
+		dst, err := graph.Vertex(edge.Target)
+		if err != nil {
+			return err
+		}
+		if src.Imported && dst.Imported {
+			if err := raw.AddEdge(edge.Source, edge.Target); err != nil {
+				return err
+			}
+			continue
+		}
 		if edgeTemplate == nil {
 			return fmt.Errorf("edge template %s -> %s not found", edge.Source, edge.Target)
 		}

pkg/engine/solution_context/view_raw.go

@@ -101,6 +101,21 @@ func (view RawAccessView) RemoveVertex(hash construct.ResourceId) error {
 func (view RawAccessView) AddEdge(source, target construct.ResourceId, options ...func(*graph.EdgeProperties)) error {
 	dfErr := view.inner.DataflowGraph().AddEdge(source, target, options...)
 
+	// check to see if both resources are imported and if so allow the edge
+	src, err := view.inner.DataflowGraph().Vertex(source)
+	if err != nil {
+		return err
+	}
+	dst, err := view.inner.DataflowGraph().Vertex(target)
+	if err != nil {
+		return err
+	}
+	if src.Imported && dst.Imported {
+		// don't need to add it to the deployment graph - if both resources are imported, then
+		// they don't need each other since neither are technically being deployed.
+		return nil
+	}
+
 	var deplErr error
 	et := view.inner.KnowledgeBase().GetEdgeTemplate(source, target)
 	srcRt, terr := view.inner.KnowledgeBase().GetResourceTemplate(source)
@@ -122,7 +137,6 @@ func (view RawAccessView) AddEdge(source, target construct.ResourceId, options .
 		}
 	}
 
-	var err error
 	if dfErr != nil && !errors.Is(dfErr, graph.ErrEdgeAlreadyExists) {
 		err = errors.Join(err, dfErr)
 	}

pkg/infra/iac/templates/aws/cloudfront_distribution/factory.ts

@@ -47,7 +47,12 @@ function create(args: Args): aws.cloudfront.Distribution {
     })
 }
 
-function properties(object: ReturnType<typeof create>, args: Args) {}
+function properties(object: ReturnType<typeof create>, args: Args) {
+    return {
+        DomainName: object.domainName,
+        URLBase: pulumi.interpolate`https://${object.domainName}`,
+    }
+}
 
 function infraExports(
     object: ReturnType<typeof create>,

pkg/infra/iac/templates/aws/ecs_service/factory.ts

@@ -16,6 +16,7 @@ interface Args {
     Subnets: aws.ec2.Subnet[]
     TaskDefinition: aws.ecs.TaskDefinition
     Name: string
+    HealthCheckGracePeriodSeconds: number
     LoadBalancers: TemplateWrapper<any[]>
     dependsOn?: pulumi.Input<pulumi.Input<pulumi.Resource>[]> | pulumi.Input<pulumi.Resource>
     ServiceRegistries: pulumi.Input<awsInputs.ecs.ServiceServiceRegistries>
@@ -39,6 +40,9 @@ function create(args: Args): aws.ecs.Service {
             //TMPL {{- if .EnableExecuteCommand }}
             enableExecuteCommand: args.EnableExecuteCommand,
             //TMPL {{- end }}
+            //TMPL {{- if .HealthCheckGracePeriodSeconds }}
+            healthCheckGracePeriodSeconds: args.HealthCheckGracePeriodSeconds,
+            //TMPL {{- end }}
             forceNewDeployment: args.ForceNewDeployment,
             //TMPL {{- if .LoadBalancers }}
             loadBalancers: args.LoadBalancers,

pkg/infra/iac/templates/aws/memorydb_cluster/factory.ts

@@ -99,5 +99,11 @@ function properties(object: aws.memorydb.Cluster, args: Args) {
             }
             return endpointStrings.join(',')
         })}`,
+        PrimaryAddress: pulumi.interpolate`${object.clusterEndpoints.apply(
+            (endpoint) => endpoint[0].address
+        )}`,
+        PrimaryPort: pulumi.interpolate`${object.clusterEndpoints.apply(
+            (endpoint) => endpoint[0].port
+        )}`,
     }
 }

pkg/templates/aws/resources/cloudfront_distribution.yaml

@@ -187,6 +187,18 @@ properties:
     type: string
   aws:tags:
     type: model
+  DomainName:
+    type: string
+    description: |
+      The domain name of the distribution. For example: d111111abcdef8.cloudfront.net.
+    deploy_time: true
+    configuration_disabled: true
+  URLBase:
+    type: string
+    description: |
+      The base URL for the distribution. For example: https://d111111abcdef8.cloudfront.net.
+    deploy_time: true
+    configuration_disabled: true
 
 path_satisfaction:
   as_source:

pkg/templates/aws/resources/ecs_service.yaml

@@ -31,6 +31,9 @@ properties:
     type: bool
     default_value: false
     description: Whether to enable Amazon ECS Exec for the service. See https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-exec.html
+  HealthCheckGracePeriodSeconds:
+    type: int
+    description: Seconds to ignore failing load balancer health checks on newly instantiated tasks to prevent premature shutdown, up to 2147483647. Only valid for services configured to use load balancers.
   ForceNewDeployment:
     type: bool
     default_value: true
@@ -77,7 +80,6 @@ properties:
         resources:
           - aws:ecs_task_definition:{{ .Self.Name }}
         unique: true
-
     description: The family and revision (family:revision) or full Amazon Resource
       Name (ARN) of the task definition to run in the service
   ServiceRegistries:

pkg/templates/aws/resources/memorydb_cluster.yaml

@@ -107,6 +107,16 @@ properties:
     description: The endpoints of the cluster as a string.
     configuration_disabled: true
     deploy_time: true
+  PrimaryAddress:
+    type: string
+    description: The address of the primary node.
+    configuration_disabled: true
+    deploy_time: true
+  PrimaryPort:
+    type: int
+    description: The port number of the primary node.
+    configuration_disabled: true
+    deploy_time: true
 
 consumption:
   emitted: