fix(stack): unable to delete invalid stack [EE-5753] #11813
+48
−18
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
chiptus
reviewed
May 12, 2024
| // to the Kubernetes cluster API endpoint via the Portainer endpoint proxy. | ||
| // See @https://github.com/portainer/portainer/blob/release/2.20/app/kubernetes/views/applications/applicationsController.js#L96 | ||
| for _, manifest := range manifestFiles { | ||
| if _, statErr := os.Stat(manifest); os.IsNotExist(statErr) { |
There was a problem hiding this comment.
we have a function for it filesystem.FileExist
api/exec/compose_stack.go
Outdated
| if err != nil { | ||
| return errors.Wrap(err, "failed to create env file") | ||
| projectPath := stack.ProjectPath | ||
| if _, err := os.Stat(projectPath); os.IsNotExist(err) { |
There was a problem hiding this comment.
we have a function for it filesystem.FileExist
api/exec/compose_stack.go
Outdated
| // copyConfigEnvVarsIfExists write the environment variables from stack configuration to target file | ||
| func copyConfigEnvVarsIfExists(w io.Writer, envs []portainer.Pair) { | ||
| for _, v := range envs { | ||
| io.WriteString(w, fmt.Sprintf("%s=%s\n", v.Name, v.Value)) |
There was a problem hiding this comment.
We should handle the error of this operation.
Nitpick: maybe use fmt.Fprintf() directly?
chiptus
reviewed
May 14, 2024
api/exec/compose_stack.go
Outdated
| } | ||
|
|
||
| return "stack.env", nil | ||
| } | ||
|
|
||
| // copyDefaultEnvFile copies the default .env file if it exists to the provided writer | ||
| func copyDefaultEnvFile(stack *portainer.Stack, w io.Writer) { | ||
| defaultEnvFile, err := os.Open(path.Join(path.Join(stack.ProjectPath, path.Dir(stack.EntryPoint)), ".env")) | ||
| func copyDefaultEnvFileIfExists(w io.Writer, defaultEnvFilePath string) error { |
There was a problem hiding this comment.
Suggested change
| func copyDefaultEnvFileIfExists(w io.Writer, defaultEnvFilePath string) error { | |
| func copyDefaultEnvFile(w io.Writer, defaultEnvFilePath string) error { |
I feel like IfExists doesn't add any value. it copied the file into the writer
There was a problem hiding this comment.
When there is no .env file, we skip the copy and don't return error. That's the reason the IfExists was added
api/exec/compose_stack.go
Outdated
Comment on lines
188
to
189
| // copyConfigEnvVarsIfExists write the environment variables from stack configuration to target file | ||
| func copyConfigEnvVarsIfExists(w io.Writer, envs []portainer.Pair) error { |
There was a problem hiding this comment.
Suggested change
| // copyConfigEnvVarsIfExists write the environment variables from stack configuration to target file | |
| func copyConfigEnvVarsIfExists(w io.Writer, envs []portainer.Pair) error { | |
| // copyConfigEnvVars write the environment variables from stack configuration to the writer | |
| func copyConfigEnvVars(w io.Writer, envs []portainer.Pair) error { |
oscarzhou-portainer
force-pushed
the
fix/EE-5753/delete-invalid-stack
branch
from
648e994
to
a877025
Compare
chiptus
reviewed
May 21, 2024
|
|
||
| if err != nil { | ||
| for _, manifest := range manifestFiles { | ||
| if exists, err := filesystem.FileExists(manifest); err != nil || !exists { |
There was a problem hiding this comment.
to prevent overriding of the original error (L248), rename this variable
Suggested change
| if exists, err := filesystem.FileExists(manifest); err != nil || !exists { | |
| if exists, fileExistsErr := filesystem.FileExists(manifest); fileExistsErr != nil || !exists { |
chiptus
approved these changes
May 21, 2024
oscarzhou-portainer
force-pushed
the
fix/EE-5753/delete-invalid-stack
branch
from
a116d01
to
edbc333
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
closes EE-5753