Revert "1.0.4: Support Google Cloud Storage upload v1"

conf/mongodb-consistent-backup.example.conf

@@ -52,13 +52,6 @@ production:
   upload:
     method: none
   #  remove_uploaded: [true|false] (default: false)
-  #  gs:
-  #    project_id: [Google Cloud Project ID]
-  #    access_key: [Google Cloud Storage Access Key]
-  #    secret_key: [Google Cloud Storage Secret Key]
-  #    bucket_name: [Google Cloud Storage Bucket Name]
-  #    bucket_prefix: [prefix] (default: /)
-  #    threads: [1+]           (default: 1 per CPU)
   #  s3:
   #    region: [AWS S3 Region] (default: us-east-1)
   #    access_key: [AWS S3 Access Key]

mongodb_consistent_backup/Pipeline/Stage.py

@@ -35,7 +35,7 @@ def init(self):
             module    = sys.modules["%s.%s" % (self.stage, self.task.capitalize())]
             mod_class = getattr(module, self.task.capitalize())
         except LookupError, e:
-            raise OperationError('Could not load task %s: %s' % (self.task, e))
+            raise OperationError('Could not load task: %s' % self.task)
         if mod_class:
             self._task = mod_class(
                 self.manager,

mongodb_consistent_backup/Upload/S3/__init__.py

@@ -6,7 +6,7 @@ def config(parser):
     parser.add_argument("--upload.s3.secret_key", dest="upload.s3.secret_key", help="S3 Uploader AWS Secret Key (required for S3 upload)", type=str)
     parser.add_argument("--upload.s3.bucket_name", dest="upload.s3.bucket_name", help="S3 Uploader destination bucket name", type=str)
     parser.add_argument("--upload.s3.bucket_prefix", dest="upload.s3.bucket_prefix", help="S3 Uploader destination bucket path prefix", type=str)
-    parser.add_argument("--upload.s3.threads", dest="upload.s3.threads", help="S3 Uploader worker threads (default: 4)", default=4, type=int)
+    parser.add_argument("--upload.s3.threads", dest="upload.s3.threads", help="S3 Uploader upload worker threads (default: 4)", default=4, type=int)
     parser.add_argument("--upload.s3.chunk_size_mb", dest="upload.s3.chunk_size_mb", help="S3 Uploader upload chunk size, in megabytes (default: 50)", default=50, type=int)
     parser.add_argument("--upload.s3.secure", dest="upload.s3.secure", help="S3 Uploader connect over SSL (default: true)", default=True, action="store_false")
     parser.add_argument("--upload.s3.retries", dest="upload.s3.retries", help="S3 Uploader retry times (default: 5)", default=5, type=int)

mongodb_consistent_backup/Upload/Upload.py

@@ -1,4 +1,3 @@
-from mongodb_consistent_backup.Upload.Gs import Gs
 from mongodb_consistent_backup.Upload.S3 import S3
 from mongodb_consistent_backup.Pipeline import Stage
 

mongodb_consistent_backup/Upload/__init__.py

@@ -2,6 +2,6 @@
 
 
 def config(parser):
-    parser.add_argument("--upload.method", dest="upload.method", help="Uploader method (default: none)", default='none', choices=['gs', 's3', 'none'])
+    parser.add_argument("--upload.method", dest="upload.method", help="Uploader method (default: none)", default='none', choices=['s3', 'none'])
     parser.add_argument("--upload.remove_uploaded", dest="upload.remove_uploaded",help="Remove source files after successful upload (default: false)", default=False, action="store_true")
     return parser