Merge ~bjornt/maas/+git/maas-release-tools:release-status-new-snapcraft into ~maas-committers/maas/+git/maas-release-tools:main

[Björn Tillenius]

Fix release-status to work with new (7.0) snapcraft.

The format of the credentials produced by 'snapcraft export-login'
has changed.

[Alberto Donato (ack)]

+1

review: Approve

diff --git a/maas_release_tools/scripts/release_status.py b/maas_release_tools/scripts/release_status.py
index 511b301..bf6743a 100644
--- a/maas_release_tools/scripts/release_status.py
+++ b/maas_release_tools/scripts/release_status.py
@@ -14,8 +14,9 @@ will go smoother.
 
 from abc import ABC, abstractmethod
 from argparse import ArgumentParser, FileType
-from configparser import ConfigParser
+import base64
 import glob
+import json
 import subprocess
 import sys
 from typing import Optional
@@ -406,23 +407,18 @@ class PackagesCopiedToReleasePPA(MAASPPA):
             return self._check_packages_copied(source_ppa, target_ppa)
 
 
-def macaroon_auth(conf):
+def macaroon_auth(macaroons):
     """Format a macaroon and its associated discharge.
 
     :return: A string suitable to use in an Authorization header.
 
     """
-    root_macaroon_raw = conf.get("macaroon")
-    unbound_raw = conf.get("unbound_discharge")
-
-    root_macaroon = Macaroon.deserialize(root_macaroon_raw)
-    unbound = Macaroon.deserialize(unbound_raw)
-    bound = root_macaroon.prepare_for_request(unbound)
-    discharge_macaroon_raw = bound.serialize()
-    auth = "Macaroon root={}, discharge={}".format(
-        root_macaroon_raw, discharge_macaroon_raw
-    )
-    return auth
+    root_macaroon = Macaroon.deserialize(macaroons["r"])
+    discharged_macaroon = Macaroon.deserialize(macaroons["d"])
+    bound_macaroon = root_macaroon.prepare_for_request(
+        discharged_macaroon
+    ).serialize()
+    return f"Macaroon root={macaroons['r']}, discharge={bound_macaroon}"
 
 
 class PackageBuilt(ReleaseStep):
@@ -611,21 +607,22 @@ def parse_args():
 
 def main():
     args = parse_args()
-    config = ConfigParser()
-    config.read("release.macaroon")
+    with open("release.macaroon", "r") as credentials_file:
+        raw = base64.b64decode(credentials_file.read())
     try:
-        macaroon = config["login.ubuntu.com"]
-    except KeyError:
+        macaroons = json.loads(raw)
+    except json.decoder.JSONDecodeError:
         print("Macaroon couldn't be found", file=sys.stderr)
         print(get_macaroon_refresh_help(), file=sys.stderr)
         return 1
+
     launchpad = LaunchpadActions(
         "maas", credentials_file=args.launchpad_credentials
     )
     release_version = ReleaseVersion(args.version)
     preparer = ReleasePreparer(
         release_version,
-        macaroon_auth(macaroon),
+        macaroon_auth(macaroons),
         launchpad=launchpad,
     )
     preparer.steps = [