feat: Target new Datastore Client after microgenerator migration (GoogleCloudPlatform#4858)

* test: target new-generator

* fix(datastore-admin): generated client creation has moved

* fix(datastore-admin): replace other datastore admin paths

* fix: update admin tests to use new style params

* fix: changes to admin surface

* chore: blacken/lint

* chore: update pin for datastore

* chore: update pin for firestore libs

* chore(deps): update datastore pin

* chore(deps): update firestore pin

* chore(deps): update firestore pin for firebase

* chore: use f strings

* fix: remove unneeded specifying of name param

Author: crwilcox

datastore/cloud-client/admin.py

@@ -12,15 +12,17 @@
 # limitations under the License.
 
 # [START datastore_admin_client_create]
-from google.cloud.datastore_admin_v1.gapic import datastore_admin_client
+from google.cloud.datastore_admin_v1 import DatastoreAdminClient
 
 
 def client_create():
     """Creates a new Datastore admin client."""
-    client = datastore_admin_client.DatastoreAdminClient()
+    client = DatastoreAdminClient()
 
     print("Admin client created\n")
     return client
+
+
 # [END datastore_admin_client_create]
 
 
@@ -32,13 +34,17 @@ def export_entities(project_id, output_url_prefix):
     """
     # project_id = "project-id"
     # output_url_prefix = "gs://bucket-name"
-    client = datastore_admin_client.DatastoreAdminClient()
+    client = DatastoreAdminClient()
 
-    op = client.export_entities(project_id, output_url_prefix)
+    op = client.export_entities(
+        {"project_id": project_id, "output_url_prefix": output_url_prefix}
+    )
     response = op.result(timeout=200)
 
     print("Entities were exported\n")
     return response
+
+
 # [END datastore_admin_entities_export]
 
 
@@ -47,13 +53,17 @@ def import_entities(project_id, input_url):
     """Imports entities into Datastore."""
     # project_id := "project-id"
     # input_url := "gs://bucket-name/overall-export-metadata-file"
-    client = datastore_admin_client.DatastoreAdminClient()
+    client = DatastoreAdminClient()
 
-    op = client.import_entities(project_id, input_url)
+    op = client.import_entities(
+        {"project_id": project_id, "input_url": input_url}
+    )
     response = op.result(timeout=200)
 
     print("Entities were imported\n")
     return response
+
+
 # [END datastore_admin_entities_import]
 
 
@@ -62,25 +72,29 @@ def get_index(project_id, index_id):
     """Gets an index."""
     # project_id := "my-project-id"
     # index_id := "my-index"
-    client = datastore_admin_client.DatastoreAdminClient()
-    index = client.get_index(project_id, index_id)
+    client = DatastoreAdminClient()
+    index = client.get_index({"project_id": project_id, "index_id": index_id})
 
     print("Got index: %v\n", index.index_id)
     return index
+
+
 # [END datastore_admin_index_get]
 
 
 # [START datastore_admin_index_list]
 def list_indexes(project_id):
     """Lists the indexes."""
     # project_id := "my-project-id"
-    client = datastore_admin_client.DatastoreAdminClient()
+    client = DatastoreAdminClient()
 
     indexes = []
-    for index in client.list_indexes(project_id):
+    for index in client.list_indexes({"project_id": project_id}):
         indexes.append(index)
         print("Got index: %v\n", index.index_id)
 
     print("Got list of indexes\n")
     return indexes
+
+
 # [END datastore_admin_index_list]

datastore/cloud-client/quickstart.py

@@ -24,22 +24,22 @@ def run_quickstart():
     datastore_client = datastore.Client()
 
     # The kind for the new entity
-    kind = 'Task'
+    kind = "Task"
     # The name/ID for the new entity
-    name = 'sampletask1'
+    name = "sampletask1"
     # The Cloud Datastore key for the new entity
     task_key = datastore_client.key(kind, name)
 
     # Prepares the new entity
     task = datastore.Entity(key=task_key)
-    task['description'] = 'Buy milk'
+    task["description"] = "Buy milk"
 
     # Saves the entity
     datastore_client.put(task)
 
-    print('Saved {}: {}'.format(task.key.name, task['description']))
+    print(f"Saved {task.key.name}: {task['description']}")
     # [END datastore_quickstart]
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     run_quickstart()

datastore/cloud-client/quickstart_test.py

@@ -18,4 +18,4 @@
 def test_quickstart(capsys):
     quickstart.run_quickstart()
     out, _ = capsys.readouterr()
-    assert 'Saved' in out
+    assert "Saved" in out

datastore/cloud-client/requirements.txt

@@ -1 +1 @@
-google-cloud-datastore==1.15.3
+google-cloud-datastore==2.0.0