Просмотр исходного кода

use consistent naming for handlers

Anukul Sangwan 4 лет назад
Родитель
Сommit
5269cc6c75

+ 5 - 5
api/server/handlers/invite/create.go

@@ -15,21 +15,21 @@ import (
 	"github.com/porter-dev/porter/internal/oauth"
 )
 
-type CreateInviteHandler struct {
+type InviteCreateHandler struct {
 	handlers.PorterHandlerReadWriter
 }
 
-func NewCreateInviteHandler(
+func NewInviteCreateHandler(
 	config *config.Config,
 	decoderValidator shared.RequestDecoderValidator,
 	writer shared.ResultWriter,
-) *CreateInviteHandler {
-	return &CreateInviteHandler{
+) *InviteCreateHandler {
+	return &InviteCreateHandler{
 		PorterHandlerReadWriter: handlers.NewDefaultPorterHandler(config, decoderValidator, writer),
 	}
 }
 
-func (c *CreateInviteHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+func (c *InviteCreateHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	user, _ := r.Context().Value(types.UserScope).(*models.User)
 	project, _ := r.Context().Value(types.ProjectScope).(*models.Project)
 

+ 5 - 5
api/server/handlers/invite/list.go

@@ -11,20 +11,20 @@ import (
 	"github.com/porter-dev/porter/internal/models"
 )
 
-type ListInvitesHandler struct {
+type InvitesListHandler struct {
 	handlers.PorterHandlerWriter
 }
 
-func NewListInvitesHandler(
+func NewInvitesListHandler(
 	config *config.Config,
 	writer shared.ResultWriter,
-) *ListInvitesHandler {
-	return &ListInvitesHandler{
+) *InvitesListHandler {
+	return &InvitesListHandler{
 		PorterHandlerWriter: handlers.NewDefaultPorterHandler(config, nil, writer),
 	}
 }
 
-func (c *ListInvitesHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+func (c *InvitesListHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	project, _ := r.Context().Value(types.ProjectScope).(*models.Project)
 
 	invites, err := c.Repo().Invite().ListInvitesByProjectID(project.ID)

+ 5 - 5
api/server/handlers/project/delete_role.go

@@ -11,21 +11,21 @@ import (
 	"github.com/porter-dev/porter/internal/models"
 )
 
-type ProjectDeleteRoleHandler struct {
+type RoleDeleteHandler struct {
 	handlers.PorterHandlerReadWriter
 }
 
-func NewProjectDeleteRoleHandler(
+func NewRoleDeleteHandler(
 	config *config.Config,
 	decoderValidator shared.RequestDecoderValidator,
 	writer shared.ResultWriter,
-) *ProjectDeleteRoleHandler {
-	return &ProjectDeleteRoleHandler{
+) *RoleDeleteHandler {
+	return &RoleDeleteHandler{
 		PorterHandlerReadWriter: handlers.NewDefaultPorterHandler(config, decoderValidator, writer),
 	}
 }
 
-func (p *ProjectDeleteRoleHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+func (p *RoleDeleteHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	proj, _ := r.Context().Value(types.ProjectScope).(*models.Project)
 
 	request := &types.DeleteRoleRequest{}

+ 5 - 5
api/server/handlers/project/list_collaborators.go

@@ -11,20 +11,20 @@ import (
 	"github.com/porter-dev/porter/internal/models"
 )
 
-type ProjectListCollaboratorsHandler struct {
+type CollaboratorsListHandler struct {
 	handlers.PorterHandlerWriter
 }
 
-func NewProjectListCollaboratorsHandler(
+func NewCollaboratorsListHandler(
 	config *config.Config,
 	writer shared.ResultWriter,
-) *ProjectListCollaboratorsHandler {
-	return &ProjectListCollaboratorsHandler{
+) *CollaboratorsListHandler {
+	return &CollaboratorsListHandler{
 		PorterHandlerWriter: handlers.NewDefaultPorterHandler(config, nil, writer),
 	}
 }
 
-func (p *ProjectListCollaboratorsHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+func (p *CollaboratorsListHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	proj, _ := r.Context().Value(types.ProjectScope).(*models.Project)
 
 	roles, err := p.Repo().Project().ListProjectRoles(proj.ID)

+ 5 - 5
api/server/handlers/project/list_roles.go

@@ -9,20 +9,20 @@ import (
 	"github.com/porter-dev/porter/api/types"
 )
 
-type ProjectListRolesHandler struct {
+type RolesListHandler struct {
 	handlers.PorterHandlerWriter
 }
 
-func NewProjectListRolesHandler(
+func NewRolesListHandler(
 	config *config.Config,
 	writer shared.ResultWriter,
-) *ProjectListRolesHandler {
-	return &ProjectListRolesHandler{
+) *RolesListHandler {
+	return &RolesListHandler{
 		PorterHandlerWriter: handlers.NewDefaultPorterHandler(config, nil, writer),
 	}
 }
 
-func (p *ProjectListRolesHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+func (p *RolesListHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	var res types.ListProjectRolesResponse = []types.RoleKind{types.RoleAdmin, types.RoleDeveloper, types.RoleViewer}
 
 	p.WriteResult(w, r, res)

+ 5 - 5
api/server/handlers/project/update_role.go

@@ -11,21 +11,21 @@ import (
 	"github.com/porter-dev/porter/internal/models"
 )
 
-type ProjectUpdateRoleHandler struct {
+type RoleUpdateHandler struct {
 	handlers.PorterHandlerReadWriter
 }
 
-func NewProjectUpdateRoleHandler(
+func NewRoleUpdateHandler(
 	config *config.Config,
 	decoderValidator shared.RequestDecoderValidator,
 	writer shared.ResultWriter,
-) *ProjectUpdateRoleHandler {
-	return &ProjectUpdateRoleHandler{
+) *RoleUpdateHandler {
+	return &RoleUpdateHandler{
 		PorterHandlerReadWriter: handlers.NewDefaultPorterHandler(config, decoderValidator, writer),
 	}
 }
 
-func (p *ProjectUpdateRoleHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+func (p *RoleUpdateHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	proj, _ := r.Context().Value(types.ProjectScope).(*models.Project)
 
 	request := &types.UpdateRoleRequest{}

+ 12 - 12
api/server/router/project.go

@@ -191,7 +191,7 @@ func getProjectRoutes(
 		Router:   r,
 	})
 
-	// GET /api/projects/{project_id}/collaborators -> project.NewProjectListCollaboratorsHandler
+	// GET /api/projects/{project_id}/collaborators -> project.NewCollaboratorsListHandler
 	listCollaboratorsEndpoint := factory.NewAPIEndpoint(
 		&types.APIRequestMetadata{
 			Verb:   types.APIVerbList,
@@ -207,7 +207,7 @@ func getProjectRoutes(
 		},
 	)
 
-	listCollaboratorsHandler := project.NewProjectListCollaboratorsHandler(
+	listCollaboratorsHandler := project.NewCollaboratorsListHandler(
 		config,
 		factory.GetResultWriter(),
 	)
@@ -218,7 +218,7 @@ func getProjectRoutes(
 		Router:   r,
 	})
 
-	// GET /api/projects/{project_id}/roles -> project.NewProjectListRolesHandler
+	// GET /api/projects/{project_id}/roles -> project.NewRolesListHandler
 	listRolesEndpoint := factory.NewAPIEndpoint(
 		&types.APIRequestMetadata{
 			Verb:   types.APIVerbList,
@@ -234,7 +234,7 @@ func getProjectRoutes(
 		},
 	)
 
-	listRolesHandler := project.NewProjectListRolesHandler(
+	listRolesHandler := project.NewRolesListHandler(
 		config,
 		factory.GetResultWriter(),
 	)
@@ -245,7 +245,7 @@ func getProjectRoutes(
 		Router:   r,
 	})
 
-	// POST /api/projects/{project_id}/roles -> project.NewProjectUpdateRoleHandler
+	// POST /api/projects/{project_id}/roles -> project.NewRoleUpdateHandler
 	updateRoleEndpoint := factory.NewAPIEndpoint(
 		&types.APIRequestMetadata{
 			Verb:   types.APIVerbUpdate,
@@ -261,7 +261,7 @@ func getProjectRoutes(
 		},
 	)
 
-	updateRoleHandler := project.NewProjectUpdateRoleHandler(
+	updateRoleHandler := project.NewRoleUpdateHandler(
 		config,
 		factory.GetDecoderValidator(),
 		factory.GetResultWriter(),
@@ -273,7 +273,7 @@ func getProjectRoutes(
 		Router:   r,
 	})
 
-	// DELETE /api/projects/{project_id}/roles -> project.NewProjectDeleteRoleHandler
+	// DELETE /api/projects/{project_id}/roles -> project.NewRoleDeleteHandler
 	deleteRoleEndpoint := factory.NewAPIEndpoint(
 		&types.APIRequestMetadata{
 			Verb:   types.APIVerbDelete,
@@ -289,7 +289,7 @@ func getProjectRoutes(
 		},
 	)
 
-	deleteRoleHandler := project.NewProjectDeleteRoleHandler(
+	deleteRoleHandler := project.NewRoleDeleteHandler(
 		config,
 		factory.GetDecoderValidator(),
 		factory.GetResultWriter(),
@@ -468,7 +468,7 @@ func getProjectRoutes(
 		Router:   r,
 	})
 
-	// GET /api/projects/{project_id}/invites -> invite.NewCreateInviteHandler
+	// GET /api/projects/{project_id}/invites -> invite.NewInvitesListHandler
 	listInvitesEndpoint := factory.NewAPIEndpoint(
 		&types.APIRequestMetadata{
 			Verb:   types.APIVerbGet,
@@ -484,7 +484,7 @@ func getProjectRoutes(
 		},
 	)
 
-	listInvitesHandler := invite.NewListInvitesHandler(
+	listInvitesHandler := invite.NewInvitesListHandler(
 		config,
 		factory.GetResultWriter(),
 	)
@@ -495,7 +495,7 @@ func getProjectRoutes(
 		Router:   r,
 	})
 
-	// POST /api/projects/{project_id}/invites -> invite.NewCreateInviteHandler
+	// POST /api/projects/{project_id}/invites -> invite.NewInviteCreateHandler
 	createInviteEndpoint := factory.NewAPIEndpoint(
 		&types.APIRequestMetadata{
 			Verb:   types.APIVerbCreate,
@@ -511,7 +511,7 @@ func getProjectRoutes(
 		},
 	)
 
-	createInviteHandler := invite.NewCreateInviteHandler(
+	createInviteHandler := invite.NewInviteCreateHandler(
 		config,
 		factory.GetDecoderValidator(),
 		factory.GetResultWriter(),