Rollout improved example converter

.ci-mgmt.yaml

@@ -25,6 +25,10 @@ makeTemplate: bridged
 docsCmd: "cd provider/pkg/docs-gen/examples/ && go run generate.go ./yaml ./"
 hybrid: true
 plugins:
+  - name: terraform
+    version: "1.0.16"
+    kind: converter
+
   - name: aws
     version: "6.8.0"
 team: ecosystem
@@ -34,3 +38,4 @@ actions:
       uses: webfactory/[email protected]
       with:
         ssh-private-key: ${{ secrets.PRIVATE_SSH_KEY_FOR_DIGITALOCEAN }}
+pulumiConvert: 1

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
 
@@ -114,6 +114,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
 	.pulumi/bin/pulumi plugin install resource aws 6.8.0
 
 lint_provider: provider

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"