Upgrade AWS to v6.37.1 (#1294)

Dependency updates: ``` @pulumi/aws: 6.32.0 to 6.37.1 @pulumi/sdk: v3.112.0 to v3.116.1 ``` In particular AWS v6.36.0 has a change that makes it work better with LocalStack as it no longer fails opaquely when given an workspacesweb endpoint override in `aws:endpoints`. This does not solve #1191 yet but alleviates most of the underlying trouble.
pulumi · May 30, 2024 · 1585f6c · 1585f6c
1 parent bb45c6a
commit 1585f6c
Show file tree

Hide file tree

Showing 17 changed files with 287 additions and 278 deletions.
diff --git a/awsx/package.json b/awsx/package.json
@@ -22,7 +22,7 @@
   },
   "//": "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.32.0",
+    "@pulumi/aws": "6.37.1",
     "@pulumi/docker": "4.5.1",
     "@pulumi/pulumi": "^3.91.1",
     "@types/aws-lambda": "^8.10.23",
@@ -63,4 +63,3 @@
     ]
   }
 }
-
diff --git a/awsx/yarn.lock b/awsx/yarn.lock
@@ -1519,10 +1519,10 @@
   resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
   integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==
 
-"@pulumi/aws@6.32.0":
-  version "6.32.0"
-  resolved "https://registry.yarnpkg.com/@pulumi/aws/-/aws-6.32.0.tgz#3afd3f938b44fc12de250c70fe773d8452c29d5a"
-  integrity sha512-kXoRn427RjSALvyEwMI5wZibNf8lRlp16vgPfI2n2OT7CLvtmqnI16IRPJ01gVf8I95sku1meKqXwXAQ+2O1Zw==
+"@pulumi/aws@6.37.1":
+  version "6.37.1"
+  resolved "https://registry.yarnpkg.com/@pulumi/aws/-/aws-6.37.1.tgz#98f9f3a719a13e9254a46fb54bfbeab52bb98533"
+  integrity sha512-vdFq8YsTTGRsl1iU0giuZzMPxpdOV1aWyh+bQH4xqHgOjnEKMo/SU4lIroCL+mnA6GWvnkht9sajaEDoCC4sAw==
   dependencies:
     "@pulumi/pulumi" "^3.0.0"
     builtin-modules "3.0.0"

diff --git a/schema.json b/schema.json
diff --git a/scripts/upgrade-aws.sh b/scripts/upgrade-aws.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+#
+# Usage:
+#
+# ./scripts/upgrade-aws.sh 6.38.0
+
+set -euo pipefail
+
+VER="$1"
+
+echo "V=$VER"
+
+(cd awsx && yarn add "@pulumi/aws@$VER")
+
+make build_sdks
diff --git a/sdk/dotnet/Ec2/Inputs/VpcEndpointSpecArgs.cs b/sdk/dotnet/Ec2/Inputs/VpcEndpointSpecArgs.cs
@@ -101,7 +101,7 @@ namespace Pulumi.Awsx.Ec2.Inputs
     ///     }
     /// 
     ///     public static void stack(Context ctx) {
-    ///         var s3 = new VpcEndpoint("s3", VpcEndpointArgs.builder()        
+    ///         var s3 = new VpcEndpoint("s3", VpcEndpointArgs.builder()
     ///             .vpcId(main.id())
     ///             .serviceName("com.amazonaws.us-west-2.s3")
     ///             .build());
@@ -210,7 +210,7 @@ namespace Pulumi.Awsx.Ec2.Inputs
     ///     }
     /// 
     ///     public static void stack(Context ctx) {
-    ///         var s3 = new VpcEndpoint("s3", VpcEndpointArgs.builder()        
+    ///         var s3 = new VpcEndpoint("s3", VpcEndpointArgs.builder()
     ///             .vpcId(main.id())
     ///             .serviceName("com.amazonaws.us-west-2.s3")
     ///             .tags(Map.of("Environment", "test"))
@@ -326,7 +326,7 @@ namespace Pulumi.Awsx.Ec2.Inputs
     ///     }
     /// 
     ///     public static void stack(Context ctx) {
