Merge pull request #267 from kthcloud/dev

add discovery route, fix many bugs with user and team notifications

models/config/helpers.go

@@ -1,7 +1,7 @@
 package config
 
 import (
-	roleModel "go-deploy/models/config/role"
+	roleModel "go-deploy/models/sys/role"
 )
 
 func (e *ConfigType) GetRole(roleName string) *roleModel.Role {

models/config/models.go

@@ -1,7 +1,7 @@
 package config
 
 import (
-	"go-deploy/models/config/role"
+	"go-deploy/models/sys/role"
 	"k8s.io/client-go/kubernetes"
 )
 
@@ -71,6 +71,8 @@ type VM struct {
 }
 
 type ConfigType struct {
+	Version string `yaml:"version"`
+
 	Port          int    `yaml:"port"`
 	ExternalUrl   string `yaml:"externalUrl"`
 	Manager       string `yaml:"manager"`

models/dto/body/discover.go

@@ -0,0 +1,6 @@
+package body
+
+type DiscoverRead struct {
+	Version string `json:"version"`
+	Roles   []Role `json:"roles"`
+}

models/dto/body/notification.go

@@ -10,5 +10,5 @@ type NotificationRead struct {
 }
 
 type NotificationUpdate struct {
-	ReadAt *time.Time `json:"readAt"`
+	Read bool `json:"read"`
 }

models/dto/body/role.go

@@ -0,0 +1,8 @@
+package body
+
+type Role struct {
+	Name        string   `json:"name"`
+	Description string   `json:"description"`
+	Permissions []string `json:"permissions"`
+	Quota       *Quota   `json:"quota,omitempty"`
+}

models/dto/body/user.go

@@ -6,19 +6,22 @@ type PublicKey struct {
 }
 
 type Quota struct {
+	Deployments      int     `json:"deployments"`
+	CpuCores         int     `json:"cpuCores"`
+	RAM              int     `json:"ram"`
+	DiskSize         int     `json:"diskSize"`
+	Snapshots        int     `json:"snapshots"`
+	GpuLeaseDuration float64 `json:"gpuLeaseDuration"` // in hours
+}
+
+type Usage struct {
 	Deployments int `json:"deployments"`
 	CpuCores    int `json:"cpuCores"`
 	RAM         int `json:"ram"`
 	DiskSize    int `json:"diskSize"`
 	Snapshots   int `json:"snapshots"`
 }
 
-type Role struct {
-	Name        string   `json:"name"`
-	Description string   `json:"description"`
-	Permissions []string `json:"permissions"`
-}
-
 type SmallUserRead struct {
 	ID        string `json:"id"`
 	Username  string `json:"username"`
@@ -40,7 +43,7 @@ type UserRead struct {
 	Admin bool `json:"admin"`
 
 	Quota Quota `json:"quota"`
-	Usage Quota `json:"usage"`
+	Usage Usage `json:"usage"`
 
 	StorageURL *string `json:"storageUrl,omitempty"`
 }

models/sys/discover/discover.go

@@ -0,0 +1,10 @@
+package discover
+
+import (
+	"go-deploy/models/sys/role"
+)
+
+type Discover struct {
+	Version string
+	Roles   []role.Role
+}

models/sys/discover/dto.go

@@ -0,0 +1,15 @@
+package discover
+
+import "go-deploy/models/dto/body"
+
+func (d *Discover) ToDTO() *body.DiscoverRead {
+	roles := make([]body.Role, len(d.Roles))
+	for i, r := range d.Roles {
+		roles[i] = r.ToDTO(true)
+	}
+
+	return &body.DiscoverRead{
+		Version: d.Version,
+		Roles:   roles,
+	}
+}

models/sys/notification/client.go

@@ -35,8 +35,8 @@ func (client *Client) AddPagination(page, pageSize int) *Client {
 	return client
 }
 
-func (client *Client) RestrictToOwner(ownerID string) *Client {
-	client.ResourceClient.AddExtraFilter(bson.D{{"ownerId", ownerID}})
+func (client *Client) RestrictToUserID(ownerID string) *Client {
+	client.ResourceClient.AddExtraFilter(bson.D{{"userId", ownerID}})
 	client.RestrictUserID = &ownerID
 
 	return client

models/sys/notification/db.go

@@ -32,5 +32,9 @@ func (client *Client) UpdateWithParamsByID(id string, params *UpdateParams) erro
 
 	models.AddIfNotNil(&update, "readAt", params.ReadAt)
 
-	return client.UpdateWithBsonByID(id, update)
+	if len(update) == 0 {
+		return nil
+	}
+
+	return client.SetWithBsonByID(id, update)
 }

models/sys/notification/notification.go

@@ -32,5 +32,8 @@ type UpdateParams struct {
 }
 
 func (u *UpdateParams) FromDTO(dto *body.NotificationUpdate) {
-	u.ReadAt = dto.ReadAt
+	if dto.Read {
+		now := time.Now()
+		u.ReadAt = &now
+	}
 }

models/sys/role/dto.go

@@ -0,0 +1,41 @@
+package role
+
+import (
+	"github.com/fatih/structs"
+	"go-deploy/models/dto/body"
+)
+
+func (r *Role) ToDTO(includeQuota bool) body.Role {
+	permissionsStructMap := structs.Map(r.Permissions)
+	permissions := make([]string, 0)
+	for name, value := range permissionsStructMap {
+		hasPermission, ok := value.(bool)
+		if ok && hasPermission {
+			permissions = append(permissions, name)
+		}
+	}
+
+	var quota *body.Quota
+	if includeQuota {
+		dto := r.Quotas.ToDTO()
+		quota = &dto
+	}
+
+	return body.Role{
+		Name:        r.Name,
+		Description: r.Description,
+		Permissions: permissions,
+		Quota:       quota,
+	}
+}
+
+func (q *Quotas) ToDTO() body.Quota {
+	return body.Quota{
+		Deployments:      q.Deployments,
+		CpuCores:         q.CpuCores,
+		RAM:              q.RAM,
+		DiskSize:         q.DiskSize,
+		Snapshots:        q.Snapshots,
+		GpuLeaseDuration: q.GpuLeaseDuration,
+	}
+}

models/sys/role/role.go

@@ -0,0 +1,26 @@
+package role
+
+type Quotas struct {
+	Deployments      int     `yaml:"deployments" structs:"deployments"`
+	CpuCores         int     `yaml:"cpuCores" structs:"cpuCores"`
+	RAM              int     `yaml:"ram" structs:"ram"`
+	DiskSize         int     `yaml:"diskSize" structs:"diskSize"`
+	Snapshots        int     `yaml:"snapshots" structs:"snapshots"`
+	GpuLeaseDuration float64 `yaml:"gpuLeaseDuration" structs:"gpuLeaseDuration"` // in hours
+}
+
+type Permissions struct {
+	ChooseZone        bool `yaml:"chooseZone" structs:"chooseZone"`
+	ChooseGPU         bool `yaml:"chooseGpu" structs:"chooseGpu"`
+	UseCustomDomains  bool `yaml:"useCustomDomains" structs:"useCustomDomains"`
+	UseGPUs           bool `yaml:"useGpus" structs:"useGpus"`
+	UsePrivilegedGPUs bool `yaml:"usePrivilegedGpus" structs:"usePrivilegedGpus"`
+}
+
+type Role struct {
+	Name        string      `yaml:"name"`
+	Description string      `yaml:"description"`
+	IamGroup    string      `yaml:"iamGroup"`
+	Permissions Permissions `yaml:"permissions"`
+	Quotas      Quotas      `yaml:"quotas"`
+}

models/sys/team/dto.go

@@ -34,7 +34,7 @@ func (t *Team) ToDTO(getMember func(*Member) *body.TeamMember, getResourceName f
 	}
 }
 
-func (params *CreateParams) FromDTO(teamCreateDTO *body.TeamCreate, getResourceFunc func(string) *Resource) {
+func (params *CreateParams) FromDTO(teamCreateDTO *body.TeamCreate, getResourceFunc func(string) *Resource, getMemberFunc func(*body.TeamMemberCreate) *Member) {
 	params.Name = teamCreateDTO.Name
 	params.MemberMap = make(map[string]Member)
 
@@ -44,19 +44,16 @@ func (params *CreateParams) FromDTO(teamCreateDTO *body.TeamCreate, getResourceF
 		}
 	}
 
-	for _, member := range teamCreateDTO.Members {
-		params.MemberMap[member.ID] = Member{
-			ID:       member.ID,
-			TeamRole: member.TeamRole,
-		}
+	for _, memberDTO := range teamCreateDTO.Members {
+		params.MemberMap[memberDTO.ID] = *getMemberFunc(&memberDTO)
 	}
 }
 
 func (params *JoinParams) FromDTO(teamJoinDTO *body.TeamJoin) {
 	params.InvitationCode = teamJoinDTO.InvitationCode
 }
 
-func (params *UpdateParams) FromDTO(teamUpdateDTO *body.TeamUpdate, getResourceFunc func(string) *Resource) {
+func (params *UpdateParams) FromDTO(teamUpdateDTO *body.TeamUpdate, getResourceFunc func(string) *Resource, getMemberFunc func(*body.TeamMemberUpdate) *Member) {
 	params.Name = teamUpdateDTO.Name
 	params.Description = teamUpdateDTO.Description
 
@@ -72,12 +69,8 @@ func (params *UpdateParams) FromDTO(teamUpdateDTO *body.TeamUpdate, getResourceF
 
 	if teamUpdateDTO.Members != nil {
 		memberMap := make(map[string]Member)
-		for _, member := range *teamUpdateDTO.Members {
-			memberMap[member.ID] = Member{
-				ID: member.ID,
-				// temporary until we have a use case for this
-				TeamRole: MemberRoleAdmin,
-			}
+		for _, memberDTO := range *teamUpdateDTO.Members {
+			memberMap[memberDTO.ID] = *getMemberFunc(&memberDTO)
 		}
 		params.MemberMap = &memberMap
 	}

models/sys/team/team.go

@@ -52,6 +52,15 @@ func (t *Team) GetMemberMap() map[string]Member {
 	return t.MemberMap
 }
 
+func (t *Team) GetMember(id string) *Member {
+	res, ok := t.GetMemberMap()[id]
+	if !ok {
+		return nil
+	}
+
+	return &res
+}
+
 func (t *Team) GetResourceMap() map[string]Resource {
 	if t.ResourceMap == nil {
 		t.ResourceMap = make(map[string]Resource)

models/sys/user/dto.go

@@ -1,9 +1,8 @@
 package user
 
 import (
-	"github.com/fatih/structs"
-	roleModel "go-deploy/models/config/role"
 	"go-deploy/models/dto/body"
+	roleModel "go-deploy/models/sys/role"
 	"log"
 )
 
@@ -28,15 +27,6 @@ func (user *User) ToDTO(effectiveRole *roleModel.Role, usage *Usage, storageURL
 		}
 	}
 
-	permissionsStructMap := structs.Map(effectiveRole.Permissions)
-	permissions := make([]string, 0)
-	for name, value := range permissionsStructMap {
-		hasPermission, ok := value.(bool)
-		if ok && hasPermission {
-			permissions = append(permissions, name)
-		}
-	}
-
 	userRead := body.UserRead{
 		ID:         user.ID,
 		Username:   user.Username,
@@ -46,30 +36,24 @@ func (user *User) ToDTO(effectiveRole *roleModel.Role, usage *Usage, storageURL
 		PublicKeys: publicKeys,
 		Onboarded:  user.Onboarded,
 
-		Role: body.Role{
-			Name:        effectiveRole.Name,
-			Description: effectiveRole.Description,
-			Permissions: permissions,
-		},
+		Role:  effectiveRole.ToDTO(false),
 		Admin: user.IsAdmin,
 
-		Quota: body.Quota{
-			Deployments: effectiveRole.Quotas.Deployments,
-			CpuCores:    effectiveRole.Quotas.CpuCores,
-			RAM:         effectiveRole.Quotas.RAM,
-			DiskSize:    effectiveRole.Quotas.DiskSize,
-			Snapshots:   effectiveRole.Quotas.Snapshots,
-		},
-		Usage: body.Quota{
-			Deployments: usage.Deployments,
-			CpuCores:    usage.CpuCores,
-			RAM:         usage.RAM,
-			DiskSize:    usage.DiskSize,
-			Snapshots:   usage.Snapshots,
-		},
+		Quota: effectiveRole.Quotas.ToDTO(),
+		Usage: usage.ToDTO(),
 
 		StorageURL: storageURL,
 	}
 
 	return userRead
 }
+
+func (usage *Usage) ToDTO() body.Usage {
+	return body.Usage{
+		Deployments: usage.Deployments,
+		CpuCores:    usage.CpuCores,
+		RAM:         usage.RAM,
+		DiskSize:    usage.DiskSize,
+		Snapshots:   usage.Snapshots,
+	}
+}

pkg/app/server.go

@@ -83,7 +83,7 @@ func Create(options *Options) *App {
 		}
 
 		go func() {
-			err := httpServer.ListenAndServe()
+			err = httpServer.ListenAndServe()
 			if err != nil && !errors.Is(err, http.ErrServerClosed) {
 				log.Fatalln(fmt.Errorf("failed to start http server. details: %w", err))
 			}

pkg/config/config.go

@@ -36,6 +36,8 @@ func SetupEnvironment() {
 		log.Fatalf(makeError(err).Error())
 	}
 
+	log.Println("go-deploy", Config.Version)
+
 	log.Println("loaded", len(Config.Roles), "roles in order:")
 	for _, role := range Config.Roles {
 		log.Println("\t", role.Name)