Skip to content

Commit 43cc58d

Browse files
VenelinMartinovVenelinMartinov
committed
SDKv2 Diff cross tests for replacement of computed properties
1 parent d7eacfb commit 43cc58d

File tree

10 files changed

+433
-1
lines changed

10 files changed

+433
-1
lines changed

‎pkg/internal/tests/cross-tests/diff_check.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020

2121
"github.com/hashicorp/terraform-plugin-go/tftypes"
2222
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
23+
"github.com/pulumi/pulumi/sdk/v3/go/auto/optpreview"
2324
"github.com/stretchr/testify/require"
2425

2526
crosstestsimpl "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/internal/tests/cross-tests/impl"
@@ -79,7 +80,7 @@ func runDiffCheck(t T, tc diffTestCase) crosstestsimpl.DiffResult {
7980
err := os.WriteFile(filepath.Join(pt.CurrentStack().Workspace().WorkDir(), "Pulumi.yaml"), yamlProgram, 0o600)
8081
require.NoErrorf(t, err, "writing Pulumi.yaml")
8182

82-
previewRes := pt.Preview(t)
83+
previewRes := pt.Preview(t, optpreview.Diff())
8384
diffResponse := crosstestsimpl.GetPulumiDiffResponse(t, pt.GrpcLog(t).Entries)
8485
x := pt.Up(t)
8586

‎pkg/internal/tests/cross-tests/diff_cross_test.go

+113
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@ import (
2626
"github.com/hashicorp/terraform-plugin-go/tftypes"
2727
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
2828
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
29+
"github.com/hexops/autogold/v2"
30+
"github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
2931
"github.com/stretchr/testify/require"
32+
"github.com/zclconf/go-cty/cty"
3033
)
3134

3235
func TestUnchangedBasicObject(t *testing.T) {
@@ -1621,3 +1624,113 @@ func TestBlockCollectionElementForceNew(t *testing.T) {
16211624
})
16221625
})
16231626
}
1627+
1628+
func TestDetailedDiffReplacementComputedProperty(t *testing.T) {
1629+
t.Parallel()
1630+
// TODO[pulumi/pulumi-terraform-bridge#2660]
1631+
// We fail to re-compute computed properties when the resource is being replaced.
1632+
res := &schema.Resource{
1633+
Schema: map[string]*schema.Schema{
1634+
"computed": {
1635+
Type: schema.TypeString,
1636+
Computed: true,
1637+
},
1638+
"other": {
1639+
Type: schema.TypeString,
1640+
Optional: true,
1641+
ForceNew: true,
1642+
},
1643+
},
1644+
CreateContext: func(ctx context.Context, rd *schema.ResourceData, meta interface{}) diag.Diagnostics {
1645+
rd.SetId("r1")
1646+
1647+
err := rd.Set("computed", "computed_value")
1648+
contract.AssertNoErrorf(err, "setting computed")
1649+
return nil
1650+
},
1651+
}
1652+
1653+
type testOutput struct {
1654+
initialValue cty.Value
1655+
changeValue cty.Value
1656+
tfOut string
1657+
pulumiOut string
1658+
detailedDiff map[string]any
1659+
}
1660+
1661+
t.Run("no change", func(t *testing.T) {
1662+
t.Parallel()
1663+
initialValue := cty.ObjectVal(map[string]cty.Value{})
1664+
changeValue := cty.ObjectVal(map[string]cty.Value{})
1665+
diff := runDiffCheck(t, diffTestCase{
1666+
Resource: res,
1667+
Config1: initialValue,
1668+
Config2: changeValue,
1669+
})
1670+
1671+
autogold.ExpectFile(t, testOutput{
1672+
initialValue: initialValue,
1673+
changeValue: changeValue,
1674+
tfOut: diff.TFOut,
1675+
pulumiOut: diff.PulumiOut,
1676+
detailedDiff: diff.PulumiDiff.DetailedDiff,
1677+
})
1678+
})
1679+
1680+
t.Run("non-computed added", func(t *testing.T) {
1681+
t.Parallel()
1682+
initialValue := cty.ObjectVal(map[string]cty.Value{})
1683+
changeValue := cty.ObjectVal(map[string]cty.Value{"other": cty.StringVal("other_value")})
1684+
diff := runDiffCheck(t, diffTestCase{
1685+
Resource: res,
1686+
Config1: initialValue,
1687+
Config2: changeValue,
1688+
})
1689+
1690+
autogold.ExpectFile(t, testOutput{
1691+
initialValue: initialValue,
1692+
changeValue: changeValue,
1693+
tfOut: diff.TFOut,
1694+
pulumiOut: diff.PulumiOut,
1695+
detailedDiff: diff.PulumiDiff.DetailedDiff,
1696+
})
1697+
})
1698+
1699+
t.Run("non-computed removed", func(t *testing.T) {
1700+
t.Parallel()
1701+
initialValue := cty.ObjectVal(map[string]cty.Value{"other": cty.StringVal("other_value")})
1702+
changeValue := cty.ObjectVal(map[string]cty.Value{})
1703+
diff := runDiffCheck(t, diffTestCase{
1704+
Resource: res,
1705+
Config1: initialValue,
1706+
Config2: changeValue,
1707+
})
1708+
1709+
autogold.ExpectFile(t, testOutput{
1710+
initialValue: initialValue,
1711+
changeValue: changeValue,
1712+
tfOut: diff.TFOut,
1713+
pulumiOut: diff.PulumiOut,
1714+
detailedDiff: diff.PulumiDiff.DetailedDiff,
1715+
})
1716+
})
1717+
1718+
t.Run("non-computed changed", func(t *testing.T) {
1719+
t.Parallel()
1720+
initialValue := cty.ObjectVal(map[string]cty.Value{"other": cty.StringVal("other_value")})
1721+
changeValue := cty.ObjectVal(map[string]cty.Value{"other": cty.StringVal("other_value_2")})
1722+
diff := runDiffCheck(t, diffTestCase{
1723+
Resource: res,
1724+
Config1: initialValue,
1725+
Config2: changeValue,
1726+
})
1727+
1728+
autogold.ExpectFile(t, testOutput{
1729+
initialValue: initialValue,
1730+
changeValue: changeValue,
1731+
tfOut: diff.TFOut,
1732+
pulumiOut: diff.PulumiOut,
1733+
detailedDiff: diff.PulumiDiff.DetailedDiff,
1734+
})
1735+
})
1736+
}

