canonical-ubuntu-qa team mailing list archive

[Tim Andersson <mp+465238@xxxxxxxxxxxxxxxxxx>]

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

sorry about the delay, I didn't get an email for this for some reason. Amending now.

> +                    )
> +                    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.