diff --git a/.ci-mgmt.yaml b/.ci-mgmt.yaml index 33d26e94750..ff509da056e 100644 --- a/.ci-mgmt.yaml +++ b/.ci-mgmt.yaml @@ -12,6 +12,18 @@ env: ARM_TENANT_ID: ${{ secrets.ARM_TENANT_ID }} ARM_CLIENT_SECRET: ${{ secrets.ARM_CLIENT_SECRET }} PULUMI_MISSING_DOCS_ERROR: true + # Would rather fail the build to force listing dependencies manually under plugins: than + # auto-install a floating dependency which may influence example generation and cause + # non-deterministic builds later on. + # + # Unfortunately this does not work yet because of e2e tests (example-based tests). Need to find a + # way to scope this env var so that it does not configure tests. + # + # TestAccFrontdoor: no resource plugin 'pulumi-resource-random' found in the workspace at version v4.15.1 or on your $PATH + # Test_sql/e2e: Error: error resolving type of resource random: internal error loading package "random": no resource plugin + # 'pulumi-resource-random' found in the workspace or on your $PATH + # + # PULUMI_DISABLE_AUTOMATIC_PLUGIN_ACQUISITION: true upstream-provider-repo: terraform-provider-azurerm makeTemplate: bridged plugins: @@ -23,6 +35,11 @@ plugins: version: "0.0.15" - name: local version: "0.0.1" + - name: std + version: "1.4.0" + - name: terraform + kind: converter + version: "1.0.11" goBuildParallelism: 2 runner: prerequisites: pulumi-ubuntu-8core @@ -38,3 +55,4 @@ actions: - name: Run provider tests run: | cd provider && go test -v -json -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt +pulumiConvert: 1 diff --git a/Makefile b/Makefile index 4bb82e2fdc4..975d2991c7a 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ JAVA_GEN := pulumi-java-gen TESTPARALLELISM := 10 WORKING_DIR := $(shell pwd) PULUMI_PROVIDER_BUILD_PARALLELISM ?= -p 2 -PULUMI_CONVERT := 0 +PULUMI_CONVERT := 1 development: install_plugins provider build_sdks install_sdks @@ -99,6 +99,8 @@ install_plugins: .pulumi/bin/pulumi .pulumi/bin/pulumi plugin install resource azuread 5.33.0 .pulumi/bin/pulumi plugin install resource time 0.0.15 .pulumi/bin/pulumi plugin install resource local 0.0.1 + .pulumi/bin/pulumi plugin install resource std 1.4.0 + .pulumi/bin/pulumi plugin install converter terraform 1.0.11 lint_provider: provider cd provider && golangci-lint run -c ../.golangci.yml