Upgrade pulumi-terraform-bridge to v3.59.0 (#131)

This PR was generated via `$ upgrade-provider pulumi/pulumi-slack --kind=bridge`. Also migrates to stable token mapping Also updates Java --- - Upgrading pulumi-terraform-bridge from v3.44.3 to v3.59.0. - Upgrading pulumi/terraform-plugin-sdk from v2.26.1 to 2.29.0.
pulumi · Sep 18, 2023 · 5c8dcf6 · 5c8dcf6
2 parents 265c12f + 7deabfb
commit 5c8dcf6
Show file tree

Hide file tree

Showing 53 changed files with 1,691 additions and 529 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -76,7 +76,7 @@ jobs:
     - name: Setup Gradle
       uses: gradle/gradle-build-action@v2
       with:
-        gradle-version: "7.6"
+        gradle-version: "8.3"
     - name: Download provider + tfgen binaries
       uses: actions/download-artifact@v2
       with:
@@ -394,7 +394,7 @@ jobs:
     - name: Setup Gradle
       uses: gradle/gradle-build-action@v2
       with:
-        gradle-version: "7.6"
+        gradle-version: "8.3"
     - name: Download provider + tfgen binaries
       uses: actions/download-artifact@v2
       with:

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -76,7 +76,7 @@ jobs:
     - name: Setup Gradle
       uses: gradle/gradle-build-action@v2
       with:
-        gradle-version: "7.6"
+        gradle-version: "8.3"
     - name: Download provider + tfgen binaries
       uses: actions/download-artifact@v2
       with:
@@ -394,7 +394,7 @@ jobs:
     - name: Setup Gradle
       uses: gradle/gradle-build-action@v2
       with:
-        gradle-version: "7.6"
+        gradle-version: "8.3"
     - name: Download provider + tfgen binaries
       uses: actions/download-artifact@v2
       with:

diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
@@ -77,7 +77,7 @@ jobs:
     - name: Setup Gradle
       uses: gradle/gradle-build-action@v2
       with:
-        gradle-version: "7.6"
+        gradle-version: "8.3"
     - name: Download provider + tfgen binaries
       uses: actions/download-artifact@v2
       with:
@@ -340,7 +340,7 @@ jobs:
     - name: Setup Gradle
       uses: gradle/gradle-build-action@v2
       with:
-        gradle-version: "7.6"
+        gradle-version: "8.3"
     - name: Download provider + tfgen binaries
       uses: actions/download-artifact@v2
       with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -76,7 +76,7 @@ jobs:
     - name: Setup Gradle
       uses: gradle/gradle-build-action@v2
       with:
-        gradle-version: "7.6"
+        gradle-version: "8.3"
     - name: Download provider + tfgen binaries
       uses: actions/download-artifact@v2
       with:
@@ -366,7 +366,7 @@ jobs:
     - name: Setup Gradle
       uses: gradle/gradle-build-action@v2
       with:
-        gradle-version: "7.6"
+        gradle-version: "8.3"
     - name: Download provider + tfgen binaries
       uses: actions/download-artifact@v2
       with:

diff --git a/.github/workflows/run-acceptance-tests.yml b/.github/workflows/run-acceptance-tests.yml
@@ -81,7 +81,7 @@ jobs:
     - name: Setup Gradle
       uses: gradle/gradle-build-action@v2
       with:
-        gradle-version: "7.6"
+        gradle-version: "8.3"
     - name: Download provider + tfgen binaries
       uses: actions/download-artifact@v2
       with:
@@ -348,7 +348,7 @@ jobs:
     - name: Setup Gradle
       uses: gradle/gradle-build-action@v2
       with:
-        gradle-version: "7.6"
+        gradle-version: "8.3"
     - name: Download provider + tfgen binaries
       uses: actions/download-artifact@v2
       with:

diff --git a/Makefile b/Makefile
@@ -9,7 +9,7 @@ TFGEN := pulumi-tfgen-$(PACK)
 PROVIDER := pulumi-resource-$(PACK)
 VERSION := $(shell pulumictl get version)
 JAVA_GEN := pulumi-java-gen
-JAVA_GEN_VERSION := v0.5.4
+JAVA_GEN_VERSION := v0.9.7
 TESTPARALLELISM := 10
 WORKING_DIR := $(shell pwd)
 

diff --git a/provider/cmd/pulumi-resource-slack/bridge-metadata.json b/provider/cmd/pulumi-resource-slack/bridge-metadata.json
@@ -2,10 +2,23 @@
     "auto-aliasing": {
         "resources": {
             "slack_conversation": {
-                "current": "slack:index/conversation:Conversation"
+                "current": "slack:index/conversation:Conversation",
+                "fields": {
+                    "permanent_members": {
+                        "maxItemsOne": false
+                    }
+                }
             },
             "slack_usergroup": {
-                "current": "slack:index/usergroup:Usergroup"
+                "current": "slack:index/usergroup:Usergroup",
+                "fields": {
+                    "channels": {
+                        "maxItemsOne": false
+                    },
+                    "users": {
+                        "maxItemsOne": false
+                    }
+                }
             }
         },
         "datasources": {
@@ -16,7 +29,15 @@
                 "current": "slack:index/getUser:getUser"
             },
             "slack_usergroup": {
-                "current": "slack:index/getUsergroup:getUsergroup"
+                "current": "slack:index/getUsergroup:getUsergroup",
+                "fields": {
+                    "channels": {
+                        "maxItemsOne": false
+                    },
+                    "users": {
+                        "maxItemsOne": false
+                    }
+                }
             }
         }
     },

