14
14
15
15
16
16
@pytest .mark .xfail (raises = client .exceptions .ConflictException )
17
- def test_quicksight (path , quicksight_datasource , quicksight_dataset , glue_database , glue_table ):
17
+ def test_quicksight (
18
+ path : str , quicksight_datasource : str , quicksight_dataset : str , glue_database : str , glue_table : str
19
+ ) -> None :
18
20
df = get_df_quicksight ()
19
21
wr .s3 .to_parquet (
20
22
df = df , path = path , dataset = True , database = glue_database , table = glue_table , partition_cols = ["par0" , "par1" ]
@@ -76,13 +78,14 @@ def test_quicksight(path, quicksight_datasource, quicksight_dataset, glue_databa
76
78
wr .quicksight .get_dataset_ids (f"{ quicksight_dataset } -sql" )
77
79
wr .quicksight .get_data_source_ids ("test" )
78
80
79
- wr .quicksight .delete_all_datasets (regex_filter = quicksight_dataset )
81
+ wr .quicksight .delete_all_datasets (regex_filter = f" { quicksight_dataset } -.*" )
80
82
wr .quicksight .delete_all_data_sources (regex_filter = quicksight_datasource )
81
83
82
84
83
- def test_quicksight_delete_all_datasources_filter ():
84
- wr .quicksight .delete_all_data_sources (regex_filter = "test.*" )
85
- resource_name = f"test-delete-{ uuid .uuid4 ()} "
85
+ def test_quicksight_delete_all_datasources_filter () -> None :
86
+ resource_name_prefix = f"test-delete-sources-{ uuid .uuid4 ()} "
87
+ resource_name = f"{ resource_name_prefix } -1"
88
+
86
89
wr .quicksight .create_athena_data_source (
87
90
name = resource_name ,
88
91
allowed_to_manage = {"users" : [wr .sts .get_current_identity_name ()]},
@@ -92,17 +95,18 @@ def test_quicksight_delete_all_datasources_filter():
92
95
93
96
assert len (wr .quicksight .get_data_source_ids (resource_name )) == 1
94
97
95
- wr .quicksight .delete_all_data_sources (regex_filter = "test-delete .*" )
98
+ wr .quicksight .delete_all_data_sources (regex_filter = f" { resource_name_prefix } - .*" )
96
99
assert len (wr .quicksight .get_data_source_ids (resource_name )) == 0
97
100
98
101
99
- def test_quicksight_delete_all_datasets (path , glue_database , glue_table ) :
102
+ def test_quicksight_delete_all_datasets (path : str , glue_database : str , glue_table : str ) -> None :
100
103
df = get_df_quicksight ()
101
104
wr .s3 .to_parquet (
102
105
df = df , path = path , dataset = True , database = glue_database , table = glue_table , partition_cols = ["par0" , "par1" ]
103
106
)
104
- wr .quicksight .delete_all_datasets (regex_filter = "test.*" )
105
- wr .quicksight .delete_all_data_sources (regex_filter = "test.*" )
107
+
108
+ resource_name_prefix = f"test-delete-datasets-{ uuid .uuid4 ()} "
109
+ resource_name = f"{ resource_name_prefix } -1"
106
110
107
111
resource_name = f"test{ str (uuid .uuid4 ())[:8 ]} "
108
112
wr .quicksight .create_athena_data_source (
@@ -122,7 +126,7 @@ def test_quicksight_delete_all_datasets(path, glue_database, glue_table):
122
126
tag_columns = {"string" : [{"ColumnGeographicRole" : "CITY" }, {"ColumnDescription" : {"Text" : "some description" }}]},
123
127
tags = {"foo" : "boo" },
124
128
)
125
- wr .quicksight .delete_all_datasets (regex_filter = "test .*" )
126
- wr .quicksight .delete_all_data_sources (regex_filter = "test .*" )
129
+ wr .quicksight .delete_all_datasets (regex_filter = f" { resource_name_prefix } - .*" )
130
+ wr .quicksight .delete_all_data_sources (regex_filter = f" { resource_name_prefix } - .*" )
127
131
128
132
assert len (wr .quicksight .get_dataset_ids (resource_name )) == 0
0 commit comments