Skip to content

Commit

Permalink
Merge pull request #1137 from pulumi/mikhailshilkov/upgrade-aws
Browse files Browse the repository at this point in the history 
Upgrade p-aws to 6.7.0 and p/p to 3.91.1
  • Loading branch information
@mikhailshilkov
mikhailshilkov authored Nov 1, 2023
2 parents 793f90d + b6e0679 commit 5cdf0d4
Show file tree
Hide file tree
Showing 45 changed files with 1,494 additions and 2,192 deletions.
6 changes: 3 additions & 3 deletions awsx/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
},
"//": "Pulumi sub-provider dependencies must be pinned at an exact version because we extract this value to generate the correct dependency in the schema",
"dependencies": {
"@pulumi/aws": "6.5.0",
"@pulumi/docker": "4.4.3",
"@pulumi/pulumi": "^3.81.0",
"@pulumi/aws": "6.7.0",
"@pulumi/docker": "4.4.4",
"@pulumi/pulumi": "^3.91.1",
"@types/aws-lambda": "^8.10.23",
"docker-classic": "npm:@pulumi/[email protected]",
"ip-address": "^8.1.0",
Expand Down
4 changes: 4 additions & 0 deletions awsx/schema-types.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,7 @@ export interface ApplicationLoadBalancerArgs {
readonly defaultTargetGroup?: TargetGroupInputs;
readonly defaultTargetGroupPort?: pulumi.Input<number>;
readonly desyncMitigationMode?: pulumi.Input<string>;
readonly dnsRecordClientRoutingPolicy?: pulumi.Input<string>;
readonly dropInvalidHeaderFields?: pulumi.Input<boolean>;
readonly enableDeletionProtection?: pulumi.Input<boolean>;
readonly enableHttp2?: pulumi.Input<boolean>;
Expand Down Expand Up @@ -317,6 +318,7 @@ export interface NetworkLoadBalancerArgs {
readonly defaultTargetGroup?: TargetGroupInputs;
readonly defaultTargetGroupPort?: pulumi.Input<number>;
readonly desyncMitigationMode?: pulumi.Input<string>;
readonly dnsRecordClientRoutingPolicy?: pulumi.Input<string>;
readonly dropInvalidHeaderFields?: pulumi.Input<boolean>;
readonly enableCrossZoneLoadBalancing?: pulumi.Input<boolean>;
readonly enableDeletionProtection?: pulumi.Input<boolean>;
Expand Down Expand Up @@ -1041,6 +1043,7 @@ export interface TargetGroupInputs {
readonly stickiness?: pulumi.Input<aws.types.input.lb.TargetGroupStickiness>;
readonly tags?: pulumi.Input<Record<string, pulumi.Input<string>>>;
readonly targetFailovers?: pulumi.Input<pulumi.Input<aws.types.input.lb.TargetGroupTargetFailover>[]>;
readonly targetHealthStates?: pulumi.Input<pulumi.Input<aws.types.input.lb.TargetGroupTargetHealthState>[]>;
readonly targetType?: pulumi.Input<string>;
readonly vpcId?: pulumi.Input<string>;
}
Expand All @@ -1063,6 +1066,7 @@ export interface TargetGroupOutputs {
readonly stickiness?: pulumi.Output<aws.types.output.lb.TargetGroupStickiness>;
readonly tags?: pulumi.Output<Record<string, string>>;
readonly targetFailovers?: pulumi.Output<aws.types.output.lb.TargetGroupTargetFailover[]>;
readonly targetHealthStates?: pulumi.Output<aws.types.output.lb.TargetGroupTargetHealthState[]>;
readonly targetType?: pulumi.Output<string>;
readonly vpcId?: pulumi.Output<string>;
}
Expand Down
249 changes: 132 additions & 117 deletions awsx/schema.json
View file

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions awsx/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1519,29 +1519,29 @@
resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==

"@pulumi/aws@6.5.0":
version "6.5.0"
resolved "https://registry.yarnpkg.com/@pulumi/aws/-/aws-6.5.0.tgz#11afe5b033be24d317b0db9918bf2e9012289515"
integrity sha512-oBoL+ZwQaBbnq7NiR/lrRexylj3GAu4dvg1s6AGi1fACbpvruIJgjtOecNnPaEJfiOpyoqPYuTURrBCk90R3rA==
"@pulumi/aws@6.7.0":
version "6.7.0"
resolved "https://registry.yarnpkg.com/@pulumi/aws/-/aws-6.7.0.tgz#50b4d7d3d604c21bbef404b9c1563485b9c7f16b"
integrity sha512-7COqQ4jkXNtfcfoNbLAvp1BK00STwNLnsM9liKl4MnRiKg7+wL+Z7jz7UiIE8m9ZqxW10wEVW8Inj92TkgjwVg==
dependencies:
"@pulumi/pulumi" "^3.0.0"
builtin-modules "3.0.0"
mime "^2.0.0"
read-package-tree "^5.2.1"
resolve "^1.7.1"

"@pulumi/[email protected].3":
version "4.4.3"
resolved "https://registry.yarnpkg.com/@pulumi/docker/-/docker-4.4.3.tgz#5779aa2b294973001b821219706f7775f92b432c"
integrity sha512-KuA0AbPKu5gwgTbMTSPjwLltwxoOBusvQadcruZaacSwtZmxG8IwfdTiDKVdPSHZ69nCfdr9hTfdKAKXbuIjAw==
"@pulumi/[email protected].4":
version "4.4.4"
resolved "https://registry.yarnpkg.com/@pulumi/docker/-/docker-4.4.4.tgz#1e412663311d36c8aeba301587e2385a201a9364"
integrity sha512-CuW5UAI+mZWJqD3ZKEv74ReWu/jCpoJKyXpjtp3m4I+bWoOoOfg7jUGoJnwLODQPnrmlawOviNa0TzMR5WdXaQ==
dependencies:
"@pulumi/pulumi" "^3.0.0"
semver "^5.4.0"

"@pulumi/pulumi@^3.0.0", "@pulumi/pulumi@^3.81.0":
version "3.82.1"
resolved "https://registry.yarnpkg.com/@pulumi/pulumi/-/pulumi-3.82.1.tgz#91c0595f392bae10096c342493406822abc107eb"
integrity sha512-wIQHSVFnlX5TeUliSQNTfn8wZZMq9z1y6JOi7KcVM1rkfHFx3kxVBwK+5ri308cl8QMEzFprXTgH56lHQ2855w==
"@pulumi/pulumi@^3.0.0", "@pulumi/pulumi@^3.91.1":
version "3.91.1"
resolved "https://registry.yarnpkg.com/@pulumi/pulumi/-/pulumi-3.91.1.tgz#fea7720178f87388146692df371d9285a43093d7"
integrity sha512-ZKX9twt1+EDSb/Sg3d9fffA74f3Ikx90Xc8k7C++qdaOkcwKd2RTycciZdzvM/ri7KW4B6CYU2qCgKy33li6tQ==
dependencies:
"@grpc/grpc-js" "^1.8.16"
"@logdna/tail-file" "^2.0.6"
Expand Down
34 changes: 8 additions & 26 deletions schemagen/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ go 1.21

require (
github.com/pkg/errors v0.9.1
github.com/pulumi/pulumi/pkg/v3 v3.85.0
github.com/pulumi/pulumi/sdk/v3 v3.85.0
github.com/pulumi/pulumi/pkg/v3 v3.91.1
github.com/pulumi/pulumi/sdk/v3 v3.91.1
)

require (
Expand All @@ -17,12 +17,7 @@ require (
cloud.google.com/go/logging v1.7.0 // indirect
cloud.google.com/go/longrunning v0.5.1 // indirect
cloud.google.com/go/storage v1.30.1 // indirect
github.com/AlecAivazis/survey/v2 v2.3.7 // indirect
github.com/Azure/azure-sdk-for-go v66.0.0+incompatible // indirect
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.1.1 // indirect
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.0.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.0.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.4.1 // indirect
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
github.com/Azure/go-autorest/autorest v0.11.28 // indirect
github.com/Azure/go-autorest/autorest/adal v0.9.21 // indirect
Expand All @@ -33,7 +28,6 @@ require (
github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
github.com/Azure/go-autorest/logger v0.2.1 // indirect
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v0.4.0 // indirect
github.com/BurntSushi/toml v1.2.1 // indirect
github.com/Microsoft/go-winio v0.5.2 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4 // indirect
Expand All @@ -46,21 +40,14 @@ require (
github.com/atotto/clipboard v0.1.4 // indirect
github.com/aws/aws-sdk-go v1.44.298 // indirect
github.com/aws/aws-sdk-go-v2 v1.17.3 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.3 // indirect
github.com/aws/aws-sdk-go-v2/config v1.15.15 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.12.10 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.9 // indirect
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.21 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.27 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.21 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.16 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.6 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.3 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.10 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.9 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.9 // indirect
github.com/aws/aws-sdk-go-v2/service/kms v1.18.1 // indirect
github.com/aws/aws-sdk-go-v2/service/s3 v1.27.2 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.11.13 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.16.10 // indirect
github.com/aws/smithy-go v1.13.5 // indirect
Expand All @@ -76,7 +63,6 @@ require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dimchansky/utfbom v1.1.1 // indirect
github.com/djherbis/times v1.5.0 // indirect
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.13.0 // indirect
Expand All @@ -86,7 +72,6 @@ require (
github.com/go-git/go-git/v5 v5.6.0 // indirect
github.com/gofrs/uuid v4.2.0+incompatible // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt v3.2.1+incompatible // indirect
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
github.com/golang/glog v1.1.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
Expand Down Expand Up @@ -117,26 +102,22 @@ require (
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hashicorp/hcl/v2 v2.16.2 // 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/iancoleman/strcase v0.2.0 // indirect
github.com/ijc/Gotty v0.0.0-20170406111628-a8b993ba6abd // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
github.com/kevinburke/ssh_config v1.2.0 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-isatty v0.0.18 // indirect
github.com/mattn/go-localereader v0.0.1 // indirect
github.com/mattn/go-runewidth v0.0.14 // indirect
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
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
Expand All @@ -157,11 +138,11 @@ require (
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-20210115035449-ce105d075bb4 // indirect
github.com/pkg/term v1.1.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/pulumi/esc v0.5.6 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/rogpeppe/go-internal v1.9.0 // indirect
github.com/rogpeppe/go-internal v1.11.0 // indirect
github.com/ryanuber/go-glob v1.0.0 // indirect
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 // indirect
github.com/santhosh-tekuri/jsonschema/v5 v5.0.0 // indirect
Expand All @@ -172,7 +153,7 @@ require (
github.com/spf13/afero v1.9.5 // indirect
github.com/spf13/cobra v1.7.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/testify v1.8.3 // indirect
github.com/stretchr/testify v1.8.4 // 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
Expand All @@ -187,7 +168,8 @@ require (
gocloud.dev v0.27.0 // indirect
gocloud.dev/secrets/hashivault v0.27.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/mod v0.10.0 // indirect
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
golang.org/x/mod v0.13.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/oauth2 v0.8.0 // indirect
golang.org/x/sync v0.2.0 // indirect
Expand Down
Loading

0 comments on commit 5cdf0d4

Please sign in to comment.