Web: Add EC2 name when listing instances in Discover flow (#33179)

gravitational · Oct 10, 2023 · b6825b5 · b6825b5
1 parent aed761f
commit b6825b5
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 0 deletions.
diff --git a/web/packages/teleport/src/Discover/Server/EnrollEc2Instance/Ec2InstanceList.tsx b/web/packages/teleport/src/Discover/Server/EnrollEc2Instance/Ec2InstanceList.tsx
@@ -117,6 +117,15 @@ export const Ec2InstanceList = ({
                 );
               },
             },
+            {
+              altKey: 'name',
+              headerText: 'Name',
+              render: ({ labels, ec2InstanceExists }) => (
+                <Cell disabledText={disabledText} disabled={ec2InstanceExists}>
+                  {labels.find(label => label.name === 'Name')?.value}
+                </Cell>
+              ),
+            },
             {
               key: 'hostname',
               headerText: 'Hostname',

diff --git a/web/packages/teleport/src/Discover/Server/EnrollEc2Instance/EnrollEc2Instance.story.tsx b/web/packages/teleport/src/Discover/Server/EnrollEc2Instance/EnrollEc2Instance.story.tsx
@@ -222,4 +222,26 @@ const ec2InstancesResponse = [
       subnetId: 'test',
     },
   },
+  {
+    id: 'ec2-instance-5',
+    kind: 'node',
+    clusterId: 'cluster',
+    hostname: 'ec2-hostname-5',
+    tags: [
+      { name: 'instance', value: 'ec2-5' },
+      { name: 'Name', value: 'My EC2 Box' },
+    ],
+    addr: 'ec2.5.com',
+    tunnel: false,
+    subKind: 'openssh-ec2-ice',
+    sshLogins: ['test'],
+    aws: {
+      accountId: 'test-account',
+      instanceId: 'instance-ec2-5',
+      region: 'us-west-1',
+      vpcId: 'test',
+      integration: 'test',
+      subnetId: 'test',
+    },
+  },
 ];