github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-25 06:52:13 +00:00
Code Issues Projects Releases Wiki Activity

runtime: Fix linter errors in release files

Browse Source 
Fix the linter errors caught in the `runtime` repos `master` branch [1],
but not in the `2.0-dev` branch [2]. See [3] for further details.

[1] - https://github.com/kata-containers/runtime/pull/2976
[2] - https://github.com/kata-containers/kata-containers/pull/735
[3] - https://github.com/kata-containers/tests/issues/2870

Fixes: #783.

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
This commit is contained in:
James O. D. Hunt 2020-09-23 09:24:54 +01:00
parent 6e9592e13d
commit 33585a8edc
2 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/runtime/cli/release.go
View File

@ -128,7 +128,7 @@ func makeRelease(release map[string]interface{}) (version string, details releas
key := "tag_name" key := "tag_name"
version, ok := release[key].(string) version, ok := release[key].(string)
if ok != true { if !ok {
return "", details, fmt.Errorf("failed to find key %s in release data", key) return "", details, fmt.Errorf("failed to find key %s in release data", key)
} }
@ -144,7 +144,7 @@ func makeRelease(release map[string]interface{}) (version string, details releas
key = "assets" key = "assets"
assetsArray, ok := release[key].([]interface{}) assetsArray, ok := release[key].([]interface{})
if ok != true { if !ok {
return "", details, fmt.Errorf("failed to find key %s in release version %q data", key, version) return "", details, fmt.Errorf("failed to find key %s in release version %q data", key, version)
} }
@ -163,7 +163,7 @@ func makeRelease(release map[string]interface{}) (version string, details releas
key = "browser_download_url" key = "browser_download_url"
downloadURL, ok = assets.(map[string]interface{})[key].(string) downloadURL, ok = assets.(map[string]interface{})[key].(string)
if ok != true { if !ok {
return "", details, fmt.Errorf("failed to find key %s in release version %q asset data", key, version) return "", details, fmt.Errorf("failed to find key %s in release version %q asset data", key, version)
} }
@ -174,7 +174,7 @@ func makeRelease(release map[string]interface{}) (version string, details releas
key = "name" key = "name"
filename, ok = assets.(map[string]interface{})[key].(string) filename, ok = assets.(map[string]interface{})[key].(string)
if ok != true { if !ok {
return "", details, fmt.Errorf("failed to find key %s in release version %q asset data", key, version) return "", details, fmt.Errorf("failed to find key %s in release version %q asset data", key, version)
} }
@ -185,7 +185,7 @@ func makeRelease(release map[string]interface{}) (version string, details releas
key = "created_at" key = "created_at"
createDate, ok = assets.(map[string]interface{})[key].(string) createDate, ok = assets.(map[string]interface{})[key].(string)
if ok != true { if !ok {
return "", details, fmt.Errorf("failed to find key %s in release version %q asset data", key, version) return "", details, fmt.Errorf("failed to find key %s in release version %q asset data", key, version)
} }
@ -402,9 +402,5 @@ func HandleReleaseVersions(cmd ReleaseCmd, currentVersion string, includeAll boo
return fmt.Errorf("Release %v has no details", newest) return fmt.Errorf("Release %v has no details", newest)
} }
if err != nil {
return err
}
return showLatestRelease(output, currentSemver, details) return showLatestRelease(output, currentSemver, details)
} }

22
src/runtime/cli/release_test.go
View File

@ -397,11 +397,11 @@ func TestFindNewestRelease(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)
type testData struct { type testData struct {
currentVer semver.Version
versions []semver.Version versions []semver.Version
expectAvailable bool currentVer semver.Version
expectVersion semver.Version expectVersion semver.Version
expectError bool expectError bool
expectAvailable bool
} }
ver1, err := semver.Make("1.11.1") ver1, err := semver.Make("1.11.1")
@ -414,15 +414,15 @@ func TestFindNewestRelease(t *testing.T) {
assert.NoError(err) assert.NoError(err)
data := []testData{ data := []testData{
{semver.Version{}, []semver.Version{}, false, semver.Version{}, true}, {[]semver.Version{}, semver.Version{}, semver.Version{}, true, false},
{ver1, []semver.Version{}, false, semver.Version{}, true}, {[]semver.Version{}, ver1, semver.Version{}, true, false},
{ver1, []semver.Version{ver1}, false, semver.Version{}, false}, {[]semver.Version{ver1}, ver1, semver.Version{}, false, false},
{ver2, []semver.Version{ver1}, false, semver.Version{}, false}, {[]semver.Version{ver1}, ver2, semver.Version{}, false, false},
{ver1, []semver.Version{ver2}, true, ver2, false}, {[]semver.Version{ver2}, ver1, ver2, false, true},
{ver1, []semver.Version{ver3}, true, ver3, false}, {[]semver.Version{ver3}, ver1, ver3, false, true},
{ver1, []semver.Version{ver2, ver3}, true, ver3, false}, {[]semver.Version{ver2, ver3}, ver1, ver3, false, true},
{ver2, []semver.Version{ver1, ver3}, true, ver3, false}, {[]semver.Version{ver1, ver3}, ver2, ver3, false, true},
{ver2, []semver.Version{ver1}, false, semver.Version{}, false}, {[]semver.Version{ver1}, ver2, semver.Version{}, false, false},
} }
for i, d := range data { for i, d := range data {