diff --git a/provider/cmd/pulumi-resource-slack/schema.json b/provider/cmd/pulumi-resource-slack/schema.json
@@ -17,38 +17,36 @@
     },
     "language": {
         "csharp": {
-            "compatibility": "tfbridge20",
-            "namespaces": null,
             "packageReferences": {
                 "Pulumi": "3.*"
-            }
+            },
+            "compatibility": "tfbridge20"
         },
         "go": {
-            "generateExtraInputTypes": true,
+            "importBasePath": "github.com/pulumi/pulumi-slack/sdk/go/slack",
             "generateResourceContainerTypes": true,
-            "importBasePath": "github.com/pulumi/pulumi-slack/sdk/go/slack"
+            "generateExtraInputTypes": true
         },
         "nodejs": {
-            "compatibility": "tfbridge20",
+            "packageDescription": "A Pulumi package for managing Slack workspaces.",
+            "readme": "\u003e This provider is a derived work of the [Terraform Provider](https://github.com/pablovarela/terraform-provider-slack)\n\u003e distributed under [MPL 2.0](https://www.mozilla.org/en-US/MPL/2.0/). If you encounter a bug or missing feature,\n\u003e first check the [`pulumi-slack` repo](https://github.com/pulumi/pulumi-slack/issues); however, if that doesn't turn up anything,\n\u003e please consult the source [`terraform-provider-slack` repo](https://github.com/pablovarela/terraform-provider-slack/issues).",
             "dependencies": {
                 "@pulumi/pulumi": "^3.0.0"
             },
             "devDependencies": {
                 "@types/mime": "^2.0.0",
                 "@types/node": "^10.0.0"
             },
-            "disableUnionOutputTypes": true,
-            "packageDescription": "A Pulumi package for managing Slack workspaces.",
-            "packageName": "",
-            "readme": "\u003e This provider is a derived work of the [Terraform Provider](https://github.com/pablovarela/terraform-provider-slack)\n\u003e distributed under [MPL 2.0](https://www.mozilla.org/en-US/MPL/2.0/). If you encounter a bug or missing feature,\n\u003e first check the [`pulumi-slack` repo](https://github.com/pulumi/pulumi-slack/issues); however, if that doesn't turn up anything,\n\u003e please consult the source [`terraform-provider-slack` repo](https://github.com/pablovarela/terraform-provider-slack/issues).",
-            "typescriptVersion": ""
+            "compatibility": "tfbridge20",
+            "disableUnionOutputTypes": true
         },
         "python": {
-            "compatibility": "tfbridge20",
-            "readme": "\u003e This provider is a derived work of the [Terraform Provider](https://github.com/pablovarela/terraform-provider-slack)\n\u003e distributed under [MPL 2.0](https://www.mozilla.org/en-US/MPL/2.0/). If you encounter a bug or missing feature,\n\u003e first check the [`pulumi-slack` repo](https://github.com/pulumi/pulumi-slack/issues); however, if that doesn't turn up anything,\n\u003e please consult the source [`terraform-provider-slack` repo](https://github.com/pablovarela/terraform-provider-slack/issues).",
             "requires": {
                 "pulumi": "\u003e=3.0.0,\u003c4.0.0"
-            }
+            },
+            "readme": "\u003e This provider is a derived work of the [Terraform Provider](https://github.com/pablovarela/terraform-provider-slack)\n\u003e distributed under [MPL 2.0](https://www.mozilla.org/en-US/MPL/2.0/). If you encounter a bug or missing feature,\n\u003e first check the [`pulumi-slack` repo](https://github.com/pulumi/pulumi-slack/issues); however, if that doesn't turn up anything,\n\u003e please consult the source [`terraform-provider-slack` repo](https://github.com/pablovarela/terraform-provider-slack/issues).",
+            "compatibility": "tfbridge20",
+            "pyproject": {}
         }
     },
     "config": {
@@ -89,7 +87,7 @@
             "properties": {
                 "actionOnDestroy": {
                     "type": "string",
-                    "description": "Either of none or archive\n"
+                    "description": "indicates whether the\nconversation should be archived or left behind on destroy. Valid values are\n`archive | none`. Note that when set to `none` the conversation will be left\nas it is  and as a result any subsequent runs of pulumi up with the same\nname  will fail.\n"
                 },
                 "actionOnUpdatePermanentMembers": {
                     "type": "string",
@@ -163,7 +161,7 @@
             "inputProperties": {
                 "actionOnDestroy": {
                     "type": "string",
-                    "description": "Either of none or archive\n"
+                    "description": "indicates whether the\nconversation should be archived or left behind on destroy. Valid values are\n`archive | none`. Note that when set to `none` the conversation will be left\nas it is  and as a result any subsequent runs of pulumi up with the same\nname  will fail.\n"
                 },
                 "actionOnUpdatePermanentMembers": {
                     "type": "string",
@@ -208,7 +206,7 @@
                 "properties": {
                     "actionOnDestroy": {
                         "type": "string",
-                        "description": "Either of none or archive\n"
+                        "description": "indicates whether the\nconversation should be archived or left behind on destroy. Valid values are\n`archive | none`. Note that when set to `none` the conversation will be left\nas it is  and as a result any subsequent runs of pulumi up with the same\nname  will fail.\n"
                     },
                     "actionOnUpdatePermanentMembers": {
                         "type": "string",
@@ -379,7 +377,7 @@
                     },
                     "isPrivate": {
                         "type": "boolean",
-                        "description": "The conversation is privileged between two or more members\n"
+                        "description": "The conversation is privileged between two or more members\n\nEither `channel_id` or `name` must be provided. `is_private` only works in conjunction\nwith `name`.\n"
                     },
                     "name": {
                         "type": "string",
@@ -465,7 +463,7 @@
                 "properties": {
                     "email": {
                         "type": "string",
-                        "description": "The email of the user\n"
+                        "description": "The email of the user\n\nThe data source expects exactly one of these fields, you can't set both.\n"
                     },
                     "name": {
                         "type": "string",
@@ -505,7 +503,7 @@
                     },
                     "usergroupId": {
                         "type": "string",
-                        "description": "The id of the usergroup\n"
+                        "description": "The id of the usergroup\n\nThe data source expects exactly one of these fields, you can't set both.\n"
                     }
                 },
                 "type": "object"