Skip to content

Commit

Permalink
e2e/bigquery: specify 1 hour expiration times (#1351)
Browse files Browse the repository at this point in the history
Set expiry durations of 1 hour for tables/partitions in bq e2e tests
  • Loading branch information
serprex authored Feb 21, 2024
1 parent e59f4fc commit 6b35d8a
Showing 1 changed file with 15 additions and 14 deletions.
29 changes: 15 additions & 14 deletions flow/e2e/bigquery/bigquery_helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,7 @@ func generateBQPeer(bigQueryConfig *protos.BigqueryConfig) *protos.Peer {
}

// datasetExists checks if the dataset exists.
func (b *BigQueryTestHelper) datasetExists(datasetName string) (bool, error) {
dataset := b.client.Dataset(datasetName)
func (b *BigQueryTestHelper) datasetExists(dataset *bigquery.Dataset) (bool, error) {
meta, err := dataset.Metadata(context.Background())
if err != nil {
// if err message contains `notFound` then dataset does not exist.
Expand All @@ -113,20 +112,24 @@ func (b *BigQueryTestHelper) datasetExists(datasetName string) (bool, error) {

// RecreateDataset recreates the dataset, i.e, deletes it if exists and creates it again.
func (b *BigQueryTestHelper) RecreateDataset() error {
exists, err := b.datasetExists(b.Config.DatasetId)
dataset := b.client.Dataset(b.Config.DatasetId)

exists, err := b.datasetExists(dataset)
if err != nil {
return fmt.Errorf("failed to check if dataset %s exists: %w", b.Config.DatasetId, err)
}

dataset := b.client.Dataset(b.Config.DatasetId)
if exists {
err := dataset.DeleteWithContents(context.Background())
if err != nil {
return fmt.Errorf("failed to delete dataset: %w", err)
}
}

err = dataset.Create(context.Background(), nil)
err = dataset.Create(context.Background(), &bigquery.DatasetMetadata{
DefaultTableExpiration: time.Hour,
DefaultPartitionExpiration: time.Hour,
})
if err != nil {
return fmt.Errorf("failed to create dataset: %w", err)
}
Expand All @@ -136,19 +139,17 @@ func (b *BigQueryTestHelper) RecreateDataset() error {

// DropDataset drops the dataset.
func (b *BigQueryTestHelper) DropDataset(datasetName string) error {
exists, err := b.datasetExists(datasetName)
dataset := b.client.Dataset(datasetName)
exists, err := b.datasetExists(dataset)
if err != nil {
return fmt.Errorf("failed to check if dataset %s exists: %w", b.Config.DatasetId, err)
}

if !exists {
return nil
}

dataset := b.client.Dataset(datasetName)
err = dataset.DeleteWithContents(context.Background())
if err != nil {
return fmt.Errorf("failed to delete dataset: %w", err)
if exists {
err = dataset.DeleteWithContents(context.Background())
if err != nil {
return fmt.Errorf("failed to delete dataset: %w", err)
}
}

return nil
Expand Down

0 comments on commit 6b35d8a

Please sign in to comment.