Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: cleanup resources at startup #1741

Merged
merged 9 commits into from
Jan 17, 2024
Merged

chore: cleanup resources at startup #1741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2098ba1
chore: cleanup resources at startup time
kiraksi Dec 4, 2023
df34fdf
reformmated with black for linter
kiraksi Dec 4, 2023
e13d3bd
changd how to call prefixer to clean up datasets, not tables
kiraksi Dec 13, 2023
1a9dbe6
Removed formatting for uuid
kiraksi Jan 10, 2024
a89844f
Removed unneeded import of uuid
kiraksi Jan 10, 2024
b8ff0cd
Merge branch 'main' into cleanup-resources-at-startup
kiraksi Jan 10, 2024
60f4875
Merge branch 'main' into cleanup-resources-at-startup
kiraksi Jan 11, 2024
133247a
Merge branch 'main' into cleanup-resources-at-startup
kiraksi Jan 17, 2024
e103ce4
remove comment from dataset_access_test.py
kiraksi Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions samples/snippets/authorized_view_tutorial_test.py
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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