-    ///         var ec2 = new VpcEndpoint("ec2", VpcEndpointArgs.builder()        
+    ///         var ec2 = new VpcEndpoint("ec2", VpcEndpointArgs.builder()
     ///             .vpcId(main.id())
     ///             .serviceName("com.amazonaws.us-west-2.ec2")
     ///             .vpcEndpointType("Interface")
@@ -491,13 +491,13 @@ namespace Pulumi.Awsx.Ec2.Inputs
     ///     public static void stack(Context ctx) {
     ///         final var current = AwsFunctions.getCallerIdentity();
     /// 
-    ///         var example = new VpcEndpointService("example", VpcEndpointServiceArgs.builder()        
+    ///         var example = new VpcEndpointService("example", VpcEndpointServiceArgs.builder()
     ///             .acceptanceRequired(false)
     ///             .allowedPrincipals(current.applyValue(getCallerIdentityResult -&gt; getCallerIdentityResult.arn()))
     ///             .gatewayLoadBalancerArns(exampleAwsLb.arn())
     ///             .build());
     /// 
-    ///         var exampleVpcEndpoint = new VpcEndpoint("exampleVpcEndpoint", VpcEndpointArgs.builder()        
+    ///         var exampleVpcEndpoint = new VpcEndpoint("exampleVpcEndpoint", VpcEndpointArgs.builder()
     ///             .serviceName(example.serviceName())
     ///             .subnetIds(exampleAwsSubnet.id())
     ///             .vpcEndpointType(example.serviceType())

diff --git a/sdk/dotnet/Lb/Inputs/ListenerArgs.cs b/sdk/dotnet/Lb/Inputs/ListenerArgs.cs
@@ -152,7 +152,7 @@ namespace Pulumi.Awsx.Lb.Inputs
     /// 
     ///         var frontEndTargetGroup = new TargetGroup("frontEndTargetGroup");
     /// 
-    ///         var frontEndListener = new Listener("frontEndListener", ListenerArgs.builder()        
+    ///         var frontEndListener = new Listener("frontEndListener", ListenerArgs.builder()
     ///             .loadBalancerArn(frontEnd.arn())
     ///             .port("443")
     ///             .protocol("HTTPS")
@@ -303,7 +303,7 @@ namespace Pulumi.Awsx.Lb.Inputs
     ///     }
     /// 
     ///     public static void stack(Context ctx) {
-    ///         var frontEnd = new Listener("frontEnd", ListenerArgs.builder()        
+    ///         var frontEnd = new Listener("frontEnd", ListenerArgs.builder()
     ///             .loadBalancerArn(frontEndAwsLb.arn())
     ///             .port("443")
     ///             .protocol("TLS")
@@ -469,7 +469,7 @@ namespace Pulumi.Awsx.Lb.Inputs
     ///     public static void stack(Context ctx) {
     ///         var frontEnd = new LoadBalancer("frontEnd");
     /// 
-    ///         var frontEndListener = new Listener("frontEndListener", ListenerArgs.builder()        
+    ///         var frontEndListener = new Listener("frontEndListener", ListenerArgs.builder()
     ///             .loadBalancerArn(frontEnd.arn())
     ///             .port("80")
     ///             .protocol("HTTP")
@@ -641,7 +641,7 @@ namespace Pulumi.Awsx.Lb.Inputs
     ///     public static void stack(Context ctx) {
     ///         var frontEnd = new LoadBalancer("frontEnd");
     /// 
-    ///         var frontEndListener = new Listener("frontEndListener", ListenerArgs.builder()        
+    ///         var frontEndListener = new Listener("frontEndListener", ListenerArgs.builder()
     ///             .loadBalancerArn(frontEnd.arn())
     ///             .port("80")
     ///             .protocol("HTTP")
@@ -879,7 +879,7 @@ namespace Pulumi.Awsx.Lb.Inputs
     /// 
     ///         var domain = new UserPoolDomain("domain");
     /// 
