Upgrade to aws v6.0.4 for the fix for aws#2774

pulumi · Sep 5, 2023 · 4d66ce5 · 4d66ce5
1 parent a6e0da5
commit 4d66ce5
Show file tree

Hide file tree

Showing 12 changed files with 2,033 additions and 111 deletions.
diff --git a/examples/managed-nodegroups-go/go.mod b/examples/managed-nodegroups-go/go.mod
@@ -3,7 +3,7 @@ module github.com/pulumi/pulumi-eks/examples/managed-nodegroups-go
 go 1.16
 
 require (
-	github.com/pulumi/pulumi-aws/sdk/v6 v6.0.3
+	github.com/pulumi/pulumi-aws/sdk/v6 v6.0.4
 	github.com/pulumi/pulumi-eks/sdk v0.40.0
 	github.com/pulumi/pulumi/sdk/v3 v3.50.1
 )
diff --git a/examples/managed-nodegroups-go/go.sum b/examples/managed-nodegroups-go/go.sum
diff --git a/examples/managed-nodegroups/package.json b/examples/managed-nodegroups/package.json
@@ -1,12 +1,12 @@
 {
     "name": "example-managed-nodegroups",
     "devDependencies": {
-        "typescript": "^3.0.0",
-        "@types/node": "latest"
+        "@types/node": "latest",
+        "typescript": "^4.0.0"
     },
     "dependencies": {
-        "@pulumi/pulumi": "^3.0.0",
-        "@pulumi/aws": "^6.0.0",
-        "@pulumi/eks": "latest"
+        "@pulumi/aws": "^6.0.4",
+        "@pulumi/eks": "latest",
+        "@pulumi/pulumi": "^3.0.0"
     }
 }
