Skip to content

Commit 944cd6c

Browse files
author
Rafid Bin Mostofa
committed
refactor: move release reading logic to a function
Previously, release info (setup.Release) parsing/reading logic was written in cmd/chisel/cmd_cut.go file. Being the only operation command before, it made sense to have it there. But, since there are incoming new commands, it is likely that this logic will be re-used. Thus, move it to a function, ``getRelease()``.
1 parent 1895d5a commit 944cd6c

1 file changed

Lines changed: 29 additions & 19 deletions

File tree

‎cmd/chisel/cmd_cut.go‎

Lines changed: 29 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -54,25 +54,7 @@ func (cmd *cmdCut) Execute(args []string) error {
5454
sliceKeys[i] = sliceKey
5555
}
5656

57-
var release *setup.Release
58-
var err error
59-
if strings.Contains(cmd.Release, "/") {
60-
release, err = setup.ReadRelease(cmd.Release)
61-
} else {
62-
var label, version string
63-
if cmd.Release == "" {
64-
label, version, err = readReleaseInfo()
65-
} else {
66-
label, version, err = parseReleaseInfo(cmd.Release)
67-
}
68-
if err != nil {
69-
return err
70-
}
71-
release, err = setup.FetchRelease(&setup.FetchOptions{
72-
Label: label,
73-
Version: version,
74-
})
75-
}
57+
release, _, err := getRelease(cmd.Release)
7658
if err != nil {
7759
return err
7860
}
@@ -136,3 +118,31 @@ func readReleaseInfo() (label, version string, err error) {
136118
}
137119
return "", "", fmt.Errorf("cannot infer release via /etc/lsb-release, see the --release option")
138120
}
121+
122+
// getRelease returns the release and release label (e.g. ubuntu-22.04 or
123+
// /path/to/release/dir/ if a directory was passed as input).
124+
func getRelease(releaseStr string) (release *setup.Release, releaseLabel string, err error) {
125+
if strings.Contains(releaseStr, "/") {
126+
release, err = setup.ReadRelease(releaseStr)
127+
releaseLabel = releaseStr
128+
} else {
129+
var label, version string
130+
if releaseStr == "" {
131+
label, version, err = readReleaseInfo()
132+
} else {
133+
label, version, err = parseReleaseInfo(releaseStr)
134+
}
135+
if err != nil {
136+
return nil, "", err
137+
}
138+
release, err = setup.FetchRelease(&setup.FetchOptions{
139+
Label: label,
140+
Version: version,
141+
})
142+
releaseLabel = label + "-" + version
143+
}
144+
if err != nil {
145+
return nil, "", err
146+
}
147+
return release, releaseLabel, nil
148+
}

0 commit comments

Comments
 (0)