From 654a4d0ab1425b156156c0a99ef43a5bc125c903 Mon Sep 17 00:00:00 2001 From: Nathan Gillett Date: Wed, 21 Oct 2020 12:12:24 -0400 Subject: [PATCH] Update examples/s3-upload and api-guide for multi-environment use --- docs/api-guide.rst | 2 +- examples/s3-upload | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/api-guide.rst b/docs/api-guide.rst index fd142ef7..4dd0f0ea 100644 --- a/docs/api-guide.rst +++ b/docs/api-guide.rst @@ -60,7 +60,7 @@ Usage: verify='/path/to/bundle.pem', config=Config(client_cert=('client.crt', 'client.key'))) - # Bucket name must match one of the environments defined in exodus-gw.ini + # Bucket name must match one of the section names in exodus-gw.ini without 'env.' prefix bucket = s3.Bucket('dev') # Basic APIs such as upload_file now work as usual bucket.upload_file('/tmp/hello.txt', diff --git a/examples/s3-upload b/examples/s3-upload index a8b079ca..00765b04 100755 --- a/examples/s3-upload +++ b/examples/s3-upload @@ -44,7 +44,7 @@ def main(): "--debug", action="store_true", help="Enable verbose logging" ) parser.add_argument("--endpoint-url", default=None) - parser.add_argument("--bucket", default="exodus-cdn-dev") + parser.add_argument("--env", default="dev") parser.add_argument("files", nargs="+") args = parser.parse_args() @@ -53,7 +53,7 @@ def main(): logging.basicConfig(level=logging.DEBUG) s3 = boto3.resource("s3", endpoint_url=args.endpoint_url) - bucket = s3.Bucket(args.bucket) + bucket = s3.Bucket(args.env) print( "Using endpoint:",