diff --git a/nodejs/eks/cluster.ts b/nodejs/eks/cluster.ts
@@ -313,8 +313,8 @@ export function getRoleProvider(
     parent?: pulumi.ComponentResource,
     provider?: pulumi.ProviderResource,
 ): CreationRoleProvider {
-    const partition = pulumi.output(aws.getPartition({ })).partition;
-    const accountId = pulumi.output(aws.getCallerIdentity({ })).accountId;
+    const partition = pulumi.output(aws.getPartition({})).partition;
+    const accountId = pulumi.output(aws.getCallerIdentity({})).accountId;
     const iamRole = new aws.iam.Role(
         `${name}-eksClusterCreatorRole`,
         {
@@ -449,7 +449,7 @@ export function createCore(
         version: args.version,
     };
 
-    const { partition, dnsSuffix } = pulumi.output(aws.getPartition({ }));
+    const { partition, dnsSuffix } = pulumi.output(aws.getPartition({}));
 
     // Configure default networking architecture.
     let vpcId: pulumi.Input<string> = args.vpcId!;
@@ -918,7 +918,9 @@ export function createCore(
                         selectors: selectors,
                         subnetIds: pulumi
                             .output(clusterSubnetIds)
-                            .apply((subnets) => computeWorkerSubnets(parent, fargate.subnetIds ?? subnets)),
+                            .apply((subnets) =>
+                                computeWorkerSubnets(parent, fargate.subnetIds ?? subnets),
+                            ),
                     },
                     { parent, dependsOn: [eksNodeAccess], provider },
                 );

diff --git a/nodejs/eks/nodegroup.ts b/nodejs/eks/nodegroup.ts
@@ -1203,15 +1203,18 @@ ${customUserData}
         : {};
 
     const device = pulumi.output(amiId).apply((id) =>
-        aws.ec2.getAmi({
-            owners: ["self", "amazon"],
-            filters: [
-                {
-                    name: "image-id",
-                    values: [id],
-                },
-            ],
-        }, { parent }),
+        aws.ec2.getAmi(
+            {
+                owners: ["self", "amazon"],
+                filters: [
+                    {
+                        name: "image-id",
+                        values: [id],
+                    },
+                ],
+            },
+            { parent },
+        ),
     ).blockDeviceMappings[0].deviceName;
 
     const nodeLaunchTemplate = new aws.ec2.LaunchTemplate(

diff --git a/nodejs/eks/package.json b/nodejs/eks/package.json
@@ -18,7 +18,7 @@
     },
     "bugs": "https://github.com/pulumi/pulumi-eks/issues",
     "dependencies": {
-        "@pulumi/aws": "^6.0.3",
+        "@pulumi/aws": "^6.0.4",
         "@pulumi/kubernetes": "^3.20.2",
         "@pulumi/pulumi": "^3.47.0",
         "https-proxy-agent": "^5.0.1",

diff --git a/nodejs/eks/yarn.lock b/nodejs/eks/yarn.lock
@@ -296,10 +296,10 @@
   resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
   integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==
 
-"@pulumi/aws@^6.0.3":
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/@pulumi/aws/-/aws-6.0.3.tgz#e49d36b6e3559e0917cff2a2c47f08cf986e14cb"
-  integrity sha512-EnxEtRtAWOmw1RPqpXzTnVcyQbd/pULc5L+CHgPN/fN+d69mxrPhUYaYoD0zO8TvDUyc+D0PK0gsvWu4GfMVKQ==
+"@pulumi/aws@^6.0.4":
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/@pulumi/aws/-/aws-6.0.4.tgz#979d96b14791f1da00d316b42d0ca93d04a661f9"
+  integrity sha512-g8t+LuKwEEGX7bKUcYpB8gr1xtrJm3PAt26Js5QztSWDiujy9ehmk4CeEgKLfMR9EGmav6jFSSvwX5IQXSPgog==
   dependencies:
     "@pulumi/pulumi" "^3.0.0"
     builtin-modules "3.0.0"

diff --git a/provider/cmd/pulumi-gen-eks/main.go b/provider/cmd/pulumi-gen-eks/main.go
@@ -80,7 +80,7 @@ func main() {
 }
 
 const (
-	awsVersion = "v6.0.3"
+	awsVersion = "v6.0.4"
 	k8sVersion = "v3.0.0"
 )
 
@@ -1372,7 +1372,7 @@ func generateSchema() schema.PackageSpec {
 			}),
 			"java": rawMessage(map[string]interface{}{
 				"dependencies": map[string]string{
-					"com.pulumi:aws":        "6.0.3",
+					"com.pulumi:aws":        "6.0.4",
 					"com.pulumi:kubernetes": "3.19.1",
 				},
 			}),
@@ -1604,8 +1604,9 @@ func nodeGroupProperties(cluster, v2 bool) map[string]schema.PropertySpec {
 
 	if v2 {
 		props["minRefreshPercentage"] = schema.PropertySpec{
-			TypeSpec:    schema.TypeSpec{Type: "integer"},
-			Description: "The minimum amount of instances that should remain available during an instance refresh, expressed as a percentage. Defaults to 50.",
+			TypeSpec: schema.TypeSpec{Type: "integer"},
+			Description: "The minimum amount of instances that should remain available during an instance " +
+				"refresh, expressed as a percentage. Defaults to 50.",
 		}
 
 		props["launchTemplateTagSpecifications"] = schema.PropertySpec{
@@ -1665,8 +1666,10 @@ func vpcCniProperties(kubeconfig bool) map[string]schema.PropertySpec {
 			Description: "IPAMD will start allocating (/28) prefixes to the ENIs with ENABLE_PREFIX_DELEGATION set to true.",
 		},
 		"enableIpv6": {
-			TypeSpec:    schema.TypeSpec{Type: "boolean"},
-			Description: "VPC CNI can operate in either IPv4 or IPv6 mode. Setting ENABLE_IPv6 to true. will configure it in IPv6 mode. IPv6 is only supported in Prefix Delegation mode, so ENABLE_PREFIX_DELEGATION needs to set to true if VPC CNI is configured to operate in IPv6 mode. Prefix delegation is only supported on nitro instances.",
+			TypeSpec: schema.TypeSpec{Type: "boolean"},
+			Description: "VPC CNI can operate in either IPv4 or IPv6 mode. Setting ENABLE_IPv6 to true. will configure it " +
+				"in IPv6 mode. IPv6 is only supported in Prefix Delegation mode, so ENABLE_PREFIX_DELEGATION needs to set " +
+				"to true if VPC CNI is configured to operate in IPv6 mode. Prefix delegation is only supported on nitro instances.",
 		},
 		"logLevel": {
 			TypeSpec: schema.TypeSpec{Type: "string"}, // TODO consider typing this as an enum