version 0.20.1 (#131)

rockset · Aug 18, 2023 · 2cae2be · 2cae2be
1 parent 207136f
commit 2cae2be
Show file tree

Hide file tree

Showing 48 changed files with 131 additions and 54 deletions.
diff --git a/openapi/README.md b/openapi/README.md
diff --git a/openapi/configuration.go b/openapi/configuration.go
diff --git a/vcr/CollectionTestSuite/TestCreateSampleCitiesCollection.cassette.gz b/vcr/CollectionTestSuite/TestCreateSampleCitiesCollection.cassette.gz
diff --git a/vcr/CollectionTestSuite/TestCreateSampleMoviesCollection.cassette.gz b/vcr/CollectionTestSuite/TestCreateSampleMoviesCollection.cassette.gz
diff --git a/vcr/CollectionTestSuite/TestGetCollection.cassette.gz b/vcr/CollectionTestSuite/TestGetCollection.cassette.gz
diff --git a/vcr/CollectionTestSuite/TestListAllCollections.cassette.gz b/vcr/CollectionTestSuite/TestListAllCollections.cassette.gz
diff --git a/vcr/CollectionTestSuite/TestListCollectionsInWorkspace.cassette.gz b/vcr/CollectionTestSuite/TestListCollectionsInWorkspace.cassette.gz
diff --git a/vcr/CollectionTestSuite/TestUpdateCollection.cassette.gz b/vcr/CollectionTestSuite/TestUpdateCollection.cassette.gz
diff --git a/vcr/IntegrationTestSuite/TestCreateGCSIntegration.cassette.gz b/vcr/IntegrationTestSuite/TestCreateGCSIntegration.cassette.gz
diff --git a/vcr/IntegrationTestSuite/TestCreateS3Integration.cassette.gz b/vcr/IntegrationTestSuite/TestCreateS3Integration.cassette.gz
diff --git a/vcr/IntegrationTestSuite/TestGetIntegration.cassette.gz b/vcr/IntegrationTestSuite/TestGetIntegration.cassette.gz
diff --git a/vcr/IntegrationTestSuite/TestListIntegrations.cassette.gz b/vcr/IntegrationTestSuite/TestListIntegrations.cassette.gz
diff --git a/vcr/QueryIntegrationSuite/TestAsyncQuery.cassette.gz b/vcr/QueryIntegrationSuite/TestAsyncQuery.cassette.gz
diff --git a/vcr/QueryIntegrationSuite/TestAsyncQueryWithClientTimeout.cassette.gz b/vcr/QueryIntegrationSuite/TestAsyncQueryWithClientTimeout.cassette.gz
diff --git a/vcr/QueryIntegrationSuite/TestCancelQuery.cassette.gz b/vcr/QueryIntegrationSuite/TestCancelQuery.cassette.gz
diff --git a/vcr/QueryIntegrationSuite/TestListQueries.cassette.gz b/vcr/QueryIntegrationSuite/TestListQueries.cassette.gz
diff --git a/vcr/QueryIntegrationSuite/TestQuery.cassette.gz b/vcr/QueryIntegrationSuite/TestQuery.cassette.gz
diff --git a/vcr/QueryIntegrationSuite/TestQueryWithTimeout.cassette.gz b/vcr/QueryIntegrationSuite/TestQueryWithTimeout.cassette.gz
diff --git a/vcr/QueryIntegrationSuite/TestValidateQuery.cassette.gz b/vcr/QueryIntegrationSuite/TestValidateQuery.cassette.gz
diff --git a/vcr/TestAliasIntegrationSuite.cassette.gz b/vcr/TestAliasIntegrationSuite.cassette.gz
diff --git a/vcr/TestAzureIntegrations.cassette.gz b/vcr/TestAzureIntegrations.cassette.gz
diff --git a/vcr/TestCollectionIntegrationSuite.cassette.gz b/vcr/TestCollectionIntegrationSuite.cassette.gz
diff --git a/vcr/TestDocumentSuite.cassette.gz b/vcr/TestDocumentSuite.cassette.gz
diff --git a/vcr/TestError_IsNotFoundError.cassette.gz b/vcr/TestError_IsNotFoundError.cassette.gz
diff --git a/vcr/TestListViews.cassette.gz b/vcr/TestListViews.cassette.gz
diff --git a/vcr/TestRockClient_CreateQueryLambda.cassette.gz b/vcr/TestRockClient_CreateQueryLambda.cassette.gz
diff --git a/vcr/TestRockClient_GetOrganization.cassette.gz b/vcr/TestRockClient_GetOrganization.cassette.gz
diff --git a/vcr/TestRockClient_GetQueryLambdaVersion.cassette.gz b/vcr/TestRockClient_GetQueryLambdaVersion.cassette.gz
diff --git a/vcr/TestRockClient_GetQueryLambdaVersionByTag.cassette.gz b/vcr/TestRockClient_GetQueryLambdaVersionByTag.cassette.gz
diff --git a/vcr/TestRockClient_ListQueryLambdaTags.cassette.gz b/vcr/TestRockClient_ListQueryLambdaTags.cassette.gz
diff --git a/vcr/TestRockClient_ListQueryLambdaVersions.cassette.gz b/vcr/TestRockClient_ListQueryLambdaVersions.cassette.gz
diff --git a/vcr/TestRockClient_ListQueryLambdas.cassette.gz b/vcr/TestRockClient_ListQueryLambdas.cassette.gz
diff --git a/vcr/TestRockClient_ListQueryLambdas_workspace.cassette.gz b/vcr/TestRockClient_ListQueryLambdas_workspace.cassette.gz
diff --git a/vcr/TestRockClient_Ping.cassette.gz b/vcr/TestRockClient_Ping.cassette.gz
diff --git a/vcr/TestRockClient_withAPIServerEnv.cassette.gz b/vcr/TestRockClient_withAPIServerEnv.cassette.gz
diff --git a/vcr/TestRoleIntegration.cassette.gz b/vcr/TestRoleIntegration.cassette.gz
diff --git a/vcr/TestSuiteAPIKey.cassette.gz b/vcr/TestSuiteAPIKey.cassette.gz
diff --git a/vcr/TestSuiteWorkspace.cassette.gz b/vcr/TestSuiteWorkspace.cassette.gz
diff --git a/vcr/TestTemplate.cassette.gz b/vcr/TestTemplate.cassette.gz
diff --git a/vcr/TestUserIntegration.cassette.gz b/vcr/TestUserIntegration.cassette.gz
diff --git a/vcr/TestViewCRUD.cassette.gz b/vcr/TestViewCRUD.cassette.gz
diff --git a/vcr/TestVirtualInstance.cassette.gz b/vcr/TestVirtualInstance.cassette.gz
diff --git a/vcr/TestVirtualInstanceIntegration.cassette.gz b/vcr/TestVirtualInstanceIntegration.cassette.gz
diff --git a/vcr/example_s3.cassette.gz b/vcr/example_s3.cassette.gz
diff --git a/vcr/example_vcr.cassette b/vcr/example_vcr.cassette
diff --git a/version.go b/version.go
@@ -1,4 +1,4 @@
 package rockset
 
 // Version is the Rockset client version
-const Version = "0.20.0"
+const Version = "0.20.1"
diff --git a/wait.go b/wait.go
@@ -63,64 +63,36 @@ func (rc *RockClient) WaitUntilAliasGone(ctx context.Context, workspace, alias s
 // WaitUntilQueryCompleted waits until queryID has either completed, errored, or been cancelled.
 func (rc *RockClient) WaitUntilQueryCompleted(ctx context.Context, queryID string) error {
 	// TODO should this only wait for COMPLETED and return an error for ERROR and CANCELLED?
-	return rc.RetryWithCheck(ctx, resourceHasState(ctx, []QueryState{QueryCompleted, QueryError, QueryCancelled}, func(ctx context.Context) (QueryState, error) {
-		q, err := rc.GetQueryInfo(ctx, queryID)
-		return QueryState(q.GetStatus()), err
-	}))
+	return rc.RetryWithCheck(ctx, resourceHasState(ctx, []QueryState{QueryCompleted, QueryError, QueryCancelled},
+		func(ctx context.Context) (QueryState, error) {
+			q, err := rc.GetQueryInfo(ctx, queryID)
+			return QueryState(q.GetStatus()), err
+		}))
 }
 
 // WaitUntilCollectionReady waits until the collection is ready.
 func (rc *RockClient) WaitUntilCollectionReady(ctx context.Context, workspace, name string) error {
-	return rc.RetryWithCheck(ctx, resourceHasState(ctx, []string{collectionStatusREADY}, func(ctx context.Context) (string, error) {
-		c, err := rc.GetCollection(ctx, workspace, name)
-		return c.GetStatus(), err
-	}))
-}
-
-// WaitUntilCollectionIsQueryable waits until it is possible to query the collection. It first
-// waits until the collection is READY before waiting for it to be queryable.
-func (rc *RockClient) WaitUntilCollectionIsQueryable(ctx context.Context, workspace, collection string) error {
-	// first make sure the workspace and collection are valid, to avoid SQL injection
-	if err := ValidEntityName(workspace); err != nil {
-		return err
-	}
-	if err := ValidEntityName(collection); err != nil {
-		return err
-	}
-
-	// wait for it to be READY, so we know that any 404 we get from thm API server is due to eventual consistency
-	if err := rc.WaitUntilCollectionReady(ctx, workspace, collection); err != nil {
-		return err
-	}
-	// now wait for a query to succeed
-	return rc.RetryWithCheck(ctx, func() (retry bool, err error) {
-		// we don't care about the result, just that we can query
-		_, err = rc.Query(ctx, fmt.Sprintf("SELECT * FROM %s.%s LIMIT 1", workspace, collection))
-
-		var re Error
-		if errors.As(err, &re) {
-			if re.IsNotFoundError() {
-				// the resource is not present, but we want to retry anyway as it *should* be present
-				return true, nil
-			}
-		}
-
-		return false, err
-	})
+	return rc.RetryWithCheck(ctx, resourceHasState(ctx, []string{collectionStatusREADY},
+		func(ctx context.Context) (string, error) {
+			c, err := rc.GetCollection(ctx, workspace, name)
+			return c.GetStatus(), err
+		}))
 }
 
 func (rc *RockClient) WaitUntilVirtualInstanceActive(ctx context.Context, id string) error {
-	return rc.RetryWithCheck(ctx, resourceHasState(ctx, []string{VirtualInstanceActive}, func(ctx context.Context) (string, error) {
-		vi, err := rc.GetVirtualInstance(ctx, id)
-		return vi.GetState(), err
-	}))
+	return rc.RetryWithCheck(ctx, resourceHasState(ctx, []string{VirtualInstanceActive},
+		func(ctx context.Context) (string, error) {
+			vi, err := rc.GetVirtualInstance(ctx, id)
+			return vi.GetState(), err
+		}))
 }
 
 func (rc *RockClient) WaitUntilVirtualInstanceSuspended(ctx context.Context, id string) error {
-	return rc.RetryWithCheck(ctx, resourceHasState(ctx, []string{VirtualInstanceSuspended}, func(ctx context.Context) (string, error) {
-		vi, err := rc.GetVirtualInstance(ctx, id)
-		return vi.GetState(), err
-	}))
+	return rc.RetryWithCheck(ctx, resourceHasState(ctx, []string{VirtualInstanceSuspended},
+		func(ctx context.Context) (string, error) {
+			vi, err := rc.GetVirtualInstance(ctx, id)
+			return vi.GetState(), err
+		}))
 }
 
 // WaitUntilCollectionGone waits until a collection marked for deletion is gone, i.e. GetCollection()
@@ -159,7 +131,8 @@ func (rc *RockClient) WaitUntilWorkspaceGone(ctx context.Context, workspace stri
 
 // WaitUntilCollectionHasNewDocuments waits until the collection has at least count new documents
 // (measured from when the method is called).
-func (rc *RockClient) WaitUntilCollectionHasNewDocuments(ctx context.Context, workspace, name string, count int64) error {
+func (rc *RockClient) WaitUntilCollectionHasNewDocuments(ctx context.Context, workspace, name string,
+	count int64) error {
 	waiter := docWaiter{rc: rc}
 	return rc.RetryWithCheck(ctx, waiter.collectionHasNewDocs(ctx, workspace, name, count))
 }

diff --git a/wait_test.go b/wait_test.go
@@ -29,7 +29,11 @@ func (s *WaitTestSuite) TestResourceIsAvailable() {
 
 		switch counter {
 		case 0:
-			return Error{ErrorModel: &openapi.ErrorModel{}, StatusCode: http.StatusNotFound, Cause: fmt.Errorf("resource not present")}
+			return Error{
+				ErrorModel: &openapi.ErrorModel{},
+				StatusCode: http.StatusNotFound,
+				Cause:      fmt.Errorf("resource not present"),
+			}
 		case 1:
 			return nil
 		default:
@@ -61,7 +65,11 @@ func (s *WaitTestSuite) TestResourceIsGone() {
 		case 0:
 			return nil
 		case 1:
-			return Error{ErrorModel: &openapi.ErrorModel{}, StatusCode: http.StatusNotFound, Cause: fmt.Errorf("resource not present")}
+			return Error{
+				ErrorModel: &openapi.ErrorModel{},
+				StatusCode: http.StatusNotFound,
+				Cause:      fmt.Errorf("resource not present"),
+			}
 		default:
 			return fmt.Errorf("fail")
 		}