Skip to content

Commit 998de46

Browse files
Revert latest pulumi upgrade (#3194)
Due to pulumi/pulumi#20419, there's still a panic when building some providers. Revert the pulumi version for now as we await a fix, so that bridge releases are unblocked.
1 parent 7139362 commit 998de46

File tree

5 files changed

+13
-14
lines changed

5 files changed

+13
-14
lines changed

dynamic/testdata/TestSchemaGenerationFullDocs/fortinetdev/fortimanager-1.13.0.golden

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129102,7 +129102,7 @@
129102129102
}
129103129103
},
129104129104
"fortimanager:index/objectRouterRoutemap:ObjectRouterRoutemap": {
129105-
"description": "Configure route maps.\n\n\u003e The following variables have sub resource. Avoid using them together, otherwise conflicts and overwrites may occur.\n\u003e- `rule`: `fortimanager.ObjectRouterRoutemapRule`\n\n\n\n## Example Usage\n\n\u003c!--Start PulumiCodeChooser --\u003e\n```typescript\nimport * as pulumi from \"@pulumi/pulumi\";\nimport * as fortimanager from \"@pulumi/fortimanager\";\n\nconst trname = new fortimanager.ObjectRouterRoutemap(\"trname\", {\n comment: \"This is a Terraform example\",\n rules: [{\n action: \"deny\",\n id: 1,\n matchCommunity: \"Priority_1\",\n matchExtcommunityExact: \"enable\",\n }],\n});\n```\n```python\nimport pulumi\nimport pulumi_fortimanager as fortimanager\n\ntrname = fortimanager.ObjectRouterRoutemap(\"trname\",\n comment=\"This is a Terraform example\",\n rules=[{\n \"action\": \"deny\",\n \"id\": 1,\n \"match_community\": \"Priority_1\",\n \"match_extcommunity_exact\": \"enable\",\n }])\n```\n```csharp\nusing System.Collections.Generic;\nusing System.Linq;\nusing Pulumi;\nusing Fortimanager = Pulumi.Fortimanager;\n\nreturn await Deployment.RunAsync(() =\u003e \n{\n var trname = new Fortimanager.ObjectRouterRoutemap(\"trname\", new()\n {\n Comment = \"This is a Terraform example\",\n Rules = new[]\n {\n new Fortimanager.Inputs.ObjectRouterRoutemapRuleArgs\n {\n Action = \"deny\",\n Id = 1,\n MatchCommunity = \"Priority_1\",\n MatchExtcommunityExact = \"enable\",\n },\n },\n });\n\n});\n```\n```go\npackage main\n\nimport (\n\t\"github.com/pulumi/pulumi-terraform-provider/sdks/go/fortimanager/fortimanager\"\n\t\"github.com/pulumi/pulumi/sdk/v3/go/pulumi\"\n)\n\nfunc main() {\n\tpulumi.Run(func(ctx *pulumi.Context) error {\n\t\t_, err := fortimanager.NewObjectRouterRoutemap(ctx, \"trname\", \u0026fortimanager.ObjectRouterRoutemapArgs{\n\t\t\tComment: \"This is a Terraform example\",\n\t\t\tRules: fortimanager.ObjectRouterRoutemapRuleTypeArray{\n\t\t\t\t\u0026fortimanager.ObjectRouterRoutemapRuleTypeArgs{\n\t\t\t\t\tAction: pulumi.String(\"deny\"),\n\t\t\t\t\tId: pulumi.Float64(1),\n\t\t\t\t\tMatchCommunity: pulumi.String(\"Priority_1\"),\n\t\t\t\t\tMatchExtcommunityExact: pulumi.String(\"enable\"),\n\t\t\t\t},\n\t\t\t},\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\treturn nil\n\t})\n}\n```\n```java\npackage generated_program;\n\nimport com.pulumi.Context;\nimport com.pulumi.Pulumi;\nimport com.pulumi.core.Output;\nimport com.pulumi.fortimanager.ObjectRouterRoutemap;\nimport com.pulumi.fortimanager.ObjectRouterRoutemapArgs;\nimport com.pulumi.fortimanager.inputs.ObjectRouterRoutemapRuleArgs;\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 var trname = new ObjectRouterRoutemap(\"trname\", ObjectRouterRoutemapArgs.builder()\n .comment(\"This is a Terraform example\")\n .rules(ObjectRouterRoutemapRuleArgs.builder()\n .action(\"deny\")\n .id(1.0)\n .matchCommunity(\"Priority_1\")\n .matchExtcommunityExact(\"enable\")\n .build())\n .build());\n\n }\n}\n```\n```yaml\nresources:\n trname:\n type: fortimanager:ObjectRouterRoutemap\n properties:\n comment: This is a Terraform example\n rules:\n - action: deny\n id: 1\n matchCommunity: Priority_1\n matchExtcommunityExact: enable\n```\n\u003c!--End PulumiCodeChooser --\u003e\n\n## Import\n\nObjectRouter RouteMap can be imported using any of these accepted formats:\n\n$ export \"FORTIMANAGER_IMPORT_TABLE\"=\"true\"\n\n```sh\n$ pulumi import fortimanager:index/objectRouterRoutemap:ObjectRouterRoutemap labelname {{name}}\n```\n\n$ unset \"FORTIMANAGER_IMPORT_TABLE\"\n\n-\u003e **Hint:** The scopetype and adom for import will directly inherit the scopetype and adom configuration of the provider.\n\n",
129105+
"description": "Configure route maps.\n\n\u003e The following variables have sub resource. Avoid using them together, otherwise conflicts and overwrites may occur.\n\u003e- `rule`: `fortimanager.ObjectRouterRoutemapRule`\n\n\n\n## Example Usage\n\n\u003c!--Start PulumiCodeChooser --\u003e\n```yaml\nresources:\n trname:\n type: fortimanager:ObjectRouterRoutemap\n properties:\n comment: This is a Terraform example\n rules:\n - action: deny\n id: 1\n matchCommunity: Priority_1\n matchExtcommunityExact: enable\n```\n\u003c!--End PulumiCodeChooser --\u003e\n\n## Import\n\nObjectRouter RouteMap can be imported using any of these accepted formats:\n\n$ export \"FORTIMANAGER_IMPORT_TABLE\"=\"true\"\n\n```sh\n$ pulumi import fortimanager:index/objectRouterRoutemap:ObjectRouterRoutemap labelname {{name}}\n```\n\n$ unset \"FORTIMANAGER_IMPORT_TABLE\"\n\n-\u003e **Hint:** The scopetype and adom for import will directly inherit the scopetype and adom configuration of the provider.\n\n",
129106129106
"properties": {
129107129107
"adom": {
129108129108
"type": "string",
@@ -139087,7 +139087,7 @@
139087139087
}
139088139088
},
139089139089
"fortimanager:index/objectSystemExternalresource:ObjectSystemExternalresource": {
139090-
"description": "Configure external resource.\n\n## Example Usage\n\n\u003c!--Start PulumiCodeChooser --\u003e\n```typescript\nimport * as pulumi from \"@pulumi/pulumi\";\nimport * as fortimanager from \"@pulumi/fortimanager\";\n\nconst trname = new fortimanager.ObjectSystemExternalresource(\"trname\", {\n category: 192,\n comment: \"This is a Terraform example\",\n});\n```\n```python\nimport pulumi\nimport pulumi_fortimanager as fortimanager\n\ntrname = fortimanager.ObjectSystemExternalresource(\"trname\",\n category=192,\n comment=\"This is a Terraform example\")\n```\n```csharp\nusing System.Collections.Generic;\nusing System.Linq;\nusing Pulumi;\nusing Fortimanager = Pulumi.Fortimanager;\n\nreturn await Deployment.RunAsync(() =\u003e \n{\n var trname = new Fortimanager.ObjectSystemExternalresource(\"trname\", new()\n {\n Category = 192,\n Comment = \"This is a Terraform example\",\n });\n\n});\n```\n```go\npackage main\n\nimport (\n\t\"github.com/pulumi/pulumi-terraform-provider/sdks/go/fortimanager/fortimanager\"\n\t\"github.com/pulumi/pulumi/sdk/v3/go/pulumi\"\n)\n\nfunc main() {\n\tpulumi.Run(func(ctx *pulumi.Context) error {\n\t\t_, err := fortimanager.NewObjectSystemExternalresource(ctx, \"trname\", \u0026fortimanager.ObjectSystemExternalresourceArgs{\n\t\t\tCategory: pulumi.Float64(192),\n\t\t\tComment: \"This is a Terraform example\",\n\t\t})\n\t\tif err != nil {\n\t\t\treturn err\n\t\t}\n\t\treturn nil\n\t})\n}\n```\n```java\npackage generated_program;\n\nimport com.pulumi.Context;\nimport com.pulumi.Pulumi;\nimport com.pulumi.core.Output;\nimport com.pulumi.fortimanager.ObjectSystemExternalresource;\nimport com.pulumi.fortimanager.ObjectSystemExternalresourceArgs;\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 var trname = new ObjectSystemExternalresource(\"trname\", ObjectSystemExternalresourceArgs.builder()\n .category(192.0)\n .comment(\"This is a Terraform example\")\n .build());\n\n }\n}\n```\n```yaml\nresources:\n trname:\n type: fortimanager:ObjectSystemExternalresource\n properties:\n category: 192\n comment: This is a Terraform example\n```\n\u003c!--End PulumiCodeChooser --\u003e\n\n## Import\n\nObjectSystem ExternalResource can be imported using any of these accepted formats:\n\n$ export \"FORTIMANAGER_IMPORT_TABLE\"=\"true\"\n\n```sh\n$ pulumi import fortimanager:index/objectSystemExternalresource:ObjectSystemExternalresource labelname {{name}}\n```\n\n$ unset \"FORTIMANAGER_IMPORT_TABLE\"\n\n-\u003e **Hint:** The scopetype and adom for import will directly inherit the scopetype and adom configuration of the provider.\n\n",
139090+
"description": "Configure external resource.\n\n## Example Usage\n\n\u003c!--Start PulumiCodeChooser --\u003e\n```yaml\nresources:\n trname:\n type: fortimanager:ObjectSystemExternalresource\n properties:\n category: 192\n comment: This is a Terraform example\n```\n\u003c!--End PulumiCodeChooser --\u003e\n\n## Import\n\nObjectSystem ExternalResource can be imported using any of these accepted formats:\n\n$ export \"FORTIMANAGER_IMPORT_TABLE\"=\"true\"\n\n```sh\n$ pulumi import fortimanager:index/objectSystemExternalresource:ObjectSystemExternalresource labelname {{name}}\n```\n\n$ unset \"FORTIMANAGER_IMPORT_TABLE\"\n\n-\u003e **Hint:** The scopetype and adom for import will directly inherit the scopetype and adom configuration of the provider.\n\n",
139091139091
"properties": {
139092139092
"adom": {
139093139093
"type": "string",

go.mod

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ require (
110110
github.com/nightlyone/lockfile v1.0.0 // indirect
111111
github.com/nxadm/tail v1.4.11 // indirect
112112
github.com/pgavlin/fx v0.1.6 // indirect
113-
github.com/pgavlin/fx/v2 v2.0.10 // indirect
114113
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
115114
github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 // indirect
116115
github.com/pulumi/esc v0.17.0 // indirect
@@ -222,8 +221,8 @@ require (
222221
github.com/pkg/term v1.1.0 // indirect
223222
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
224223
github.com/posener/complete v1.2.3 // indirect
225-
github.com/pulumi/pulumi/pkg/v3 v3.197.0
226-
github.com/pulumi/pulumi/sdk/v3 v3.197.0
224+
github.com/pulumi/pulumi/pkg/v3 v3.190.0
225+
github.com/pulumi/pulumi/sdk/v3 v3.190.0
227226
github.com/rivo/uniseg v0.4.4 // indirect
228227
github.com/rogpeppe/go-internal v1.14.1 // indirect
229228
github.com/ryanuber/go-glob v1.0.0 // indirect

go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2357,8 +2357,8 @@ github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtP
23572357
github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac=
23582358
github.com/pgavlin/fx v0.1.6 h1:r9jEg69DhNoCd3Xh0+5mIbdbS3PqWrVWujkY76MFRTU=
23592359
github.com/pgavlin/fx v0.1.6/go.mod h1:KWZJ6fqBBSh8GxHYqwYCf3rYE7Gp2p0N8tJp8xv9u9M=
2360-
github.com/pgavlin/fx/v2 v2.0.10 h1:ggyQ6pB+lEQEbEae48Wh/X221eLOamMD7i01ISe88u4=
2361-
github.com/pgavlin/fx/v2 v2.0.10/go.mod h1:M/nF/ooAOy+NUBooYYXl2REARzJ/giPJxfMs8fINfKc=
2360+
github.com/pgavlin/fx/v2 v2.0.3 h1:ZBVklTFjxcWvBVPE+ti5qwnmTIQ0Gq6nuj3J5RKDtKk=
2361+
github.com/pgavlin/fx/v2 v2.0.3/go.mod h1:Cvnwqq0BopdHUJ7CU50h1XPeKrF4ZwdFj1nJLXbAjCE=
23622362
github.com/pgavlin/goldmark v1.1.33-0.20200616210433-b5eb04559386 h1:LoCV5cscNVWyK5ChN/uCoIFJz8jZD63VQiGJIRgr6uo=
23632363
github.com/pgavlin/goldmark v1.1.33-0.20200616210433-b5eb04559386/go.mod h1:MRxHTJrf9FhdfNQ8Hdeh9gmHevC9RJE/fu8M3JIGjoE=
23642364
github.com/phpdave11/gofpdf v1.4.2/go.mod h1:zpO6xFn9yxo3YLyMvW8HcKWVdbNqgIfOOp2dXMnm1mY=
@@ -2424,10 +2424,10 @@ github.com/pulumi/pulumi-java/pkg v1.12.0 h1:T7yFnFr0bgqy6huVUANMyUeGO1/Y3r2CJJ6
24242424
github.com/pulumi/pulumi-java/pkg v1.12.0/go.mod h1:g8QQjEgB5wTsZptyf1vbIcI/pgYEGJObnihAEgymkAo=
24252425
github.com/pulumi/pulumi-yaml v1.19.1 h1:Y92eTQv07p5RbbNj6s/54+ibdPgvndLJ2Lb1IjYffng=
24262426
github.com/pulumi/pulumi-yaml v1.19.1/go.mod h1:n1JTtfUXR1IWVJ86HvMvQglK5mrDeDduxsLifGW1WIA=
2427-
github.com/pulumi/pulumi/pkg/v3 v3.197.0 h1:FRIEQOTq+0QAqVe9b5DFVf0JCNzCoyaozAdEcUZLocU=
2428-
github.com/pulumi/pulumi/pkg/v3 v3.197.0/go.mod h1:89EecSPKyKmuK5Lygp6iXq5yZvNeD8Tm3ltA+pWPRK4=
2429-
github.com/pulumi/pulumi/sdk/v3 v3.197.0 h1:ZNKda7CQpfVbRS2r/7U5F+s4iejfL9HK39bXl5CCTpY=
2430-
github.com/pulumi/pulumi/sdk/v3 v3.197.0/go.mod h1:aV0+c5xpSYccWKmOjTZS9liYCqh7+peu3cQgSXu7CJw=
2427+
github.com/pulumi/pulumi/pkg/v3 v3.190.0 h1:CJi5NW2ckBgB32m60rhWH8VXFxIhL2cyXy+eAGBqoww=
2428+
github.com/pulumi/pulumi/pkg/v3 v3.190.0/go.mod h1:xRjPaEpEaw20EopBMT4hOvyu4qIGZTpdXw9pgNKid6I=
2429+
github.com/pulumi/pulumi/sdk/v3 v3.190.0 h1:sRY8xsQLqxJGTPpd0lrVienoEU+4ZKntisV32+82Czc=
2430+
github.com/pulumi/pulumi/sdk/v3 v3.190.0/go.mod h1:aV0+c5xpSYccWKmOjTZS9liYCqh7+peu3cQgSXu7CJw=
24312431
github.com/pulumi/schema-tools v0.1.2 h1:Fd9xvUjgck4NA+7/jSk7InqCUT4Kj940+EcnbQKpfZo=
24322432
github.com/pulumi/schema-tools v0.1.2/go.mod h1:62lgj52Tzq11eqWTIaKd+EVyYAu5dEcDJxMhTjvMO/k=
24332433
github.com/pulumi/terraform-diff-reader v0.0.2 h1:kTE4nEXU3/SYXESvAIem+wyHMI3abqkI3OhJ0G04LLI=

tools/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ require (
6666
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
6767
github.com/nightlyone/lockfile v1.0.0 // indirect
6868
github.com/pmezard/go-difflib v1.0.0 // indirect
69-
github.com/pulumi/pulumi/sdk/v3 v3.197.0
69+
github.com/pulumi/pulumi/sdk/v3 v3.190.0
7070
github.com/ulikunitz/xz v0.5.10 // indirect
7171
github.com/zclconf/go-cty v1.16.2 // indirect
7272
github.com/zclconf/go-cty-yaml v1.0.3 // indirect

tools/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -452,8 +452,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
452452
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
453453
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
454454
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
455-
github.com/pulumi/pulumi/sdk/v3 v3.197.0 h1:ZNKda7CQpfVbRS2r/7U5F+s4iejfL9HK39bXl5CCTpY=
456-
github.com/pulumi/pulumi/sdk/v3 v3.197.0/go.mod h1:aV0+c5xpSYccWKmOjTZS9liYCqh7+peu3cQgSXu7CJw=
455+
github.com/pulumi/pulumi/sdk/v3 v3.190.0 h1:sRY8xsQLqxJGTPpd0lrVienoEU+4ZKntisV32+82Czc=
456+
github.com/pulumi/pulumi/sdk/v3 v3.190.0/go.mod h1:aV0+c5xpSYccWKmOjTZS9liYCqh7+peu3cQgSXu7CJw=
457457
github.com/pulumi/terraform v0.12.1-0.20230322133416-a268cd0892c9 h1:VHeasqoSdMgpxw8Rx46TybHixfnBlCk0i0JLDusNn4Y=
458458
github.com/pulumi/terraform v0.12.1-0.20230322133416-a268cd0892c9/go.mod h1:w029Faz4rGcWSr4gPHWjlzU7CdvbxwQNjgiYWBC0FzU=
459459
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=

0 commit comments

Comments
 (0)