-    ///         var frontEndListener = new Listener("frontEndListener", ListenerArgs.builder()        
+    ///         var frontEndListener = new Listener("frontEndListener", ListenerArgs.builder()
     ///             .loadBalancerArn(frontEnd.arn())
     ///             .port("80")
     ///             .protocol("HTTP")
@@ -1111,7 +1111,7 @@ namespace Pulumi.Awsx.Lb.Inputs
     /// 
     ///         var frontEndTargetGroup = new TargetGroup("frontEndTargetGroup");
     /// 
-    ///         var frontEndListener = new Listener("frontEndListener", ListenerArgs.builder()        
+    ///         var frontEndListener = new Listener("frontEndListener", ListenerArgs.builder()
     ///             .loadBalancerArn(frontEnd.arn())
     ///             .port("80")
     ///             .protocol("HTTP")
@@ -1351,15 +1351,15 @@ namespace Pulumi.Awsx.Lb.Inputs
     ///     }
     /// 
     ///     public static void stack(Context ctx) {
-    ///         var example = new LoadBalancer("example", LoadBalancerArgs.builder()        
+    ///         var example = new LoadBalancer("example", LoadBalancerArgs.builder()
     ///             .loadBalancerType("gateway")
     ///             .name("example")
     ///             .subnetMappings(LoadBalancerSubnetMappingArgs.builder()
     ///                 .subnetId(exampleAwsSubnet.id())
     ///                 .build())
     ///             .build());
     /// 
-    ///         var exampleTargetGroup = new TargetGroup("exampleTargetGroup", TargetGroupArgs.builder()        
+    ///         var exampleTargetGroup = new TargetGroup("exampleTargetGroup", TargetGroupArgs.builder()
     ///             .name("example")
     ///             .port(6081)
     ///             .protocol("GENEVE")
@@ -1370,7 +1370,7 @@ namespace Pulumi.Awsx.Lb.Inputs
     ///                 .build())
     ///             .build());
     /// 
-    ///         var exampleListener = new Listener("exampleListener", ListenerArgs.builder()        
+    ///         var exampleListener = new Listener("exampleListener", ListenerArgs.builder()
     ///             .loadBalancerArn(example.id())
     ///             .defaultActions(ListenerDefaultActionArgs.builder()
     ///                 .targetGroupArn(exampleTargetGroup.id())
@@ -1551,13 +1551,13 @@ namespace Pulumi.Awsx.Lb.Inputs
     ///     }
     /// 
     ///     public static void stack(Context ctx) {
-    ///         var example = new LoadBalancer("example", LoadBalancerArgs.builder()        
+    ///         var example = new LoadBalancer("example", LoadBalancerArgs.builder()
     ///             .loadBalancerType("application")
     ///             .build());
     /// 
     ///         var exampleTargetGroup = new TargetGroup("exampleTargetGroup");
     /// 
-    ///         var exampleListener = new Listener("exampleListener", ListenerArgs.builder()        
+    ///         var exampleListener = new Listener("exampleListener", ListenerArgs.builder()
     ///             .loadBalancerArn(example.id())
     ///             .defaultActions(ListenerDefaultActionArgs.builder()
     ///                 .targetGroupArn(exampleTargetGroup.id())

diff --git a/sdk/dotnet/Lb/Inputs/TargetGroupArgs.cs b/sdk/dotnet/Lb/Inputs/TargetGroupArgs.cs
@@ -119,11 +119,11 @@ namespace Pulumi.Awsx.Lb.Inputs
     ///     }
     /// 
     ///     public static void stack(Context ctx) {
-    ///         var main = new Vpc("main", VpcArgs.builder()        
+    ///         var main = new Vpc("main", VpcArgs.builder()
     ///             .cidrBlock("10.0.0.0/16")
     ///             .build());
     /// 
-    ///         var test = new TargetGroup("test", TargetGroupArgs.builder()        
+    ///         var test = new TargetGroup("test", TargetGroupArgs.builder()
     ///             .name("tf-example-lb-tg")
     ///             .port(80)
     ///             .protocol("HTTP")
@@ -255,11 +255,11 @@ namespace Pulumi.Awsx.Lb.Inputs
     ///     }
     /// 
     ///     public static void stack(Context ctx) {
