Skip to content

Commit

Permalink
Upgrade pulumi-terraform-bridge to v3.88.0 (#244)
Browse files Browse the repository at this point in the history 
* make tfgen

* make build_sdks
  • Loading branch information
@pulumi-bot
pulumi-bot authored Jul 26, 2024
1 parent ab2d7b0 commit 2bbe39c
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 25 deletions.
4 changes: 2 additions & 2 deletions examples/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module null/examples
go 1.21

require (
github.com/pulumi/pulumi/pkg/v3 v3.124.0
github.com/pulumi/pulumi/pkg/v3 v3.126.0
github.com/stretchr/testify v1.9.0
)

Expand Down Expand Up @@ -126,7 +126,7 @@ require (
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 // indirect
github.com/pulumi/esc v0.9.1 // indirect
github.com/pulumi/pulumi/sdk/v3 v3.124.0 // indirect
github.com/pulumi/pulumi/sdk/v3 v3.126.0 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/rogpeppe/go-internal v1.12.0 // indirect
github.com/ryanuber/go-glob v1.0.0 // indirect
Expand Down
8 changes: 4 additions & 4 deletions examples/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -342,10 +342,10 @@ github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 h1:vkHw5I/plNdTr435
github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231/go.mod h1:murToZ2N9hNJzewjHBgfFdXhZKjY3z5cYC1VXk+lbFE=
github.com/pulumi/esc v0.9.1 h1:HH5eEv8sgyxSpY5a8yePyqFXzA8cvBvapfH8457+mIs=
github.com/pulumi/esc v0.9.1/go.mod h1:oEJ6bOsjYlQUpjf70GiX+CXn3VBmpwFDxUTlmtUN84c=
github.com/pulumi/pulumi/pkg/v3 v3.124.0 h1:JgUePx6Ga9geBJ1dku6K8GXTrsBYzXMhKIsk+cxeKo8=
github.com/pulumi/pulumi/pkg/v3 v3.124.0/go.mod h1:/XUDPNoIikS3lcQe1HpGuKs73cO5HqBvOdxXFeC3UHM=
github.com/pulumi/pulumi/sdk/v3 v3.124.0 h1:f9Rb2AhLSaacKTaBPbKXPCfviHxTuhEXafhT4E095Y0=
github.com/pulumi/pulumi/sdk/v3 v3.124.0/go.mod h1:p1U24en3zt51agx+WlNboSOV8eLlPWYAkxMzVEXKbnY=
github.com/pulumi/pulumi/pkg/v3 v3.126.0 h1:XaZU1ehjHN2I5ihkfwxK/UFMDiCDM9FSt2TBnbldAx4=
github.com/pulumi/pulumi/pkg/v3 v3.126.0/go.mod h1:1P4/oK9zceOJUm48QQl/TqjDN68lfsdnTR1FITTFddw=
github.com/pulumi/pulumi/sdk/v3 v3.126.0 h1:6GQVhwG2jgnG7wjRiWgrq0/sU39onctAiBcvTlqb20s=
github.com/pulumi/pulumi/sdk/v3 v3.126.0/go.mod h1:p1U24en3zt51agx+WlNboSOV8eLlPWYAkxMzVEXKbnY=
github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
Expand Down
2 changes: 1 addition & 1 deletion provider/cmd/pulumi-resource-null/schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
},
"resources": {
"null:index/resource:Resource": {
"description": "## Example Usage\n\n\u003c!--Start PulumiCodeChooser --\u003e\n```typescript\nimport * as pulumi from \"@pulumi/pulumi\";\nimport * as _null from \"@pulumi/null\";\nimport * as aws from \"@pulumi/aws\";\nimport * as std from \"@pulumi/std\";\n\nconst cluster: aws.index.Instance[] = [];\nfor (const range = {value: 0}; range.value \u003c 3; range.value++) {\n cluster.push(new aws.index.Instance(`cluster-${range.value}`, {\n ami: \"ami-0dcc1e21636832c5d\",\n instanceType: \"m5.large\",\n }));\n}\n// The primary use-case for the null resource is as a do-nothing container\n// for arbitrary actions taken by a provisioner.\n//\n// In this example, three EC2 instances are created and then a\n// null_resource instance is used to gather data about all three\n// and execute a single action that affects them all. Due to the triggers\n// map, the null_resource will be replaced each time the instance ids\n// change, and thus the remote-exec provisioner will be re-run.\nconst clusterResource = new _null.Resource(\"cluster\", {triggers: {\n cluster_instance_ids: std.join({\n separator: \",\",\n input: cluster.map(__item =\u003e __item.id),\n }).then(invoke =\u003e invoke.result),\n}});\n```\n```python\nimport pulumi\nimport pulumi_aws as aws\nimport pulumi_null as null\nimport pulumi_std as std\n\ncluster = []\nfor range in [{\"value\": i} for i in range(0, 3)]:\n cluster.append(aws.index.Instance(f\"cluster-{range['value']}\",\n ami=ami-0dcc1e21636832c5d,\n instance_type=m5.large))\n# The primary use-case for the null resource is as a do-nothing container\n# for arbitrary actions taken by a provisioner.\n#\n# In this example, three EC2 instances are created and then a\n# null_resource instance is used to gather data about all three\n# and execute a single action that affects them all. Due to the triggers\n# map, the null_resource will be replaced each time the instance ids\n# change, and thus the remote-exec provisioner will be re-run.\ncluster_resource = null.Resource(\"cluster\", triggers={\n \"cluster_instance_ids\": std.join(separator=\",\",\n input=[__item[\"id\"] for __item in cluster]).result,\n})\n```\n```csharp\nusing System.Collections.Generic;\nusing System.Linq;\nusing Pulumi;\nusing Aws = Pulumi.Aws;\nusing Null = Pulumi.Null;\nusing Std = Pulumi.Std;\n\nreturn await Deployment.RunAsync(() =\u003e \n{\n var cluster = new List\u003cAws.Index.Instance\u003e();\n for (var rangeIndex = 0; rangeIndex \u003c 3; rangeIndex++)\n {\n var range = new { Value = rangeIndex };\n cluster.Add(new Aws.Index.Instance($\"cluster-{range.Value}\", new()\n {\n Ami = \"ami-0dcc1e21636832c5d\",\n InstanceType = \"m5.large\",\n }));\n }\n // The primary use-case for the null resource is as a do-nothing container\n // for arbitrary actions taken by a provisioner.\n //\n // In this example, three EC2 instances are created and then a\n // null_resource instance is used to gather data about all three\n // and execute a single action that affects them all. Due to the triggers\n // map, the null_resource will be replaced each time the instance ids\n // change, and thus the remote-exec provisioner will be re-run.\n var clusterResource = new Null.Resource(\"cluster\", new()\n {\n Triggers = \n {\n { \"cluster_instance_ids\", Std.Join.Invoke(new()\n {\n Separator = \",\",\n Input = cluster.Select(__item =\u003e __item.Id).ToList(),\n }).Apply(invoke =\u003e invoke.Result) },\n },\n });\n\n});\n```\n```go\npackage main\n\nimport (\n\t\"github.com/pulumi/pulumi-aws/sdk/go/aws\"\n\t\"github.com/pulumi/pulumi-null/sdk/go/null\"\n\t\"github.com/pulumi/pulumi-std/sdk/go/std\"\n\t\"github.com/pulumi/pulumi/sdk/v3/go/pulumi\"\n)\nfunc main() {\npulumi.Run(func(ctx *pulumi.Context) error {\nvar cluster []*aws.Instance\nfor index := 0; index \u003c 3; index++ {\n key0 := index\n _ := index\n__res, err := aws.NewInstance(ctx, fmt.Sprintf(\"cluster-%v\", key0), \u0026aws.InstanceArgs{\nAmi: \"ami-0dcc1e21636832c5d\",\nInstanceType: \"m5.large\",\n})\nif err != nil {\nreturn err\n}\ncluster = append(cluster, __res)\n}\ninvokeJoin, err := std.Join(ctx, \u0026std.JoinArgs{\nSeparator: \",\",\nInput: %!v(PANIC=Format method: fatal: A failure has occurred: unlowered splat expression @ example.pp:22,19-32),\n}, nil)\nif err != nil {\nreturn err\n}\n// The primary use-case for the null resource is as a do-nothing container\n// for arbitrary actions taken by a provisioner.\n//\n// In this example, three EC2 instances are created and then a\n// null_resource instance is used to gather data about all three\n// and execute a single action that affects them all. Due to the triggers\n// map, the null_resource will be replaced each time the instance ids\n// change, and thus the remote-exec provisioner will be re-run.\n_, err = null.NewResource(ctx, \"cluster\", \u0026null.ResourceArgs{\nTriggers: pulumi.StringMap{\n\"cluster_instance_ids\": invokeJoin.Result,\n},\n})\nif err != nil {\nreturn err\n}\nreturn nil\n})\n}\n```\n```java\npackage generated_program;\n\nimport com.pulumi.Context;\nimport com.pulumi.Pulumi;\nimport com.pulumi.core.Output;\nimport com.pulumi.aws.instance;\nimport com.pulumi.aws.InstanceArgs;\nimport com.pulumi.null.Resource;\nimport com.pulumi.null.ResourceArgs;\nimport com.pulumi.codegen.internal.KeyedValue;\nimport java.util.List;\nimport java.util.ArrayList;\nimport java.util.Map;\nimport java.io.File;\nimport java.nio.file.Files;\nimport java.nio.file.Paths;\n\npublic class App {\n public static void main(String[] args) {\n Pulumi.run(App::stack);\n }\n\n public static void stack(Context ctx) {\n for (var i = 0; i \u003c 3; i++) {\n new Instance(\"cluster-\" + i, InstanceArgs.builder()\n .ami(\"ami-0dcc1e21636832c5d\")\n .instanceType(\"m5.large\")\n .build());\n\n \n}\n // The primary use-case for the null resource is as a do-nothing container\n // for arbitrary actions taken by a provisioner.\n //\n // In this example, three EC2 instances are created and then a\n // null_resource instance is used to gather data about all three\n // and execute a single action that affects them all. Due to the triggers\n // map, the null_resource will be replaced each time the instance ids\n // change, and thus the remote-exec provisioner will be re-run.\n var clusterResource = new Resource(\"clusterResource\", ResourceArgs.builder()\n .triggers(Map.of(\"cluster_instance_ids\", StdFunctions.join(JoinArgs.builder()\n .separator(\",\")\n .input(cluster.stream().map(element -\u003e element.id()).collect(toList()))\n .build()).result()))\n .build());\n\n }\n}\n```\n\u003c!--End PulumiCodeChooser --\u003e\n",
"description": "## Example Usage\n\n\u003c!--Start PulumiCodeChooser --\u003e\n```typescript\nimport * as pulumi from \"@pulumi/pulumi\";\nimport * as _null from \"@pulumi/null\";\nimport * as aws from \"@pulumi/aws\";\nimport * as std from \"@pulumi/std\";\n\nconst cluster: aws.index.Instance[] = [];\nfor (const range = {value: 0}; range.value \u003c 3; range.value++) {\n cluster.push(new aws.index.Instance(`cluster-${range.value}`, {\n ami: \"ami-0dcc1e21636832c5d\",\n instanceType: \"m5.large\",\n }));\n}\n// The primary use-case for the null resource is as a do-nothing container\n// for arbitrary actions taken by a provisioner.\n//\n// In this example, three EC2 instances are created and then a\n// null_resource instance is used to gather data about all three\n// and execute a single action that affects them all. Due to the triggers\n// map, the null_resource will be replaced each time the instance ids\n// change, and thus the remote-exec provisioner will be re-run.\nconst clusterResource = new _null.Resource(\"cluster\", {triggers: {\n cluster_instance_ids: std.join({\n separator: \",\",\n input: cluster.map(__item =\u003e __item.id),\n }).then(invoke =\u003e invoke.result),\n}});\n```\n```python\nimport pulumi\nimport pulumi_aws as aws\nimport pulumi_null as null\nimport pulumi_std as std\n\ncluster = []\nfor range in [{\"value\": i} for i in range(0, 3)]:\n cluster.append(aws.index.Instance(f\"cluster-{range['value']}\",\n ami=ami-0dcc1e21636832c5d,\n instance_type=m5.large))\n# The primary use-case for the null resource is as a do-nothing container\n# for arbitrary actions taken by a provisioner.\n#\n# In this example, three EC2 instances are created and then a\n# null_resource instance is used to gather data about all three\n# and execute a single action that affects them all. Due to the triggers\n# map, the null_resource will be replaced each time the instance ids\n# change, and thus the remote-exec provisioner will be re-run.\ncluster_resource = null.Resource(\"cluster\", triggers={\n \"cluster_instance_ids\": std.join(separator=\",\",\n input=[__item[\"id\"] for __item in cluster]).result,\n})\n```\n```csharp\nusing System.Collections.Generic;\nusing System.Linq;\nusing Pulumi;\nusing Aws = Pulumi.Aws;\nusing Null = Pulumi.Null;\nusing Std = Pulumi.Std;\n\nreturn await Deployment.RunAsync(() =\u003e \n{\n var cluster = new List\u003cAws.Index.Instance\u003e();\n for (var rangeIndex = 0; rangeIndex \u003c 3; rangeIndex++)\n {\n var range = new { Value = rangeIndex };\n cluster.Add(new Aws.Index.Instance($\"cluster-{range.Value}\", new()\n {\n Ami = \"ami-0dcc1e21636832c5d\",\n InstanceType = \"m5.large\",\n }));\n }\n // The primary use-case for the null resource is as a do-nothing container\n // for arbitrary actions taken by a provisioner.\n //\n // In this example, three EC2 instances are created and then a\n // null_resource instance is used to gather data about all three\n // and execute a single action that affects them all. Due to the triggers\n // map, the null_resource will be replaced each time the instance ids\n // change, and thus the remote-exec provisioner will be re-run.\n var clusterResource = new Null.Resource(\"cluster\", new()\n {\n Triggers = \n {\n { \"cluster_instance_ids\", Std.Join.Invoke(new()\n {\n Separator = \",\",\n Input = cluster.Select(__item =\u003e __item.Id).ToList(),\n }).Apply(invoke =\u003e invoke.Result) },\n },\n });\n\n});\n```\n```go\npackage main\n\nimport (\n\t\"github.com/pulumi/pulumi-aws/sdk/go/aws\"\n\t\"github.com/pulumi/pulumi-null/sdk/go/null\"\n\t\"github.com/pulumi/pulumi-std/sdk/go/std\"\n\t\"github.com/pulumi/pulumi/sdk/v3/go/pulumi\"\n)\nfunc main() {\npulumi.Run(func(ctx *pulumi.Context) error {\nvar cluster []*aws.Instance\nfor index := 0; index \u003c 3; index++ {\n key0 := index\n _ := index\n__res, err := aws.NewInstance(ctx, fmt.Sprintf(\"cluster-%v\", key0), \u0026aws.InstanceArgs{\nAmi: \"ami-0dcc1e21636832c5d\",\nInstanceType: \"m5.large\",\n})\nif err != nil {\nreturn err\n}\ncluster = append(cluster, __res)\n}\ninvokeJoin, err := std.Join(ctx, \u0026std.JoinArgs{\nSeparator: \",\",\nInput: %!v(PANIC=Format method: fatal: A failure has occurred: unlowered splat expression @ example.pp:22,19-32),\n}, nil)\nif err != nil {\nreturn err\n}\n// The primary use-case for the null resource is as a do-nothing container\n// for arbitrary actions taken by a provisioner.\n//\n// In this example, three EC2 instances are created and then a\n// null_resource instance is used to gather data about all three\n// and execute a single action that affects them all. Due to the triggers\n// map, the null_resource will be replaced each time the instance ids\n// change, and thus the remote-exec provisioner will be re-run.\n_, err = null.NewResource(ctx, \"cluster\", \u0026null.ResourceArgs{\nTriggers: pulumi.StringMap{\n\"cluster_instance_ids\": pulumi.String(invokeJoin.Result),\n},\n})\nif err != nil {\nreturn err\n}\nreturn nil\n})\n}\n```\n```java\npackage generated_program;\n\nimport com.pulumi.Context;\nimport com.pulumi.Pulumi;\nimport com.pulumi.core.Output;\nimport com.pulumi.aws.instance;\nimport com.pulumi.aws.InstanceArgs;\nimport com.pulumi.null.Resource;\nimport com.pulumi.null.ResourceArgs;\nimport com.pulumi.codegen.internal.KeyedValue;\nimport java.util.List;\nimport java.util.ArrayList;\nimport java.util.Map;\nimport java.io.File;\nimport java.nio.file.Files;\nimport java.nio.file.Paths;\n\npublic class App {\n public static void main(String[] args) {\n Pulumi.run(App::stack);\n }\n\n public static void stack(Context ctx) {\n for (var i = 0; i \u003c 3; i++) {\n new Instance(\"cluster-\" + i, InstanceArgs.builder()\n .ami(\"ami-0dcc1e21636832c5d\")\n .instanceType(\"m5.large\")\n .build());\n\n \n}\n // The primary use-case for the null resource is as a do-nothing container\n // for arbitrary actions taken by a provisioner.\n //\n // In this example, three EC2 instances are created and then a\n // null_resource instance is used to gather data about all three\n // and execute a single action that affects them all. Due to the triggers\n // map, the null_resource will be replaced each time the instance ids\n // change, and thus the remote-exec provisioner will be re-run.\n var clusterResource = new Resource(\"clusterResource\", ResourceArgs.builder()\n .triggers(Map.of(\"cluster_instance_ids\", StdFunctions.join(JoinArgs.builder()\n .separator(\",\")\n .input(cluster.stream().map(element -\u003e element.id()).collect(toList()))\n .build()).result()))\n .build());\n\n }\n}\n```\n\u003c!--End PulumiCodeChooser --\u003e\n",
"properties": {
"triggers": {
"type": "object",
Expand Down
8 changes: 4 additions & 4 deletions provider/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ go 1.21.12
replace github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20240520223432-0c0bf0d65f10

require (
github.com/pulumi/pulumi-terraform-bridge/pf v0.40.0
github.com/pulumi/pulumi-terraform-bridge/v3 v3.87.0
github.com/pulumi/pulumi-terraform-bridge/pf v0.41.0
github.com/pulumi/pulumi-terraform-bridge/v3 v3.88.0
github.com/terraform-providers/terraform-provider-null v0.0.0
)

Expand Down Expand Up @@ -171,8 +171,8 @@ require (
github.com/pulumi/pulumi-java/pkg v0.11.0 // indirect
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.8 // indirect
github.com/pulumi/pulumi-yaml v1.9.1 // indirect
github.com/pulumi/pulumi/pkg/v3 v3.124.0 // indirect
github.com/pulumi/pulumi/sdk/v3 v3.124.0 // indirect
github.com/pulumi/pulumi/pkg/v3 v3.126.0 // indirect
github.com/pulumi/pulumi/sdk/v3 v3.126.0 // indirect
github.com/pulumi/schema-tools v0.1.2 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/rogpeppe/go-internal v1.12.0 // indirect
Expand Down
Loading

0 comments on commit 2bbe39c

Please sign in to comment.