CLOUDP-220676: NPE in default_setter_opts.go (#2537)

mongodb · Jan 3, 2024 · 77c94f9 · 77c94f9
1 parent 6b393d6
commit 77c94f9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/internal/cli/default_setter_opts.go b/internal/cli/default_setter_opts.go
@@ -151,7 +151,7 @@ func (opts *DefaultSetterOpts) orgs(filter string) (results interface{}, err err
 	}
 	switch r := orgs.(type) {
 	case *atlasv2.PaginatedOrganization:
-		if *r.TotalCount == 0 {
+		if r.TotalCount == nil || *r.TotalCount == 0 {
 			return nil, errNoResults
 		}
 		if *r.TotalCount > resultsLimit {

diff --git a/internal/cli/default_setter_opts_test.go b/internal/cli/default_setter_opts_test.go
@@ -135,4 +135,21 @@ func TestDefaultOpts_Orgs(t *testing.T) {
 		require.NoError(t, err)
 		assert.Equal(t, expectedOrgs.Results, gotOrgs)
 	})
+
+	t.Run("with no org", func(t *testing.T) {
+		expectedOrgs := &atlas.Organizations{
+			Results: []*atlas.Organization{},
+		}
+		mockStore.EXPECT().Organizations(gomock.Any()).Return(expectedOrgs, nil).Times(1)
+		_, err := opts.orgs("")
+		require.Error(t, err)
+		require.EqualError(t, err, errNoResults.Error())
+	})
+
+	t.Run("with nil org", func(t *testing.T) {
+		mockStore.EXPECT().Organizations(gomock.Any()).Return(nil, nil).Times(1)
+		_, err := opts.orgs("")
+		require.Error(t, err)
+		require.EqualError(t, err, errNoResults.Error())
+	})
 }