Skip to content

Commit 8deae80

Browse files
authored
Tighten component dependency tests (#23353)
This PR extends the `l3-component-simple` conformance tests to require that dependencies flow through in-language component instantiations correctly. This testing gap was discovered when testing HCL, and the test shows the same gap is present in PCL. Existing production languages pass without modification.
1 parent e6a7bcc commit 8deae80

12 files changed

Lines changed: 105 additions & 28 deletions

File tree

  • pkg
  • sdk
    • go/pulumi-language-go/testdata/overrides/l3-component-simple
    • nodejs/cmd/pulumi-language-nodejs/testdata/published
      • bun/projects/l3-component-simple
      • tsc/projects/l3-component-simple
      • tsnode/projects/l3-component-simple
    • pcl/cmd/pulumi-language-pcl/testdata
      • eject-pcl/l3-component-simple
      • projects/l3-component-simple
      • round-tripped-project/l3-component-simple
    • python/cmd/pulumi-language-python/testdata/setuppy

‎pkg/pcl/runtime/interpreter.go‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1825,15 +1825,29 @@ func (i *Interpreter) registerComponent(ctx context.Context, component *pcl.Comp
18251825
}
18261826
marshalOpts.KeepOutputValues = true
18271827

1828+
dependencies := []string{}
1829+
propertyDependencies := map[string]*pulumirpc.RegisterResourceRequest_PropertyDependencies{}
1830+
for key, val := range inputs {
1831+
deps := getAllDependencies(val)
1832+
if len(deps) > 0 {
1833+
dependencies = append(dependencies, deps...)
1834+
propertyDependencies[string(key)] = &pulumirpc.RegisterResourceRequest_PropertyDependencies{
1835+
Urns: deps,
1836+
}
1837+
}
1838+
}
1839+
18281840
componentName := i.effectiveName(component.LogicalName())
18291841
request := &pulumirpc.RegisterResourceRequest{
1830-
Type: "components:index:" + component.DeclarationName(),
1831-
Name: componentName,
1832-
Custom: false,
1833-
Object: obj,
1834-
AcceptSecrets: true,
1835-
AcceptResources: true,
1836-
Parent: i.stackURN,
1842+
Type: "components:index:" + component.DeclarationName(),
1843+
Name: componentName,
1844+
Custom: false,
1845+
Object: obj,
1846+
PropertyDependencies: propertyDependencies,
1847+
Dependencies: dependencies,
1848+
AcceptSecrets: true,
1849+
AcceptResources: true,
1850+
Parent: i.stackURN,
18371851
}
18381852
if component.Options != nil && component.Options.Parent != nil {
18391853
parent, poison, diags := i.evalContext.Evaluate(component.Options.Parent)

‎pkg/testing/pulumi-test-language/tests/l3_component_simple.go‎

Lines changed: 37 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ func init() {
3636

3737
RequireStackResource(l, err, changes)
3838

39-
// Check we have the one simple resource in the snapshot, its provider, its parent component and the
40-
// stack.
41-
require.Len(l, snap.Resources, 4, "expected 4 resources in snapshot")
39+
// Check we have the two simple resources in the snapshot, their provider, the component
40+
// and the stack.
41+
require.Len(l, snap.Resources, 5, "expected 5 resources in snapshot")
4242

4343
stack := RequireSingleResource(l, snap.Resources, "pulumi:pulumi:Stack")
4444
assert.Empty(l, stack.Inputs, "expected stack to have no inputs")
@@ -57,15 +57,45 @@ func init() {
5757

5858
RequireSingleResource(l, snap.Resources, "pulumi:providers:simple")
5959

60-
simple := RequireSingleResource(l, snap.Resources, "simple:index:Resource")
61-
assert.Equal(l, "someComponent-res", simple.URN.Name())
62-
assert.Equal(l, component.URN, simple.Parent, "expected simple resource to have component as parent")
63-
60+
input := RequireSingleNamedResource(l, snap.Resources, "input")
61+
assert.Equal(l, "simple:index:Resource", input.Type.String())
6462
want = resource.NewPropertyMapFromMap(map[string]any{
6563
"value": true,
6664
})
65+
assert.Equal(l, want, input.Inputs, "expected input resource inputs to be %v", want)
66+
assert.Equal(l, input.Inputs, input.Outputs, "expected input resource inputs and outputs to match")
67+
68+
simple := RequireSingleNamedResource(l, snap.Resources, "someComponent-res")
69+
assert.Equal(l, "simple:index:Resource", simple.Type.String())
70+
assert.Equal(l, component.URN, simple.Parent, "expected simple resource to have component as parent")
6771
assert.Equal(l, want, simple.Inputs, "expected inputs to be %v", want)
6872
assert.Equal(l, simple.Inputs, simple.Outputs, "expected inputs and outputs to match")
73+
74+
// The top-level `input` resource has a literal value, so it has no dependencies.
75+
assert.Empty(l, input.Dependencies, "expected input resource to have no dependencies")
76+
for k, deps := range input.PropertyDependencies {
77+
assert.Empty(l, deps, "expected input resource property %q to have no dependencies", k)
78+
}
79+
80+
// The component's `input` argument is set to `input.value`, so the component must record a
81+
// dependency on the top-level `input` resource, both overall and per-property.
82+
assert.Equal(l, []resource.URN{input.URN}, component.Dependencies,
83+
"expected component to depend on the top-level input resource")
84+
componentInputDeps, ok := component.PropertyDependencies["input"]
85+
require.True(l, ok, "expected component to have property dependencies for input")
86+
assert.Equal(l, []resource.URN{input.URN}, componentInputDeps,
87+
"expected component.input to depend on the top-level input resource")
88+
89+
// Inside the component, `res.value = input` flows the component's `input` config -- which
90+
// itself traces back to the top-level `input` resource -- into the child resource. The
91+
// dependency on `input` must propagate through the component boundary so the engine can
92+
// correctly order operations.
93+
assert.Contains(l, simple.Dependencies, input.URN,
94+
"expected simple resource inside the component to depend on the top-level input resource")
95+
simpleValueDeps, ok := simple.PropertyDependencies["value"]
96+
require.True(l, ok, "expected simple resource to have property dependencies for value")
97+
assert.Contains(l, simpleValueDeps, input.URN,
98+
"expected simple.value inside the component to depend on the top-level input resource")
6999
},
70100
},
71101
},
Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1+
resource "input" "simple:index:Resource" {
2+
value = true
3+
}
4+
15
component someComponent "./myComponent" {
2-
input = true
6+
input = input.value
37
}
48

59
output result {
610
value = someComponent.output
7-
}
11+
}

