configstore: add actions and roles

Add initial actions and roles. An action represents a specific action on a resource. Roles are predefined roles (not saved on storage) that can do some actions.
agola-io · Dec 12, 2019 · 0886349 · 0886349
1 parent a438a06
commit 0886349
Show file tree

Hide file tree

Showing 13 changed files with 321 additions and 34 deletions.
diff --git a/cmd/agola/cmd/orgmemberadd.go b/cmd/agola/cmd/orgmemberadd.go
@@ -63,7 +63,7 @@ func orgMemberAdd(cmd *cobra.Command, args []string) error {
 	gwclient := gwclient.NewClient(gatewayURL, token)
 
 	log.Infof("adding/updating member %q to organization %q with role %q", orgMemberAddOpts.username, orgMemberAddOpts.orgname, orgMemberAddOpts.role)
-	_, _, err := gwclient.AddOrgMember(context.TODO(), orgMemberAddOpts.orgname, orgMemberAddOpts.username, gwapitypes.MemberRole(orgMemberAddOpts.role))
+	_, _, err := gwclient.AddOrgMember(context.TODO(), orgMemberAddOpts.orgname, orgMemberAddOpts.username, gwapitypes.OrgMemberRole(orgMemberAddOpts.role))
 	if err != nil {
 		return errors.Errorf("failed to add/update organization member: %w", err)
 	}

diff --git a/internal/services/configstore/action/org.go b/internal/services/configstore/action/org.go
@@ -32,7 +32,7 @@ import (
 
 type OrgMemberResponse struct {
 	User *types.User
-	Role types.MemberRole
+	Role types.OrgMemberRole
 }
 
 func orgMemberResponse(orgUser *readdb.OrgUser) *OrgMemberResponse {
@@ -138,7 +138,7 @@ func (h *ActionHandler) CreateOrg(ctx context.Context, org *types.Organization)
 			ID:             uuid.NewV4().String(),
 			OrganizationID: org.ID,
 			UserID:         org.CreatorUserID,
-			MemberRole:     types.MemberRoleOwner,
+			MemberRole:     types.OrgMemberRoleOwner,
 		}
 		orgmemberj, err := json.Marshal(orgmember)
 		if err != nil {
@@ -221,8 +221,8 @@ func (h *ActionHandler) DeleteOrg(ctx context.Context, orgRef string) error {
 
 // AddOrgMember add/updates an org member.
 // TODO(sgotti) handle invitation when implemented
-func (h *ActionHandler) AddOrgMember(ctx context.Context, orgRef, userRef string, role types.MemberRole) (*types.OrganizationMember, error) {
-	if !types.IsValidMemberRole(role) {
+func (h *ActionHandler) AddOrgMember(ctx context.Context, orgRef, userRef string, role types.OrgMemberRole) (*types.OrganizationMember, error) {
+	if !types.IsValidOrgMemberRole(role) {
 		return nil, util.NewErrBadRequest(errors.Errorf("invalid role %q", role))
 	}
 

diff --git a/internal/services/configstore/action/user.go b/internal/services/configstore/action/user.go
@@ -632,7 +632,7 @@ func (h *ActionHandler) DeleteUserToken(ctx context.Context, userRef, tokenName
 
 type UserOrgsResponse struct {
 	Organization *types.Organization
-	Role         types.MemberRole
+	Role         types.OrgMemberRole
 }
 
 func userOrgsResponse(userOrg *readdb.UserOrg) *UserOrgsResponse {

diff --git a/internal/services/configstore/readdb/org.go b/internal/services/configstore/readdb/org.go
@@ -297,7 +297,7 @@ func scanOrgMembers(rows *sql.Rows) ([]*types.OrganizationMember, []string, erro
 
 type OrgUser struct {
 	User *types.User
-	Role types.MemberRole
+	Role types.OrgMemberRole
 }
 
 // TODO(sgotti) implement cursor fetching
@@ -348,7 +348,7 @@ func (r *ReadDB) GetOrgUsers(tx *db.Tx, orgID string) ([]*OrgUser, error) {
 
 type UserOrg struct {
 	Organization *types.Organization
-	Role         types.MemberRole
+	Role         types.OrgMemberRole
 }
 
 // TODO(sgotti) implement cursor fetching

diff --git a/internal/services/gateway/action/auth.go b/internal/services/gateway/action/auth.go
@@ -68,7 +68,7 @@ func (h *ActionHandler) IsOrgOwner(ctx context.Context, orgID string) (bool, err
 		if userOrg.Organization.ID != orgID {
 			continue
 		}
-		if userOrg.Role == cstypes.MemberRoleOwner {
+		if userOrg.Role == cstypes.OrgMemberRoleOwner {
 			return true, nil
 		}
 	}
@@ -103,7 +103,7 @@ func (h *ActionHandler) IsProjectOwner(ctx context.Context, ownerType cstypes.Co
 			if userOrg.Organization.ID != ownerID {
 				continue
 			}
-			if userOrg.Role == cstypes.MemberRoleOwner {
+			if userOrg.Role == cstypes.OrgMemberRoleOwner {
 				return true, nil
 			}
 		}

diff --git a/internal/services/gateway/action/org.go b/internal/services/gateway/action/org.go
@@ -52,7 +52,7 @@ type OrgMembersResponse struct {
 
 type OrgMemberResponse struct {
 	User *cstypes.User
-	Role cstypes.MemberRole
+	Role cstypes.OrgMemberRole
 }
 
 func (h *ActionHandler) GetOrgMembers(ctx context.Context, orgRef string) (*OrgMembersResponse, error) {
@@ -143,7 +143,7 @@ type AddOrgMemberResponse struct {
 	User               *cstypes.User
 }
 
-func (h *ActionHandler) AddOrgMember(ctx context.Context, orgRef, userRef string, role cstypes.MemberRole) (*AddOrgMemberResponse, error) {
+func (h *ActionHandler) AddOrgMember(ctx context.Context, orgRef, userRef string, role cstypes.OrgMemberRole) (*AddOrgMemberResponse, error) {
 	org, resp, err := h.configstoreClient.GetOrg(ctx, orgRef)
 	if err != nil {
 		return nil, ErrFromRemote(resp, err)

diff --git a/internal/services/gateway/api/org.go b/internal/services/gateway/api/org.go
@@ -189,10 +189,10 @@ func (h *OrgsHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-func createOrgMemberResponse(user *cstypes.User, role cstypes.MemberRole) *gwapitypes.OrgMemberResponse {
+func createOrgMemberResponse(user *cstypes.User, role cstypes.OrgMemberRole) *gwapitypes.OrgMemberResponse {
 	return &gwapitypes.OrgMemberResponse{
 		User: createUserResponse(user),
-		Role: gwapitypes.MemberRole(role),
+		Role: gwapitypes.OrgMemberRole(role),
 	}
 }
 
@@ -229,12 +229,12 @@ func (h *OrgMembersHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-func createAddOrgMemberResponse(org *cstypes.Organization, user *cstypes.User, role cstypes.MemberRole) *gwapitypes.AddOrgMemberResponse {
+func createAddOrgMemberResponse(org *cstypes.Organization, user *cstypes.User, role cstypes.OrgMemberRole) *gwapitypes.AddOrgMemberResponse {
 	return &gwapitypes.AddOrgMemberResponse{
 		Organization: createOrgResponse(org),
 		OrgMemberResponse: gwapitypes.OrgMemberResponse{
 			User: createUserResponse(user),
-			Role: gwapitypes.MemberRole(role),
+			Role: gwapitypes.OrgMemberRole(role),
 		},
 	}
 }
@@ -262,7 +262,7 @@ func (h *AddOrgMemberHandler) ServeHTTP(w http.ResponseWriter, r *http.Request)
 		return
 	}
 
-	ares, err := h.ah.AddOrgMember(ctx, orgRef, userRef, cstypes.MemberRole(req.Role))
+	ares, err := h.ah.AddOrgMember(ctx, orgRef, userRef, cstypes.OrgMemberRole(req.Role))
 	if httpError(w, err) {
 		h.log.Errorf("err: %+v", err)
 		return

diff --git a/services/configstore/api/types/org.go b/services/configstore/api/types/org.go
@@ -19,10 +19,10 @@ import (
 )
 
 type AddOrgMemberRequest struct {
-	Role cstypes.MemberRole
+	Role cstypes.OrgMemberRole
 }
 
 type OrgMemberResponse struct {
 	User *cstypes.User
-	Role cstypes.MemberRole
+	Role cstypes.OrgMemberRole
 }
diff --git a/services/configstore/api/types/user.go b/services/configstore/api/types/user.go
@@ -59,5 +59,5 @@ type CreateUserTokenResponse struct {
 
 type UserOrgsResponse struct {
 	Organization *cstypes.Organization
-	Role         cstypes.MemberRole
+	Role         cstypes.OrgMemberRole
 }
diff --git a/services/configstore/client/client.go b/services/configstore/client/client.go
@@ -531,7 +531,7 @@ func (c *Client) DeleteOrg(ctx context.Context, orgRef string) (*http.Response,
 	return c.getResponse(ctx, "DELETE", fmt.Sprintf("/orgs/%s", orgRef), nil, jsonContent, nil)
 }
 
-func (c *Client) AddOrgMember(ctx context.Context, orgRef, userRef string, role cstypes.MemberRole) (*cstypes.OrganizationMember, *http.Response, error) {
+func (c *Client) AddOrgMember(ctx context.Context, orgRef, userRef string, role cstypes.OrgMemberRole) (*cstypes.OrganizationMember, *http.Response, error) {
 	req := &csapitypes.AddOrgMemberRequest{
 		Role: role,
 	}