tahoe-lafs/tahoe-lafs
tahoe-lafs
/
tahoe-lafs
2
0
Fork 0
Code Issues Pull Requests 23 Packages Projects Releases 1 Wiki Activity

Address review comments from Daira. 

1. Fix typo.
2. Rename config item googlestorage.bucket_name to googlestorage.bucket for
   consistency.
This commit is contained in:
Itamar Turner-Trauring 2013-04-18 09:04:33 -04:00 committed by Daira Hopwood
parent afdbce1569
commit 74b796d939
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/backends/cloud.rst
View File

@ -168,11 +168,11 @@ the server's ``tahoe.cfg`` file:
``googlestorage.project_id = (string, required)``
This is the project number of the project you you created,
This is the project number of the project you created,
e.g. ``123456``. You can find this number in the Google Cloud Storage
section of the APIs console (the number following `x-goog-project-id`).
``googlestorage.bucket_name = (string, required)``
``googlestorage.bucket = (string, required)``
This controls which bucket (aka container) will be used to hold
shares. The Tahoe-LAFS storage server will only modify and access objects

2
src/allmydata/storage/backends/cloud/googlestorage/googlestorage_container.py
View File

@ -238,7 +238,7 @@ def configure_googlestorage_container(storedir, config):
"""
account_email = config.get_config("storage", "googlestorage.account_email")
private_key = config.get_private_config("googlestorage_private_key")
bucket_name = config.get_config("storage", "googlestorage.bucket_name")
bucket_name = config.get_config("storage", "googlestorage.bucket")
# Only necessary if we do bucket creation/deletion, otherwise can be
# removed:
project_id = config.get_config("storage", "googlestorage.project_id")

8
src/allmydata/test/test_client.py
View File

@ -339,11 +339,11 @@ class Basic(testutil.ReallyEqualMixin, unittest.TestCase):
def test_googlestorage_config_required(self):
"""
account_email, bucket_name and project_id are all required by
account_email, bucket and project_id are all required by
googlestorage configuration.
"""
configs = ["googlestorage.account_email = u@example.com",
"googlestorage.bucket_name = bucket",
"googlestorage.bucket = bucket",
"googlestorage.project_id = 456"]
for i in range(len(configs)):
basedir = self.mktemp()
@ -372,7 +372,7 @@ class Basic(testutil.ReallyEqualMixin, unittest.TestCase):
"enabled = true\n" +
"backend = cloud.googlestorage\n" +
"googlestorage.account_email = u@example.com\n" +
"googlestorage.bucket_name = bucket\n" +
"googlestorage.bucket = bucket\n" +
"googlestorage.project_id = 456\n")
self.failUnlessRaises(MissingConfigEntry, client.Client, basedir)
@ -391,7 +391,7 @@ class Basic(testutil.ReallyEqualMixin, unittest.TestCase):
"enabled = true\n" +
"backend = cloud.googlestorage\n" +
"googlestorage.account_email = u@example.com\n" +
"googlestorage.bucket_name = bucket\n" +
"googlestorage.bucket = bucket\n" +
"googlestorage.project_id = 456\n")
c = client.Client(basedir)
server = c.getServiceNamed("storage")