‎pkg/internal/tests/cross-tests/testdata/TestComputedProperty/no_change.golden

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
crosstests.testOutput{
2+
initialValue: cty.Value{
3+
ty: cty.Type{typeImpl: cty.typeObject{
4+
AttrTypes: map[string]cty.Type{},
5+
}},
6+
v: map[string]interface{}{},
7+
},
8+
changeValue: cty.Value{
9+
ty: cty.Type{typeImpl: cty.typeObject{AttrTypes: map[string]cty.Type{}}},
10+
v: map[string]interface{}{},
11+
},
12+
tfOut: `
13+
No changes. Your infrastructure matches the configuration.
14+
15+
Terraform has compared your real infrastructure against your configuration
16+
and found no differences, so no changes are needed.
17+
`,
18+
pulumiOut: `Previewing update (test):
19+
pulumi:pulumi:Stack: (same)
20+
[urn=urn:pulumi:test::project::pulumi:pulumi:Stack::project-test]
21+
Resources:
22+
2 unchanged
23+
`,
24+
}

‎pkg/internal/tests/cross-tests/testdata/TestComputedProperty/non-computed_added.golden

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
crosstests.testOutput{
2+
initialValue: cty.Value{
3+
ty: cty.Type{typeImpl: cty.typeObject{
4+
AttrTypes: map[string]cty.Type{},
5+
}},
6+
v: map[string]interface{}{},
7+
},
8+
changeValue: cty.Value{
9+
ty: cty.Type{typeImpl: cty.typeObject{AttrTypes: map[string]cty.Type{
10+
"other": {typeImpl: cty.primitiveType{
11+
Kind: cty.primitiveTypeKind(83),
12+
}},
13+
}}},
14+
v: map[string]interface{}{"other": "other_value"},
15+
},
16+
tfOut: `
17+
Terraform used the selected providers to generate the following execution
18+
plan. Resource actions are indicated with the following symbols:
19+
+/- create replacement and then destroy
20+
21+
Terraform will perform the following actions:
22+
23+
# crossprovider_test_res.example must be replaced
24+
+/- resource "crossprovider_test_res" "example" {
25+
~ computed = "computed_value" -> (known after apply)
26+
~ id = "r1" -> (known after apply)
27+
+ other = "other_value" # forces replacement
28+
}
29+
30+
Plan: 1 to add, 0 to change, 1 to destroy.
31+
32+
`,
33+
pulumiOut: `Previewing update (test):
34+
pulumi:pulumi:Stack: (same)
35+
[urn=urn:pulumi:test::project::pulumi:pulumi:Stack::project-test]
36+
+-crossprovider:index/testRes:TestRes: (replace)
37+
[id=r1]
38+
[urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example]
39+
+ other: "other_value"
40+
Resources:
41+
+-1 to replace
42+
1 unchanged
43+
`,
44+
detailedDiff: map[string]interface{}{"other": map[string]interface{}{"kind": "ADD_REPLACE"}},
45+
}

