Added more CLI commands and API endpoints

database/sql/instances.go

@@ -182,7 +182,7 @@ func (s *sqlDatabase) UpdateInstance(ctx context.Context, instanceID string, par
 	return s.sqlToParamsInstance(instance), nil
 }
 
-func (s *sqlDatabase) ListInstances(ctx context.Context, poolID string) ([]params.Instance, error) {
+func (s *sqlDatabase) ListPoolInstances(ctx context.Context, poolID string) ([]params.Instance, error) {
 	pool, err := s.getPoolByID(ctx, poolID, "Tags", "Instances")
 	if err != nil {
 		return nil, errors.Wrap(err, "fetching pool")
@@ -194,3 +194,17 @@ func (s *sqlDatabase) ListInstances(ctx context.Context, poolID string) ([]param
 	}
 	return ret, nil
 }
+
+func (s *sqlDatabase) ListAllInstances(ctx context.Context) ([]params.Instance, error) {
+	var instances []Instance
+
+	q := s.conn.Model(&Instance{}).Find(&instances)
+	if q.Error != nil {
+		return nil, errors.Wrap(q.Error, "fetching instances")
+	}
+	ret := make([]params.Instance, len(instances))
+	for idx, instance := range instances {
+		ret[idx] = s.sqlToParamsInstance(instance)
+	}
+	return ret, nil
+}

database/sql/organizations.go

@@ -182,7 +182,7 @@ func (s *sqlDatabase) CreateOrganizationPool(ctx context.Context, orgId string,
 		}
 	}
 
-	pool, err := s.getPoolByID(ctx, newPool.ID.String(), "Tags")
+	pool, err := s.getPoolByID(ctx, newPool.ID.String(), "Tags", "Instances", "Organization", "Repository")
 	if err != nil {
 		return params.Pool{}, errors.Wrap(err, "fetching pool")
 	}
@@ -247,7 +247,7 @@ func (s *sqlDatabase) ListOrgInstances(ctx context.Context, orgID string) ([]par
 }
 
 func (s *sqlDatabase) UpdateOrganizationPool(ctx context.Context, orgID, poolID string, param params.UpdatePoolParams) (params.Pool, error) {
-	pool, err := s.getOrgPool(ctx, orgID, poolID, "Tags")
+	pool, err := s.getOrgPool(ctx, orgID, poolID, "Tags", "Instances", "Organization", "Repository")
 	if err != nil {
 		return params.Pool{}, errors.Wrap(err, "fetching pool")
 	}

database/sql/pools.go

@@ -0,0 +1,49 @@
+package sql
+
+import (
+	"context"
+
+	"garm/params"
+
+	"github.com/pkg/errors"
+)
+
+func (s *sqlDatabase) ListAllPools(ctx context.Context) ([]params.Pool, error) {
+	var pools []Pool
+
+	q := s.conn.Model(&Pool{}).
+		Preload("Tags").
+		Preload("Organization").
+		Preload("Repository").
+		Find(&pools)
+	if q.Error != nil {
+		return nil, errors.Wrap(q.Error, "fetching all pools")
+	}
+
+	ret := make([]params.Pool, len(pools))
+	for idx, val := range pools {
+		ret[idx] = s.sqlToCommonPool(val)
+	}
+	return ret, nil
+}
+
+func (s *sqlDatabase) GetPoolByID(ctx context.Context, poolID string) (params.Pool, error) {
+	pool, err := s.getPoolByID(ctx, poolID, "Tags", "Instances", "Organization", "Repository")
+	if err != nil {
+		return params.Pool{}, errors.Wrap(err, "fetching pool by ID")
+	}
+	return s.sqlToCommonPool(pool), nil
+}
+
+func (s *sqlDatabase) DeletePoolByID(ctx context.Context, poolID string) error {
+	pool, err := s.getPoolByID(ctx, poolID)
+	if err != nil {
+		return errors.Wrap(err, "fetching pool by ID")
+	}
+
+	if q := s.conn.Unscoped().Delete(&pool); q.Error != nil {
+		return errors.Wrap(q.Error, "removing pool")
+	}
+
+	return nil
+}

database/sql/repositories.go

@@ -190,7 +190,7 @@ func (s *sqlDatabase) CreateRepositoryPool(ctx context.Context, repoId string, p
 		}
 	}
 
-	pool, err := s.getPoolByID(ctx, newPool.ID.String(), "Tags")
+	pool, err := s.getPoolByID(ctx, newPool.ID.String(), "Tags", "Instances", "Organization", "Repository")
 	if err != nil {
 		return params.Pool{}, errors.Wrap(err, "fetching pool")
 	}
@@ -256,7 +256,7 @@ func (s *sqlDatabase) ListRepoInstances(ctx context.Context, repoID string) ([]p
 }
 
 func (s *sqlDatabase) UpdateRepositoryPool(ctx context.Context, repoID, poolID string, param params.UpdatePoolParams) (params.Pool, error) {
-	pool, err := s.getRepoPool(ctx, repoID, poolID, "Tags")
+	pool, err := s.getRepoPool(ctx, repoID, poolID, "Tags", "Instances", "Organization", "Repository")
 	if err != nil {
 		return params.Pool{}, errors.Wrap(err, "fetching pool")
 	}

database/sql/util.go

@@ -1,9 +1,11 @@
 package sql
 
 import (
+	"fmt"
 	"garm/params"
 
 	"github.com/pkg/errors"
+	uuid "github.com/satori/go.uuid"
 	"gorm.io/gorm"
 )
 
@@ -73,6 +75,18 @@ func (s *sqlDatabase) sqlToCommonPool(pool Pool) params.Pool {
 		Instances:      make([]params.Instance, len(pool.Instances)),
 	}
 
+	if pool.RepoID != uuid.Nil {
+		ret.RepoID = pool.RepoID.String()
+		if pool.Repository.Owner != "" && pool.Repository.Name != "" {
+			ret.RepoName = fmt.Sprintf("%s/%s", pool.Repository.Owner, pool.Repository.Name)
+		}
+	}
+
+	if pool.OrgID != uuid.Nil && pool.Organization.Name != "" {
+		ret.OrgID = pool.OrgID.String()
+		ret.OrgName = pool.Organization.Name
+	}
+
 	for idx, val := range pool.Tags {
 		ret.Tags[idx] = s.sqlToCommonTags(*val)
 	}