‎sdk/go/pulumi-language-go/testdata/overrides/l3-component-simple/main.go‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
11
package main
22

33
import (
4+
"example.com/pulumi-simple/sdk/go/v2/simple"
45
"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
56
)
67

78
func main() {
89
pulumi.Run(func(ctx *pulumi.Context) error {
10+
input, err := simple.NewResource(ctx, "input", &simple.ResourceArgs{
11+
Value: pulumi.Bool(true),
12+
})
13+
if err != nil {
14+
return err
15+
}
916
someComponent, err := NewMyComponent(ctx, "someComponent", &MyComponentArgs{
10-
Input: pulumi.Bool(true),
17+
Input: input.Value,
1118
})
1219
if err != nil {
1320
return err
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import * as pulumi from "@pulumi/pulumi";
2+
import * as simple from "@pulumi/simple";
23
import { MyComponent } from "./myComponent";
34

4-
const someComponent = new MyComponent("someComponent", {input: true});
5+
const input = new simple.Resource("input", {value: true});
6+
const someComponent = new MyComponent("someComponent", {input: input.value});
57
export const result = someComponent.output;
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import * as pulumi from "@pulumi/pulumi";
2+
import * as simple from "@pulumi/simple";
23
import { MyComponent } from "./myComponent";
34

4-
const someComponent = new MyComponent("someComponent", {input: true});
5+
const input = new simple.Resource("input", {value: true});
6+
const someComponent = new MyComponent("someComponent", {input: input.value});
57
export const result = someComponent.output;
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import * as pulumi from "@pulumi/pulumi";
2+
import * as simple from "@pulumi/simple";
23
import { MyComponent } from "./myComponent";
34

4-
const someComponent = new MyComponent("someComponent", {input: true});
5+
const input = new simple.Resource("input", {value: true});
6+
const someComponent = new MyComponent("someComponent", {input: input.value});
57
export const result = someComponent.output;
Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1+
resource "input" "simple:index:Resource" {
2+
value = true
3+
}
4+
15
component someComponent "./myComponent" {
2-
input = true
6+
input = input.value
37
}
48

59
output result {
610
value = someComponent.output
7-
}
11+
}
Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1+
resource "input" "simple:index:Resource" {
2+
value = true
3+
}
4+
15
component someComponent "./myComponent" {
2-
input = true
6+
input = input.value
37
}
48

59
output result {
610
value = someComponent.output
7-
}
11+
}
Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1+
resource "input" "simple:index:Resource" {
2+
value = true
3+
}
4+
15
component someComponent "./myComponent" {
2-
input = true
6+
input = input.value
37
}
48

59
output result {
610
value = someComponent.output
7-
}
11+
}

0 commit comments

Comments
 (0)