daniepusb
diff --git a/‎datastore/schedule-export/main.py
Copy file name to clipboardExpand all lines: datastore/schedule-export/main.py
+20-18Lines changed: 20 additions & 18 deletions b/‎datastore/schedule-export/main.py
Copy file name to clipboardExpand all lines: datastore/schedule-export/main.py
+20-18Lines changed: 20 additions & 18 deletions
@@ -1,10 +1,10 @@
-# Copyright 2021 Google LLC
+# Copyright 2021 Google LLC All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -32,12 +32,12 @@ def set(self, url, content):
 
 # The default cache (file_cache) is unavailable when using oauth2client >= 4.0.0 or google-auth,
 # and it will log worrisome messages unless given another interface to use.
-datastore = build('datastore', 'v1', cache=MemoryCache())
-project_id = os.environ.get('GCP_PROJECT')
+datastore = build("datastore", "v1", cache=MemoryCache())
+project_id = os.environ.get("GCP_PROJECT")
 
 
 def datastore_export(event, context):
-    '''Triggers a Datastore export from a Cloud Scheduler job.
+    """Triggers a Datastore export from a Cloud Scheduler job.
 
     Args:
         event (dict): event[data] must contain a json object encoded in
@@ -46,26 +46,28 @@ def datastore_export(event, context):
             and 'namespaceIds' values.
         context (google.cloud.functions.Context): The Cloud Functions event
             metadata.
-    '''
+    """
 
-    json_data = json.loads(base64.b64decode(event['data']).decode('utf-8'))
-    bucket = json_data['bucket']
+    if "data" in event:
+        # Triggered via Cloud Scheduler, decode the inner data field of the json payload.
+        json_data = json.loads(base64.b64decode(event["data"]).decode("utf-8"))
+    else:
+        # Otherwise, for instance if triggered via the Cloud Console on a Cloud Function, the event is the data.
+        json_data = event
+
+    bucket = json_data["bucket"]
     entity_filter = {}
 
-    if 'kinds' in json_data:
-        entity_filter['kinds'] = json_data['kinds']
+    if "kinds" in json_data:
+        entity_filter["kinds"] = json_data["kinds"]
 
-    if 'namespaceIds' in json_data:
-        entity_filter['namespaceIds'] = json_data['namespaceIds']
+    if "namespaceIds" in json_data:
+        entity_filter["namespaceIds"] = json_data["namespaceIds"]
 
-    request_body = {
-        'outputUrlPrefix': bucket,
-        'entityFilter': entity_filter
-    }
+    request_body = {"outputUrlPrefix": bucket, "entityFilter": entity_filter}
 
     export_request = datastore.projects().export(
-        projectId=project_id,
-        body=request_body
+        projectId=project_id, body=request_body
     )
     response = export_request.execute()
     print(response)