Skip to content

Commit

Permalink
Update dependencies (#233)
Browse files Browse the repository at this point in the history
Lots of little fixes:
- Update pulumi/pulumi to 3.112.0
- Update go version to 1.21.0
- Update pulumi-java to 0.10.0
- Resulting codegen changes
- Some test file changes because of changes to the integration test
framework caused by updating pulumi/pulumi
- Other dependabot dependency updates
  • Loading branch information
komalali authored Apr 3, 2024
1 parent ee20f71 commit 2600d28
Show file tree
Hide file tree
Showing 42 changed files with 4,861 additions and 1,622 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ jobs:
fail-fast: true
matrix:
dotnetversion: [3.1.301]
goversion: [1.20.x]
goversion: [1.21.x]
language: [nodejs, python, dotnet, java, go]
nodeversion: [20.x]
pythonversion: ["3.11"]
Expand Down Expand Up @@ -156,7 +156,7 @@ jobs:
strategy:
fail-fast: true
matrix:
goversion: [1.20.x]
goversion: [1.21.x]
publish:
name: publish
needs: test
Expand Down Expand Up @@ -204,7 +204,7 @@ jobs:
fail-fast: true
matrix:
goversion:
- 1.20.x
- 1.21.x
publish_sdk:
name: publish_sdk
needs: publish
Expand Down Expand Up @@ -285,7 +285,7 @@ jobs:
fail-fast: true
matrix:
dotnetversion: [3.1.301]
goversion: [1.20.x]
goversion: [1.21.x]
nodeversion: [20.x]
pythonversion: ["3.11"]
javaversion: ["11"]
Expand Down Expand Up @@ -367,7 +367,7 @@ jobs:
run: make install_${{ matrix.language}}_sdk
env:
# Right now we pin this, we should add a way to automatically upgrade
PULUMI_JAVA_SDK_VERSION: '0.8.0'
PULUMI_JAVA_SDK_VERSION: '0.10.0'
- name: Run tests
run: |
set -euo pipefail
Expand All @@ -379,7 +379,7 @@ jobs:
language: [nodejs, java, python, dotnet, go, yaml, dotnet]

dotnetversion: [3.1.301]
goversion: [1.20.x]
goversion: [1.21.x]
nodeversion: [20.x]
pythonversion: ["3.11"]
javaversion: ["11"]
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ env:
GPR_USER: ${{ secrets.GPR_USER }}
GPR_TOKEN: ${{ secrets.GPR_TOKEN }}
# Need to pin this until codegen gets updated
PULUMI_JAVA_SDK_VERSION: 0.8.0
PULUMI_JAVA_SDK_VERSION: 0.10.0
jobs:
create_docs_build:
name: create_docs_build
Expand Down Expand Up @@ -106,7 +106,7 @@ jobs:
fail-fast: true
matrix:
goversion:
- 1.20.x
- 1.21.x
tag_sdk:
name: tag_sdk
needs: publish_sdk
Expand Down Expand Up @@ -219,7 +219,7 @@ jobs:
dotnetversion:
- 3.1.301
goversion:
- 1.20.x
- 1.21.x
language:
- nodejs
- python
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/run-acceptance-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ env:
# Required to properly write "go mod edit -replace=.." when running go examples
PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/..
PROVIDER: pulumiservice
# Need to pin this as 0.8.0 until codegen is updated
PULUMI_JAVA_SDK_VERSION: 0.8.0
# Need to pin this as 0.10.0 until codegen is updated
PULUMI_JAVA_SDK_VERSION: 0.10.0

# Lookup nuget packages from this directory as well as default nuget directories
PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget
Expand All @@ -42,7 +42,7 @@ jobs:
fail-fast: true
matrix:
dotnetversion: [ 3.1.301 ]
goversion: [ 1.20.x ]
goversion: [ 1.21.x ]
language: [ nodejs, python, dotnet, go, java ]
nodeversion: [ 20.x ]
pythonversion: [ 3.11 ]
Expand Down Expand Up @@ -116,7 +116,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
goversion: [1.20.x]
goversion: [1.21.x]
steps:
- name: Checkout Repo
uses: actions/checkout@v3
Expand Down Expand Up @@ -164,7 +164,7 @@ jobs:
language: [nodejs, java, yaml, go, dotnet, python]

dotnetversion: [3.1.301]
goversion: [1.20.x]
goversion: [1.21.x]
nodeversion: [20.x]
pythonversion: [3.11]
javaversion: [11]
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG_PENDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@

### Bug Fixes


### Miscellaneous

- Updated pulumi/pulumi and other dependencies to latest versions. [#233](https://github.com/pulumi/pulumi-pulumiservice/pull/233)
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ java_sdk::
mkdir -p $(RESOURCE_FOLDER) && \
echo "$(VERSION)" > $(RESOURCE_FOLDER)/version.txt && \
echo '{"resource": true,"name": "pulumiservice","version": "$(VERSION)"}' > $(RESOURCE_FOLDER)/plugin.json && \
PULUMI_JAVA_SDK_VERSION=0.8.0 ./gradlew --console=plain build && \
PULUMI_JAVA_SDK_VERSION=0.8.0 ./gradlew --console=plain publishToMavenLocal
PULUMI_JAVA_SDK_VERSION=0.10.0 ./gradlew --console=plain build && \
PULUMI_JAVA_SDK_VERSION=0.10.0 ./gradlew --console=plain publishToMavenLocal

.PHONY: build
build:: gen provider dotnet_sdk go_sdk nodejs_sdk python_sdk java_sdk
Expand Down
42 changes: 21 additions & 21 deletions examples/go-teams/go.mod
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module github.com/pulumi/pulumi-pulumiservice/examples/go-teams

go 1.20
go 1.21.0

require (
github.com/pulumi/pulumi-pulumiservice/sdk v0.2.0
github.com/pulumi/pulumi/sdk/v3 v3.94.2
github.com/pulumi/pulumi/sdk/v3 v3.112.0
)

require (
Expand All @@ -22,20 +22,20 @@ require (
github.com/golang/protobuf v1.5.3 // indirect
github.com/hashicorp/hcl/v2 v2.17.0 // indirect
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
github.com/mattn/go-isatty v0.0.18 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/mattn/go-localereader v0.0.1 // indirect
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b // indirect
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
github.com/muesli/cancelreader v0.2.2 // indirect
github.com/muesli/reflow v0.3.0 // indirect
github.com/muesli/termenv v0.15.1 // indirect
github.com/pulumi/esc v0.5.6 // indirect
github.com/muesli/termenv v0.15.2 // indirect
github.com/pulumi/esc v0.6.2 // indirect
github.com/zclconf/go-cty v1.13.2 // indirect
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
golang.org/x/mod v0.13.0 // indirect
golang.org/x/sync v0.4.0 // indirect
golang.org/x/tools v0.14.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/sync v0.5.0 // indirect
golang.org/x/tools v0.15.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
)

require (
Expand All @@ -45,12 +45,12 @@ require (
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
github.com/blang/semver v3.5.1+incompatible // indirect
github.com/cheggaaa/pb v1.0.29 // indirect
github.com/cloudflare/circl v1.3.6 // indirect
github.com/cloudflare/circl v1.3.7 // indirect
github.com/djherbis/times v1.5.0 // indirect
github.com/emirpasic/gods v1.18.1 // 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.9.0 // indirect
github.com/go-git/go-git/v5 v5.11.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/glog v1.1.2 // indirect
github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect
Expand All @@ -59,7 +59,7 @@ require (
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/kevinburke/ssh_config v1.2.0 // indirect
github.com/mattn/go-runewidth v0.0.14 // indirect
github.com/mattn/go-runewidth v0.0.15 // indirect
github.com/mitchellh/go-ps v1.0.0 // indirect
github.com/opentracing/basictracer-go v1.1.0 // indirect
github.com/opentracing/opentracing-go v1.2.0 // indirect
Expand All @@ -72,22 +72,22 @@ require (
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 // indirect
github.com/santhosh-tekuri/jsonschema/v5 v5.0.0 // indirect
github.com/sergi/go-diff v1.3.1 // indirect
github.com/skeema/knownhosts v1.2.0 // indirect
github.com/spf13/cobra v1.7.0 // indirect
github.com/skeema/knownhosts v1.2.1 // indirect
github.com/spf13/cobra v1.8.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/texttheater/golang-levenshtein v1.0.1 // indirect
github.com/tweekmonster/luser v0.0.0-20161003172636-3fa38070dbd7 // indirect
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
go.uber.org/atomic v1.9.0 // indirect
golang.org/x/crypto v0.17.0 // indirect
golang.org/x/net v0.18.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/term v0.15.0 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/net v0.21.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/term v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/grpc v1.59.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
lukechampine.com/frand v1.4.2 // indirect
Expand Down
Loading

0 comments on commit 2600d28

Please sign in to comment.