diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 56d080dd65e..6c0116ae9ff 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ env: GOOGLE_CI_WORKLOAD_IDENTITY_POOL: pulumi-ci GOOGLE_CI_WORKLOAD_IDENTITY_PROVIDER: pulumi-ci GOOGLE_PROJECT_NUMBER: 895284651812 - GOLANGCI_LINT_VERSION: v2.5.0 + GOLANGCI_LINT_VERSION: v2.9.0 jobs: diff --git a/.gitmodules b/.gitmodules index a6efc649493..17a9eea7ad4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "pulumi"] path = pulumi url = https://github.com/pulumi/pulumi - branch = v3.219.0 + branch = v3.220.0 diff --git a/.mise.toml b/.mise.toml index 571094a2781..f406871af71 100644 --- a/.mise.toml +++ b/.mise.toml @@ -1,6 +1,7 @@ [tools] changie = "latest" -golangci-lint = "2.5.0" +go = "1.25" +golangci-lint = "2.9.0" gradle = "8.14.1" java = "temurin-11.0.28+6" maven = "3.9.11" diff --git a/pkg/cmd/pulumi-language-java/language_test.go b/pkg/cmd/pulumi-language-java/language_test.go index e1eecd727e3..9986b73f7d6 100644 --- a/pkg/cmd/pulumi-language-java/language_test.go +++ b/pkg/cmd/pulumi-language-java/language_test.go @@ -155,7 +155,8 @@ var expectedFailures = map[string]string{ "l1-builtin-project-root": "TODO: call rootDirectory", "l1-builtin-try": "#1683 Fix l1-builtin-try/can", "l1-builtin-can": "#1683 Fix l1-builtin-try/can", - "l1-config-types": "compilation error", + "l1-config-types-object": "https://github.com/pulumi/pulumi-java/issues/2005", + "l1-config-types-primitive": "https://github.com/pulumi/pulumi-java/issues/2004", "l1-keyword-overlap": "#1681 Fix l1-keyword-overlap", "l1-output-null": "unhandled error occurred", "l1-output-string": "#1562 Large string literals are not generated correctly", @@ -239,8 +240,10 @@ var expectedFailures = map[string]string{ "l2-resource-option-version-sdk": "https://github.com/pulumi/pulumi-java/issues/1996", "l3-range-resource-output-traversal": "https://github.com/pulumi/pulumi-java/issues/1997", "l2-resource-option-plugin-download-url": "https://github.com/pulumi/pulumi-java/issues/1999", + "l2-resource-option-env-var-mappings": "https://github.com/pulumi/pulumi-java/issues/2006", "provider-resource-component": "not implemented", "provider-alias-component": "not implemented", + "provider-replacement-trigger-component": "https://github.com/pulumi/pulumi-java/issues/2007", } // runTestingHost boots up a new instance of the language conformance test runner, `pulumi-test-language`, as well as a diff --git a/pkg/go.mod b/pkg/go.mod index e23e5067295..26a348a5267 100644 --- a/pkg/go.mod +++ b/pkg/go.mod @@ -12,8 +12,8 @@ require ( github.com/hashicorp/hcl/v2 v2.24.0 github.com/hexops/autogold/v2 v2.2.1 github.com/pkg/errors v0.9.1 - github.com/pulumi/pulumi/pkg/v3 v3.219.0 - github.com/pulumi/pulumi/sdk/v3 v3.219.0 + github.com/pulumi/pulumi/pkg/v3 v3.220.0 + github.com/pulumi/pulumi/sdk/v3 v3.220.0 github.com/spf13/cobra v1.10.1 github.com/stretchr/testify v1.10.0 github.com/zclconf/go-cty v1.17.0 @@ -142,7 +142,7 @@ require ( github.com/pkg/term v1.1.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 // indirect - github.com/pulumi/esc v0.21.0 // indirect + github.com/pulumi/esc v0.22.0 // indirect github.com/pulumi/inflector v0.2.1 // indirect github.com/rivo/uniseg v0.4.4 // indirect github.com/rogpeppe/go-internal v1.14.1 // indirect diff --git a/pkg/go.sum b/pkg/go.sum index e839be75120..db0d71da2c8 100644 --- a/pkg/go.sum +++ b/pkg/go.sum @@ -462,14 +462,14 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 h1:vkHw5I/plNdTr435cARxCW6q9gc0S/Yxz7Mkd38pOb0= github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231/go.mod h1:murToZ2N9hNJzewjHBgfFdXhZKjY3z5cYC1VXk+lbFE= -github.com/pulumi/esc v0.21.0 h1:TR8Ff22SU+z8cooTmUKkmk2FltXW/wDPrIwI9BP88Vk= -github.com/pulumi/esc v0.21.0/go.mod h1:mkghIFn/TvN3XnP4jmCB4U5BG1I4UjGluARi39ckrCE= +github.com/pulumi/esc v0.22.0 h1:Kbk0kIPsoIu6vnLgKtiE8AKRfl8B8bg6adiQuwJiBjA= +github.com/pulumi/esc v0.22.0/go.mod h1:mkghIFn/TvN3XnP4jmCB4U5BG1I4UjGluARi39ckrCE= github.com/pulumi/inflector v0.2.1 h1:bqyiish3tq//vLeLiEstSFE5K7RNjy/ce47ed4QATu8= github.com/pulumi/inflector v0.2.1/go.mod h1:HUFCjcPTz96YtTuUlwG3i3EZG4WlniBvR9bd+iJxCUY= -github.com/pulumi/pulumi/pkg/v3 v3.219.0 h1:Tr1xOszG65cwFx+TDk3/McXdyKXOH5KIbuj/u4eIBzI= -github.com/pulumi/pulumi/pkg/v3 v3.219.0/go.mod h1:cxmMnghuTrmDGqO+kMTFisJQ5WTIfS+i01Eang6zKKI= -github.com/pulumi/pulumi/sdk/v3 v3.219.0 h1:OwTSwk1ZuOI4hQUdSccWuIAuqs4fL/FcppesPOAKHQ8= -github.com/pulumi/pulumi/sdk/v3 v3.219.0/go.mod h1:ZOBPPC2NZOZf729AdCX+CctfNc5SN6aJh0bdqNdzQC4= +github.com/pulumi/pulumi/pkg/v3 v3.220.0 h1:M2mg8ohi8HEceoub+5YSNxCgQ6WY/ycdeMzc0uZmlWI= +github.com/pulumi/pulumi/pkg/v3 v3.220.0/go.mod h1:RjLYZtdMcBn6qmAWF5HFy4Xw8U/nwsL9QdirtETkarU= +github.com/pulumi/pulumi/sdk/v3 v3.220.0 h1:TtdlW2VfvBWhFZSvaDN9lSUlSS4gGSdNWdca3RGPsBQ= +github.com/pulumi/pulumi/sdk/v3 v3.220.0/go.mod h1:UGWJOz25OiFIN0QH79UFij8mffH94TYebKUgy9Wvug0= github.com/redis/go-redis/v9 v9.7.0 h1:HhLSs+B6O021gwzl+locl0zEDnyNkxMtf/Z3NNBMa9E= github.com/redis/go-redis/v9 v9.7.0/go.mod h1:f6zhXITC7JUJIlPEiBOTXxJgPLdZcA93GewI7inzyWw= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= diff --git a/pkg/version/version.go b/pkg/version/version.go index 11ba6b21b13..a9367c73485 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package version +package version //nolint: revive // Version is initialized by the Go linker to contain the semver of this build. var Version string diff --git a/pulumi b/pulumi index 11ec8dc8249..e8ecd95a5ec 160000 --- a/pulumi +++ b/pulumi @@ -1 +1 @@ -Subproject commit 11ec8dc8249b56bedb4496926cc6e4133c5f2532 +Subproject commit e8ecd95a5ecb4baa93f35866ec34e94fa785b1c5