Skip to content

Commit

Permalink
Merge branch 'master' into zaid/fix-numeric-enums-program-gen
Browse files Browse the repository at this point in the history
  • Loading branch information
Zaid-Ajaj committed May 29, 2024
2 parents 0c9178d + fa52908 commit 090b6a4
Show file tree
Hide file tree
Showing 220 changed files with 7,352 additions and 10,694 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/ci-build-binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ on:
description: "Version to produce"
type: string
version-set:
required: false
required: true
description: "Set of language versions to use for builds, lints, releases, etc."
type: string
enable-coverage:
Expand Down Expand Up @@ -131,6 +131,7 @@ jobs:
| go run github.com/t0yv0/goreleaser-filter@v0.3.0 -goos ${{ inputs.os }} -goarch ${{ inputs.arch }} \
| goreleaser release -f - -p 5 --skip-validate --clean --snapshot
- uses: actions/upload-artifact@v2
if: ${{ inputs.os != 'js' }}
with:
name: artifacts-cli-${{ inputs.os }}-${{ inputs.arch }}
retention-days: 1
Expand Down
13 changes: 13 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,19 @@ jobs:
enable-race-detection: ${{ matrix.target.os == 'darwin' || (matrix.target.os == 'linux' && matrix.target.arch == 'amd64') }}
secrets: inherit

build-display-wasm-module:
name: build display WASM module
needs: [matrix]
uses: ./.github/workflows/ci-build-binaries.yml
with:
ref: ${{ inputs.ref }}
version: ${{ inputs.version }}
os: js
arch: wasm
build-platform: "ubuntu-latest"
version-set: ${{ needs.matrix.outputs.version-set }}
secrets: inherit

build-sdks:
name: Build SDKs
needs: [matrix]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-homebrew-tap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,4 @@ jobs:
run: |
set -euo pipefail
git push origin HEAD:master
git push origin HEAD:main
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,4 @@ __pycache__
# Temporary files
*.tmp
test-results/
yarn-error.log
yarn-error.log
12 changes: 12 additions & 0 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,18 @@ builds:
dir: sdk/python/cmd/pulumi-language-python
main: ./
gobinary: ../../../../scripts/go-wrapper.sh
- <<: *pulumibin
id: pulumi-display-wasm
binary: pulumi-display
dir: pkg
main: ./backend/display/wasm
goos: ['js']
goarch: ['wasm']
hooks:
post:
# Check the size of the WASM module.
- |
sh -c "[ `du -k {{ .Path }} | cut -f1` -le 79182 ] || (echo 'error: WASM module > 77M'; exit 1)"
archives:
- id: pulumi
Expand Down
49 changes: 49 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,54 @@
# Changelog

## 3.117.0 (2024-05-24)


### Features