-    ///         var main = new Vpc("main", VpcArgs.builder()        
+    ///         var main = new Vpc("main", VpcArgs.builder()
     ///             .cidrBlock("10.0.0.0/16")
     ///             .build());
     /// 
-    ///         var ip_example = new TargetGroup("ip-example", TargetGroupArgs.builder()        
+    ///         var ip_example = new TargetGroup("ip-example", TargetGroupArgs.builder()
     ///             .name("tf-example-lb-tg")
     ///             .port(80)
     ///             .protocol("HTTP")
@@ -365,7 +365,7 @@ namespace Pulumi.Awsx.Lb.Inputs
     ///     }
     /// 
     ///     public static void stack(Context ctx) {
-    ///         var lambda_example = new TargetGroup("lambda-example", TargetGroupArgs.builder()        
+    ///         var lambda_example = new TargetGroup("lambda-example", TargetGroupArgs.builder()
     ///             .name("tf-example-lb-tg")
     ///             .targetType("lambda")
     ///             .build());
@@ -473,7 +473,7 @@ namespace Pulumi.Awsx.Lb.Inputs
     ///     }
     /// 
     ///     public static void stack(Context ctx) {
-    ///         var alb_example = new TargetGroup("alb-example", TargetGroupArgs.builder()        
+    ///         var alb_example = new TargetGroup("alb-example", TargetGroupArgs.builder()
     ///             .name("tf-example-lb-alb-tg")
     ///             .targetType("alb")
     ///             .port(80)
@@ -602,7 +602,7 @@ namespace Pulumi.Awsx.Lb.Inputs
     ///     }
     /// 
     ///     public static void stack(Context ctx) {
-    ///         var tcp_example = new TargetGroup("tcp-example", TargetGroupArgs.builder()        
+    ///         var tcp_example = new TargetGroup("tcp-example", TargetGroupArgs.builder()
     ///             .name("tf-example-lb-nlb-tg")
     ///             .port(25)
     ///             .protocol("TCP")

diff --git a/sdk/go.mod b/sdk/go.mod
@@ -6,15 +6,15 @@ toolchain go1.21.1
 
 require (
 	github.com/blang/semver v3.5.1+incompatible
-	github.com/pulumi/pulumi-aws/sdk/v6 v6.32.0
+	github.com/pulumi/pulumi-aws/sdk/v6 v6.37.1
 	github.com/pulumi/pulumi-docker/sdk/v4 v4.4.3
-	github.com/pulumi/pulumi/sdk/v3 v3.112.0
+	github.com/pulumi/pulumi/sdk/v3 v3.116.1
 )
 
 require (
 	dario.cat/mergo v1.0.0 // indirect
 	github.com/Microsoft/go-winio v0.6.1 // indirect
-	github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
+	github.com/ProtonMail/go-crypto v1.0.0 // indirect
 	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
@@ -31,12 +31,11 @@ require (
 	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.11.0 // indirect
+	github.com/go-git/go-git/v5 v5.12.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/glog v1.1.0 // indirect
+	github.com/golang/glog v1.2.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/google/uuid v1.3.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
@@ -66,8 +65,8 @@ require (
 	github.com/rogpeppe/go-internal v1.11.0 // indirect
 	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.1 // indirect
+	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
+	github.com/skeema/knownhosts v1.2.2 // indirect
 	github.com/spf13/cobra v1.7.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/stretchr/objx v0.5.0 // indirect
@@ -78,18 +77,18 @@ require (
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
 	github.com/zclconf/go-cty v1.13.2 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
-	golang.org/x/crypto v0.21.0 // indirect
+	golang.org/x/crypto v0.22.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.21.0 // indirect
-	golang.org/x/sync v0.5.0 // indirect
-	golang.org/x/sys v0.18.0 // indirect
-	golang.org/x/term v0.18.0 // indirect
+	golang.org/x/net v0.24.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/tools v0.15.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230731190214-cbb8c96f2d6d // indirect
-	google.golang.org/grpc v1.57.1 // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
+	google.golang.org/grpc v1.63.2 // indirect
+	google.golang.org/protobuf v1.34.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