pulp / pulp-cli-deb

2 stars 11 forks source link

remote : gpgkey parameter missing #108

Closed olwins closed 4 months ago

olwins commented 5 months ago

Hi

the gpgkey is missing in the cli when trying to create or update a remote. (I had to use httpie manually to update the remote to pass this parameter)

I'm not a dev, but i tried to fix that, and it seems to work for me locally. If that look ok, I will try to open a pull request (never done that before :D)


For me, only one file seems impacted : https://github.com/pulp/pulp-cli-deb/blob/main/pulpcore/cli/deb/remote.py

By looking at the pulp-cli code, that deals will similar case for the ca-cert parameter.

I did the following :

add _load_stringcallback in the import from pulpcore.cli.common.generic

And then add the following code in the apt_remote_create_options & apt_remote_update_options tuples.

gpgkey_help = _("Gpg public key to verify origin releases against or @file containing same.")

 click.option(
    "--gpgkey",
     help=gpgkey_help,
     callback=load_string_callback,
  ),

I tested with

NAME='ubuntu'
REMOTE_OPTIONS=(
  --url=http://archive.ubuntu.com/ubuntu/
  --distribution=jammy
  --architecture=amd64
  --policy=on_demand
  --gpgkey=@/tmp/ubuntu.txt
)

pulp deb remote create --name=${NAME} ${REMOTE_OPTIONS[@]}

the parameter was set properly

  "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBFufwdoBEADv/Gxytx/LcSXYuM0MwKojbBye81s0G1nEx+lz6VAUpIUZnbkq\ndXBHC+dwrGS/CeeLuAjPRLU8AoxE/jjvZVp8xFGEWHYdklqXGZ/gJfP5d3fIUBtZ\nHZEJl8B8m9pMHf/AQQdsC+YzizSG5t5Mhnotw044LXtdEEkx2t6Jz0OGrh+5Ioxq\nX7pZiq6Cv19BohaUioKMdp7ES6RYfN7ol6HSLFlrMXtVfh/ijpN9j3ZhVGVeRC8k\nKHQsJ5PkIbmvxBiUh7SJmfZUx0IQhNMaDHXfdZAGNtnhzzNReb1FqNLSVkrS/Pns\nAQzMhG1BDm2VOSF64jebKXffFqM5LXRQTeqTLsjUbbrqR6s/GCO8UF7jfUj6I7ta\nLygmsHO/JD4jpKRC0gbpUBfaiJyLvuepx3kWoqL3sN0LhlMI80+fA7GTvoOx4tpq\nVlzlE6TajYu+jfW3QpOFS5ewEMdL26hzxsZg/geZvTbArcP+OsJKRmhv4kNo6Ayd\nyHQ/3ZV/f3X9mT3/SPLbJaumkgp3Yzd6t5PeBu+ZQk/mN5WNNuaihNEV7llb1Zhv\nY0Fxu9BVd/BNl0rzuxp3rIinB2TX2SCg7wE5xXkwXuQ/2eTDE0v0HlGntkuZjGow\nDZkxHZQSxZVOzdZCRVaX/WEFLpKa2AQpw5RJrQ4oZ/OfifXyJzP27o03wQARAQAB\ntEJVYnVudHUgQXJjaGl2ZSBBdXRvbWF0aWMgU2lnbmluZyBLZXkgKDIwMTgpIDxm\ndHBtYXN0ZXJAdWJ1bnR1LmNvbT6JAjgEEwEKACIFAlufwdoCGwMGCwkIBwMCBhUI\nAgkKCwQWAgMBAh4BAheAAAoJEIcZINGZG8k8LHMQAKS2cnxz/5WaoCOWArf5g6UH\nbeOCgc5DBm0hCuFDZWWv427aGei3CPuLw0DGLCXZdyc5dqE8mvjMlOmmAKKlj1uG\ng3TYCbQWjWPeMnBPZbkFgkZoXJ7/6CB7bWRht1sHzpt1LTZ+SYDwOwJ68QRp7DRa\nZl9Y6QiUbeuhq2DUcTofVbBxbhrckN4ZteLvm+/nG9m/ciopc66LwRdkxqfJ32Cy\nq+1TS5VaIJDG7DWziG+Kbu6qCDM4QNlg3LH7p14CrRxAbc4lvohRgsV4eQqsIcdF\nkuVY5HPPj2K8TqpY6STe8Gh0aprG1RV8ZKay3KSMpnyV1fAKn4fM9byiLzQAovC0\nLZ9MMMsrAS/45AvC3IEKSShjLFn1X1dRCiO6/7jmZEoZtAp53hkf8SMBsi78hVNr\nBumZwfIdBA1v22+LY4xQK8q4XCoRcA9G+pvzU9YVW7cRnDZZGl0uwOw7z9PkQBF5\nKFKjWDz4fCk+K6+YtGpovGKekGBb8I7EA6UpvPgqA/QdI0t1IBP0N06RQcs1fUaA\nQEtz6DGy5zkRhR4pGSZn+dFET7PdAjEK84y7BdY4t+U1jcSIvBj0F2B7LwRL7xGp\nSpIKi/ekAXLs117bvFHaCvmUYN7JVp1GMmVFxhIdx6CFm3fxG8QjNb5tere/YqK+\nuOgcXny1UlwtCUzlrSaP\n=9AdM\n-----END PGP PUBLIC KEY BLOCK-----",
mdellweg commented 5 months ago

Please go ahead. I would not introduce an extra variable for the help text though.

olwins commented 5 months ago

Done I hope I didn't make any mistake :)