Skip to content

feat: Target new Datastore Client after microgenerator migration #4858

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

Merged
crwilcox merged 17 commits into from
Nov 12, 2020
Merged

feat: Target new Datastore Client after microgenerator migration #4858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
429eff7
test: target new-generator
crwilcox Oct 15, 2020
b8949b9
fix(datastore-admin): generated client creation has moved
crwilcox Oct 15, 2020
6502dcb
fix(datastore-admin): replace other datastore admin paths
crwilcox Oct 15, 2020
92d86b0
fix: update admin tests to use new style params
crwilcox Oct 15, 2020
503ad9c
fix: changes to admin surface
crwilcox Oct 16, 2020
85a85fc
chore: blacken/lint
crwilcox Oct 16, 2020
304079d
Merge branch 'master' into test-new-datastore
crwilcox Oct 30, 2020
48bdef9
Merge branch 'master' into test-new-datastore
crwilcox Oct 30, 2020
8d25b47
chore: update pin for datastore
crwilcox Oct 30, 2020
816b400
chore: update pin for firestore libs
crwilcox Oct 30, 2020
8e1d007
chore(deps): update datastore pin
crwilcox Nov 10, 2020
c98b07a
chore(deps): update firestore pin
crwilcox Nov 10, 2020
6ea77f3
chore(deps): update firestore pin for firebase
crwilcox Nov 10, 2020
1f93134
chore: use f strings
crwilcox Nov 10, 2020
f1beddb
Merge branch 'master' into test-new-datastore
crwilcox Nov 10, 2020
57f89ee
fix: remove unneeded specifying of name param
crwilcox Nov 10, 2020
a2f3dac
Merge branch 'master' into test-new-datastore
crwilcox Nov 12, 2020
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
34 changes: 24 additions & 10 deletions datastore/cloud-client/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]


Expand All @@ -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]


Expand All @@ -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]


Expand All @@ -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]
10 changes: 5 additions & 5 deletions datastore/cloud-client/quickstart.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
2 changes: 1 addition & 1 deletion datastore/cloud-client/quickstart_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
def test_quickstart(capsys):
quickstart.run_quickstart()
out, _ = capsys.readouterr()
assert 'Saved' in out
assert "Saved" in out
2 changes: 1 addition & 1 deletion datastore/cloud-client/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
google-cloud-datastore==1.15.3
google-cloud-datastore==2.0.0
Loading