Skip to content

Fix NPE for AtlasCLI and add tests #1036

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 14, 2022
Merged

Fix NPE for AtlasCLI and add tests #1036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions internal/cli/root/atlas/builder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func TestBuilder(t *testing.T) {
func TestOutputOpts_notifyIfApplicable(t *testing.T) {
tests := testCases()
for _, tt := range tests {
t.Run(fmt.Sprintf("%v / %v", tt.currentVersion, tt.release.GetTagName()), func(t *testing.T) {
t.Run(fmt.Sprintf("%v/%v", tt.currentVersion, tt.release), func(t *testing.T) {
config.ToolName = config.AtlasCLI
prevVersion := version.Version
version.Version = tt.currentVersion
Expand Down Expand Up @@ -77,7 +77,11 @@ func TestOutputOpts_notifyIfApplicable(t *testing.T) {
t.Errorf("notifyIfApplicable() unexpected error:%v", err)
}

v := latestrelease.VersionFromTag(tt.release.GetTagName(), config.ToolName)
v := ""
if tt.release != nil {
v = latestrelease.VersionFromTag(tt.release.GetTagName(), config.ToolName)
}

want := ""
if tt.expectNewVersion {
want = fmt.Sprintf(`
Expand Down Expand Up @@ -126,6 +130,11 @@ func testCases() []testCase {
expectNewVersion: false,
release: &github.RepositoryRelease{TagName: &atlasV, Prerelease: &f, Draft: &f},
},
{
currentVersion: "v3.0.0-123",
expectNewVersion: false,
release: nil,
},
}
return tests
}
13 changes: 11 additions & 2 deletions internal/cli/root/mongocli/builder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ func TestBuilder(t *testing.T) {
func TestOutputOpts_notifyIfApplicable(t *testing.T) {
tests := testCases()
for _, tt := range tests {
t.Run(fmt.Sprintf("%v / %v", tt.currentVersion, tt.release.GetTagName()), func(t *testing.T) {
t.Run(fmt.Sprintf("%v/%v", tt.currentVersion, tt.release), func(t *testing.T) {
prevVersion := version.Version
version.Version = tt.currentVersion
defer func() {
Expand Down Expand Up @@ -166,7 +166,11 @@ func TestOutputOpts_notifyIfApplicable(t *testing.T) {
t.Errorf("notifyIfApplicable() unexpected error:%v", err)
}

v := latestrelease.VersionFromTag(tt.release.GetTagName(), config.ToolName)
v := ""
if tt.release != nil {
v = latestrelease.VersionFromTag(tt.release.GetTagName(), config.ToolName)
}

want := ""
if tt.expectNewVersion {
want = fmt.Sprintf(`
Expand Down Expand Up @@ -221,6 +225,11 @@ func testCases() []testCase {
expectNewVersion: false,
release: &github.RepositoryRelease{TagName: &mcliV, Prerelease: &f, Draft: &f},
},
{
currentVersion: "v3.0.0-123",
expectNewVersion: false,
release: nil,
},
}
return tests
}
4 changes: 2 additions & 2 deletions internal/latestrelease/finder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ func (f *finder) loadOrGet() (*ReleaseInformation, *semver.Version, error) {
}

newestRelease, err := f.find()
if err != nil {
if err != nil || newestRelease == nil {
return nil, nil, err
}

Expand All @@ -126,7 +126,7 @@ func (f *finder) Find() (releaseInfo *ReleaseInformation, err error) {
}

releaseInfo, newestVersion, err := f.loadOrGet()
if err != nil || svCurrentVersion.Compare(newestVersion) > 0 {
if err != nil || releaseInfo == nil || svCurrentVersion.Compare(newestVersion) > 0 {
return nil, err
}
return releaseInfo, nil
Expand Down