update and move the tests resources setup files

googleapis · Feb 2, 2022 · 9c55e74 · 9c55e74
1 parent 0c74c0b
commit 9c55e74
Show file tree

Hide file tree

Showing 43 changed files with 530 additions and 2,225 deletions.
diff --git a/.../snippets/TEST_RESOURCES_SETUP_CLEANUP.md → ...tutorials/TEST_RESOURCES_SETUP_CLEANUP.md b/.../snippets/TEST_RESOURCES_SETUP_CLEANUP.md → ...tutorials/TEST_RESOURCES_SETUP_CLEANUP.md
@@ -3,22 +3,31 @@
 ## Required environment variables
 
 To successfully import the catalog data for tests, the following environment variables should be set:
- - PROJECT_NUMBER
+ - GOOGLE_CLOUD_PROJECT_NUMBER
+ - GOOGLE_CLOUD_PROJECT_ID 
  - BUCKET_NAME
+ - EVENTS_BUCKET_NAME
 These values are stored in the Secret Manager and will be submitted as 
    docker environment variables before the test run.
 
 The Secret Manager name is set in .kokoro/presubmit/common.cfg file, SECRET_MANAGER_KEYS variable.
 
 ## Import catalog data
 
-There is a JSON file with valid products prepared in the `product` directory:
-`resources/products.json`.
+There are a JSON files with valid products and user events prepared in `resources` directory:
+`samples/resources/products.json` and `samples/resources/user_events.json` respectively.
 
 Run the `create_test_resources.py` to perform the following actions:
    - create the GCS bucket <BUCKET_NAME>, 
-   - upload the product data from `resources/products.json` file,
-   - import products to the default branch of the Retail catalog.
+      - upload the product data from `resources/products.json` file to products bucket,
+   - import products to the default branch of the Retail catalog,
+   - create the GCS bucket <EVENTS_BUCKET_NAME>, 
+      - upload the product data from `resources/user_events.json` file to events bucket,
+   - create a BigQuery dataset and table `products`,
+      - insert products from resources/products.json to the created products table,
+   - create a BigQuery dataset and table `events`,
+      - insert user events from resources/user_events.json to the created events table
+
 
 ```
 $ python create_test_resources.py
@@ -33,6 +42,10 @@ Run the `remove_test_resources.py` to perform the following actions:
    - remove all objects from the GCS bucket <BUCKET_NAME>, 
    - remove the <BUCKET_NAME> bucket,
    - delete all products from the Retail catalog.
+   - remove all objects from the GCS bucket <EVENTS_BUCKET_NAME>, 
+   - remove the <EVENTS_BUCKET_NAME> bucket,
+   - remove dataset `products` along with tables
+   - remove dataset `user_events` along with tables 
 
 ```
 $ python remove_test_resources.py

diff --git a/samples/interactive-tutorials/product/import_products_big_query_table.py b/samples/interactive-tutorials/product/import_products_big_query_table.py
diff --git a/samples/interactive-tutorials/product/import_products_bq_test.py b/samples/interactive-tutorials/product/import_products_bq_test.py
diff --git a/samples/interactive-tutorials/product/import_products_gcs.py b/samples/interactive-tutorials/product/import_products_gcs.py
diff --git a/samples/interactive-tutorials/product/import_products_gcs_test.py b/samples/interactive-tutorials/product/import_products_gcs_test.py