Rollout improved example converter

.ci-mgmt.yaml

@@ -8,6 +8,10 @@ env: # these are in plaintext in the setup script
   KEYCLOAK_USER: "keycloak"
 makeTemplate: bridged
 plugins:
+  - name: terraform
+    version: "1.0.16"
+    kind: converter
+
   - name: aws
     version: "4.2.0"
 actions:
@@ -16,3 +20,4 @@ actions:
       run: make upstream
     - name: Setup local Keycloak
       run: make -C upstream local
+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
 
@@ -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
 	.pulumi/bin/pulumi plugin install resource aws 4.2.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"