Merge pull request #157 from sailpoint-oss/devrel-1759

update sail conn list command to show tags and versions and sort the …

Author: darrell-thobe-sp

cmd/connector/conn_list.go

@@ -6,9 +6,12 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"sort"
+	"strings"
 
 	"github.com/olekukonko/tablewriter"
 	"github.com/sailpoint-oss/sailpoint-cli/internal/client"
+	"github.com/sailpoint-oss/sailpoint-cli/internal/util"
 	"github.com/spf13/cobra"
 )
 
@@ -40,19 +43,75 @@ func newConnListCmd(client client.Client) *cobra.Command {
 				return err
 			}
 
-			var conns []connector
+			var conns []connectorList
 			err = json.Unmarshal(raw, &conns)
 			if err != nil {
 				return err
 			}
 
+			// Sort connectors by Alias
+			sort.Slice(conns, func(i, j int) bool {
+				return conns[i].Alias < conns[j].Alias
+			})
+
 			table := tablewriter.NewWriter(cmd.OutOrStdout())
-			table.SetHeader(connectorColumns)
-			for _, v := range conns {
-				table.Append(v.columns())
+			table.SetHeader(connectorListColumns)
+
+			// Process each connector and populate the table
+			for _, conn := range conns {
+				connectorRef := conn.ID
+				if connectorRef == "" {
+					continue
+				}
+
+				// Build the tags endpoint using the connectorRef
+				tagsEndpoint := util.ResourceUrl(endpoint, connectorRef, "tags")
+				tagsResp, err := client.Get(cmd.Context(), tagsEndpoint)
+				if err != nil {
+					return err
+				}
+				defer tagsResp.Body.Close()
+
+				if tagsResp.StatusCode != http.StatusOK {
+					body, _ := io.ReadAll(tagsResp.Body)
+					return fmt.Errorf("non-200 response: %s\nbody: %s", tagsResp.Status, body)
+				}
+
+				// Process the response for the tags request
+				tagsRaw, err := io.ReadAll(tagsResp.Body)
+				if err != nil {
+					return err
+				}
+
+				var tags []tag
+				err = json.Unmarshal(tagsRaw, &tags)
+				if err != nil {
+					return err
+				}
+
+				// Prepare data for the table
+				var tagNames []string
+				var versions []string
+				for _, t := range tags {
+					tagNames = append(tagNames, t.TagName)
+					versions = append(versions, fmt.Sprintf("%d", t.ActiveVersion))
+				}
+				// Format the tags and versions as comma-separated lists
+				tagsString := strings.Join(tagNames, ", ")
+				versionsString := strings.Join(versions, ", ")
+
+				// Add the row to the table
+				row := []string{
+					conn.ID,
+					conn.Alias,
+					tagsString,
+					versionsString,
+				}
+				table.Append(row)
 			}
-			table.Render()
 
+			// Render the table
+			table.Render()
 			return nil
 		},
 	}

cmd/connector/models.go

@@ -17,6 +17,19 @@ func (c connector) columns() []string {
 
 var connectorColumns = []string{"ID", "Alias"}
 
+type connectorList struct {
+	ID            string `json:"id"`
+	Alias         string `json:"alias"`
+	TagName       string `json:"tagName"`
+	ActiveVersion uint32 `json:"activeVersion"`
+}
+
+func (c connectorList) columns() []string {
+	return []string{c.ID, c.Alias, c.TagName, fmt.Sprint(c.ActiveVersion)}
+}
+
+var connectorListColumns = []string{"ID", "Alias", "Tags", "Version"}
+
 type connectorVersion struct {
 	ConnectorID string `json:"connectorId"`
 	Version     int    `json:"version"`

cmd/connector/static/connector/package.json

@@ -24,7 +24,7 @@
     "prettier": "^2.3.2",
     "shx": "^0.3.3",
     "ts-jest": "^27.0.5",
-    "typescript": "4.9.3",
+    "typescript": "^4.9.5",
     "cross-env": "7.0.3"
   },
   "jest": {

cmd/connector/static/connector/src/index.spec.ts

@@ -16,7 +16,9 @@ describe('connector unit tests', () => {
     it('should execute stdTestConnectionHandler', async () => {
         await (await connector())._exec(
             StandardCommand.StdTestConnection,
-            {},
+            {reloadConfig() {
+                return Promise.resolve()
+            },},
             undefined,
             new PassThrough({ objectMode: true }).on('data', (chunk) => expect(chunk).toStrictEqual(new RawResponse ({}, ResponseType.Output)))
         )

cmd/connector/static/customizer/src/index.spec.ts

@@ -15,7 +15,9 @@ describe('connector customizer unit tests', () => {
         }
         let updatedInput = await customizer._exec(
             customizer.handlerKey(CustomizerType.Before, StandardCommand.StdAccountRead),
-            {},
+            {reloadConfig() {
+                return Promise.resolve()
+            },},
             input
         )
 
@@ -26,7 +28,9 @@ describe('connector customizer unit tests', () => {
         let customizer = await connectorCustomizer()
         let output = await customizer._exec(
             customizer.handlerKey(CustomizerType.After, StandardCommand.StdAccountRead),
-            {},
+            {reloadConfig() {
+                return Promise.resolve()
+            },},
             {
                 identity: '',
                 attributes: {
@@ -40,4 +44,4 @@ describe('connector customizer unit tests', () => {
 
         expect(output.attributes.location).toStrictEqual('Austin')
     })
-})
+})