Create release command #145
Conversation
nicholasSUSE
force-pushed
the
create-release-cmd
branch
from
e920791 to
c34578c
Compare
pkg/git/git.go
Outdated
| if err := cmd.Run(); err != nil { | ||
| return err // Return the error if the file does not exist or any other git error occurs | ||
| } | ||
| return nil // Return nil if the file exists |
There was a problem hiding this comment.
I think we can instead directly return the cmd.Run() call.
| if err := cmd.Run(); err != nil { | |
| return err // Return the error if the file does not exist or any other git error occurs | |
| } | |
| return nil // Return nil if the file exists | |
| return exec.Command("git", "-C", g.Dir, "cat-file", "-e", target).Run() |
pkg/git/git.go
Outdated
| if err := cmd.Run(); err != nil { | ||
| return err | ||
| } | ||
| return nil |
There was a problem hiding this comment.
Same here.
| if err := cmd.Run(); err != nil { | |
| return err | |
| } | |
| return nil | |
| return exec.Command("git", "-C", g.Dir, "reset", "HEAD").Run() |
pkg/auto/release.go
Outdated
| } | ||
|
|
||
| // ReleaseVersions represents the versions within the release.yaml file | ||
| type ReleaseVersions map[string][]string |
There was a problem hiding this comment.
I don' think this needs to be a named type and it doesn't need to be exported.
| ) | ||
|
|
||
| // Release holds necessary metadata to release a chart version | ||
| type Release struct { |
There was a problem hiding this comment.
Is this used outside of this package? If not, please unexport it.
There was a problem hiding this comment.
It is not used outside yet, except from main.go file.
But this will be used by auto-forward-port in a future PR.
pkg/auto/release.go
Outdated
| return nil | ||
| } | ||
|
|
||
| func checkAssetReleased(chartVersion string) bool { |
There was a problem hiding this comment.
Let's change this from bool to error. We shouldn't let errors get ignored.
pkg/auto/release.go
Outdated
| // example: assets/longhorn/longhorn-100.0.0+up0.0.0.tgz | ||
| assetTgz = chart + "-" + version + ".tgz" | ||
| assetPath = "assets/" + chart + "/" + assetTgz | ||
| return |
pkg/auto/release.go
Outdated
| return err | ||
| } | ||
|
|
||
| if err := r.git.ResetHEAD(); err != nil { |
There was a problem hiding this comment.
| if err := r.git.ResetHEAD(); err != nil { | |
| return r.git.ResetHEAD(); err != nil { |
pkg/auto/release.go
Outdated
| updatedYAMLIndented := enforceYamlStandard(updatedYAML) | ||
|
|
||
| // Write the updated YAML back to the file | ||
| if err := os.WriteFile(r.ReleaseYamlPath, updatedYAMLIndented, 0644); err != nil { |
There was a problem hiding this comment.
| if err := os.WriteFile(r.ReleaseYamlPath, updatedYAMLIndented, 0644); err != nil { | |
| return os.WriteFile(r.ReleaseYamlPath, updatedYAMLIndented, 0644); err != nil { |
pkg/auto/release.go
Outdated
| func (r *Release) UpdateReleaseYaml() error { | ||
| var releaseVersions ReleaseVersions | ||
|
|
||
| rvBytes, err := os.ReadFile(r.ReleaseYamlPath) |
There was a problem hiding this comment.
Rather than reading directly into memory, we should use the stream interface methods of encoder and decoder and we can condense the operations down as well as read the stream of bytes. This goes for the unmarshal function below.
pkg/auto/release.go
Outdated
| } | ||
|
|
||
| // enforceYamlStandard adds indentation to list items in a YAML string and a new line at the end of the file. | ||
| func enforceYamlStandard(yamlBytes []byte) []byte { |
There was a problem hiding this comment.
Is there no library for formatting or validating?
There was a problem hiding this comment.
This was removed.
I am using "gopkg.in/yaml.v3" now.
pkg/git/git.go
Outdated
| targetBranch := upstreamRemote + "/" + branch | ||
|
|
||
| cmd := exec.Command("git", "-C", g.Dir, "checkout", targetBranch, "--", file) | ||
| if err := cmd.Run(); err != nil { |
There was a problem hiding this comment.
| if err := cmd.Run(); err != nil { | |
| return cmd.Run(); err != nil { |
There was a problem hiding this comment.
Refactored all functions here
| @@ -22,7 +22,7 @@ type Asset struct { | |||
| // Dependencies holds the necessary filesystem, | |||
| // assets versions map, version rules and methods to apply the lifecycle rules in the target branch | |||
| type Dependencies struct { | |||
| rootFs billy.Filesystem | |||
| RootFs billy.Filesystem | |||
There was a problem hiding this comment.
Is this field accessed outside of this package?
There was a problem hiding this comment.
Yes it is used by auto package
nicholasSUSE
force-pushed
the
create-release-cmd
branch
from
4440930 to
cb000ca
Compare
This Pull Request is for replacing: forward-port script
With Golang safe code that can be used within ecm-distro-tools
Issue: rancher/ecm-distro-tools#446