diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 272c822..fb97fe1 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -93,7 +93,7 @@ jobs: - name: Upload Provider Binaries run: aws s3 cp dist s3://get.pulumi.com/releases/plugins/ --recursive - name: Create GH Release - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 if: inputs.isPrerelease == false with: tag_name: v${{ inputs.version }} diff --git a/.github/workflows/upgrade-provider.yml b/.github/workflows/upgrade-provider.yml index 22386fa..7d0056b 100644 --- a/.github/workflows/upgrade-provider.yml +++ b/.github/workflows/upgrade-provider.yml @@ -7,7 +7,7 @@ on: version: description: | The version of the upstream provider to upgrade to, without the 'v' prefix - + If no version is specified, it will be inferred from the upstream provider's release tags. required: false type: string @@ -55,7 +55,16 @@ jobs: run: echo "version=${{ github.event.inputs.version || steps.upstream_version.outputs.latest_version }}" >> "$GITHUB_OUTPUT" shell: bash - name: Attempt provider upgrade + id: upgrade_provider # Only attempt the upgrade if we have a target version if: steps.target_version.outputs.version != '' + # Don't mark the build as failed if we can't auto-open a PR as we've already opened the upgrade issue for tracking + continue-on-error: true run: upgrade-provider "${{ github.repository }}" --kind="all" --target-version="${{ steps.target_version.outputs.version }}" shell: bash + - name: Comment on upgrade issue if automated PR failed + if: steps.upgrade_provider.outcome == 'failure' + shell: bash + run: | + issue_number=$(gh issue list --search "pulumiupgradeproviderissue" --repo "${{ github.repository }}" --json=number --jq=".[0].number") + gh issue comment "${issue_number}" --repo "${{ github.repository }}" --body "Failed to create automatic PR: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}/" diff --git a/Makefile b/Makefile index 71dd0a5..7dcc5e2 100644 --- a/Makefile +++ b/Makefile @@ -179,7 +179,6 @@ bin/pulumi-java-gen: .pulumi-java-gen.version # - Run make ci-mgmt to apply the change locally. # ci-mgmt: .ci-mgmt.yaml - find .github/workflows/*.yml -type f ! -name "$(PACK)*.yml" -delete go run github.com/pulumi/ci-mgmt/provider-ci@master generate \ --name $(ORG)/pulumi-$(PACK) \ --out . \ diff --git a/provider/cmd/pulumi-resource-dnsimple/main.go b/provider/cmd/pulumi-resource-dnsimple/main.go index 958014b..3bff932 100644 --- a/provider/cmd/pulumi-resource-dnsimple/main.go +++ b/provider/cmd/pulumi-resource-dnsimple/main.go @@ -21,7 +21,7 @@ import ( _ "embed" - "github.com/pulumi/pulumi-terraform-bridge/pf/tfbridge" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge" dnsimple "github.com/pulumi/pulumi-dnsimple/provider/v4" ) diff --git a/provider/cmd/pulumi-tfgen-dnsimple/main.go b/provider/cmd/pulumi-tfgen-dnsimple/main.go index 27d342c..99a6c7c 100644 --- a/provider/cmd/pulumi-tfgen-dnsimple/main.go +++ b/provider/cmd/pulumi-tfgen-dnsimple/main.go @@ -15,7 +15,7 @@ package main import ( - "github.com/pulumi/pulumi-terraform-bridge/pf/tfgen" + "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfgen" dnsimple "github.com/pulumi/pulumi-dnsimple/provider/v4" ) diff --git a/provider/go.mod b/provider/go.mod index dc3318d..8227e48 100644 --- a/provider/go.mod +++ b/provider/go.mod @@ -5,7 +5,6 @@ go 1.23 toolchain go1.23.2 require ( - github.com/pulumi/pulumi-terraform-bridge/pf v0.47.0 github.com/pulumi/pulumi-terraform-bridge/v3 v3.94.0 github.com/pulumi/pulumi/pkg/v3 v3.137.0 github.com/terraform-providers/terraform-provider-dnsimple v0.0.0 @@ -52,6 +51,7 @@ require ( github.com/ettle/strcase v0.1.1 // indirect github.com/fatih/color v1.16.0 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect + github.com/frankban/quicktest v1.14.4 // indirect github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect github.com/go-git/go-billy/v5 v5.5.0 // indirect github.com/go-git/go-git/v5 v5.12.0 // indirect @@ -148,6 +148,7 @@ require ( github.com/spf13/cast v1.5.0 // indirect github.com/spf13/cobra v1.8.0 // indirect github.com/spf13/pflag v1.0.5 // indirect + github.com/stretchr/objx v0.5.2 // indirect github.com/teekennedy/goldmark-markdown v0.3.0 // indirect github.com/texttheater/golang-levenshtein v1.0.1 // indirect github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect diff --git a/provider/go.sum b/provider/go.sum index c44f7e7..7999312 100644 --- a/provider/go.sum +++ b/provider/go.sum @@ -320,6 +320,7 @@ github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWH github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 h1:q2hJAaP1k2wIvVRd/hEHD7lacgqrCPS+k8g1MndzfWY= github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk= github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg= github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -707,6 +708,7 @@ github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4= github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI= github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ= github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU= +github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= @@ -728,8 +730,6 @@ github.com/pulumi/providertest v0.1.3 h1:GpNKRy/haNjRHiUA9bi4diU4Op2zf3axYXbga5A github.com/pulumi/providertest v0.1.3/go.mod h1:GcsqEGgSngwaNOD+kICJPIUQlnA911fGBU8HDlJvVL0= github.com/pulumi/pulumi-java/pkg v0.16.1 h1:orHnDWFbpOERwaBLry9f+6nqPX7x0MsrIkaa5QDGAns= github.com/pulumi/pulumi-java/pkg v0.16.1/go.mod h1:QH0DihZkWYle9XFc+LJ76m4hUo+fA3RdyaM90pqOaSM= -github.com/pulumi/pulumi-terraform-bridge/pf v0.47.0 h1:vPNSFtQxeXaqhKxjPHeuNX1g9l4HB/TVj5A3iUrd0EU= -github.com/pulumi/pulumi-terraform-bridge/pf v0.47.0/go.mod h1:n1Yt5RBM0Td388yoPX380Jz6tlVqJzVsNfWGcaQo5vE= github.com/pulumi/pulumi-terraform-bridge/v3 v3.94.0 h1:wRJxFAQVV5Bg+BUVKpsNTWDIBSPCZUnbtxTyujZiM2o= github.com/pulumi/pulumi-terraform-bridge/v3 v3.94.0/go.mod h1:S7rLe9paLUP2U7iwJhNJslwQszlgUfND83KRVCogbog= github.com/pulumi/pulumi-yaml v1.11.1 h1:ULUL9fpb2Bwgf3jJHx0FamKYm0ld0KxBQr/uSAslRLk= @@ -752,6 +752,7 @@ github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis= github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= diff --git a/provider/resources.go b/provider/resources.go index a8b5756..f26810a 100644 --- a/provider/resources.go +++ b/provider/resources.go @@ -24,7 +24,7 @@ import ( dnsimple "github.com/terraform-providers/terraform-provider-dnsimple/shim" - pfbridge "github.com/pulumi/pulumi-terraform-bridge/pf/tfbridge" + pfbridge "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/pf/tfbridge" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/info" tfbridgetokens "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/tokens"