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

[Barry Price]

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

[🤖 Canonical IS Review Bot (canonical-is-reviewbot)]

Proxy approval for jsimpso

review: Approve

diff --git a/swoffsite/swoffsite/cli.py b/swoffsite/swoffsite/cli.py
index a468c6b..4260969 100644
--- a/swoffsite/swoffsite/cli.py
+++ b/swoffsite/swoffsite/cli.py
@@ -35,10 +35,10 @@ from .pool import FakePool, Pool
 def s3_bucket_name():
     '''Calculate a unique bucket name for the specified AWS key and OS tenant.
     '''
-    return '_'.join([
+    return '-'.join([
         'swoffsite',
         os.environ['OS_TENANT_NAME'],
-        os.environ['AWS_ACCESS_KEY_ID']]).lower()
+        os.environ['AWS_ACCESS_KEY_ID']]).lower().replace('_', '-')
 
 
 def parse_args():