Rollout improved example converter

.ci-mgmt.yaml

@@ -5,3 +5,8 @@ makeTemplate: bridged
 publishRegistry: false
 env:
   EXTERNAL_TOKEN: ${{ secrets.EXTERNAL_TOKEN }}
+pulumiConvert: 1
+plugins:
+  - name: terraform
+    version: "1.0.16"
+    kind: converter

Makefile

@@ -11,7 +11,7 @@ VERSION := $(shell pulumictl get version)
 JAVA_GEN := pulumi-java-gen
 TESTPARALLELISM := 10
 WORKING_DIR := $(shell pwd)
-PULUMI_CONVERT := 0
+PULUMI_CONVERT := 1
 
 development: install_plugins provider build_sdks install_sdks
 
@@ -111,6 +111,7 @@ install_nodejs_sdk:
 install_plugins: export PULUMI_HOME := $(WORKING_DIR)/.pulumi
 install_plugins: export PATH := $(WORKING_DIR)/.pulumi/bin:$(PATH)
 install_plugins: .pulumi/bin/pulumi
+	.pulumi/bin/pulumi plugin install converter terraform 1.0.16
 
 lint_provider: provider
 	cd provider && golangci-lint run -c ../.golangci.yml

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

@@ -85,40 +85,40 @@
                 "description": "A collection of values returned by getExternal.\n",
                 "properties": {
                     "id": {
-                        "type": "string",
-                        "description": "The id of the data source. This will always be set to `-`\n"
+                        "description": "The id of the data source. This will always be set to `-`\n",
+                        "type": "string"
                     },
                     "programs": {
-                        "type": "array",
                         "items": {
                             "type": "string"
-                        }
+                        },
+                        "type": "array"
                     },
                     "query": {
-                        "type": "object",
                         "additionalProperties": {
                             "type": "string"
                         },
-                        "description": "A map of string values to pass to the external program as the query arguments. If not supplied, the program will receive an empty object as its input.\n"
+                        "description": "A map of string values to pass to the external program as the query arguments. If not supplied, the program will receive an empty object as its input.\n",
+                        "type": "object"
                     },
                     "result": {
-                        "type": "object",
                         "additionalProperties": {
                             "type": "string"
                         },
-                        "description": "A map of string values returned from the external program.\n"
+                        "description": "A map of string values returned from the external program.\n",
+                        "type": "object"
                     },
                     "workingDir": {
-                        "type": "string",
-                        "description": "Working directory of the program. If not supplied, the program will run in the current directory.\n"
+                        "description": "Working directory of the program. If not supplied, the program will run in the current directory.\n",
+                        "type": "string"
                     }
                 },
-                "type": "object",
                 "required": [
                     "id",
                     "programs",
                     "result"
-                ]
+                ],
+                "type": "object"
             }
         }
     }

scripts/upstream.sh

@@ -176,7 +176,7 @@ end_rebase() {
 
   rm patches/*.patch
   cd upstream
-  git format-patch local -o ../patches --zero-commit --no-signature --no-stat
+  git format-patch local -o ../patches --zero-commit --no-signature --no-stat --no-numbered
   cd ..
   rm rebase-in-progress
   apply "$1"