swoffsite Charms

Merge ~barryprice/swoffsite-charms/+git/swoffsite-charm:master into ~swoffsite-charmers/swoffsite-charms/+git/swoffsite-charm:master

  1. Git
  2. lp:~barryprice/swoffsite-charms/+git/swoffsite-charm
  3. master
  4. Merge into master
Proposed by Barry Price
Status: Merged
Merged at revision: 105670e7790d6d49a2c42c7e2a859e2161d9f03d
Proposed branch: ~barryprice/swoffsite-charms/+git/swoffsite-charm:master
Merge into: ~swoffsite-charmers/swoffsite-charms/+git/swoffsite-charm:master
Diff against target: 17 lines (+2/-2)
1 file modified
swoffsite/swoffsite/cli.py (+2/-2)
Reviewer Review Type Date Requested Status
🤖 Canonical IS Review Bot (community) Approve
swoffsite Charmers Pending
Review via email: mp+453407@code.launchpad.net

Commit message

Temporarily patch our bundled swoffsite to not use underscores in S3 bucket names (forbidden since 2018)

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Review Bot (canonical-is-reviewbot) wrote :

Proxy approval for jsimpso

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/swoffsite/swoffsite/cli.py b/swoffsite/swoffsite/cli.py
2index a468c6b..4260969 100644
3--- a/swoffsite/swoffsite/cli.py
4+++ b/swoffsite/swoffsite/cli.py
5@@ -35,10 +35,10 @@ from .pool import FakePool, Pool
6 def s3_bucket_name():
7 '''Calculate a unique bucket name for the specified AWS key and OS tenant.
8 '''
9- return '_'.join([
10+ return '-'.join([
11 'swoffsite',
12 os.environ['OS_TENANT_NAME'],
13- os.environ['AWS_ACCESS_KEY_ID']]).lower()
14+ os.environ['AWS_ACCESS_KEY_ID']]).lower().replace('_', '-')
15
16
17 def parse_args():

Subscribers

People subscribed via source and target branches