diff --git a/provider-ci/generate-provider.ts b/provider-ci/generate-provider.ts index 239d15b90d..7f39974332 100644 --- a/provider-ci/generate-provider.ts +++ b/provider-ci/generate-provider.ts @@ -19,6 +19,7 @@ const upstreamProviderOrg = getRequiredStringParam('upstream-provider-org'); const upstreamProviderRepo = param.String('upstream-provider-repo', `terraform-provider-${provider}`); const failOnExtraMapping = param.Boolean('fail-on-extra-mapping', true); const failOnMissingMapping = param.Boolean('fail-on-missing-mapping', true); +const upstreamProviderMajorVersion = param.String('upstream-provider-major-version', ""); // NOTE: The following code works against the JS in lib/ generated from the TS // in src/. In order to have changes in e.g. workflows.ts be reflected in this @@ -43,6 +44,7 @@ const updateUpstreamProvider = () => new wf.UpdateUpstreamProviderWorkflow({ upstreamProviderRepo: upstreamProviderRepo, failOnExtraMapping: failOnExtraMapping, failOnMissingMapping: failOnMissingMapping, + upstreamProviderMajorVersion: upstreamProviderMajorVersion, }); const commandDispatch = () => new wf.CommandDispatchWorkflow(); const pre = () => new goreleaser.PulumiGoreleaserPreConfig(provider); diff --git a/provider-ci/lib/workflows.js b/provider-ci/lib/workflows.js index 28c4f9d4c0..a1687bdbfc 100644 --- a/provider-ci/lib/workflows.js +++ b/provider-ci/lib/workflows.js @@ -190,6 +190,11 @@ export class UpdatePulumiTerraformBridgeWorkflow extends g.GithubWorkflow { }, { env: { GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}', + // If there are missing or extra mappings, they can not have been + // introduced by updating the bridge, so for this workflow we'll + // ignore mapping errors. + PULUMI_EXTRA_MAPPING_ERROR: false, + PULUMI_MISSING_MAPPING_ERROR: false, } }); this.jobs = { @@ -264,7 +269,7 @@ export class UpdateUpstreamProviderWorkflow extends g.GithubWorkflow { } } }, { - env: Object.assign(Object.assign({}, env), { PULUMI_EXTRA_MAPPING_ERROR: args.failOnExtraMapping, PULUMI_MISSING_MAPPING_ERROR: args.failOnMissingMapping, UPSTREAM_PROVIDER_ORG: args.upstreamProviderOrg, UPSTREAM_PROVIDER_REPO: args.upstreamProviderRepo }) + env: Object.assign(Object.assign({}, env), { PULUMI_EXTRA_MAPPING_ERROR: args.failOnExtraMapping, PULUMI_MISSING_MAPPING_ERROR: args.failOnMissingMapping, UPSTREAM_PROVIDER_ORG: args.upstreamProviderOrg, UPSTREAM_PROVIDER_REPO: args.upstreamProviderRepo, UPSTREAM_PROVIDER_MAJOR_VERSION: args.upstreamProviderMajorVersion }) }); const prStepOptions = { "commit-message": "Update ${{ env.UPSTREAM_PROVIDER_REPO }} to v${{ github.event.inputs.version }}", @@ -305,11 +310,11 @@ export class UpdateUpstreamProviderWorkflow extends g.GithubWorkflow { .addStep({ name: "Update shim/go.mod", if: "${{ hashFiles('provider/shim/go.mod') != '' }}", - run: "cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy" + run: "cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy" }) .addStep({ name: "Update go.mod", - run: "cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy", + run: "cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy", }) .addStep(new steps.RunCommand('make tfgen')) .addStep(new steps.RunCommand('make build_sdks')) diff --git a/provider-ci/providers/aiven/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/aiven/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/aiven/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/aiven/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/aiven/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/aiven/repo/.github/workflows/update-upstream-provider.yml index 75b891bf64..b3ef674312 100644 --- a/provider-ci/providers/aiven/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/aiven/repo/.github/workflows/update-upstream-provider.yml @@ -8,12 +8,14 @@ env: PROVIDER: aiven PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: pulumi UPSTREAM_PROVIDER_REPO: terraform-provider-aiven jobs: @@ -55,12 +57,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/akamai/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/akamai/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/akamai/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/akamai/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/akamai/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/akamai/repo/.github/workflows/update-upstream-provider.yml index a6e331b727..431b21a3fb 100644 --- a/provider-ci/providers/akamai/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/akamai/repo/.github/workflows/update-upstream-provider.yml @@ -10,12 +10,14 @@ env: PROVIDER: akamai PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: pulumi UPSTREAM_PROVIDER_REPO: terraform-provider-akamai jobs: @@ -57,12 +59,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/alicloud/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/alicloud/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/alicloud/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/alicloud/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/alicloud/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/alicloud/repo/.github/workflows/update-upstream-provider.yml index df55b4fa82..3fcc76aa24 100644 --- a/provider-ci/providers/alicloud/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/alicloud/repo/.github/workflows/update-upstream-provider.yml @@ -16,6 +16,7 @@ env: PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: aliyun UPSTREAM_PROVIDER_REPO: terraform-provider-alicloud jobs: @@ -57,12 +58,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/artifactory/config.yaml b/provider-ci/providers/artifactory/config.yaml index 3bf5cdf052..c3a6dcb23f 100644 --- a/provider-ci/providers/artifactory/config.yaml +++ b/provider-ci/providers/artifactory/config.yaml @@ -4,3 +4,4 @@ env: ARTIFACTORY_URL: ${{ secrets.ARTIFACTORY_URL }} ARTIFACTORY_ACCESS_TOKEN: ${{ secrets.ARTIFACTORY_ACCESS_TOKEN}} upstream-provider-org: jfrog +upstream-provider-major-version: /v2 diff --git a/provider-ci/providers/artifactory/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/artifactory/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/artifactory/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/artifactory/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/artifactory/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/artifactory/repo/.github/workflows/update-upstream-provider.yml index 76fac762b0..be65049ed9 100644 --- a/provider-ci/providers/artifactory/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/artifactory/repo/.github/workflows/update-upstream-provider.yml @@ -8,12 +8,14 @@ env: PROVIDER: artifactory PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: /v2 UPSTREAM_PROVIDER_ORG: jfrog UPSTREAM_PROVIDER_REPO: terraform-provider-artifactory jobs: @@ -55,12 +57,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/auth0/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/auth0/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/auth0/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/auth0/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/auth0/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/auth0/repo/.github/workflows/update-upstream-provider.yml index 1de998f0b2..d227ba14bd 100644 --- a/provider-ci/providers/auth0/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/auth0/repo/.github/workflows/update-upstream-provider.yml @@ -9,12 +9,14 @@ env: PROVIDER: auth0 PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: alexkappa UPSTREAM_PROVIDER_REPO: terraform-provider-auth0 jobs: @@ -56,12 +58,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/aws/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/aws/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/aws/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/aws/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/aws/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/aws/repo/.github/workflows/update-upstream-provider.yml index 05db456d1e..05d3d9f10d 100644 --- a/provider-ci/providers/aws/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/aws/repo/.github/workflows/update-upstream-provider.yml @@ -7,12 +7,14 @@ env: PROVIDER: aws PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: pulumi UPSTREAM_PROVIDER_REPO: terraform-provider-aws jobs: @@ -54,12 +56,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/azure/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/azure/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/azure/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/azure/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/azure/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/azure/repo/.github/workflows/update-upstream-provider.yml index ab5c5a30ad..e88937de4f 100644 --- a/provider-ci/providers/azure/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/azure/repo/.github/workflows/update-upstream-provider.yml @@ -12,12 +12,14 @@ env: PROVIDER: azure PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: pulumi UPSTREAM_PROVIDER_REPO: terraform-provider-azurerm jobs: @@ -59,12 +61,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/azuread/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/azuread/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/azuread/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/azuread/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/azuread/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/azuread/repo/.github/workflows/update-upstream-provider.yml index 6f0cbd35c6..25e3ebec3f 100644 --- a/provider-ci/providers/azuread/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/azuread/repo/.github/workflows/update-upstream-provider.yml @@ -11,12 +11,14 @@ env: PROVIDER: azuread PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: hashicorp UPSTREAM_PROVIDER_REPO: terraform-provider-azuread jobs: @@ -58,12 +60,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/azuredevops/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/azuredevops/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/azuredevops/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/azuredevops/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/azuredevops/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/azuredevops/repo/.github/workflows/update-upstream-provider.yml index b8b9846e24..a00e9fb3f9 100644 --- a/provider-ci/providers/azuredevops/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/azuredevops/repo/.github/workflows/update-upstream-provider.yml @@ -8,12 +8,14 @@ env: PROVIDER: azuredevops PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: pulumi UPSTREAM_PROVIDER_REPO: terraform-provider-azuredevops jobs: @@ -55,12 +57,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/civo/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/civo/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/civo/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/civo/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/civo/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/civo/repo/.github/workflows/update-upstream-provider.yml index e327621b03..13f6a3f61b 100644 --- a/provider-ci/providers/civo/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/civo/repo/.github/workflows/update-upstream-provider.yml @@ -7,12 +7,14 @@ env: PROVIDER: civo PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: pulumi UPSTREAM_PROVIDER_REPO: terraform-provider-civo jobs: @@ -54,12 +56,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/cloudamqp/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/cloudamqp/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/cloudamqp/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/cloudamqp/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/cloudamqp/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/cloudamqp/repo/.github/workflows/update-upstream-provider.yml index 601d3d97cb..9446f5dc41 100644 --- a/provider-ci/providers/cloudamqp/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/cloudamqp/repo/.github/workflows/update-upstream-provider.yml @@ -6,12 +6,14 @@ env: PROVIDER: cloudamqp PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: cloudamqp UPSTREAM_PROVIDER_REPO: terraform-provider-cloudamqp jobs: @@ -53,12 +55,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/cloudflare/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/cloudflare/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/cloudflare/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/cloudflare/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/cloudflare/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/cloudflare/repo/.github/workflows/update-upstream-provider.yml index c1fef75836..558e8241e8 100644 --- a/provider-ci/providers/cloudflare/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/cloudflare/repo/.github/workflows/update-upstream-provider.yml @@ -6,12 +6,14 @@ env: PROVIDER: cloudflare PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: cloudflare UPSTREAM_PROVIDER_REPO: terraform-provider-cloudflare jobs: @@ -53,12 +55,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/cloudinit/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/cloudinit/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/cloudinit/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/cloudinit/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/cloudinit/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/cloudinit/repo/.github/workflows/update-upstream-provider.yml index 31382002bd..ca03bc79c5 100644 --- a/provider-ci/providers/cloudinit/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/cloudinit/repo/.github/workflows/update-upstream-provider.yml @@ -6,12 +6,14 @@ env: PROVIDER: cloudinit PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: hashicorp UPSTREAM_PROVIDER_REPO: terraform-provider-cloudinit jobs: @@ -53,12 +55,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/confluent/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/confluent/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/confluent/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/confluent/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/confluent/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/confluent/repo/.github/workflows/update-upstream-provider.yml index af3bbebbb8..e66a3c1fbc 100644 --- a/provider-ci/providers/confluent/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/confluent/repo/.github/workflows/update-upstream-provider.yml @@ -8,12 +8,14 @@ env: PROVIDER: confluent PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: Mongey UPSTREAM_PROVIDER_REPO: terraform-provider-confluent jobs: @@ -55,12 +57,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/consul/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/consul/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/consul/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/consul/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/consul/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/consul/repo/.github/workflows/update-upstream-provider.yml index 1265dd3a7e..79c5ae1f79 100644 --- a/provider-ci/providers/consul/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/consul/repo/.github/workflows/update-upstream-provider.yml @@ -6,12 +6,14 @@ env: PROVIDER: consul PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: hashicorp UPSTREAM_PROVIDER_REPO: terraform-provider-consul jobs: @@ -53,12 +55,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/datadog/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/datadog/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/datadog/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/datadog/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/datadog/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/datadog/repo/.github/workflows/update-upstream-provider.yml index 55ed34ef83..3a0e2d8ab4 100644 --- a/provider-ci/providers/datadog/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/datadog/repo/.github/workflows/update-upstream-provider.yml @@ -6,12 +6,14 @@ env: PROVIDER: datadog PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: pulumi UPSTREAM_PROVIDER_REPO: terraform-provider-datadog jobs: @@ -53,12 +55,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/digitalocean/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/digitalocean/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/digitalocean/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/digitalocean/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/digitalocean/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/digitalocean/repo/.github/workflows/update-upstream-provider.yml index 9b5ea64421..c182ebfff4 100644 --- a/provider-ci/providers/digitalocean/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/digitalocean/repo/.github/workflows/update-upstream-provider.yml @@ -7,12 +7,14 @@ env: PROVIDER: digitalocean PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: pulumi UPSTREAM_PROVIDER_REPO: terraform-provider-digitalocean jobs: @@ -54,12 +56,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/dnsimple/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/dnsimple/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/dnsimple/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/dnsimple/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/dnsimple/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/dnsimple/repo/.github/workflows/update-upstream-provider.yml index b85eff2122..9cb9858179 100644 --- a/provider-ci/providers/dnsimple/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/dnsimple/repo/.github/workflows/update-upstream-provider.yml @@ -8,12 +8,14 @@ env: PROVIDER: dnsimple PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: pulumi UPSTREAM_PROVIDER_REPO: terraform-provider-dnsimple jobs: @@ -55,12 +57,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/docker/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/docker/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/docker/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/docker/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/docker/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/docker/repo/.github/workflows/update-upstream-provider.yml index 64dfbf45c4..9139e7accb 100644 --- a/provider-ci/providers/docker/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/docker/repo/.github/workflows/update-upstream-provider.yml @@ -12,12 +12,14 @@ env: PROVIDER: docker PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: /home/runner/work/pulumi-docker PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: kreuzwerker UPSTREAM_PROVIDER_REPO: terraform-provider-docker jobs: @@ -59,12 +61,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/ec/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/ec/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/ec/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/ec/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/ec/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/ec/repo/.github/workflows/update-upstream-provider.yml index 560837f12c..a2ce07f1f4 100644 --- a/provider-ci/providers/ec/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/ec/repo/.github/workflows/update-upstream-provider.yml @@ -7,12 +7,14 @@ env: PROVIDER: ec PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: elastic UPSTREAM_PROVIDER_REPO: terraform-provider-ec jobs: @@ -54,12 +56,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/equinix-metal/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/equinix-metal/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/equinix-metal/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/equinix-metal/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/equinix-metal/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/equinix-metal/repo/.github/workflows/update-upstream-provider.yml index b1c7012125..89d00d4428 100644 --- a/provider-ci/providers/equinix-metal/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/equinix-metal/repo/.github/workflows/update-upstream-provider.yml @@ -7,12 +7,14 @@ env: PROVIDER: equinix-metal PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: equinix UPSTREAM_PROVIDER_REPO: terraform-provider-metal jobs: @@ -54,12 +56,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/f5bigip/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/f5bigip/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/f5bigip/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/f5bigip/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/f5bigip/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/f5bigip/repo/.github/workflows/update-upstream-provider.yml index 85a57b843e..00e484e781 100644 --- a/provider-ci/providers/f5bigip/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/f5bigip/repo/.github/workflows/update-upstream-provider.yml @@ -10,12 +10,14 @@ env: PROVIDER: f5bigip PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: F5Networks UPSTREAM_PROVIDER_REPO: terraform-provider-bigip jobs: @@ -57,12 +59,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/fastly/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/fastly/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/fastly/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/fastly/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/fastly/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/fastly/repo/.github/workflows/update-upstream-provider.yml index 8a7b1c354d..aaf4caea04 100644 --- a/provider-ci/providers/fastly/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/fastly/repo/.github/workflows/update-upstream-provider.yml @@ -7,12 +7,14 @@ env: PROVIDER: fastly PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: pulumi UPSTREAM_PROVIDER_REPO: terraform-provider-fastly jobs: @@ -54,12 +56,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/gcp/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/gcp/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/gcp/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/gcp/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/gcp/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/gcp/repo/.github/workflows/update-upstream-provider.yml index 41dc329aaf..aebff5cad9 100644 --- a/provider-ci/providers/gcp/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/gcp/repo/.github/workflows/update-upstream-provider.yml @@ -9,12 +9,14 @@ env: PROVIDER: gcp PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: pulumi UPSTREAM_PROVIDER_REPO: terraform-provider-google-beta jobs: @@ -56,12 +58,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/github/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/github/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/github/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/github/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/github/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/github/repo/.github/workflows/update-upstream-provider.yml index 4df48c626c..aa2b931124 100644 --- a/provider-ci/providers/github/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/github/repo/.github/workflows/update-upstream-provider.yml @@ -8,12 +8,14 @@ env: PROVIDER: github PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: pulumi UPSTREAM_PROVIDER_REPO: terraform-provider-github jobs: @@ -55,12 +57,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/gitlab/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/gitlab/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/gitlab/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/gitlab/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/gitlab/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/gitlab/repo/.github/workflows/update-upstream-provider.yml index 248a751d98..31ee34dc98 100644 --- a/provider-ci/providers/gitlab/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/gitlab/repo/.github/workflows/update-upstream-provider.yml @@ -7,12 +7,14 @@ env: PROVIDER: gitlab PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: gitlabhq UPSTREAM_PROVIDER_REPO: terraform-provider-gitlab jobs: @@ -54,12 +56,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/hcloud/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/hcloud/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/hcloud/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/hcloud/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/hcloud/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/hcloud/repo/.github/workflows/update-upstream-provider.yml index d26a63ce2d..0df4d940ae 100644 --- a/provider-ci/providers/hcloud/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/hcloud/repo/.github/workflows/update-upstream-provider.yml @@ -7,12 +7,14 @@ env: PROVIDER: hcloud PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: hetznercloud UPSTREAM_PROVIDER_REPO: terraform-provider-hcloud jobs: @@ -54,12 +56,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/kafka/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/kafka/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/kafka/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/kafka/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/kafka/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/kafka/repo/.github/workflows/update-upstream-provider.yml index cf0c6b144c..6d9fa51d72 100644 --- a/provider-ci/providers/kafka/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/kafka/repo/.github/workflows/update-upstream-provider.yml @@ -6,12 +6,14 @@ env: PROVIDER: kafka PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: Mongey UPSTREAM_PROVIDER_REPO: terraform-provider-kafka jobs: @@ -53,12 +55,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/keycloak/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/keycloak/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/keycloak/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/keycloak/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/keycloak/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/keycloak/repo/.github/workflows/update-upstream-provider.yml index fe51950e92..e59c440a2f 100644 --- a/provider-ci/providers/keycloak/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/keycloak/repo/.github/workflows/update-upstream-provider.yml @@ -11,12 +11,14 @@ env: PROVIDER: keycloak PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: pulumi UPSTREAM_PROVIDER_REPO: terraform-provider-keycloak jobs: @@ -58,12 +60,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/kong/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/kong/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/kong/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/kong/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/kong/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/kong/repo/.github/workflows/update-upstream-provider.yml index 6f537a0fa6..d869b795c1 100644 --- a/provider-ci/providers/kong/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/kong/repo/.github/workflows/update-upstream-provider.yml @@ -6,12 +6,14 @@ env: PROVIDER: kong PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: kevholditch UPSTREAM_PROVIDER_REPO: terraform-provider-kong jobs: @@ -53,12 +55,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/libvirt/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/libvirt/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/libvirt/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/libvirt/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/libvirt/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/libvirt/repo/.github/workflows/update-upstream-provider.yml index 85a90daf59..bd895773a9 100644 --- a/provider-ci/providers/libvirt/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/libvirt/repo/.github/workflows/update-upstream-provider.yml @@ -7,12 +7,14 @@ env: PROVIDER: libvirt PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: dmacvicar UPSTREAM_PROVIDER_REPO: terraform-provider-libvirt jobs: @@ -54,12 +56,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/linode/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/linode/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/linode/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/linode/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/linode/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/linode/repo/.github/workflows/update-upstream-provider.yml index 0e429eb5c3..19cbfbe38f 100644 --- a/provider-ci/providers/linode/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/linode/repo/.github/workflows/update-upstream-provider.yml @@ -7,12 +7,14 @@ env: PROVIDER: linode PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: pulumi UPSTREAM_PROVIDER_REPO: terraform-provider-linode jobs: @@ -54,12 +56,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/mailgun/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/mailgun/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/mailgun/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/mailgun/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/mailgun/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/mailgun/repo/.github/workflows/update-upstream-provider.yml index ddf0a03e26..4c8bbd39ca 100644 --- a/provider-ci/providers/mailgun/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/mailgun/repo/.github/workflows/update-upstream-provider.yml @@ -7,12 +7,14 @@ env: PROVIDER: mailgun PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: pulumi UPSTREAM_PROVIDER_REPO: terraform-provider-mailgun jobs: @@ -54,12 +56,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/minio/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/minio/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/minio/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/minio/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/minio/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/minio/repo/.github/workflows/update-upstream-provider.yml index 6cf717433d..132bc9997d 100644 --- a/provider-ci/providers/minio/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/minio/repo/.github/workflows/update-upstream-provider.yml @@ -10,12 +10,14 @@ env: PROVIDER: minio PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: pulumi UPSTREAM_PROVIDER_REPO: terraform-provider-minio jobs: @@ -57,12 +59,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/mongodbatlas/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/mongodbatlas/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/mongodbatlas/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/mongodbatlas/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/mongodbatlas/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/mongodbatlas/repo/.github/workflows/update-upstream-provider.yml index f28c603577..5b25e263b7 100644 --- a/provider-ci/providers/mongodbatlas/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/mongodbatlas/repo/.github/workflows/update-upstream-provider.yml @@ -9,12 +9,14 @@ env: PROVIDER: mongodbatlas PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: mongodb UPSTREAM_PROVIDER_REPO: terraform-provider-mongodbatlas jobs: @@ -56,12 +58,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/mysql/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/mysql/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/mysql/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/mysql/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/mysql/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/mysql/repo/.github/workflows/update-upstream-provider.yml index e607e43bb6..1fed2e6a15 100644 --- a/provider-ci/providers/mysql/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/mysql/repo/.github/workflows/update-upstream-provider.yml @@ -6,12 +6,14 @@ env: PROVIDER: mysql PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: pulumi UPSTREAM_PROVIDER_REPO: terraform-provider-mysql jobs: @@ -53,12 +55,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/newrelic/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/newrelic/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/newrelic/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/newrelic/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/newrelic/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/newrelic/repo/.github/workflows/update-upstream-provider.yml index 0095665b6e..31f2bb6c97 100644 --- a/provider-ci/providers/newrelic/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/newrelic/repo/.github/workflows/update-upstream-provider.yml @@ -8,12 +8,14 @@ env: PROVIDER: newrelic PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: pulumi UPSTREAM_PROVIDER_REPO: terraform-provider-newrelic jobs: @@ -55,12 +57,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/nomad/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/nomad/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/nomad/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/nomad/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/nomad/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/nomad/repo/.github/workflows/update-upstream-provider.yml index 9e10883552..eced132d17 100644 --- a/provider-ci/providers/nomad/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/nomad/repo/.github/workflows/update-upstream-provider.yml @@ -6,12 +6,14 @@ env: PROVIDER: nomad PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: hashicorp UPSTREAM_PROVIDER_REPO: terraform-provider-nomad VAULT_ADDR: http://127.0.0.1:4646 @@ -54,12 +56,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/ns1/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/ns1/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/ns1/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/ns1/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/ns1/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/ns1/repo/.github/workflows/update-upstream-provider.yml index ad3076d591..86674aa625 100644 --- a/provider-ci/providers/ns1/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/ns1/repo/.github/workflows/update-upstream-provider.yml @@ -7,12 +7,14 @@ env: PROVIDER: ns1 PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: pulumi UPSTREAM_PROVIDER_REPO: terraform-provider-ns1 jobs: @@ -54,12 +56,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/okta/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/okta/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/okta/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/okta/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/okta/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/okta/repo/.github/workflows/update-upstream-provider.yml index dbd6cdb251..52aae900fc 100644 --- a/provider-ci/providers/okta/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/okta/repo/.github/workflows/update-upstream-provider.yml @@ -9,12 +9,14 @@ env: PROVIDER: okta PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: okta UPSTREAM_PROVIDER_REPO: terraform-provider-okta jobs: @@ -56,12 +58,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/openstack/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/openstack/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/openstack/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/openstack/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/openstack/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/openstack/repo/.github/workflows/update-upstream-provider.yml index a5e5ca9ee5..bb6f03c627 100644 --- a/provider-ci/providers/openstack/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/openstack/repo/.github/workflows/update-upstream-provider.yml @@ -15,12 +15,14 @@ env: PROVIDER: openstack PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: terraform-provider-openstack UPSTREAM_PROVIDER_REPO: terraform-provider-openstack jobs: @@ -62,12 +64,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/opsgenie/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/opsgenie/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/opsgenie/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/opsgenie/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/opsgenie/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/opsgenie/repo/.github/workflows/update-upstream-provider.yml index 81997b8a7b..2627c7fabc 100644 --- a/provider-ci/providers/opsgenie/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/opsgenie/repo/.github/workflows/update-upstream-provider.yml @@ -7,12 +7,14 @@ env: PROVIDER: opsgenie PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: opsgenie UPSTREAM_PROVIDER_REPO: terraform-provider-opsgenie jobs: @@ -54,12 +56,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/pagerduty/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/pagerduty/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/pagerduty/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/pagerduty/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/pagerduty/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/pagerduty/repo/.github/workflows/update-upstream-provider.yml index b44c677ff6..5fab1c3465 100644 --- a/provider-ci/providers/pagerduty/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/pagerduty/repo/.github/workflows/update-upstream-provider.yml @@ -7,12 +7,14 @@ env: PROVIDER: pagerduty PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: pulumi UPSTREAM_PROVIDER_REPO: terraform-provider-pagerduty jobs: @@ -54,12 +56,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/postgresql/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/postgresql/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/postgresql/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/postgresql/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/postgresql/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/postgresql/repo/.github/workflows/update-upstream-provider.yml index b68b5ca104..5d8e2c2f0e 100644 --- a/provider-ci/providers/postgresql/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/postgresql/repo/.github/workflows/update-upstream-provider.yml @@ -6,12 +6,14 @@ env: PROVIDER: postgresql PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: pulumi UPSTREAM_PROVIDER_REPO: terraform-provider-postgresql jobs: @@ -53,12 +55,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/rabbitmq/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/rabbitmq/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/rabbitmq/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/rabbitmq/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/rabbitmq/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/rabbitmq/repo/.github/workflows/update-upstream-provider.yml index 3b625e8829..7b32d14ac6 100644 --- a/provider-ci/providers/rabbitmq/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/rabbitmq/repo/.github/workflows/update-upstream-provider.yml @@ -6,12 +6,14 @@ env: PROVIDER: rabbitmq PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: cyrilgdn UPSTREAM_PROVIDER_REPO: terraform-provider-rabbitmq jobs: @@ -53,12 +55,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/rancher2/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/rancher2/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/rancher2/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/rancher2/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/rancher2/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/rancher2/repo/.github/workflows/update-upstream-provider.yml index 91747e84ed..8e34aa1692 100644 --- a/provider-ci/providers/rancher2/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/rancher2/repo/.github/workflows/update-upstream-provider.yml @@ -6,14 +6,16 @@ env: PROVIDER: rancher2 PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} RANCHER_INSECURE: "true" RANCHER_URL: https://localhost SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: pulumi UPSTREAM_PROVIDER_REPO: terraform-provider-rancher2 jobs: @@ -55,12 +57,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/random/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/random/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/random/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/random/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/random/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/random/repo/.github/workflows/update-upstream-provider.yml index 6f558ce83b..e6e868f071 100644 --- a/provider-ci/providers/random/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/random/repo/.github/workflows/update-upstream-provider.yml @@ -6,12 +6,14 @@ env: PROVIDER: random PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: pulumi UPSTREAM_PROVIDER_REPO: terraform-provider-random jobs: @@ -53,12 +55,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/rke/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/rke/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/rke/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/rke/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/rke/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/rke/repo/.github/workflows/update-upstream-provider.yml index 3c7ecb4036..ff40207023 100644 --- a/provider-ci/providers/rke/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/rke/repo/.github/workflows/update-upstream-provider.yml @@ -7,12 +7,14 @@ env: PROVIDER: rke PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: pulumi UPSTREAM_PROVIDER_REPO: terraform-provider-rke jobs: @@ -54,12 +56,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/signalfx/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/signalfx/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/signalfx/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/signalfx/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/signalfx/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/signalfx/repo/.github/workflows/update-upstream-provider.yml index 2805f29ac1..cb37d0514e 100644 --- a/provider-ci/providers/signalfx/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/signalfx/repo/.github/workflows/update-upstream-provider.yml @@ -6,12 +6,14 @@ env: PROVIDER: signalfx PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: pulumi UPSTREAM_PROVIDER_REPO: terraform-provider-signalfx jobs: @@ -53,12 +55,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/snowflake/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/snowflake/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/snowflake/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/snowflake/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/snowflake/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/snowflake/repo/.github/workflows/update-upstream-provider.yml index 9fd42c8388..a19ce0f665 100644 --- a/provider-ci/providers/snowflake/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/snowflake/repo/.github/workflows/update-upstream-provider.yml @@ -6,9 +6,10 @@ env: PROVIDER: snowflake PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} SNOWFLAKE_ACCOUNT: ${{ secrets.SNOWFLAKE_ACCOUNT }} @@ -17,6 +18,7 @@ env: SNOWFLAKE_ROLE: ${{ secrets.SNOWFLAKE_ROLE }} SNOWFLAKE_USER: ${{ secrets.SNOWFLAKE_USER }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: chanzuckerberg UPSTREAM_PROVIDER_REPO: terraform-provider-snowflake jobs: @@ -58,12 +60,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/splunk/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/splunk/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/splunk/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/splunk/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/splunk/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/splunk/repo/.github/workflows/update-upstream-provider.yml index 27924217df..6e2354b8e6 100644 --- a/provider-ci/providers/splunk/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/splunk/repo/.github/workflows/update-upstream-provider.yml @@ -6,15 +6,17 @@ env: PROVIDER: splunk PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} SPLUNK_PASSWORD: password SPLUNK_URL: localhost:8089 SPLUNK_USERNAME: admin TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: splunk UPSTREAM_PROVIDER_REPO: terraform-provider-splunk jobs: @@ -56,12 +58,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/spotinst/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/spotinst/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/spotinst/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/spotinst/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/spotinst/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/spotinst/repo/.github/workflows/update-upstream-provider.yml index 1ccadf8dea..5a5fc959ff 100644 --- a/provider-ci/providers/spotinst/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/spotinst/repo/.github/workflows/update-upstream-provider.yml @@ -7,14 +7,16 @@ env: PROVIDER: spotinst PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} SPOTINST_ACCOUNT: ${{ secrets.SPOTINST_ACCOUNT }} SPOTINST_TOKEN: ${{ secrets.SPOTINST_TOKEN }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: pulumi UPSTREAM_PROVIDER_REPO: terraform-provider-spotinst jobs: @@ -56,12 +58,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/sumologic/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/sumologic/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/sumologic/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/sumologic/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/sumologic/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/sumologic/repo/.github/workflows/update-upstream-provider.yml index 61acbd8b2f..79ad64f11e 100644 --- a/provider-ci/providers/sumologic/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/sumologic/repo/.github/workflows/update-upstream-provider.yml @@ -6,15 +6,17 @@ env: PROVIDER: sumologic PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} SUMOLOGIC_ACCESSID: ${{ secrets.SUMOLOGIC_ACCESSID }} SUMOLOGIC_ACCESSKEY: ${{ secrets.SUMOLOGIC_ACCESSKEY }} SUMOLOGIC_ENVIRONMENT: ${{ secrets.SUMOLOGIC_ENVIRONMENT }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: pulumi UPSTREAM_PROVIDER_REPO: terraform-provider-sumologic jobs: @@ -56,12 +58,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/tailscale/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/tailscale/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/tailscale/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/tailscale/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/tailscale/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/tailscale/repo/.github/workflows/update-upstream-provider.yml index 306ca44caa..270f158c87 100644 --- a/provider-ci/providers/tailscale/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/tailscale/repo/.github/workflows/update-upstream-provider.yml @@ -6,14 +6,16 @@ env: PROVIDER: tailscale PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TAILSCALE_API_KEY: ${{ secrets.TAILSCALE_API_KEY }} TAILSCALE_TAILNET: ${{ secrets.TAILSCALE_TAILNET }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: davidsbond UPSTREAM_PROVIDER_REPO: terraform-provider-tailscale jobs: @@ -55,12 +57,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/terraform/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/terraform/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/terraform/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/terraform/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/terraform/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/terraform/repo/.github/workflows/update-upstream-provider.yml index 68eadc1710..2cef52efdc 100644 --- a/provider-ci/providers/terraform/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/terraform/repo/.github/workflows/update-upstream-provider.yml @@ -7,14 +7,16 @@ env: PROVIDER: terraform PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TFE_ORGANIZATION: ${{ secrets.TFE_ORGANIZATION }} TFE_TOKEN: ${{ secrets.TFE_TOKEN }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: hashicorp UPSTREAM_PROVIDER_REPO: terraform jobs: @@ -56,12 +58,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/tls/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/tls/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/tls/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/tls/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/tls/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/tls/repo/.github/workflows/update-upstream-provider.yml index cbfdf572d6..2a4b47b083 100644 --- a/provider-ci/providers/tls/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/tls/repo/.github/workflows/update-upstream-provider.yml @@ -6,12 +6,14 @@ env: PROVIDER: tls PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: terraform-providers UPSTREAM_PROVIDER_REPO: terraform-provider-tls jobs: @@ -53,12 +55,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/vault/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/vault/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/vault/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/vault/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/vault/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/vault/repo/.github/workflows/update-upstream-provider.yml index ae7cd87b28..45c4edc3ad 100644 --- a/provider-ci/providers/vault/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/vault/repo/.github/workflows/update-upstream-provider.yml @@ -6,12 +6,14 @@ env: PROVIDER: vault PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: pulumi UPSTREAM_PROVIDER_REPO: terraform-provider-vault jobs: @@ -53,12 +55,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/venafi/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/venafi/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/venafi/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/venafi/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/venafi/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/venafi/repo/.github/workflows/update-upstream-provider.yml index fc45606d3e..97f8c84e7d 100644 --- a/provider-ci/providers/venafi/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/venafi/repo/.github/workflows/update-upstream-provider.yml @@ -6,12 +6,14 @@ env: PROVIDER: venafi PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: pulumi UPSTREAM_PROVIDER_REPO: terraform-provider-venafi VENAFI_TOKEN: ${{ secrets.VENAFI_TOKEN }} @@ -56,12 +58,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/vsphere/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/vsphere/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/vsphere/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/vsphere/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/vsphere/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/vsphere/repo/.github/workflows/update-upstream-provider.yml index 6684a50c07..3c31bc0ca8 100644 --- a/provider-ci/providers/vsphere/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/vsphere/repo/.github/workflows/update-upstream-provider.yml @@ -6,12 +6,14 @@ env: PROVIDER: vsphere PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: pulumi UPSTREAM_PROVIDER_REPO: terraform-provider-vsphere jobs: @@ -53,12 +55,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/wavefront/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/wavefront/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/wavefront/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/wavefront/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/wavefront/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/wavefront/repo/.github/workflows/update-upstream-provider.yml index b1e69f70e4..072519cf1f 100644 --- a/provider-ci/providers/wavefront/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/wavefront/repo/.github/workflows/update-upstream-provider.yml @@ -6,12 +6,14 @@ env: PROVIDER: wavefront PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} PULUMI_API: https://api.pulumi-staging.io + PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget - PULUMI_PROVIDER_MAP_ERROR: true + PULUMI_MISSING_MAPPING_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: vmware UPSTREAM_PROVIDER_REPO: terraform-provider-wavefront WAVEFRONT_ADDRESS: ${{ secrets.WAVEFRONT_ADDRESS }} @@ -55,12 +57,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/providers/yandex/repo/.github/workflows/update-bridge.yml b/provider-ci/providers/yandex/repo/.github/workflows/update-bridge.yml index 653e25a2df..10f3c824d8 100644 --- a/provider-ci/providers/yandex/repo/.github/workflows/update-bridge.yml +++ b/provider-ci/providers/yandex/repo/.github/workflows/update-bridge.yml @@ -1,5 +1,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PULUMI_EXTRA_MAPPING_ERROR: false + PULUMI_MISSING_MAPPING_ERROR: false jobs: update_bridge: name: update-bridge diff --git a/provider-ci/providers/yandex/repo/.github/workflows/update-upstream-provider.yml b/provider-ci/providers/yandex/repo/.github/workflows/update-upstream-provider.yml index d4a0327b6e..6d21bfa09d 100644 --- a/provider-ci/providers/yandex/repo/.github/workflows/update-upstream-provider.yml +++ b/provider-ci/providers/yandex/repo/.github/workflows/update-upstream-provider.yml @@ -13,6 +13,7 @@ env: PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TRAVIS_OS_NAME: linux + UPSTREAM_PROVIDER_MAJOR_VERSION: "" UPSTREAM_PROVIDER_ORG: yandex-cloud UPSTREAM_PROVIDER_REPO: terraform-provider-yandex YC_CLOUD_ID: ${{ secrets.YC_CLOUD_ID }} @@ -57,12 +58,12 @@ jobs: - if: ${{ hashFiles('provider/shim/go.mod') != '' }} name: Update shim/go.mod run: cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - name: Update go.mod run: cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG - }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go - mod tidy + }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION + }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy - run: make tfgen - run: make build_sdks - if: ${{ !github.event.inputs.linked_issue_number }} diff --git a/provider-ci/src/workflows.ts b/provider-ci/src/workflows.ts index 9ebb85c617..e1fadd11e6 100644 --- a/provider-ci/src/workflows.ts +++ b/provider-ci/src/workflows.ts @@ -286,6 +286,7 @@ class UpdateUpstreamProviderArgs { upstreamProviderRepo: string; failOnExtraMapping: boolean; failOnMissingMapping: boolean; + upstreamProviderMajorVersion: string; } export class UpdateUpstreamProviderWorkflow extends g.GithubWorkflow { @@ -314,6 +315,7 @@ export class UpdateUpstreamProviderWorkflow extends g.GithubWorkflow { PULUMI_MISSING_MAPPING_ERROR: args.failOnMissingMapping, UPSTREAM_PROVIDER_ORG: args.upstreamProviderOrg, UPSTREAM_PROVIDER_REPO: args.upstreamProviderRepo, + UPSTREAM_PROVIDER_MAJOR_VERSION: args.upstreamProviderMajorVersion, } }); @@ -357,11 +359,11 @@ export class UpdateUpstreamProviderWorkflow extends g.GithubWorkflow { .addStep({ name: "Update shim/go.mod", if: "${{ hashFiles('provider/shim/go.mod') != '' }}", - run: "cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy" + run: "cd provider/shim && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy" }) .addStep({ name: "Update go.mod", - run: "cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG }}/${{ env.UPSTREAM_PROVIDER_REPO }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy", + run: "cd provider && go mod edit -require github.com/${{ env.UPSTREAM_PROVIDER_ORG }}/${{ env.UPSTREAM_PROVIDER_REPO }}${{ env.UPSTREAM_PROVIDER_MAJOR_VERSION }}@${{ env.UPSTREAM_PROVIDER_SHA }} && go mod tidy", }) .addStep(new steps.RunCommand('make tfgen')) .addStep(new steps.RunCommand('make build_sdks'))