a
/
agola
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #130 from sgotti/gateway_projectgroup_update_add_parentref 

gateway: add parentRef field to project group update api
This commit is contained in:
Simone Gotti 2019-10-01 15:39:04 +02:00 committed by GitHub
parent bd3852809c 11da186913
commit dde20435d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
internal/services/gateway/action/projectgroup.go
View File

@ -105,8 +105,10 @@ func (h *ActionHandler) CreateProjectGroup(ctx context.Context, req *CreateProje
} }
type UpdateProjectGroupRequest struct { type UpdateProjectGroupRequest struct {
Name string Name *string
Visibility cstypes.Visibility ParentRef *string
Visibility *cstypes.Visibility
} }
func (h *ActionHandler) UpdateProjectGroup(ctx context.Context, projectGroupRef string, req *UpdateProjectGroupRequest) (*csapitypes.ProjectGroup, error) { func (h *ActionHandler) UpdateProjectGroup(ctx context.Context, projectGroupRef string, req *UpdateProjectGroupRequest) (*csapitypes.ProjectGroup, error) {
@ -123,8 +125,15 @@ func (h *ActionHandler) UpdateProjectGroup(ctx context.Context, projectGroupRef
return nil, util.NewErrForbidden(errors.Errorf("user not authorized")) return nil, util.NewErrForbidden(errors.Errorf("user not authorized"))
} }
pg.Name = req.Name if req.Name != nil {
pg.Visibility = req.Visibility pg.Name = *req.Name
}
if req.ParentRef != nil {
pg.Parent.ID = *req.ParentRef
}
if req.Visibility != nil {
pg.Visibility = *req.Visibility
}
h.log.Infof("updating project group") h.log.Infof("updating project group")
rp, resp, err := h.configstoreClient.UpdateProjectGroup(ctx, pg.ID, pg.ProjectGroup) rp, resp, err := h.configstoreClient.UpdateProjectGroup(ctx, pg.ID, pg.ProjectGroup)

9
internal/services/gateway/api/projectgroup.go
View File

@ -100,9 +100,16 @@ func (h *UpdateProjectGroupHandler) ServeHTTP(w http.ResponseWriter, r *http.Req
return return
} }
var visibility *cstypes.Visibility
if req.Visibility != nil {
v := cstypes.Visibility(*req.Visibility)
visibility = &v
}
areq := &action.UpdateProjectGroupRequest{ areq := &action.UpdateProjectGroupRequest{
Name: req.Name, Name: req.Name,
Visibility: cstypes.Visibility(req.Visibility), ParentRef: req.ParentRef,
Visibility: visibility,
} }
projectGroup, err := h.ah.UpdateProjectGroup(ctx, projectGroupRef, areq) projectGroup, err := h.ah.UpdateProjectGroup(ctx, projectGroupRef, areq)
if httpError(w, err) { if httpError(w, err) {

5
services/gateway/api/types/projectgroup.go
View File

@ -21,8 +21,9 @@ type CreateProjectGroupRequest struct {
} }
type UpdateProjectGroupRequest struct { type UpdateProjectGroupRequest struct {
Name string `json:"name,omitempty"` Name *string `json:"name,omitempty"`
Visibility Visibility `json:"visibility,omitempty"` ParentRef *string `json:"parent_ref,omitempty"`
Visibility *Visibility `json:"visibility,omitempty"`
} }
type ProjectGroupResponse struct { type ProjectGroupResponse struct {