List groups command (#215)

* List groups command

* Update groups on destination create

internal/cmd/cmd.go

@@ -763,6 +763,39 @@ var usersCmd = &cobra.Command{
 	},
 }
 
+var groupsCmd = &cobra.Command{
+	Use:   "groups",
+	Short: "List groups",
+	RunE: func(cmd *cobra.Command, args []string) error {
+		client, err := apiClientFromConfig()
+		if err != nil {
+			return err
+		}
+
+		ctx, err := apiContextFromConfig()
+		if err != nil {
+			return err
+		}
+
+		groups, _, err := client.GroupsApi.ListGroups(ctx).Execute()
+		if err != nil {
+			return err
+		}
+
+		sort.Slice(groups, func(i, j int) bool {
+			return groups[i].Created > groups[j].Created
+		})
+
+		rows := [][]string{}
+		for _, g := range groups {
+			rows = append(rows, []string{g.Name, units.HumanDuration(time.Now().UTC().Sub(time.Unix(g.Created, 0))) + " ago", g.Source})
+		}
+
+		printTable([]string{"NAME", "CREATED", "SOURCE"}, rows)
+		return nil
+	},
+}
+
 func newRegistryCmd() (*cobra.Command, error) {
 	var options registry.Options
 
@@ -964,6 +997,7 @@ func NewRootCmd() (*cobra.Command, error) {
 
 	rootCmd.AddCommand(listCmd)
 	rootCmd.AddCommand(usersCmd)
+	rootCmd.AddCommand(groupsCmd)
 	rootCmd.AddCommand(loginCmd)
 	rootCmd.AddCommand(logoutCmd)
 

internal/registry/api.go

@@ -140,9 +140,9 @@ func (a *Api) ListUsers(w http.ResponseWriter, r *http.Request) {
 
 func (a *Api) ListGroups(w http.ResponseWriter, r *http.Request) {
 	var groups []Group
-	if err := a.db.Find(&groups).Error; err != nil {
+	if err := a.db.Preload("Source").Find(&groups).Error; err != nil {
 		logging.L.Error(err.Error())
-		sendApiError(w, http.StatusInternalServerError, "could not list users")
+		sendApiError(w, http.StatusInternalServerError, "could not list groups")
 		return
 	}
 
@@ -624,6 +624,7 @@ func dbToApiGroup(g *Group) api.Group {
 		Created: g.Created,
 		Updated: g.Updated,
 		Name:    g.Name,
+		Source:  g.Source.Type,
 	}
 }
 

internal/registry/api_test.go

@@ -708,6 +708,32 @@ func TestListRolesForUnknownCluster(t *testing.T) {
 	assert.Equal(t, 0, len(roles))
 }
 
+func TestListGroups(t *testing.T) {
+	a := &Api{db: db}
+
+	r := httptest.NewRequest(http.MethodGet, "/v1/groups", nil)
+
+	w := httptest.NewRecorder()
+	http.HandlerFunc(a.ListGroups).ServeHTTP(w, r)
+	assert.Equal(t, http.StatusOK, w.Code)
+
+	var groups []api.Group
+	if err := json.NewDecoder(w.Body).Decode(&groups); err != nil {
+		t.Fatal(err)
+	}
+
+	assert.Equal(t, 4, len(groups))
+
+	groupSources := make(map[string]string)
+	for _, g := range groups {
+		groupSources[g.Name] = g.Source
+	}
+	assert.Equal(t, "infra", groupSources["ios-developers"])
+	assert.Equal(t, "infra", groupSources["mac-admins"])
+	assert.Equal(t, "okta", groupSources["heroes"])
+	assert.Equal(t, "okta", groupSources["villains"])
+}
+
 func containsUser(users []api.User, email string) bool {
 	for _, u := range users {
 		if u.Email == email {

internal/registry/data.go

@@ -215,6 +215,9 @@ func (r *Destination) BeforeCreate(tx *gorm.DB) (err error) {
 }
 
 func (d *Destination) AfterCreate(tx *gorm.DB) error {
+	if _, _, err := ApplyGroupMappings(tx, initialConfig.Groups); err != nil {
+		return err
+	}
 	_, err := ApplyUserMapping(tx, initialConfig.Users)
 	return err
 }

internal/registry/ui/api/models/Group.ts

@@ -43,6 +43,12 @@ export interface Group {
      * @memberof Group
      */
     updated: number;
+    /**
+     * 
+     * @type {string}
+     * @memberof Group
+     */
+    source: string;
 }
 
 export function GroupFromJSON(json: any): Group {
@@ -59,6 +65,7 @@ export function GroupFromJSONTyped(json: any, ignoreDiscriminator: boolean): Gro
         'name': json['name'],
         'created': json['created'],
         'updated': json['updated'],
+        'source': json['source'],
     };
 }
 
@@ -75,6 +82,7 @@ export function GroupToJSON(value?: Group | null): any {
         'name': value.name,
         'created': value.created,
         'updated': value.updated,
+        'source': value.source,
     };
 }
 

openapi.yaml

@@ -58,6 +58,7 @@ components:
         - name
         - created
         - updated
+        - source
       properties:
         id:
           type: string
@@ -69,6 +70,8 @@ components:
         updated:
           type: integer
           format: int64
+        source:
+          type: string
     Source:
       type: object
       required: