Skip to content

Commit a85730d

Browse files
raghavyuvaraghavyuva
authored
style: format api and view (#523)
* style: format api * style: format view
1 parent f55e3c1 commit a85730d

File tree

133 files changed

+3827
-3695
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+3827
-3695
lines changed

‎api/internal/features/audit/service/init.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ func (s *AuditService) generateIntegrationMessage(actor string, action types.Aud
468468

469469
func (s *AuditService) generateGenericMessage(actor string, action types.AuditAction, resourceType string) string {
470470
return fmt.Sprintf("%s %s %s", actor, action, resourceType)
471-
}
471+
}
472472

473473
func getActionColor(action types.AuditAction) string {
474474
switch action {

‎api/internal/features/auth/service/login.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"github.com/raghavyuva/nixopus-api/internal/features/logger"
99
"golang.org/x/crypto/bcrypt"
1010
)
11+
1112
// Deprecated: Use SupertokensLogin instead
1213
func (u *AuthService) Login(email string, password string) (types.AuthResponse, error) {
1314
u.logger.Log(logger.Info, "logging in user", email)

‎api/internal/features/auth/service/register.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ func (c *AuthService) Register(registrationRequest types.RegisterRequest, userTy
118118
User: user,
119119
}, nil
120120
}
121+
121122
// Deprecated: Use SupertokensRegister instead
122123
func (c *AuthService) createDefaultOrganization(user shared_types.User, tx bun.Tx) (shared_types.Organization, error) {
123124
c.logger.Log(logger.Info, "creating default organization for user", user.Email)

‎api/internal/features/auth/types/auth.go‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -75,48 +75,48 @@ type TwoFactorLoginRequest struct {
7575
}
7676

7777
var (
78-
ErrInvalidUser = errors.New("invalid user")
79-
ErrEmptyPassword = errors.New("password cannot be empty")
80-
ErrPasswordMustHaveAtLeast8Chars = errors.New("password must have at least 8 characters")
81-
ErrPasswordMustHaveAtLeast1Number = errors.New("password must have at least 1 number")
82-
ErrPasswordMustHaveAtLeast1SpecialChar = errors.New("password must have at least 1 special character")
83-
ErrPasswordMustHaveAtLeast1UppercaseLetter = errors.New("password must have at least 1 uppercase letter")
84-
ErrPasswordMustHaveAtLeast1LowercaseLetter = errors.New("password must have at least 1 lowercase letter")
85-
ErrFailedToDecodeRequest = errors.New("failed to decode request body")
86-
ErrMissingRequiredFields = errors.New("missing required fields")
87-
ErrUserWithEmailAlreadyExists = errors.New("user with email already exists")
88-
ErrUserWithUsernameAlreadyExists = errors.New("user with username already exists")
89-
ErrFailedToRegisterUser = errors.New("failed to register user")
90-
ErrFailedToHashPassword = errors.New("failed to hash password")
91-
ErrFailedToCreateToken = errors.New("failed to create token")
92-
ErrInvalidPassword = errors.New("invalid password")
93-
ErrUserNotFound = errors.New("user not found")
94-
ErrFailedToGetUserFromContext = errors.New("failed to get user from context")
95-
ErrFailedToUpdateUser = errors.New("failed to update user")
96-
ErrSamePassword = errors.New("passwords must be different")
97-
ErrFailedToSendEmail = errors.New("failed to send email")
98-
ErrInvalidResetToken = errors.New("invalid reset token")
99-
ErrFailedToCreateRefreshToken = errors.New("failed to create refresh token")
100-
ErrRefreshTokenIsRequired = errors.New("refresh token is required")
101-
ErrInvalidRefreshToken = errors.New("invalid refresh token")
102-
ErrRefreshTokenAlreadyRevoked = errors.New("refresh token is already revoked")
103-
ErrPermissionAlreadyExists = errors.New("permission already exists")
104-
ErrPermissionDoesNotExist = errors.New("permission does not exist")
105-
ErrUserNameContainsSpaces = errors.New("user name cannot contain spaces")
106-
ErrUserNameTooLong = errors.New("user name is too long")
107-
ErrInvalidEmail = errors.New("invalid email")
108-
ErrInvalidRequestType = errors.New("invalid request type")
109-
ErrFailedToCreateAccessToken = errors.New("failed to create access token")
110-
ErrMissingRefreshToken = errors.New("refresh token is required")
111-
ErrInvalidUserType = errors.New("invalid user type")
112-
ErrFailedToCreateDefaultOrganization = errors.New("failed to create default organization")
113-
ErrFailedToCreateDefaultPermissions = errors.New("failed to create default permissions")
114-
ErrNoOrganizationsFound = errors.New("no organizations found")
115-
ErrFailedToAddUserToOrganization = errors.New("failed to add user to organization")
116-
ErrFailedToGetOrganization = errors.New("failed to get organization")
117-
ErrInvalidAccess = errors.New("invalid access")
118-
ErrFailedToSetup2FA = errors.New("failed to setup two-factor authentication")
119-
ErrFailedToEnable2FA = errors.New("failed to enable two-factor authentication")
120-
ErrFailedToDisable2FA = errors.New("failed to disable two-factor authentication")
121-
ErrInvalid2FACode = errors.New("invalid two-factor authentication code")
78+
ErrInvalidUser = errors.New("invalid user")
79+
ErrEmptyPassword = errors.New("password cannot be empty")
80+
ErrPasswordMustHaveAtLeast8Chars = errors.New("password must have at least 8 characters")
81+
ErrPasswordMustHaveAtLeast1Number = errors.New("password must have at least 1 number")
82+
ErrPasswordMustHaveAtLeast1SpecialChar = errors.New("password must have at least 1 special character")
83+
ErrPasswordMustHaveAtLeast1UppercaseLetter = errors.New("password must have at least 1 uppercase letter")
84+
ErrPasswordMustHaveAtLeast1LowercaseLetter = errors.New("password must have at least 1 lowercase letter")
85+
ErrFailedToDecodeRequest = errors.New("failed to decode request body")
86+
ErrMissingRequiredFields = errors.New("missing required fields")
87+
ErrUserWithEmailAlreadyExists = errors.New("user with email already exists")
88+
ErrUserWithUsernameAlreadyExists = errors.New("user with username already exists")
89+
ErrFailedToRegisterUser = errors.New("failed to register user")
90+
ErrFailedToHashPassword = errors.New("failed to hash password")
91+
ErrFailedToCreateToken = errors.New("failed to create token")
92+
ErrInvalidPassword = errors.New("invalid password")
93+
ErrUserNotFound = errors.New("user not found")
94+
ErrFailedToGetUserFromContext = errors.New("failed to get user from context")
95+
ErrFailedToUpdateUser = errors.New("failed to update user")
96+
ErrSamePassword = errors.New("passwords must be different")
97+
ErrFailedToSendEmail = errors.New("failed to send email")
98+
ErrInvalidResetToken = errors.New("invalid reset token")
99+
ErrFailedToCreateRefreshToken = errors.New("failed to create refresh token")
100+
ErrRefreshTokenIsRequired = errors.New("refresh token is required")
101+
ErrInvalidRefreshToken = errors.New("invalid refresh token")
102+
ErrRefreshTokenAlreadyRevoked = errors.New("refresh token is already revoked")
103+
ErrPermissionAlreadyExists = errors.New("permission already exists")
104+
ErrPermissionDoesNotExist = errors.New("permission does not exist")
105+
ErrUserNameContainsSpaces = errors.New("user name cannot contain spaces")
106+
ErrUserNameTooLong = errors.New("user name is too long")
107+
ErrInvalidEmail = errors.New("invalid email")
108+
ErrInvalidRequestType = errors.New("invalid request type")
109+
ErrFailedToCreateAccessToken = errors.New("failed to create access token")
110+
ErrMissingRefreshToken = errors.New("refresh token is required")
111+
ErrInvalidUserType = errors.New("invalid user type")
112+
ErrFailedToCreateDefaultOrganization = errors.New("failed to create default organization")
113+
ErrFailedToCreateDefaultPermissions = errors.New("failed to create default permissions")
114+
ErrNoOrganizationsFound = errors.New("no organizations found")
115+
ErrFailedToAddUserToOrganization = errors.New("failed to add user to organization")
116+
ErrFailedToGetOrganization = errors.New("failed to get organization")
117+
ErrInvalidAccess = errors.New("invalid access")
118+
ErrFailedToSetup2FA = errors.New("failed to setup two-factor authentication")
119+
ErrFailedToEnable2FA = errors.New("failed to enable two-factor authentication")
120+
ErrFailedToDisable2FA = errors.New("failed to disable two-factor authentication")
121+
ErrInvalid2FACode = errors.New("invalid two-factor authentication code")
122122
)

‎api/internal/features/container/controller/init.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,18 @@ func NewContainerController(
3636
}
3737

3838
func (c *ContainerController) isProtectedContainer(containerID string, action string) (*shared_types.Response, bool) {
39-
details, err := c.dockerService.GetContainerById(containerID)
40-
if err != nil {
41-
return nil, false
42-
}
43-
name := strings.ToLower(details.Name)
44-
if strings.Contains(name, "nixopus") {
45-
c.logger.Log(logger.Info, fmt.Sprintf("Skipping %s for protected container", action), details.Name)
46-
return &shared_types.Response{
47-
Status: "success",
48-
Message: "Operation skipped for protected container",
49-
Data: map[string]string{"status": "skipped"},
50-
}, true
51-
}
52-
return nil, false
39+
details, err := c.dockerService.GetContainerById(containerID)
40+
if err != nil {
41+
return nil, false
42+
}
43+
name := strings.ToLower(details.Name)
44+
if strings.Contains(name, "nixopus") {
45+
c.logger.Log(logger.Info, fmt.Sprintf("Skipping %s for protected container", action), details.Name)
46+
return &shared_types.Response{
47+
Status: "success",
48+
Message: "Operation skipped for protected container",
49+
Data: map[string]string{"status": "skipped"},
50+
}, true
51+
}
52+
return nil, false
5353
}

‎api/internal/features/container/controller/remove_container.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import (
1212
func (c *ContainerController) RemoveContainer(f fuego.ContextNoBody) (*shared_types.Response, error) {
1313
containerID := f.PathParam("container_id")
1414

15-
if resp, skipped := c.isProtectedContainer(containerID, "remove"); skipped {
16-
return resp, nil
17-
}
15+
if resp, skipped := c.isProtectedContainer(containerID, "remove"); skipped {
16+
return resp, nil
17+
}
1818

1919
err := c.dockerService.RemoveContainer(containerID, container.RemoveOptions{Force: true})
2020
if err != nil {

‎api/internal/features/container/controller/start_container.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import (
1212
func (c *ContainerController) StartContainer(f fuego.ContextNoBody) (*shared_types.Response, error) {
1313
containerID := f.PathParam("container_id")
1414

15-
if resp, skipped := c.isProtectedContainer(containerID, "start"); skipped {
16-
return resp, nil
17-
}
15+
if resp, skipped := c.isProtectedContainer(containerID, "start"); skipped {
16+
return resp, nil
17+
}
1818

1919
err := c.dockerService.StartContainer(containerID, container.StartOptions{})
2020
if err != nil {

‎api/internal/features/deploy/controller/handle_restart.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,14 @@ func (c *DeployController) HandleRestart(f fuego.ContextWithBody[types.RestartDe
6060
Status: http.StatusUnauthorized,
6161
}
6262
}
63-
err = c.taskService.RestartDeployment(&data, user.ID, organizationID)
64-
if err != nil {
65-
c.logger.Log(logger.Error, "failed to restart application", "id: "+data.ID.String()+", error: "+err.Error())
66-
return nil, fuego.HTTPError{
67-
Err: err,
68-
Status: http.StatusInternalServerError,
69-
}
70-
}
63+
err = c.taskService.RestartDeployment(&data, user.ID, organizationID)
64+
if err != nil {
65+
c.logger.Log(logger.Error, "failed to restart application", "id: "+data.ID.String()+", error: "+err.Error())
66+
return nil, fuego.HTTPError{
67+
Err: err,
68+
Status: http.StatusInternalServerError,
69+
}
70+
}
7171

7272
c.logger.Log(logger.Info, "application restarted successfully", "id: "+data.ID.String())
7373
return &shared_types.Response{

‎api/internal/features/deploy/controller/handle_rollback.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@ func (c *DeployController) HandleRollback(f fuego.ContextWithBody[types.Rollback
6161

6262
c.logger.Log(logger.Info, "attempting to rollback application", "id: "+data.ID.String()+", user_id: "+user.ID.String())
6363

64-
err = c.taskService.RollbackDeployment(&data, user.ID, organizationID)
65-
if err != nil {
66-
c.logger.Log(logger.Error, "failed to rollback application", "id: "+data.ID.String()+", error: "+err.Error())
67-
return nil, fuego.HTTPError{
68-
Err: err,
69-
Status: http.StatusInternalServerError,
70-
}
71-
}
64+
err = c.taskService.RollbackDeployment(&data, user.ID, organizationID)
65+
if err != nil {
66+
c.logger.Log(logger.Error, "failed to rollback application", "id: "+data.ID.String()+", error: "+err.Error())
67+
return nil, fuego.HTTPError{
68+
Err: err,
69+
Status: http.StatusInternalServerError,
70+
}
71+
}
7272

7373
c.logger.Log(logger.Info, "application rolled back successfully", "id: "+data.ID.String())
7474
return &shared_types.Response{

‎api/internal/features/deploy/controller/init.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func NewDeployController(
3838
notificationManager *notification.NotificationManager,
3939
) *DeployController {
4040
storage := storage.DeployStorage{DB: store.DB, Ctx: ctx}
41-
docker_repo := docker.NewDockerService()
41+
docker_repo := docker.NewDockerService()
4242
github_service := github_service.NewGithubConnectorService(store, ctx, l, &github_storage.GithubConnectorStorage{DB: store.DB, Ctx: ctx})
4343
taskService := tasks.NewTaskService(&storage, l, docker_repo, github_service, store)
4444
taskService.SetupCreateDeploymentQueue()

0 commit comments

Comments
 (0)