LGTM with an inline suggestion.
Diff comments:
> diff --git a/charms/focal/autopkgtest-web/webcontrol/cache-amqp
> b/charms/focal/autopkgtest-web/webcontrol/cache-amqp
> index adfd4df..22b6623 100755
> --- a/charms/focal/autopkgtest-web/webcontrol/cache-amqp
> +++ b/charms/focal/autopkgtest-web/webcontrol/cache-amqp
> @@ -126,12 +126,15 @@ class AutopkgtestQueueContents:
> req = r.split("\n", 1)
> if len(req) > 1:
> params = json.loads(req[1])
> + if params.get("readable-by", False) or params.get(
> + "swiftuser", False
> + ):
> + r = "private job"
> else:
> - params = {}
> - if params.get("readable-by", False) or params.get(
> - "swiftuser", False
> - ):
> - r = "private job"
> + logging.warning(
> + "Found malformed request: %s\nMarking it as such." %
> r
I am not a fan of newline in warning/error messages, as by parsing the logs it
may be difficult to tell where a string comes from. I'd just leave out the
"\nMarking it as such.", the message is clear enough.
> + )
> + r = "malformed request"
> res.append(r)
> except (ValueError, IndexError) as e:
> logging.warning(
--
https://code.launchpad.net/~andersson123/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/465238
Your team Canonical's Ubuntu QA is requested to review the proposed merge of
~andersson123/autopkgtest-cloud:fix-cache-amqp-creds into
autopkgtest-cloud:master.
--
Mailing list: https://launchpad.net/~canonical-ubuntu-qa
Post to : canonical-ubuntu-qa@lists.launchpad.net
Unsubscribe : https://launchpad.net/~canonical-ubuntu-qa
More help : https://help.launchpad.net/ListHelp
