Fix output of default node group referring to autoscalingGroupName (#…

…1410) In #1373 the default node group was updated to use the `NodeGroupV2` component. We missed changing the `NodeGroupData` type to reflect this. It was still referring to a property called `autoScalingGroupName`, but it should've been changed to expose an `autoScalingGroup`. Fixes #1402
pulumi · Oct 1, 2024 · dfd76f2 · dfd76f2
1 parent 120f84d
commit dfd76f2
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 46 deletions.
diff --git a/examples/cluster/index.ts b/examples/cluster/index.ts
@@ -18,6 +18,8 @@ const cluster1 = new eks.Cluster(`${projectName}-1`, {
     nodeAmiId: "ami-066e69f6f03b5383e",
 });
 
+export const defaultAsgArn: pulumi.Output<string> = cluster1.defaultNodeGroup.apply(ng => ng?.autoScalingGroup.arn ?? pulumi.output(""));
+
 const cluster2 = new eks.Cluster(`${projectName}-2`, {
     vpcId: vpc.vpcId,
     publicSubnetIds: vpc.publicSubnetIds,

diff --git a/examples/examples_nodejs_test.go b/examples/examples_nodejs_test.go
@@ -56,6 +56,8 @@ func TestAccCluster(t *testing.T) {
 					info.Outputs["kubeconfig4"],
 				)
 
+				assert.NotEmpty(t, info.Outputs["defaultAsgArn"], "should have a default ASG")
+
 				// let's test there's a iamRoleArn specified for the cluster
 				assert.NotEmpty(t, info.Outputs["iamRoleArn"])
 

diff --git a/provider/cmd/pulumi-gen-eks/main.go b/provider/cmd/pulumi-gen-eks/main.go
@@ -1393,15 +1393,15 @@ func generateSchema(version semver.Version) schema.PackageSpec {
 							},
 							Description: "The additional security groups for the node group that captures user-specific rules.",
 						},
-						"autoScalingGroupName": {
-							TypeSpec:    schema.TypeSpec{Type: "string"},
-							Description: "The AutoScalingGroup name for the node group.",
+						"autoScalingGroup": {
+							TypeSpec:    schema.TypeSpec{Ref: awsRef("#/resources/aws:autoscaling%2Fgroup:Group")},
+							Description: "The AutoScalingGroup for the node group.",
 						},
 					},
 					Required: []string{
 						"nodeSecurityGroup",
 						"extraNodeSecurityGroups",
-						"autoScalingGroupName",
+						"autoScalingGroup",
 					},
 				},
 			},