- [engine] Guess ID references of dependant resources when generating code for import operations
[#16208](https://github.com/pulumi/pulumi/pull/16208)


### Bug Fixes

- [engine] Check property dependencies and deleted-with relationships for target dependents
[#16220](https://github.com/pulumi/pulumi/pull/16220)

- [engine] Propagate dependencies of untargeted resources correctly during targeted updates
[#16247](https://github.com/pulumi/pulumi/pull/16247)

- [backend/diy] Rewrite DeletedWith references when renaming stacks
[#16216](https://github.com/pulumi/pulumi/pull/16216)

- [cli/state] Fix state renames involving DeletedWith
[#16260](https://github.com/pulumi/pulumi/pull/16260)

- [sdk/python] Use a separate type variable for static methods on Output
[#16172](https://github.com/pulumi/pulumi/pull/16172)

- [sdk/python] Relax Output.all types to better match the implementation
[#16172](https://github.com/pulumi/pulumi/pull/16172)

- [sdkgen/python] Generate __init__.py files for modules that only contain enumerations
[#16229](https://github.com/pulumi/pulumi/pull/16229)

## 3.116.1 (2024-05-15)


### Features

- [docs] Resource docs: bump the number of displayed supporting types from 200 to 1000 by default
[#16185](https://github.com/pulumi/pulumi/pull/16185)

- [sdk/go] Prefer pluginDownloadURLOverrides over PluginDownloadURL specified in the package
[#16186](https://github.com/pulumi/pulumi/pull/16186)


### Bug Fixes

- [engine] Fix panic when using `pulumi up --refresh --continue-on-error`
[#16184](https://github.com/pulumi/pulumi/pull/16184)

## 3.116.0 (2024-05-10)


Expand Down
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,12 @@ generate::
$(call STEP_MESSAGE)
echo "This command does not do anything anymore. It will be removed in a future version."

build:: build-proto go.ensure
build:: build-proto build_display_wasm go.ensure
cd pkg && go install -ldflags "-X github.com/pulumi/pulumi/pkg/v3/version.Version=${VERSION}" ${PROJECT}

build_display_wasm:: go.ensure
cd pkg && GOOS=js GOARCH=wasm go build -o ../bin/pulumi-display.wasm -ldflags "-X github.com/pulumi/pulumi/pkg/v3/version.Version=${VERSION}" ./backend/display/wasm

install:: .ensure.phony go.ensure
cd pkg && GOBIN=$(PULUMI_BIN) go install -ldflags "-X github.com/pulumi/pulumi/pkg/v3/version.Version=${VERSION}" ${PROJECT}

Expand Down

This file was deleted.

40 changes: 12 additions & 28 deletions cmd/pulumi-test-language/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
github.com/deckarep/golang-set/v2 v2.5.0
github.com/hexops/gotextdiff v1.0.3
github.com/pulumi/pulumi/pkg/v3 v3.98.0
github.com/pulumi/pulumi/sdk/v3 v3.116.0
github.com/pulumi/pulumi/sdk/v3 v3.117.0
github.com/segmentio/encoding v0.3.6
github.com/stretchr/testify v1.9.0
google.golang.org/grpc v1.63.2
Expand Down Expand Up @@ -44,8 +44,6 @@ require (
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
github.com/agext/levenshtein v1.2.3 // indirect
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
github.com/armon/go-metrics v0.4.0 // indirect
github.com/armon/go-radix v1.0.0 // indirect
github.com/atotto/clipboard v0.1.4 // indirect
github.com/aws/aws-sdk-go v1.50.36 // indirect
github.com/aws/aws-sdk-go-v2 v1.26.1 // indirect
Expand Down Expand Up @@ -82,11 +80,11 @@ require (
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/edsrzf/mmap-go v1.1.0 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/fatih/color v1.15.0 // indirect
github.com/felixge/httpsnoop v1.0.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
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/gofrs/uuid v4.2.0+incompatible // indirect
Expand All @@ -95,7 +93,6 @@ require (
github.com/golang/glog v1.2.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/s2a-go v0.1.7 // indirect
github.com/google/uuid v1.6.0 // indirect
Expand All @@ -106,24 +103,15 @@ require (
github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-hclog v1.2.2 // indirect
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-plugin v1.4.6 // indirect
github.com/hashicorp/go-retryablehttp v0.7.1 // indirect
github.com/hashicorp/go-retryablehttp v0.7.5 // indirect
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
github.com/hashicorp/go-secure-stdlib/mlock v0.1.2 // indirect
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6 // indirect
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.8 // indirect
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
github.com/hashicorp/go-sockaddr v1.0.2 // indirect
github.com/hashicorp/go-uuid v1.0.3 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/hashicorp/go-sockaddr v1.0.6 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hashicorp/hcl/v2 v2.17.0 // indirect
github.com/hashicorp/vault/api v1.8.2 // indirect
github.com/hashicorp/vault/sdk v0.6.1 // indirect
github.com/hashicorp/yamux v0.1.1 // indirect
github.com/hashicorp/vault/api v1.12.0 // indirect
github.com/ijc/Gotty v0.0.0-20170406111628-a8b993ba6abd // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
Expand All @@ -141,7 +129,6 @@ require (
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/go-ps v1.0.0 // indirect
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
Expand All @@ -152,12 +139,10 @@ require (
github.com/muesli/reflow v0.3.0 // indirect
github.com/muesli/termenv v0.15.2 // indirect
github.com/natefinch/atomic v1.0.1 // indirect
github.com/oklog/run v1.1.0 // indirect
github.com/opentracing/basictracer-go v1.1.0 // indirect
github.com/opentracing/opentracing-go v1.2.0 // indirect
github.com/pgavlin/fx v0.1.6 // indirect
github.com/pgavlin/goldmark v1.1.33-0.20200616210433-b5eb04559386 // indirect
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
github.com/pjbgf/sha1cd v0.3.0 // indirect
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
github.com/pkg/errors v0.9.1 // indirect
Expand Down Expand Up @@ -192,16 +177,16 @@ require (
go.opentelemetry.io/otel/trace v1.24.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
gocloud.dev v0.37.0 // indirect
gocloud.dev/secrets/hashivault v0.27.0 // indirect
golang.org/x/crypto v0.22.0 // indirect
gocloud.dev/secrets/hashivault v0.37.0 // indirect
golang.org/x/crypto v0.23.0 // indirect
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/net v0.25.0 // indirect
golang.org/x/oauth2 v0.18.0 // indirect
golang.org/x/sync v0.6.0 // indirect
golang.org/x/sys v0.19.0 // indirect
golang.org/x/term v0.19.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/sys v0.20.0 // indirect
golang.org/x/term v0.20.0 // indirect
golang.org/x/text v0.15.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.17.0 // indirect
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
Expand All @@ -210,7 +195,6 @@ require (
google.golang.org/genproto v0.0.0-20240311173647-c811ad7063a7 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240311173647-c811ad7063a7 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240311173647-c811ad7063a7 // indirect
gopkg.in/square/go-jose.v2 v2.6.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 090b6a4

Please sign in to comment.