s3: wire up GCP-brand S3

jwise · jwise · commit e41fd1bded17 · 2021-10-24T03:11:50.000-04:00
diff --git a/appstore/s3.py b/appstore/s3.py
@@ -16,8 +16,7 @@
             aws_access_key_id=config['AWS_ACCESS_KEY'],
             aws_secret_access_key=config['AWS_SECRET_KEY'],
         )
-        # XXX: for GCP later:
-        # s3_endpoint = creds.get('S3Endpoint')
+        s3_endpoint = config['S3_ENDPOINT']
 except:
     pass
 
diff --git a/appstore/settings.py b/appstore/settings.py
@@ -24,4 +24,5 @@
     'ALGOLIA_DISABLE': os.environ.get('ALGOLIA_DISABLE', False),
     'AWS_ACCESS_KEY': os.environ.get('AWS_ACCESS_KEY', None),
     'AWS_SECRET_KEY': os.environ.get('AWS_SECRET_KEY', None),
+    'S3_ENDPOINT': os.environ.get('S3_ENDPOINT', None),
 }

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,7 @@`
`16`	`16`	`aws_access_key_id=config['AWS_ACCESS_KEY'],`
`17`	`17`	`aws_secret_access_key=config['AWS_SECRET_KEY'],`
`18`	`18`	`)`
`19`		`- # XXX: for GCP later:`
`20`		`- # s3_endpoint = creds.get('S3Endpoint')`
	`19`	`+ s3_endpoint = config['S3_ENDPOINT']`
`21`	`20`	`except:`
`22`	`21`	`pass`
`23`	`22`
Original file line number	Diff line number	Diff line change
`@@ -24,4 +24,5 @@`
`24`	`24`	`'ALGOLIA_DISABLE': os.environ.get('ALGOLIA_DISABLE', False),`
`25`	`25`	`'AWS_ACCESS_KEY': os.environ.get('AWS_ACCESS_KEY', None),`
`26`	`26`	`'AWS_SECRET_KEY': os.environ.get('AWS_SECRET_KEY', None),`
	`27`	`+ 'S3_ENDPOINT': os.environ.get('S3_ENDPOINT', None),`
`27`	`28`	`}`