chore(code): clean up the code EE-7251 (#11948)

api/stacks/stackbuilders/stack_file_content_builder.go

@@ -16,7 +16,7 @@ type FileContentMethodStackBuildProcess interface {
 	Deploy(payload *StackPayload, endpoint *portainer.Endpoint) FileContentMethodStackBuildProcess
 	// Save the stack information to database
 	SaveStack() (*portainer.Stack, *httperror.HandlerError)
-	// Get reponse from http request. Use if it is needed
+	// Get response from HTTP request. Use if it is needed
 	GetResponse() string
 	// Process the file content
 	SetFileContent(payload *StackPayload) FileContentMethodStackBuildProcess
@@ -32,19 +32,15 @@ func (b *FileContentMethodStackBuilder) SetGeneralInfo(payload *StackPayload, en
 	b.stack.EndpointID = endpoint.ID
 	b.stack.Status = portainer.StackStatusActive
 	b.stack.CreationDate = time.Now().Unix()
+
 	return b
 }
 
 func (b *FileContentMethodStackBuilder) SetUniqueInfo(payload *StackPayload) FileContentMethodStackBuildProcess {
-
 	return b
 }
 
 func (b *FileContentMethodStackBuilder) SetFileContent(payload *StackPayload) FileContentMethodStackBuildProcess {
-	if b.hasError() {
-		return b
-	}
-
 	return b
 }
 
@@ -54,10 +50,8 @@ func (b *FileContentMethodStackBuilder) Deploy(payload *StackPayload, endpoint *
 	}
 
 	// Deploy the stack
-	err := b.deploymentConfiger.Deploy()
-	if err != nil {
+	if err := b.deploymentConfiger.Deploy(); err != nil {
 		b.err = httperror.InternalServerError(err.Error(), err)
-		return b
 	}
 
 	return b

api/stacks/stackbuilders/stack_file_upload_builder.go

@@ -17,7 +17,7 @@ type FileUploadMethodStackBuildProcess interface {
 	Deploy(payload *StackPayload, endpoint *portainer.Endpoint) FileUploadMethodStackBuildProcess
 	// Save the stack information to database
 	SaveStack() (*portainer.Stack, *httperror.HandlerError)
-	// Get reponse from http request. Use if it is needed
+	// Get response from HTTP request. Use if it is needed
 	GetResponse() string
 	// Process the upload file
 	SetUploadedFile(payload *StackPayload) FileUploadMethodStackBuildProcess
@@ -33,11 +33,11 @@ func (b *FileUploadMethodStackBuilder) SetGeneralInfo(payload *StackPayload, end
 	b.stack.EndpointID = endpoint.ID
 	b.stack.Status = portainer.StackStatusActive
 	b.stack.CreationDate = time.Now().Unix()
+
 	return b
 }
 
 func (b *FileUploadMethodStackBuilder) SetUniqueInfo(payload *StackPayload) FileUploadMethodStackBuildProcess {
-
 	return b
 }
 
@@ -52,6 +52,7 @@ func (b *FileUploadMethodStackBuilder) SetUploadedFile(payload *StackPayload) Fi
 		b.err = httperror.InternalServerError("Unable to persist Compose file on disk", err)
 		return b
 	}
+
 	b.stack.ProjectPath = projectPath
 
 	return b
@@ -63,13 +64,14 @@ func (b *FileUploadMethodStackBuilder) Deploy(payload *StackPayload, endpoint *p
 	}
 
 	// Deploy the stack
-	err := b.deploymentConfiger.Deploy()
-	if err != nil {
+	if err := b.deploymentConfiger.Deploy(); err != nil {
 		b.err = httperror.InternalServerError(err.Error(), err)
+
 		return b
 	}
 
 	b.doCleanUp = false
+
 	return b
 }
 

api/stacks/stackbuilders/stack_git_builder.go

@@ -23,7 +23,7 @@ type GitMethodStackBuildProcess interface {
 	Deploy(payload *StackPayload, endpoint *portainer.Endpoint) GitMethodStackBuildProcess
 	// Save the stack information to database and return the stack object
 	SaveStack() (*portainer.Stack, *httperror.HandlerError)
-	// Get reponse from http request. Use if it is needed
+	// Get response from HTTP request. Use if it is needed
 	GetResponse() string
 	// Set git repository configuration
 	SetGitRepository(payload *StackPayload) GitMethodStackBuildProcess
@@ -45,11 +45,11 @@ func (b *GitMethodStackBuilder) SetGeneralInfo(payload *StackPayload, endpoint *
 	b.stack.Status = portainer.StackStatusActive
 	b.stack.CreationDate = time.Now().Unix()
 	b.stack.AutoUpdate = payload.AutoUpdate
+
 	return b
 }
 
 func (b *GitMethodStackBuilder) SetUniqueInfo(payload *StackPayload) GitMethodStackBuildProcess {
-
 	return b
 }
 
@@ -74,6 +74,7 @@ func (b *GitMethodStackBuilder) SetGitRepository(payload *StackPayload) GitMetho
 	if payload.ComposeFile == "" {
 		repoConfig.ConfigFilePath = filesystem.ComposeFileDefaultName
 	}
+
 	// If a manifest file is specified (for kube git apps), then use it instead of the default compose file name
 	if payload.ManifestFile != "" {
 		repoConfig.ConfigFilePath = payload.ManifestFile
@@ -97,6 +98,7 @@ func (b *GitMethodStackBuilder) SetGitRepository(payload *StackPayload) GitMetho
 	// Update the latest commit id
 	repoConfig.ConfigHash = commitHash
 	b.stack.GitConfig = &repoConfig
+
 	return b
 }
 
@@ -134,6 +136,7 @@ func (b *GitMethodStackBuilder) SetAutoUpdate(payload *StackPayload) GitMethodSt
 
 		b.stack.AutoUpdate.JobID = jobID
 	}
+
 	return b
 }
 

api/stacks/stackbuilders/swarm_file_upload_builder.go

@@ -38,11 +38,13 @@ func (b *SwarmStackFileUploadBuilder) SetUniqueInfo(payload *StackPayload) FileU
 	if b.hasError() {
 		return b
 	}
+
 	b.stack.Name = payload.Name
 	b.stack.Type = portainer.DockerSwarmStack
 	b.stack.SwarmID = payload.SwarmID
 	b.stack.EntryPoint = filesystem.ComposeFileDefaultName
 	b.stack.Env = payload.Env
+
 	return b
 }