Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upstream v5.47.0 #3881

Merged
merged 13 commits into from
May 1, 2024
Merged

Upstream v5.47.0 #3881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6ca4e15
Moving ./upstream to v5.47.0
t0yv0 Apr 29, 2024
2af96e1
Update patches
t0yv0 Apr 29, 2024
77e933d
Add helper scripts to facilitate git-based patch rebasing
t0yv0 Apr 29, 2024
8c0efc4
Helpers to run go mod tidy
t0yv0 Apr 29, 2024
e15fb38
./scripts/tidy-all.sh
t0yv0 Apr 29, 2024
a8b0036
Remove patched plugin framework
t0yv0 Apr 29, 2024
990ffec
Patch tags ComputedOnly on bedrockagent and other modules
t0yv0 Apr 29, 2024
a0392af
Register Billing and Cost Management Data module
t0yv0 Apr 29, 2024
56f1203
make tfgen
t0yv0 Apr 29, 2024
21bd027
make build_sdks
t0yv0 Apr 30, 2024
e272a0e
Disambiguate BcmData.Export.Export in C#
t0yv0 Apr 30, 2024
11ed888
make build_dotnet
t0yv0 Apr 30, 2024
0da68d0
Weaken RDS instance upgrade test
t0yv0 May 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 5 additions & 2 deletions examples/examples_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,9 @@ func replay(t *testing.T, sequence string) {
//
// The second test is when upgrading from pulumi-aws version <5.0.0 to v6.x.x, and
// prevents regressions on https://github.com/pulumi/pulumi-aws/issues/2823.
//
// Updated in https://github.com/pulumi/pulumi-aws/pull/3881 to accept CHANGES_SOME so long as they are not
// replacements.
func TestMigrateRdsInstance(t *testing.T) {
replay(t, `[
{
Expand Down Expand Up @@ -237,7 +240,7 @@ func TestMigrateRdsInstance(t *testing.T) {
},
"response": {
"stables": "*",
"changes": "DIFF_NONE",
"changes": "*",
"hasDetailedDiff": true
},
"metadata": {
Expand Down Expand Up @@ -376,7 +379,7 @@ func TestMigrateRdsInstance(t *testing.T) {
},
"response": {
"stables": "*",
"changes": "DIFF_NONE",
"changes": "*",
"hasDetailedDiff": true
},
"metadata": {
Expand Down
44 changes: 25 additions & 19 deletions examples/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
module github.com/pulumi/pulumi-aws/examples/v6

go 1.21.0
go 1.22.0

toolchain go1.22.2

require (
github.com/aws/aws-sdk-go v1.51.23
github.com/aws/aws-sdk-go v1.51.28
github.com/pulumi/providertest v0.0.11
github.com/pulumi/pulumi-aws/provider/v6 v6.0.0-00010101000000-000000000000
github.com/pulumi/pulumi-terraform-bridge/pf v0.34.0
Expand Down Expand Up @@ -73,15 +75,16 @@ require (
github.com/aws/aws-sdk-go-v2/service/appconfig v1.29.2 // indirect
github.com/aws/aws-sdk-go-v2/service/appfabric v1.7.4 // indirect
github.com/aws/aws-sdk-go-v2/service/appflow v1.41.4 // indirect
github.com/aws/aws-sdk-go-v2/service/appintegrations v1.25.4 // indirect
github.com/aws/aws-sdk-go-v2/service/apprunner v1.28.4 // indirect
github.com/aws/aws-sdk-go-v2/service/athena v1.40.4 // indirect
github.com/aws/aws-sdk-go-v2/service/auditmanager v1.32.4 // indirect
github.com/aws/aws-sdk-go-v2/service/autoscaling v1.40.5 // indirect
github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.20.4 // indirect
github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.20.5 // indirect
github.com/aws/aws-sdk-go-v2/service/batch v1.37.0 // indirect
github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.3.4 // indirect
github.com/aws/aws-sdk-go-v2/service/bedrock v1.7.7 // indirect
github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.6.0 // indirect
github.com/aws/aws-sdk-go-v2/service/bedrock v1.8.0 // indirect
github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.8.0 // indirect
github.com/aws/aws-sdk-go-v2/service/budgets v1.22.4 // indirect
github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.15.5 // indirect
github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.14.4 // indirect
Expand Down Expand Up @@ -112,17 +115,17 @@ require (
github.com/aws/aws-sdk-go-v2/service/connectcases v1.15.4 // indirect
github.com/aws/aws-sdk-go-v2/service/controltower v1.13.5 // indirect
github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.23.4 // indirect
github.com/aws/aws-sdk-go-v2/service/costexplorer v1.37.1 // indirect
github.com/aws/aws-sdk-go-v2/service/costexplorer v1.38.0 // indirect
github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.4.4 // indirect
github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.36.4 // indirect
github.com/aws/aws-sdk-go-v2/service/datasync v1.36.4 // indirect
github.com/aws/aws-sdk-go-v2/service/datasync v1.37.0 // indirect
github.com/aws/aws-sdk-go-v2/service/datazone v1.8.0 // indirect
github.com/aws/aws-sdk-go-v2/service/dax v1.19.4 // indirect
github.com/aws/aws-sdk-go-v2/service/devopsguru v1.30.4 // indirect
github.com/aws/aws-sdk-go-v2/service/directoryservice v1.24.4 // indirect
github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.9.3 // indirect
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.31.1 // indirect
github.com/aws/aws-sdk-go-v2/service/ec2 v1.157.0 // indirect
github.com/aws/aws-sdk-go-v2/service/ec2 v1.159.0 // indirect
github.com/aws/aws-sdk-go-v2/service/ecr v1.27.4 // indirect
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.23.4 // indirect
github.com/aws/aws-sdk-go-v2/service/ecs v1.41.7 // indirect
Expand All @@ -131,14 +134,15 @@ require (
github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.23.4 // indirect
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.30.5 // indirect
github.com/aws/aws-sdk-go-v2/service/emr v1.39.5 // indirect
github.com/aws/aws-sdk-go-v2/service/emrserverless v1.18.0 // indirect
github.com/aws/aws-sdk-go-v2/service/emrserverless v1.19.0 // indirect
github.com/aws/aws-sdk-go-v2/service/eventbridge v1.30.4 // indirect
github.com/aws/aws-sdk-go-v2/service/evidently v1.19.4 // indirect
github.com/aws/aws-sdk-go-v2/service/finspace v1.24.1 // indirect
github.com/aws/aws-sdk-go-v2/service/firehose v1.28.6 // indirect
github.com/aws/aws-sdk-go-v2/service/fis v1.24.2 // indirect
github.com/aws/aws-sdk-go-v2/service/fms v1.31.4 // indirect
github.com/aws/aws-sdk-go-v2/service/glacier v1.22.4 // indirect
github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.23.1 // indirect
github.com/aws/aws-sdk-go-v2/service/groundstation v1.27.0 // indirect
github.com/aws/aws-sdk-go-v2/service/healthlake v1.24.0 // indirect
github.com/aws/aws-sdk-go-v2/service/iam v1.32.0 // indirect
Expand All @@ -149,7 +153,7 @@ require (
github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.6 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.7 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.5 // indirect
github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.13.0 // indirect
github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.14.0 // indirect
github.com/aws/aws-sdk-go-v2/service/ivschat v1.12.5 // indirect
github.com/aws/aws-sdk-go-v2/service/kafka v1.31.3 // indirect
github.com/aws/aws-sdk-go-v2/service/kendra v1.50.1 // indirect
Expand All @@ -175,26 +179,27 @@ require (
github.com/aws/aws-sdk-go-v2/service/oam v1.10.1 // indirect
github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.11.4 // indirect
github.com/aws/aws-sdk-go-v2/service/osis v1.8.4 // indirect
github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.9.4 // indirect
github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.10.0 // indirect
github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.5.4 // indirect
github.com/aws/aws-sdk-go-v2/service/pipes v1.11.4 // indirect
github.com/aws/aws-sdk-go-v2/service/polly v1.39.6 // indirect
github.com/aws/aws-sdk-go-v2/service/pricing v1.28.1 // indirect
github.com/aws/aws-sdk-go-v2/service/qbusiness v1.5.0 // indirect
github.com/aws/aws-sdk-go-v2/service/qldb v1.21.4 // indirect
github.com/aws/aws-sdk-go-v2/service/rbin v1.16.4 // indirect
github.com/aws/aws-sdk-go-v2/service/rds v1.77.1 // indirect
github.com/aws/aws-sdk-go-v2/service/rds v1.77.2 // indirect
github.com/aws/aws-sdk-go-v2/service/redshift v1.44.0 // indirect
github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.25.4 // indirect
github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.17.4 // indirect
github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.17.5 // indirect
github.com/aws/aws-sdk-go-v2/service/rekognition v1.40.0 // indirect
github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.10.5 // indirect
github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.22.0 // indirect
github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.21.4 // indirect
github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.10.0 // indirect
github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.11.0 // indirect
github.com/aws/aws-sdk-go-v2/service/route53domains v1.23.4 // indirect
github.com/aws/aws-sdk-go-v2/service/route53profiles v1.0.0 // indirect
github.com/aws/aws-sdk-go-v2/service/s3 v1.53.1 // indirect
github.com/aws/aws-sdk-go-v2/service/s3control v1.44.5 // indirect
github.com/aws/aws-sdk-go-v2/service/s3control v1.44.6 // indirect
github.com/aws/aws-sdk-go-v2/service/scheduler v1.8.4 // indirect
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.28.6 // indirect
github.com/aws/aws-sdk-go-v2/service/securityhub v1.47.2 // indirect
Expand All @@ -206,7 +211,7 @@ require (
github.com/aws/aws-sdk-go-v2/service/signer v1.22.6 // indirect
github.com/aws/aws-sdk-go-v2/service/sns v1.29.4 // indirect
github.com/aws/aws-sdk-go-v2/service/sqs v1.31.4 // indirect
github.com/aws/aws-sdk-go-v2/service/ssm v1.49.5 // indirect
github.com/aws/aws-sdk-go-v2/service/ssm v1.50.0 // indirect
github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.22.4 // indirect
github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.30.4 // indirect
github.com/aws/aws-sdk-go-v2/service/ssmsap v1.12.4 // indirect
Expand All @@ -218,16 +223,17 @@ require (
github.com/aws/aws-sdk-go-v2/service/synthetics v1.24.4 // indirect
github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.25.5 // indirect
github.com/aws/aws-sdk-go-v2/service/transcribe v1.36.4 // indirect
github.com/aws/aws-sdk-go-v2/service/transfer v1.46.0 // indirect
github.com/aws/aws-sdk-go-v2/service/transfer v1.47.0 // indirect
github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.13.1 // indirect
github.com/aws/aws-sdk-go-v2/service/vpclattice v1.7.5 // indirect
github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.30.0 // indirect
github.com/aws/aws-sdk-go-v2/service/workspaces v1.38.4 // indirect
github.com/aws/aws-sdk-go-v2/service/workspaces v1.39.0 // indirect
github.com/aws/aws-sdk-go-v2/service/xray v1.25.4 // indirect
github.com/aws/smithy-go v1.20.2 // indirect
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
github.com/beevik/etree v1.3.0 // indirect
github.com/blang/semver v3.5.1+incompatible // indirect
github.com/cedar-policy/cedar-go v0.0.0-20240318205125-470d1fe984bb // indirect
github.com/cenkalti/backoff/v3 v3.2.2 // indirect
github.com/charmbracelet/bubbles v0.16.1 // indirect
github.com/charmbracelet/bubbletea v0.24.2 // indirect
Expand Down Expand Up @@ -390,7 +396,7 @@ require (
gocloud.dev v0.37.0 // indirect
gocloud.dev/secrets/hashivault v0.27.0 // indirect
golang.org/x/crypto v0.22.0 // indirect
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
golang.org/x/mod v0.15.0 // indirect
golang.org/x/net v0.24.0 // indirect
golang.org/x/oauth2 v0.18.0 // indirect
Expand Down
Loading
Loading