‎pkg/internal/tests/cross-tests/testdata/TestComputedProperty/non-computed_changed.golden

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
crosstests.testOutput{
2+
initialValue: cty.Value{
3+
ty: cty.Type{typeImpl: cty.typeObject{
4+
AttrTypes: map[string]cty.Type{"other": {
5+
typeImpl: cty.primitiveType{Kind: cty.primitiveTypeKind(83)},
6+
}},
7+
}},
8+
v: map[string]interface{}{"other": "other_value"},
9+
},
10+
changeValue: cty.Value{
11+
ty: cty.Type{typeImpl: cty.typeObject{AttrTypes: map[string]cty.Type{
12+
"other": {typeImpl: cty.primitiveType{
13+
Kind: cty.primitiveTypeKind(83),
14+
}},
15+
}}},
16+
v: map[string]interface{}{"other": "other_value_2"},
17+
},
18+
tfOut: `
19+
Terraform used the selected providers to generate the following execution
20+
plan. Resource actions are indicated with the following symbols:
21+
+/- create replacement and then destroy
22+
23+
Terraform will perform the following actions:
24+
25+
# crossprovider_test_res.example must be replaced
26+
+/- resource "crossprovider_test_res" "example" {
27+
~ computed = "computed_value" -> (known after apply)
28+
~ id = "r1" -> (known after apply)
29+
~ other = "other_value" -> "other_value_2" # forces replacement
30+
}
31+
32+
Plan: 1 to add, 0 to change, 1 to destroy.
33+
34+
`,
35+
pulumiOut: `Previewing update (test):
36+
pulumi:pulumi:Stack: (same)
37+
[urn=urn:pulumi:test::project::pulumi:pulumi:Stack::project-test]
38+
+-crossprovider:index/testRes:TestRes: (replace)
39+
[id=r1]
40+
[urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example]
41+
~ other: "other_value" => "other_value_2"
42+
Resources:
43+
+-1 to replace
44+
1 unchanged
45+
`,
46+
detailedDiff: map[string]interface{}{"other": map[string]interface{}{"kind": "UPDATE_REPLACE"}},
47+
}

