Merge pull request #92 from GoogleCloudPlatform/mainify-storage

Reorganizing storage samples.
GoogleCloudPlatform · Sep 16, 2015 · 75969d8 · 75969d8
2 parents 2fe9e39 + a6aa223
commit 75969d8
Show file tree

Hide file tree

Showing 17 changed files with 33 additions and 189 deletions.
diff --git a/README.md b/README.md
@@ -8,16 +8,6 @@ This repository holds the samples used in the python documentation on [cloud.goo
 For more detailed introduction to a product, check the README in the
 corresponding folder.
 
-## Running the samples
-
-Most samples must be run as modules instead of directly, for example:
-
-```
-$ python -m bigquery.samples.async_query [your-project-id] [your-query]
-```
-
-Refer to the README in the corresponding folder for any special instructions.
-
 ## Contributing changes
 
 * See [CONTRIBUTING.md](CONTRIBUTING.md)

diff --git a/bigquery/README.md b/bigquery/README.md
@@ -2,14 +2,6 @@
 
 This section contains samples for [Google BigQuery](https://cloud.google.com/bigquery).
 
-## Running the samples
-
-These samples must be run as modules, for example:
-
-```
-$ python -m bigquery.samples.async_query [your-project-id] [your-query]
-```
-
 ## Other Samples
 
 * [Using BigQuery from Google App Engine](../appengine/bigquery).
diff --git a/storage/api/__init__.py b/storage/api/__init__.py
diff --git a/storage/compose_objects.py → storage/api/compose_objects.py b/storage/compose_objects.py → storage/api/compose_objects.py
diff --git a/storage/list_objects.py → storage/api/list_objects.py b/storage/list_objects.py → storage/api/list_objects.py
diff --git a/storage/tests/test_compose_objects.py → storage/api/test_compose_objects.py b/storage/tests/test_compose_objects.py → storage/api/test_compose_objects.py
@@ -13,7 +13,7 @@
 #
 import os
 
-from storage.compose_objects import main
+from .compose_objects import main
 from tests import CloudBaseTest
 
 

diff --git a/storage/tests/test_list_objects.py → storage/api/test_list_objects.py b/storage/tests/test_list_objects.py → storage/api/test_list_objects.py
@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from storage.list_objects import main
+from .list_objects import main
 from tests import CloudBaseTest
 
 

diff --git a/storage/storage_transfer/test_aws_request.py b/storage/storage_transfer/test_aws_request.py
diff --git a/storage/storage_transfer/test_create_client.py b/storage/storage_transfer/test_create_client.py
diff --git a/storage/storage_transfer/test_nearline_request.py b/storage/storage_transfer/test_nearline_request.py
diff --git a/storage/storage_transfer/test_transfer_check.py b/storage/storage_transfer/test_transfer_check.py
diff --git a/storage/storage_transfer/README.md → storage/transfer_service/README.md b/storage/storage_transfer/README.md → storage/transfer_service/README.md
diff --git a/storage/transfer_service/__init__.py b/storage/transfer_service/__init__.py
diff --git a/storage/storage_transfer/aws_request.py → storage/transfer_service/aws_request.py b/storage/storage_transfer/aws_request.py → storage/transfer_service/aws_request.py
@@ -15,13 +15,18 @@
 import json
 import logging
 
-import create_client
+from apiclient import discovery
+from oauth2client.client import GoogleCredentials
+
+
+logging.basicConfig(level=logging.DEBUG)
 
 
 def main():
     """Create a one-off transfer from Amazon S3 to GCS."""
-    logging.getLogger().setLevel(logging.DEBUG)
-    transfer_service_client = create_client.create_transfer_client()
+    credentials = GoogleCredentials.get_application_default()
+    storagetransfer = discovery.build(
+        'storagetransfer', 'v1', credentials=credentials)
 
     # Edit this template with desired parameters.
     # Specify times below using US Pacific Time Zone.
@@ -61,7 +66,7 @@ def main():
     }
     '''
 
-    result = transfer_service_client.transferJobs().create(body=json.loads(
+    result = storagetransfer.transferJobs().create(body=json.loads(
         transfer_job)).execute()
     logging.info('Returned transferJob: %s', json.dumps(result, indent=4))
 

diff --git a/storage/storage_transfer/create_client.py → storage/transfer_service/create_client.py b/storage/storage_transfer/create_client.py → storage/transfer_service/create_client.py
diff --git a/storage/storage_transfer/nearline_request.py → storage/transfer_service/nearline_request.py b/storage/storage_transfer/nearline_request.py → storage/transfer_service/nearline_request.py
@@ -15,13 +15,18 @@
 import json
 import logging
 
-import create_client
+from apiclient import discovery
+from oauth2client.client import GoogleCredentials
+
+
+logging.basicConfig(level=logging.DEBUG)
 
 
 def main():
     """Transfer from standard Cloud Storage to Cloud Storage Nearline."""
-    logging.getLogger().setLevel(logging.DEBUG)
-    transfer_service_client = create_client.create_transfer_client()
+    credentials = GoogleCredentials.get_application_default()
+    storagetransfer = discovery.build(
+        'storagetransfer', 'v1', credentials=credentials)
 
     # Edit this template with desired parameters.
     # Specify times below using US Pacific Time Zone.
@@ -57,7 +62,7 @@ def main():
         }
     }
     '''
-    result = transfer_service_client.transferJobs().create(body=json.loads(
+    result = storagetransfer.transferJobs().create(body=json.loads(
         transfer_job)).execute()
     logging.info('Returned transferJob: %s', json.dumps(result, indent=4))
 

diff --git a/storage/storage_transfer/transfer_check.py → storage/transfer_service/transfer_check.py b/storage/storage_transfer/transfer_check.py → storage/transfer_service/transfer_check.py
@@ -15,29 +15,34 @@
 import json
 import logging
 
-import create_client
+from apiclient import discovery
+from oauth2client.client import GoogleCredentials
+
+
+logging.basicConfig(level=logging.DEBUG)
 
 # Edit these values with desired parameters.
 PROJECT_ID = 'YOUR_PROJECT_ID'
 JOB_NAME = 'YOUR_JOB_NAME'
 
 
-def check_operation(transfer_service_client, project_id, job_name):
+def check_operation(storagetransfer, project_id, job_name):
     """Review the transfer operations associated with a transfer job."""
     filterString = (
         '{{"project_id": "{project_id}", '
-        '"job_names": ["{job_name}"]}}').format(
-        project_id=project_id, job_name=job_name)
-    return transfer_service_client.transferOperations().list(
+        '"job_names": ["{job_name}"]}}'
+    ).format(project_id=project_id, job_name=job_name)
+    return storagetransfer.transferOperations().list(
         name="transferOperations",
         filter=filterString).execute()
 
 
 def main():
-    logging.getLogger().setLevel(logging.DEBUG)
-    transfer_service_client = create_client.create_transfer_client()
+    credentials = GoogleCredentials.get_application_default()
+    storagetransfer = discovery.build(
+        'storagetransfer', 'v1', credentials=credentials)
 
-    result = check_operation(transfer_service_client, PROJECT_ID, JOB_NAME)
+    result = check_operation(storagetransfer, PROJECT_ID, JOB_NAME)
     logging.info('Result of transferOperations/list: %s',
                  json.dumps(result, indent=4, sort_keys=True))