option to auto-detect format (#53)

* option to auto-detect format
* better user testing

Author: pmenglund

option/format.go

@@ -57,6 +57,13 @@ func WithCSVFormat(columnNames []string, columnTypes []ColumnType, options ...CS
 	}
 }
 
+// WithAutoFormat sets the format to auto-detect JSON, Parquet, XLS or PDF.
+func WithAutoFormat() Format {
+	return func(f *openapi.FormatParams) {
+		// sets nothing as it is the default behavior
+	}
+}
+
 // WithJSONFormat sets the format to JSON.
 func WithJSONFormat() Format {
 	return func(f *openapi.FormatParams) {

users.go

@@ -71,6 +71,27 @@ func (rc *RockClient) GetCurrentUser(ctx context.Context) (openapi.User, error)
 	return *user, nil
 }
 
+// GetUser gets a user.
+//
+// REST API documentation https://docs.rockset.com/rest-api/#getuser
+func (rc *RockClient) GetUser(ctx context.Context, email string) (openapi.User, error) {
+	var err error
+	var user *openapi.User
+
+	q := rc.UsersApi.GetUser(ctx, email)
+
+	err = rc.Retry(ctx, func() error {
+		user, _, err = q.Execute()
+		return err
+	})
+
+	if err != nil {
+		return openapi.User{}, err
+	}
+
+	return *user, nil
+}
+
 // ListUsers lists all users.
 //
 // REST API documentation https://docs.rockset.com/rest-api/#listusers

users_test.go

@@ -1,44 +1,76 @@
 package rockset_test
 
 import (
+	"github.com/stretchr/testify/suite"
 	"testing"
 
-	"github.com/rs/zerolog"
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/rockset/rockset-go-client"
 )
 
-func TestRockClient_ListUsers(t *testing.T) {
-	skipUnlessIntegrationTest(t)
+const CIUser = "pme+circleci@rockset.com"
 
-	ctx := testCtx()
-	log := zerolog.Ctx(ctx)
+type UserTestSuite struct {
+	suite.Suite
+	rc    *rockset.RockClient
+	email string
+}
+
+func TestUserTestSuite(t *testing.T) {
+	skipUnlessIntegrationTest(t)
 
 	rc, err := rockset.NewClient()
 	require.NoError(t, err)
 
-	users, err := rc.ListUsers(ctx)
-	require.NoError(t, err)
+	s := UserTestSuite{
+		rc:    rc,
+		email: "pme+testuser@rockset.com",
+	}
+	suite.Run(t, &s)
+}
 
-	assert.NotEmpty(t, users)
+func (s *UserTestSuite) TearDownSuite() {
+	ctx := testCtx()
 
-	for _, user := range users {
-		log.Debug().Str("user", user.Email).Send()
-	}
+	err := s.rc.DeleteUser(ctx, s.email)
+	s.Require().NoError(err)
 }
 
-func TestRockClient_GetCurrentUser(t *testing.T) {
-	skipUnlessIntegrationTest(t)
+func (s *UserTestSuite) TestCreateUser() {
+	ctx := testCtx()
 
+	_, err := s.rc.CreateUser(ctx, s.email, []string{"read-only"})
+	s.Require().NoError(err)
+}
+
+func (s *UserTestSuite) TestGetCurrentUser() {
 	ctx := testCtx()
 
-	rc, err := rockset.NewClient()
-	require.NoError(t, err)
+	user, err := s.rc.GetCurrentUser(ctx)
+	s.Require().NoError(err)
+	s.Assert().Equal(CIUser, user.Email)
+}
 
-	user, err := rc.GetCurrentUser(ctx)
-	require.NoError(t, err)
+func (s *UserTestSuite) TestGetUser() {
+	ctx := testCtx()
 
-	assert.Equal(t, "pme+circleci@rockset.com", user.Email)
+	user, err := s.rc.GetUser(ctx, s.email)
+	s.Require().NoError(err)
+	s.Assert().Equal(s.email, user.Email)
+}
+
+func (s *UserTestSuite) TestListUsers() {
+	ctx := testCtx()
+
+	users, err := s.rc.ListUsers(ctx)
+	s.Require().NoError(err)
+
+	var found bool
+	for _, user := range users {
+		if user.Email == CIUser {
+			found = true
+		}
+	}
+	s.Assert().True(found)
 }