‎pkg/internal/tests/cross-tests/testdata/TestComputedProperty/non-computed_removed.golden

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
crosstests.testOutput{
2+
initialValue: cty.Value{
3+
ty: cty.Type{typeImpl: cty.typeObject{
4+
AttrTypes: map[string]cty.Type{"other": {
5+
typeImpl: cty.primitiveType{Kind: cty.primitiveTypeKind(83)},
6+
}},
7+
}},
8+
v: map[string]interface{}{"other": "other_value"},
9+
},
10+
changeValue: cty.Value{
11+
ty: cty.Type{typeImpl: cty.typeObject{AttrTypes: map[string]cty.Type{}}},
12+
v: map[string]interface{}{},
13+
},
14+
tfOut: `
15+
Terraform used the selected providers to generate the following execution
16+
plan. Resource actions are indicated with the following symbols:
17+
+/- create replacement and then destroy
18+
19+
Terraform will perform the following actions:
20+
21+
# crossprovider_test_res.example must be replaced
22+
+/- resource "crossprovider_test_res" "example" {
23+
~ computed = "computed_value" -> (known after apply)
24+
~ id = "r1" -> (known after apply)
25+
- other = "other_value" -> null # forces replacement
26+
}
27+
28+
Plan: 1 to add, 0 to change, 1 to destroy.
29+
30+
`,
31+
pulumiOut: `Previewing update (test):
32+
pulumi:pulumi:Stack: (same)
33+
[urn=urn:pulumi:test::project::pulumi:pulumi:Stack::project-test]
34+
+-crossprovider:index/testRes:TestRes: (replace)
35+
[id=r1]
36+
[urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example]
37+
- other: "other_value"
38+
Resources:
39+
+-1 to replace
40+
1 unchanged
41+
`,
42+
detailedDiff: map[string]interface{}{"other": map[string]interface{}{"kind": "DELETE_REPLACE"}},
43+
}

‎pkg/internal/tests/cross-tests/testdata/TestDetailedDiffReplacementComputedProperty/no_change.golden

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
crosstests.testOutput{
2+
initialValue: cty.Value{
3+
ty: cty.Type{typeImpl: cty.typeObject{
4+
AttrTypes: map[string]cty.Type{},
5+
}},
6+
v: map[string]interface{}{},
7+
},
8+
changeValue: cty.Value{
9+
ty: cty.Type{typeImpl: cty.typeObject{AttrTypes: map[string]cty.Type{}}},
10+
v: map[string]interface{}{},
11+
},
12+
tfOut: `
13+
No changes. Your infrastructure matches the configuration.
14+
15+
Terraform has compared your real infrastructure against your configuration
16+
and found no differences, so no changes are needed.
17+
`,
18+
pulumiOut: `Previewing update (test):
19+
pulumi:pulumi:Stack: (same)
20+
[urn=urn:pulumi:test::project::pulumi:pulumi:Stack::project-test]
21+
Resources:
22+
2 unchanged
23+
`,
24+
}

‎pkg/internal/tests/cross-tests/testdata/TestDetailedDiffReplacementComputedProperty/non-computed_added.golden

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
crosstests.testOutput{
2+
initialValue: cty.Value{
3+
ty: cty.Type{typeImpl: cty.typeObject{
4+
AttrTypes: map[string]cty.Type{},
5+
}},
6+
v: map[string]interface{}{},
7+
},
8+
changeValue: cty.Value{
9+
ty: cty.Type{typeImpl: cty.typeObject{AttrTypes: map[string]cty.Type{
10+
"other": {typeImpl: cty.primitiveType{
11+
Kind: cty.primitiveTypeKind(83),
12+
}},
13+
}}},
14+
v: map[string]interface{}{"other": "other_value"},
15+
},
16+
tfOut: `
17+
Terraform used the selected providers to generate the following execution
18+
plan. Resource actions are indicated with the following symbols:
19+
+/- create replacement and then destroy
20+
21+
Terraform will perform the following actions:
22+
23+
# crossprovider_test_res.example must be replaced
24+
+/- resource "crossprovider_test_res" "example" {
25+
~ computed = "computed_value" -> (known after apply)
26+
~ id = "r1" -> (known after apply)
27+
+ other = "other_value" # forces replacement
28+
}
29+
30+
Plan: 1 to add, 0 to change, 1 to destroy.
31+
32+
`,
33+
pulumiOut: `Previewing update (test):
34+
pulumi:pulumi:Stack: (same)
35+
[urn=urn:pulumi:test::project::pulumi:pulumi:Stack::project-test]
36+
+-crossprovider:index/testRes:TestRes: (replace)
37+
[id=r1]
38+
[urn=urn:pulumi:test::project::crossprovider:index/testRes:TestRes::example]
39+
+ other: "other_value"
40+
Resources:
41+
+-1 to replace
42+
1 unchanged
43+
`,
44+
detailedDiff: map[string]interface{}{"other": map[string]interface{}{"kind": "ADD_REPLACE"}},
45+
}

0 commit comments

Comments
 (0)