Skip to content

Commit 66d614c

Browse files
authored
Revert #5442 (#5484)
Reverts #5442 The root cause of #5438 is now fixed in the bridge https://github.com/pulumi/pulumi-terraform-bridge/releases/tag/v3.107.0 and we no longer need the workaround. This also will alleviate #5483 We need to remember to update pulumi-eks with the version that ships this change to avoid tripping up this error again: pulumi/pulumi-eks#1752
1 parent 8fbecca commit 66d614c

File tree

13 files changed

+6
-138
lines changed

13 files changed

+6
-138
lines changed

provider/cmd/pulumi-resource-aws/schema.json

+4-26
Original file line numberDiff line numberDiff line change
@@ -55475,8 +55475,7 @@
5547555475
},
5547655476
"description": {
5547755477
"type": "string",
55478-
"description": "Description of this egress rule.\n",
55479-
"default": ""
55478+
"description": "Description of this egress rule.\n"
5548055479
},
5548155480
"fromPort": {
5548255481
"type": "integer",
@@ -55521,17 +55520,7 @@
5552155520
"fromPort",
5552255521
"protocol",
5552355522
"toPort"
55524-
],
55525-
"language": {
55526-
"nodejs": {
55527-
"requiredOutputs": [
55528-
"description",
55529-
"fromPort",
55530-
"protocol",
55531-
"toPort"
55532-
]
55533-
}
55534-
}
55523+
]
5553555524
},
5553655525
"aws:ec2/SecurityGroupIngress:SecurityGroupIngress": {
5553755526
"properties": {
@@ -55544,8 +55533,7 @@
5554455533
},
5554555534
"description": {
5554655535
"type": "string",
55547-
"description": "Description of this ingress rule.\n",
55548-
"default": ""
55536+
"description": "Description of this ingress rule.\n"
5554955537
},
5555055538
"fromPort": {
5555155539
"type": "integer",
@@ -55590,17 +55578,7 @@
5559055578
"fromPort",
5559155579
"protocol",
5559255580
"toPort"
55593-
],
55594-
"language": {
55595-
"nodejs": {
55596-
"requiredOutputs": [
55597-
"description",
55598-
"fromPort",
55599-
"protocol",
55600-
"toPort"
55601-
]
55602-
}
55603-
}
55581+
]
5560455582
},
5560555583
"aws:ec2/SpotFleetRequestLaunchSpecification:SpotFleetRequestLaunchSpecification": {
5560655584
"properties": {

provider/resources.go

-10
Original file line numberDiff line numberDiff line change
@@ -2027,19 +2027,9 @@ compatibility shim in favor of the new "name" field.`)
20272027
// Use "ingress" instead of "ingresses" to match AWS APIs
20282028
"ingress": {
20292029
Name: "ingress",
2030-
Elem: &tfbridge.SchemaInfo{
2031-
Fields: map[string]*tfbridge.SchemaInfo{
2032-
"description": {Default: &info.Default{Value: ""}},
2033-
},
2034-
},
20352030
},
20362031
"egress": {
20372032
Name: "egress",
2038-
Elem: &tfbridge.SchemaInfo{
2039-
Fields: map[string]*tfbridge.SchemaInfo{
2040-
"description": {Default: &info.Default{Value: ""}},
2041-
},
2042-
},
20432033
},
20442034
},
20452035
},

sdk/dotnet/Ec2/Inputs/SecurityGroupEgressArgs.cs

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/dotnet/Ec2/Inputs/SecurityGroupEgressGetArgs.cs

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/dotnet/Ec2/Inputs/SecurityGroupIngressArgs.cs

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/dotnet/Ec2/Inputs/SecurityGroupIngressGetArgs.cs

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/go/aws/ec2/pulumiTypes.go

-48
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/java/src/main/java/com/pulumi/aws/ec2/inputs/SecurityGroupEgressArgs.java

-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/java/src/main/java/com/pulumi/aws/ec2/inputs/SecurityGroupIngressArgs.java

-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/nodejs/types/input.ts

-18
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/nodejs/types/output.ts

+2-20
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/python/pulumi_aws/ec2/_inputs.py

-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/python/pulumi_aws/ec2/outputs.py

-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)