private-link cli: render server-provided DNS (#807)

Author: shreyasj-livekit

cmd/lk/agent_private_link.go

@@ -96,10 +96,6 @@ func buildCreatePrivateLinkRequest(name, region string, port uint32, endpoint st
 	}
 }
 
-func privateLinkServiceDNS(name, projectID string) string {
-	return fmt.Sprintf("%s-%s.plg.svc", name, projectID)
-}
-
 func buildPrivateLinkListRows(links []*lkproto.PrivateLink, healthByID map[string]*lkproto.PrivateLinkStatus, healthErrByID map[string]error) [][]string {
 	var rows [][]string
 	for _, link := range links {
@@ -119,12 +115,17 @@ func buildPrivateLinkListRows(links []*lkproto.PrivateLink, healthByID map[strin
 				updatedAt = health.UpdatedAt.AsTime().UTC().Format("2006-01-02T15:04:05Z07:00")
 			}
 		}
+		dns := link.Endpoint
+		if dns == "" {
+			dns = "-"
+		}
 
 		rows = append(rows, []string{
 			link.PrivateLinkId,
 			link.Name,
 			link.Region,
 			strconv.FormatUint(uint64(link.Port), 10),
+			dns,
 			status,
 			updatedAt,
 		})
@@ -157,8 +158,8 @@ func createPrivateLink(ctx context.Context, cmd *cli.Command) error {
 	}
 
 	fmt.Printf("Created private link [%s]\n", util.Accented(resp.PrivateLink.PrivateLinkId))
-	if project != nil && project.ProjectId != "" {
-		fmt.Printf("Gateway DNS [%s]\n", util.Accented(privateLinkServiceDNS(req.Name, project.ProjectId)))
+	if resp.PrivateLink.Endpoint != "" {
+		fmt.Printf("Gateway DNS [%s]\n", util.Accented(resp.PrivateLink.Endpoint))
 	}
 	return nil
 }
@@ -217,7 +218,7 @@ func listPrivateLinks(ctx context.Context, cmd *cli.Command) error {
 	}
 
 	rows := buildPrivateLinkListRows(resp.Items, healthByID, healthErrByID)
-	table := util.CreateTable().Headers("ID", "Name", "Region", "Port", "Health", "Updated At").Rows(rows...)
+	table := util.CreateTable().Headers("ID", "Name", "Region", "Port", "DNS", "Health", "Updated At").Rows(rows...)
 	fmt.Println(table)
 	return nil
 }

cmd/lk/agent_private_link_test.go

@@ -55,10 +55,6 @@ func TestBuildCreatePrivateLinkRequest_HappyPath(t *testing.T) {
 	assert.Equal(t, "com.amazonaws.vpce.us-east-1.vpce-svc-abc123", req.Endpoint)
 }
 
-func TestPrivateLinkServiceDNS(t *testing.T) {
-	assert.Equal(t, "orders-db-prj_123.plg.svc", privateLinkServiceDNS("orders-db", "prj_123"))
-}
-
 func TestBuildPrivateLinkListRows_EmptyList(t *testing.T) {
 	rows := buildPrivateLinkListRows([]*lkproto.PrivateLink{}, map[string]*lkproto.PrivateLinkStatus{}, map[string]error{})
 	assert.Empty(t, rows)
@@ -71,6 +67,7 @@ func TestBuildPrivateLinkListRows_OnePrivateLink(t *testing.T) {
 			Name:          "orders-db",
 			Region:        "us-east-1",
 			Port:          6379,
+			Endpoint:      "orders-db-p123.link",
 		},
 	}
 
@@ -88,7 +85,8 @@ func TestBuildPrivateLinkListRows_OnePrivateLink(t *testing.T) {
 	assert.Equal(t, "orders-db", rows[0][1])
 	assert.Equal(t, "us-east-1", rows[0][2])
 	assert.Equal(t, "6379", rows[0][3])
-	assert.Equal(t, lkproto.PrivateLinkStatus_PRIVATE_LINK_STATUS_AVAILABLE.String(), rows[0][4])
+	assert.Equal(t, "orders-db-p123.link", rows[0][4])
+	assert.Equal(t, lkproto.PrivateLinkStatus_PRIVATE_LINK_STATUS_AVAILABLE.String(), rows[0][5])
 }
 
 func TestBuildPrivateLinkListRows_TwoPrivateLinksDifferentRegions(t *testing.T) {
@@ -98,12 +96,14 @@ func TestBuildPrivateLinkListRows_TwoPrivateLinksDifferentRegions(t *testing.T)
 			Name:          "orders-db",
 			Region:        "us-east-1",
 			Port:          6379,
+			Endpoint:      "orders-db-p123.link",
 		},
 		{
 			PrivateLinkId: "pl-2",
 			Name:          "cache",
 			Region:        "eu-west-1",
 			Port:          6380,
+			Endpoint:      "cache-p123.link",
 		},
 	}
 
@@ -121,6 +121,8 @@ func TestBuildPrivateLinkListRows_TwoPrivateLinksDifferentRegions(t *testing.T)
 
 	assert.Equal(t, "us-east-1", rows[0][2])
 	assert.Equal(t, "eu-west-1", rows[1][2])
-	assert.Equal(t, lkproto.PrivateLinkStatus_PRIVATE_LINK_STATUS_AVAILABLE.String(), rows[0][4])
-	assert.Equal(t, lkproto.PrivateLinkStatus_PRIVATE_LINK_STATUS_AVAILABLE.String(), rows[1][4])
+	assert.Equal(t, "orders-db-p123.link", rows[0][4])
+	assert.Equal(t, "cache-p123.link", rows[1][4])
+	assert.Equal(t, lkproto.PrivateLinkStatus_PRIVATE_LINK_STATUS_AVAILABLE.String(), rows[0][5])
+	assert.Equal(t, lkproto.PrivateLinkStatus_PRIVATE_LINK_STATUS_AVAILABLE.String(), rows[1][5])
 }