store/source: Show associated agents in source api model

api/v1alpha1/openapi.yaml

@@ -279,13 +279,6 @@ components:
         id:
           type: string
           format: uuid
-        name:
-          type: string
-        status:
-          type: string
-          enum: [not-connected, waiting-for-credentials, error, gathering-initial-inventory, up-to-date]
-        statusInfo:
-          type: string
         inventory:
           $ref: '#/components/schemas/Inventory'
         createdAt:
@@ -294,17 +287,12 @@ components:
         updatedAt:
           type: string
           format: date-time
-        sshKey:
-          type: string
         agents:
           type: array
           items:
             $ref: '#/components/schemas/SourceAgentItem'
       required:
         - id
-        - name
-        - status
-        - statusInfo
         - createdAt
         - updatedAt
 

internal/cli/get.go

@@ -165,8 +165,8 @@ func printTable(response interface{}, kind string, id *uuid.UUID) error {
 }
 
 func printSourcesTable(w *tabwriter.Writer, sources ...api.Source) {
-	fmt.Fprintln(w, "ID\tNAME\tSTATUS")
+	fmt.Fprintln(w, "ID")
 	for _, s := range sources {
-		fmt.Fprintf(w, "%s\t%s\t%s\n", s.Id, s.Name, s.Status)
+		fmt.Fprintf(w, "%s\n", s.Id)
 	}
 }

internal/store/source.go

@@ -43,7 +43,7 @@ func (s *SourceStore) InitialMigration(ctx context.Context) error {
 
 func (s *SourceStore) List(ctx context.Context) (api.SourceList, error) {
 	var sources model.SourceList
-	result := s.getDB(ctx).Model(&sources).Order("id").Find(&sources)
+	result := s.getDB(ctx).Model(&sources).Order("id").Preload("Agents").Find(&sources)
 	if result.Error != nil {
 		return nil, result.Error
 	}

internal/store/source_test.go

@@ -46,13 +46,32 @@ var _ = Describe("source store", Ordered, func() {
 			Expect(sources).To(HaveLen(2))
 		})
 
+		It("successfully list all the sources -- with agents", func() {
+			sourceID := uuid.NewString()
+			agentID := uuid.NewString()
+			tx := gormdb.Exec(fmt.Sprintf(insertAgentStm, agentID, "not-connected", "status-info-1", "cred_url-1"))
+			Expect(tx.Error).To(BeNil())
+			tx = gormdb.Exec(fmt.Sprintf(insertSourceStm, sourceID))
+			Expect(tx.Error).To(BeNil())
+			tx = gormdb.Exec(fmt.Sprintf("UPDATE agents set source_id = '%s';", sourceID))
+			Expect(tx.Error).To(BeNil())
+
+			sources, err := s.Source().List(context.TODO())
+			Expect(err).To(BeNil())
+			Expect(sources).To(HaveLen(1))
+			agents := *sources[0].Agents
+			Expect(agents).To(HaveLen(1))
+			Expect(agents[0].Id.String()).To(Equal(agentID))
+		})
+
 		It("list all sources -- no sources", func() {
 			sources, err := s.Source().List(context.TODO())
 			Expect(err).To(BeNil())
 			Expect(sources).To(HaveLen(0))
 		})
 
 		AfterEach(func() {
+			gormdb.Exec("DELETE from agents;")
 			gormdb.Exec("DELETE from sources;")
 		})
 	})