Skip to content

Commit

Permalink
chore: cleanup resources at startup (#1741)
Browse files Browse the repository at this point in the history
* chore: cleanup resources at startup time

* reformmated with black for linter

* changd how to call prefixer to clean up datasets, not tables

* Removed formatting for uuid

* Removed unneeded import of uuid

* remove comment from dataset_access_test.py
  • Loading branch information
kiraksi committed Jan 17, 2024
1 parent d90602d commit ffe8059
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 19 deletions.
10 changes: 3 additions & 7 deletions samples/snippets/authorized_view_tutorial_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
# limitations under the License.

from typing import Iterator, List
import uuid

from google.cloud import bigquery
import pytest

import authorized_view_tutorial # type: ignore
from conftest import prefixer # type: ignore


@pytest.fixture(scope="module")
Expand All @@ -38,12 +38,8 @@ def test_authorized_view_tutorial(
client: bigquery.Client, datasets_to_delete: List[str]
) -> None:
override_values = {
"source_dataset_id": "github_source_data_{}".format(
str(uuid.uuid4()).replace("-", "_")
),
"shared_dataset_id": "shared_views_{}".format(
str(uuid.uuid4()).replace("-", "_")
),
"source_dataset_id": f"{prefixer.create_prefix()}_authorized_view_tutorial",
"shared_dataset_id": f"{prefixer.create_prefix()}_authorized_view_tutorial_shared_views",
}
source_dataset_ref = "{}.{}".format(
client.project, override_values["source_dataset_id"]
Expand Down
3 changes: 2 additions & 1 deletion samples/snippets/materialized_view_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import pytest

import materialized_view # type: ignore
from conftest import prefixer # type: ignore


def temp_suffix() -> str:
Expand All @@ -37,7 +38,7 @@ def bigquery_client_patch(

@pytest.fixture(scope="module")
def dataset_id(bigquery_client: bigquery.Client) -> Iterator[str]:
dataset_id = f"mvdataset_{temp_suffix()}"
dataset_id = f"{prefixer.create_prefix()}_materialized_view"
bigquery_client.create_dataset(dataset_id)
yield dataset_id
bigquery_client.delete_dataset(dataset_id, delete_contents=True)
Expand Down
8 changes: 2 additions & 6 deletions samples/snippets/natality_tutorial_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
# limitations under the License.

from typing import Iterator, List
import uuid

from google.cloud import bigquery
import pytest

import natality_tutorial # type: ignore
from conftest import prefixer # type: ignore


@pytest.fixture(scope="module")
Expand All @@ -37,11 +37,7 @@ def datasets_to_delete(client: bigquery.Client) -> Iterator[List[str]]:
def test_natality_tutorial(
client: bigquery.Client, datasets_to_delete: List[str]
) -> None:
override_values = {
"dataset_id": "natality_regression_{}".format(
str(uuid.uuid4()).replace("-", "_")
),
}
override_values = {"dataset_id": f"{prefixer.create_prefix()}_natality_tutorial"}
datasets_to_delete.append(override_values["dataset_id"])

natality_tutorial.run_natality_tutorial(override_values)
Expand Down
6 changes: 2 additions & 4 deletions samples/snippets/quickstart_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
# limitations under the License.

from typing import Iterator, List
import uuid

from google.cloud import bigquery
import pytest

import quickstart # type: ignore
from conftest import prefixer # type: ignore

# Must match the dataset listed in quickstart.py (there's no easy way to
# extract this).
Expand All @@ -43,9 +43,7 @@ def test_quickstart(
client: bigquery.Client,
datasets_to_delete: List[str],
) -> None:
override_values = {
"dataset_id": "my_new_dataset_{}".format(str(uuid.uuid4()).replace("-", "_")),
}
override_values = {"dataset_id": f"{prefixer.create_prefix()}_quickstart"}
datasets_to_delete.append(override_values["dataset_id"])

quickstart.run_quickstart(override_values)
Expand Down
3 changes: 2 additions & 1 deletion samples/snippets/view_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import pytest

import view # type: ignore
from conftest import prefixer # type: ignore


def temp_suffix() -> str:
Expand Down Expand Up @@ -53,7 +54,7 @@ def view_id(bigquery_client: bigquery.Client, view_dataset_id: str) -> Iterator[
def source_dataset_id(
bigquery_client: bigquery.Client, project_id: str
) -> Iterator[str]:
dataset_id = f"{project_id}.view_{temp_suffix()}"
dataset_id = f"{prefixer.create_prefix()}_view"
bigquery_client.create_dataset(dataset_id)
yield dataset_id
bigquery_client.delete_dataset(dataset_id, delete_contents=True)
Expand Down

0 comments on commit ffe8059

Please sign in to comment.