diff --git a/provider/cmd/pulumi-resource-eks/schema.json b/provider/cmd/pulumi-resource-eks/schema.json
@@ -677,9 +677,9 @@
         "eks:index:NodeGroupData": {
             "description": "NodeGroupData describes the resources created for the given NodeGroup.",
             "properties": {
-                "autoScalingGroupName": {
-                    "type": "string",
-                    "description": "The AutoScalingGroup name for the node group."
+                "autoScalingGroup": {
+                    "$ref": "/aws/v6.18.2/schema.json#/resources/aws:autoscaling%2Fgroup:Group",
+                    "description": "The AutoScalingGroup for the node group."
                 },
                 "extraNodeSecurityGroups": {
                     "type": "array",
@@ -697,7 +697,7 @@
             "required": [
                 "nodeSecurityGroup",
                 "extraNodeSecurityGroups",
-                "autoScalingGroupName"
+                "autoScalingGroup"
             ]
         },
         "eks:index:NodeadmOptions": {

diff --git a/sdk/dotnet/Outputs/NodeGroupData.cs b/sdk/dotnet/Outputs/NodeGroupData.cs
@@ -17,9 +17,9 @@ namespace Pulumi.Eks.Outputs
     public sealed class NodeGroupData
     {
         /// <summary>
-        /// The AutoScalingGroup name for the node group.
+        /// The AutoScalingGroup for the node group.
         /// </summary>
-        public readonly string AutoScalingGroupName;
+        public readonly Pulumi.Aws.AutoScaling.Group AutoScalingGroup;
         /// <summary>
         /// The additional security groups for the node group that captures user-specific rules.
         /// </summary>
@@ -31,13 +31,13 @@ public sealed class NodeGroupData
 
         [OutputConstructor]
         private NodeGroupData(
-            string autoScalingGroupName,
+            Pulumi.Aws.AutoScaling.Group autoScalingGroup,
 
             ImmutableArray<Pulumi.Aws.Ec2.SecurityGroup> extraNodeSecurityGroups,
 
             Pulumi.Aws.Ec2.SecurityGroup nodeSecurityGroup)
         {
-            AutoScalingGroupName = autoScalingGroupName;
+            AutoScalingGroup = autoScalingGroup;
             ExtraNodeSecurityGroups = extraNodeSecurityGroups;
             NodeSecurityGroup = nodeSecurityGroup;
         }

diff --git a/sdk/go/eks/pulumiTypes.go b/sdk/go/eks/pulumiTypes.go
diff --git a/sdk/java/src/main/java/com/pulumi/eks/outputs/NodeGroupData.java b/sdk/java/src/main/java/com/pulumi/eks/outputs/NodeGroupData.java
@@ -3,20 +3,20 @@
 
 package com.pulumi.eks.outputs;
 
+import com.pulumi.aws.autoscaling.Group;
 import com.pulumi.aws.ec2.SecurityGroup;
 import com.pulumi.core.annotations.CustomType;
 import com.pulumi.exceptions.MissingRequiredPropertyException;
-import java.lang.String;
 import java.util.List;
 import java.util.Objects;
 
 @CustomType
 public final class NodeGroupData {
     /**
-     * @return The AutoScalingGroup name for the node group.
+     * @return The AutoScalingGroup for the node group.
      * 
      */
-    private String autoScalingGroupName;
+    private Group autoScalingGroup;
     /**
      * @return The additional security groups for the node group that captures user-specific rules.
      * 
@@ -30,11 +30,11 @@ public final class NodeGroupData {
 
     private NodeGroupData() {}
     /**
-     * @return The AutoScalingGroup name for the node group.
+     * @return The AutoScalingGroup for the node group.
      * 
      */
-    public String autoScalingGroupName() {
-        return this.autoScalingGroupName;
+    public Group autoScalingGroup() {
+        return this.autoScalingGroup;
     }
     /**
      * @return The additional security groups for the node group that captures user-specific rules.
@@ -60,23 +60,23 @@ public static Builder builder(NodeGroupData defaults) {
     }
     @CustomType.Builder
     public static final class Builder {
-        private String autoScalingGroupName;
+        private Group autoScalingGroup;
         private List<SecurityGroup> extraNodeSecurityGroups;
         private SecurityGroup nodeSecurityGroup;
         public Builder() {}
         public Builder(NodeGroupData defaults) {
     	      Objects.requireNonNull(defaults);
-    	      this.autoScalingGroupName = defaults.autoScalingGroupName;
+    	      this.autoScalingGroup = defaults.autoScalingGroup;
     	      this.extraNodeSecurityGroups = defaults.extraNodeSecurityGroups;
     	      this.nodeSecurityGroup = defaults.nodeSecurityGroup;
         }
 
         @CustomType.Setter
-        public Builder autoScalingGroupName(String autoScalingGroupName) {
-            if (autoScalingGroupName == null) {
-              throw new MissingRequiredPropertyException("NodeGroupData", "autoScalingGroupName");
+        public Builder autoScalingGroup(Group autoScalingGroup) {
+            if (autoScalingGroup == null) {
+              throw new MissingRequiredPropertyException("NodeGroupData", "autoScalingGroup");
             }
-            this.autoScalingGroupName = autoScalingGroupName;
+            this.autoScalingGroup = autoScalingGroup;
             return this;
         }
         @CustomType.Setter
@@ -100,7 +100,7 @@ public Builder nodeSecurityGroup(SecurityGroup nodeSecurityGroup) {
         }
         public NodeGroupData build() {
             final var _resultValue = new NodeGroupData();
-            _resultValue.autoScalingGroupName = autoScalingGroupName;
+            _resultValue.autoScalingGroup = autoScalingGroup;
             _resultValue.extraNodeSecurityGroups = extraNodeSecurityGroups;
             _resultValue.nodeSecurityGroup = nodeSecurityGroup;
             return _resultValue;

diff --git a/sdk/nodejs/types/output.ts b/sdk/nodejs/types/output.ts
@@ -373,9 +373,9 @@ export interface CoreData {
  */
 export interface NodeGroupData {
     /**
-     * The AutoScalingGroup name for the node group.
+     * The AutoScalingGroup for the node group.
      */
-    autoScalingGroupName: string;
+    autoScalingGroup: pulumiAws.autoscaling.Group;
     /**
      * The additional security groups for the node group that captures user-specific rules.
      */

diff --git a/sdk/python/pulumi_eks/outputs.py b/sdk/python/pulumi_eks/outputs.py
@@ -1192,8 +1192,8 @@ class NodeGroupData(dict):
     @staticmethod
     def __key_warning(key: str):
         suggest = None
-        if key == "autoScalingGroupName":
-            suggest = "auto_scaling_group_name"
+        if key == "autoScalingGroup":
+            suggest = "auto_scaling_group"
         elif key == "extraNodeSecurityGroups":
             suggest = "extra_node_security_groups"
         elif key == "nodeSecurityGroup":
@@ -1211,26 +1211,26 @@ def get(self, key: str, default = None) -> Any:
         return super().get(key, default)
 
     def __init__(__self__, *,
-                 auto_scaling_group_name: str,
+                 auto_scaling_group: 'pulumi_aws.autoscaling.Group',
                  extra_node_security_groups: Sequence['pulumi_aws.ec2.SecurityGroup'],
                  node_security_group: 'pulumi_aws.ec2.SecurityGroup'):
         """
         NodeGroupData describes the resources created for the given NodeGroup.
-        :param str auto_scaling_group_name: The AutoScalingGroup name for the node group.
+        :param 'pulumi_aws.autoscaling.Group' auto_scaling_group: The AutoScalingGroup for the node group.
         :param Sequence['pulumi_aws.ec2.SecurityGroup'] extra_node_security_groups: The additional security groups for the node group that captures user-specific rules.
         :param 'pulumi_aws.ec2.SecurityGroup' node_security_group: The security group for the node group to communicate with the cluster.
         """
-        pulumi.set(__self__, "auto_scaling_group_name", auto_scaling_group_name)
+        pulumi.set(__self__, "auto_scaling_group", auto_scaling_group)
         pulumi.set(__self__, "extra_node_security_groups", extra_node_security_groups)
         pulumi.set(__self__, "node_security_group", node_security_group)
 
     @property
-    @pulumi.getter(name="autoScalingGroupName")
-    def auto_scaling_group_name(self) -> str:
+    @pulumi.getter(name="autoScalingGroup")
+    def auto_scaling_group(self) -> 'pulumi_aws.autoscaling.Group':
         """
-        The AutoScalingGroup name for the node group.
+        The AutoScalingGroup for the node group.
         """
-        return pulumi.get(self, "auto_scaling_group_name")
+        return pulumi.get(self, "auto_scaling_group")
 
     @property
     @pulumi.getter(name="extraNodeSecurityGroups")