Skip to content

Commit

Permalink
update pulumi to current master and go.mod versions, as well as test …
Browse files Browse the repository at this point in the history
…exclusions
  • Loading branch information
brandonpollack23 committed Feb 20, 2025
1 parent 654f993 commit 85a8cfe
Show file tree
Hide file tree
Showing 60 changed files with 4,468 additions and 77 deletions.
6 changes: 6 additions & 0 deletions .changes/unreleased/Improvements-482.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
component: sdk
kind: Improvements
body: updated pulumi submodule and go.mod sdk/pkg and excluded failing conformance tests
time: 2025-02-20T13:37:32.609837+09:00
custom:
PR: "482"
2 changes: 1 addition & 1 deletion pulumi
Submodule pulumi updated 1687 files
28 changes: 14 additions & 14 deletions pulumi-language-dotnet/go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module github.com/pulumi/pulumi-dotnet/pulumi-language-dotnet

go 1.21
go 1.22

toolchain go1.22.0
toolchain go1.23.5

replace github.com/Sirupsen/logrus => github.com/sirupsen/logrus v1.5.0

Expand All @@ -12,9 +12,9 @@ require (
github.com/blang/semver v3.5.1+incompatible
github.com/golang/protobuf v1.5.4
github.com/pkg/errors v0.9.1
github.com/pulumi/pulumi/pkg/v3 v3.143.1-0.20241213151151-109d75b57c54
github.com/pulumi/pulumi/sdk/v3 v3.143.1-0.20241213151151-109d75b57c54
github.com/stretchr/testify v1.9.0
github.com/pulumi/pulumi/pkg/v3 v3.150.0
github.com/pulumi/pulumi/sdk/v3 v3.150.0
github.com/stretchr/testify v1.10.0
google.golang.org/grpc v1.67.1
google.golang.org/protobuf v1.35.1
)
Expand All @@ -23,7 +23,7 @@ require (
dario.cat/mergo v1.0.0 // indirect
github.com/BurntSushi/toml v1.2.1 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/ProtonMail/go-crypto v1.0.0 // indirect
github.com/ProtonMail/go-crypto v1.1.3 // indirect
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
github.com/agext/levenshtein v1.2.3 // indirect
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
Expand All @@ -38,16 +38,16 @@ require (
github.com/charmbracelet/x/windows v0.1.0 // indirect
github.com/cheggaaa/pb v1.0.29 // indirect
github.com/cloudflare/circl v1.3.8 // indirect
github.com/cyphar/filepath-securejoin v0.2.5 // indirect
github.com/cyphar/filepath-securejoin v0.3.6 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/deckarep/golang-set/v2 v2.5.0 // indirect
github.com/djherbis/times v1.6.0 // indirect
github.com/edsrzf/mmap-go v1.1.0 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // 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
github.com/go-git/go-billy/v5 v5.6.1 // indirect
github.com/go-git/go-git/v5 v5.13.1 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/glog v1.2.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
Expand Down Expand Up @@ -85,7 +85,7 @@ require (
github.com/segmentio/asm v1.1.3 // indirect
github.com/segmentio/encoding v0.3.5 // indirect
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
github.com/skeema/knownhosts v1.2.2 // indirect
github.com/skeema/knownhosts v1.3.0 // indirect
github.com/spf13/afero v1.9.5 // indirect
github.com/spf13/cobra v1.8.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
Expand All @@ -97,14 +97,14 @@ require (
github.com/zclconf/go-cty v1.14.4 // indirect
go.uber.org/atomic v1.11.0 // indirect
golang.org/x/crypto v0.31.0 // indirect
golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8 // indirect
golang.org/x/mod v0.18.0 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
golang.org/x/mod v0.19.0 // indirect
golang.org/x/net v0.33.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/term v0.27.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/tools v0.22.0 // indirect
golang.org/x/tools v0.23.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
92 changes: 30 additions & 62 deletions pulumi-language-dotnet/go.sum

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions pulumi-language-dotnet/language_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,9 @@ func TestLanguage(t *testing.T) {
require.NoError(t, err)

expectedToFail := map[string]string{
"l1-builtin-can": "#489 codegen not implemented",
"l1-builtin-try": "#490 codegen not implemented",
"l2-component-call-simple": "#491 update to pulumi 1.50 conformance failure",
"l2-resource-asset-archive": "The namespace 'Pulumi.AssetArchive' conflicts with the type 'AssetArchive' in 'Pulumi, Version=1.0.0.0",
"l2-resource-config": "sdk packing for config: build error before pack",
"l2-resource-alpha": "wrong package reference Include=Pulumi.Alpha.3.0 Version=0-alpha.1.internal",
Expand Down
Loading

0 comments on commit 85a8cfe

Please sign in to comment.